ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Also release GMEM_FIXED data in free_cached_data. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2016-10-01 14:55:05 +02:00 committed by Alexandre Julliard
parent b6b54fa14a
commit df3c2a4a41
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/user32/clipboard.c
View File

@ -326,11 +326,7 @@ static void free_cached_data( struct cached_format *cache )
GlobalFree( cache->handle ); GlobalFree( cache->handle );
break; break;
default: default:
if ((ptr = GlobalLock( cache->handle )) && ptr != cache->handle)
{
GlobalUnlock( cache->handle );
GlobalFree( cache->handle ); GlobalFree( cache->handle );
}
break; break;
} }
list_remove( &cache->entry ); list_remove( &cache->entry );

19
dlls/user32/tests/clipboard.c
View File

@ -1590,9 +1590,7 @@ static BOOL is_fixed( HANDLE handle )
static BOOL is_freed( HANDLE handle ) static BOOL is_freed( HANDLE handle )
{ {
void *ptr = GlobalLock( handle ); return !GlobalSize( handle );
if (ptr) GlobalUnlock( handle );
return !ptr;
} }
static UINT format_id; static UINT format_id;
@ -1602,7 +1600,8 @@ static const LOGPALETTE logpalette = { 0x300, 1, {{ 0x12, 0x34, 0x56, 0x78 }}};
static void test_handles( HWND hwnd ) static void test_handles( HWND hwnd )
{ {
HGLOBAL h, htext, htext2, htext3, htext4, htext5, hfixed, hmoveable, empty_fixed, empty_moveable; HGLOBAL h, htext, htext2, htext3, htext4, htext5;
HGLOBAL hfixed, hfixed2, hmoveable, empty_fixed, empty_moveable;
void *ptr; void *ptr;
UINT format_id2 = RegisterClipboardFormatA( "another format" ); UINT format_id2 = RegisterClipboardFormatA( "another format" );
BOOL r; BOOL r;
@ -1622,6 +1621,7 @@ static void test_handles( HWND hwnd )
palette = CreatePalette( &logpalette ); palette = CreatePalette( &logpalette );
hfixed = GlobalAlloc( GMEM_FIXED, 17 ); hfixed = GlobalAlloc( GMEM_FIXED, 17 );
hfixed2 = GlobalAlloc( GMEM_FIXED, 17 );
ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed ); ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed );
ok( GlobalSize( hfixed ) == 17, "wrong size %lu\n", GlobalSize( hfixed )); ok( GlobalSize( hfixed ) == 17, "wrong size %lu\n", GlobalSize( hfixed ));
@ -1682,8 +1682,8 @@ static void test_handles( HWND hwnd )
h = SetClipboardData( format_id2, empty_fixed ); h = SetClipboardData( format_id2, empty_fixed );
ok( h == empty_fixed, "got %p\n", h ); ok( h == empty_fixed, "got %p\n", h );
ok( is_fixed( h ), "expected fixed mem %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h );
h = SetClipboardData( 0xdeadbeef, hfixed ); h = SetClipboardData( 0xdeadbeef, hfixed2 );
ok( h == hfixed, "got %p\n", h ); ok( h == hfixed2, "got %p\n", h );
ok( is_fixed( h ), "expected fixed mem %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h );
h = SetClipboardData( 0xdeadbabe, hmoveable ); h = SetClipboardData( 0xdeadbabe, hmoveable );
ok( h == hmoveable, "got %p\n", h ); ok( h == hmoveable, "got %p\n", h );
@ -1719,7 +1719,7 @@ static void test_handles( HWND hwnd )
ok( is_fixed( data ), "expected fixed mem %p\n", data ); ok( is_fixed( data ), "expected fixed mem %p\n", data );
data = GetClipboardData( 0xdeadbeef ); data = GetClipboardData( 0xdeadbeef );
ok( data == hfixed, "wrong data %p\n", data ); ok( data == hfixed2, "wrong data %p\n", data );
ok( is_fixed( data ), "expected fixed mem %p\n", data ); ok( is_fixed( data ), "expected fixed mem %p\n", data );
data = GetClipboardData( 0xdeadbabe ); data = GetClipboardData( 0xdeadbabe );
@ -1734,6 +1734,11 @@ static void test_handles( HWND hwnd )
ok( is_moveable( h ), "expected moveable mem %p\n", h ); ok( is_moveable( h ), "expected moveable mem %p\n", h );
ok( is_freed( htext5 ), "expected freed mem %p\n", htext5 ); ok( is_freed( htext5 ), "expected freed mem %p\n", htext5 );
h = SetClipboardData( 0xdeadbeef, hfixed );
ok( h == hfixed, "got %p\n", h );
ok( is_fixed( h ), "expected fixed mem %p\n", h );
ok( is_freed( hfixed2 ) || broken( !is_freed( hfixed2 )) /* < Vista */, "expected freed mem %p\n", hfixed2 );
r = CloseClipboard(); r = CloseClipboard();
ok( r, "gle %d\n", GetLastError() ); ok( r, "gle %d\n", GetLastError() );