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

winex11: Allocate clipboard data as GMEM_FIXED. 

Based on a patch by Rafał Harabień.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-08-18 20:57:51 +09:00
parent a96b017070
commit 60f8b516e2
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -846,9 +846,9 @@ static void test_handles( HWND hwnd )
} }
data = GetClipboardData( CF_OEMTEXT ); data = GetClipboardData( CF_OEMTEXT );
todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); ok( is_fixed( data ), "expected fixed mem %p\n", data );
data = GetClipboardData( CF_UNICODETEXT ); data = GetClipboardData( CF_UNICODETEXT );
todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); ok( is_fixed( data ), "expected fixed mem %p\n", data );
data = GetClipboardData( CF_BITMAP ); data = GetClipboardData( CF_BITMAP );
ok( data == bitmap, "expected bitmap %p\n", data ); ok( data == bitmap, "expected bitmap %p\n", data );
data = GetClipboardData( CF_PALETTE ); data = GetClipboardData( CF_PALETTE );
@ -858,7 +858,7 @@ static void test_handles( HWND hwnd )
data = GetClipboardData( CF_GDIOBJFIRST + 2 ); data = GetClipboardData( CF_GDIOBJFIRST + 2 );
ok( data == pen, "expected pen %p\n", data ); ok( data == pen, "expected pen %p\n", data );
data = GetClipboardData( CF_DIB ); data = GetClipboardData( CF_DIB );
todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); ok( is_fixed( data ), "expected fixed mem %p\n", data );
data = GetClipboardData( CF_DIBV5 ); data = GetClipboardData( CF_DIBV5 );
todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data );
@ -924,7 +924,7 @@ static DWORD WINAPI test_handles_thread2( void *arg )
ok( h == pen, "different pen %p / %p\n", h, pen ); ok( h == pen, "different pen %p / %p\n", h, pen );
trace( "pen %p\n", h ); trace( "pen %p\n", h );
h = GetClipboardData( CF_DIB ); h = GetClipboardData( CF_DIB );
todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h );
h = GetClipboardData( CF_DIBV5 ); h = GetClipboardData( CF_DIBV5 );
todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h );
r = CloseClipboard(); r = CloseClipboard();
@ -942,7 +942,7 @@ static void test_handles_process( const char *str )
r = OpenClipboard( 0 ); r = OpenClipboard( 0 );
ok( r, "gle %d\n", GetLastError() ); ok( r, "gle %d\n", GetLastError() );
h = GetClipboardData( CF_TEXT ); h = GetClipboardData( CF_TEXT );
todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h );
ptr = GlobalLock( h ); ptr = GlobalLock( h );
if (ptr) todo_wine ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); if (ptr) todo_wine ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr );
GlobalUnlock( h ); GlobalUnlock( h );

24
dlls/winex11.drv/clipboard.c
View File

@ -863,8 +863,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wForma
else else
alloc_size = dst_chars; alloc_size = dst_chars;
hData = GlobalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE | hData = GlobalAlloc(GMEM_ZEROINIT | GMEM_FIXED, alloc_size);
GMEM_DDESHARE, alloc_size);
lpstrT = GlobalLock(hData); lpstrT = GlobalLock(hData);
@ -941,8 +940,7 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp)
/* Allocate the packed DIB */ /* Allocate the packed DIB */
TRACE("\tAllocating packed DIB of size %d\n", cPackedSize); TRACE("\tAllocating packed DIB of size %d\n", cPackedSize);
hPackedDIB = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE /*| GMEM_ZEROINIT*/, hPackedDIB = GlobalAlloc( GMEM_FIXED, cPackedSize );
cPackedSize );
if ( !hPackedDIB ) if ( !hPackedDIB )
{ {
WARN("Could not allocate packed DIB!\n"); WARN("Could not allocate packed DIB!\n");
@ -1233,7 +1231,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *display, Window w, Atom p
inlcount++; inlcount++;
} }
if ((hText = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbytes + inlcount + 1))) if ((hText = GlobalAlloc(GMEM_FIXED, cbytes + inlcount + 1)))
{ {
lpstr = GlobalLock(hText); lpstr = GlobalLock(hText);
@ -1290,7 +1288,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *display, Window w, Atom prop)
} }
count = MultiByteToWideChar(CP_UTF8, 0, lpstr, -1, NULL, 0); count = MultiByteToWideChar(CP_UTF8, 0, lpstr, -1, NULL, 0);
hUnicodeText = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, count * sizeof(WCHAR)); hUnicodeText = GlobalAlloc(GMEM_FIXED, count * sizeof(WCHAR));
if (hUnicodeText) if (hUnicodeText)
{ {
@ -1348,7 +1346,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, At
TRACE("lcount = %d, destlen=%d, srcstr %s\n", lcount, destlen, srcstr[0]); TRACE("lcount = %d, destlen=%d, srcstr %s\n", lcount, destlen, srcstr[0]);
if ((hUnicodeText = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (destlen + lcount + 1) * sizeof(WCHAR)))) if ((hUnicodeText = GlobalAlloc(GMEM_FIXED, (destlen + lcount + 1) * sizeof(WCHAR))))
{ {
WCHAR *deststr = GlobalLock(hUnicodeText); WCHAR *deststr = GlobalLock(hUnicodeText);
MultiByteToWideChar(CP_UNIXCP, 0, srcstr[0], -1, deststr, destlen); MultiByteToWideChar(CP_UNIXCP, 0, srcstr[0], -1, deststr, destlen);
@ -1432,8 +1430,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p
DWORD info_size = bitmap_info_size( info, DIB_RGB_COLORS ); DWORD info_size = bitmap_info_size( info, DIB_RGB_COLORS );
BYTE *ptr; BYTE *ptr;
hClipData = GlobalAlloc( GMEM_MOVEABLE | GMEM_DDESHARE, hClipData = GlobalAlloc( GMEM_FIXED, info_size + info->bmiHeader.biSizeImage );
info_size + info->bmiHeader.biSizeImage );
if (hClipData) if (hClipData)
{ {
ptr = GlobalLock( hClipData ); ptr = GlobalLock( hClipData );
@ -1614,7 +1611,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportTextUriList(Display *display, Window w, Ato
if (out && end >= len) if (out && end >= len)
{ {
DROPFILES *dropFiles; DROPFILES *dropFiles;
handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); handle = GlobalAlloc(GMEM_FIXED, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR));
if (handle) if (handle)
{ {
dropFiles = (DROPFILES*) GlobalLock(handle); dropFiles = (DROPFILES*) GlobalLock(handle);
@ -1650,8 +1647,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, A
{ {
if (cbytes) if (cbytes)
{ {
/* Turn on the DDESHARE flag to enable shared 32 bit memory */ hClipData = GlobalAlloc(GMEM_FIXED, cbytes);
hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbytes);
if (hClipData == 0) if (hClipData == 0)
{ {
HeapFree(GetProcessHeap(), 0, lpdata); HeapFree(GetProcessHeap(), 0, lpdata);
@ -1716,7 +1712,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportClipboardData(Display *display, Window requ
{ {
datasize = GlobalSize(lpData->hData); datasize = GlobalSize(lpData->hData);
hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, datasize); hClipData = GlobalAlloc(GMEM_FIXED, datasize);
if (hClipData == 0) return NULL; if (hClipData == 0) return NULL;
if ((lpClipData = GlobalLock(hClipData))) if ((lpClipData = GlobalLock(hClipData)))
@ -2182,7 +2178,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, A
ERR("Failed to export %04x format\n", lpdata->wFormatID); ERR("Failed to export %04x format\n", lpdata->wFormatID);
return 0; return 0;
} }
hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, textUriListSize); hClipData = GlobalAlloc(GMEM_FIXED, textUriListSize);
if (hClipData == NULL) if (hClipData == NULL)
return 0; return 0;
hDrop = (HDROP) lpdata->hData; hDrop = (HDROP) lpdata->hData;