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

winex11: Fix a WM_DROPFILES memory ownership ambiguity.

This commit is contained in:
Damjan Jovanovic 2014-05-06 03:02:45 +02:00 committed by Alexandre Julliard
parent 9016d1eda0
commit f0a91c0248
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/winex11.drv/xdnd.c
View File

@ -727,17 +727,20 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd)
if (found) if (found)
{ {
DROPFILES *lpDrop = current->data; HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, current->size);
if (lpDrop) if (dropHandle)
{ {
DROPFILES *lpDrop = GlobalLock(dropHandle);
lpDrop->pt.x = XDNDxy.x; lpDrop->pt.x = XDNDxy.x;
lpDrop->pt.y = XDNDxy.y; lpDrop->pt.y = XDNDxy.y;
memcpy(lpDrop, current->data, current->size);
TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd,
((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles)));
GlobalUnlock(dropHandle);
PostMessageW(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0))
GlobalFree(dropHandle);
} }
} }
@ -761,6 +764,7 @@ static void X11DRV_XDND_FreeDragDropOp(void)
LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry)
{ {
list_remove(&current->entry); list_remove(&current->entry);
HeapFree(GetProcessHeap(), 0, current->data);
HeapFree(GetProcessHeap(), 0, current); HeapFree(GetProcessHeap(), 0, current);
} }