winex11.drv: Indicate whether the drop point is non-client area.

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winex11.drv: Indicate whether the drop point is non-client area.
aaac4e25 · Akihiro Sagawa · Alexandre Julliard · 424e1e71 · aaac4e25
Commit aaac4e25 authored Aug 15, 2019 by Akihiro Sagawa Committed by Alexandre Julliard Aug 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

xdnd.c dlls/winex11.drv/xdnd.c +4 -1

No files found.
--- a/dlls/winex11.drv/xdnd.c
+++ b/dlls/winex11.drv/xdnd.c
@@ -636,12 +636,15 @@ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd)
        HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents));
        if (dropHandle)
        {
+            RECT rect;
            DROPFILES *lpDrop = GlobalLock(dropHandle);
            memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents));
            GlobalUnlock(current->contents);
            lpDrop->pt.x = XDNDxy.x;
            lpDrop->pt.y = XDNDxy.y;
-            lpDrop->fNC  = !ScreenToClient(hwnd, &lpDrop->pt);
+            lpDrop->fNC  = !(ScreenToClient(hwnd, &lpDrop->pt) &&
+                             GetClientRect(hwnd, &rect) &&
+                             PtInRect(&rect, lpDrop->pt));
            TRACE("Sending WM_DROPFILES: hWnd=0x%p, fNC=%d, x=%d, y=%d, files=%p(%s)\n", hwnd,
                    lpDrop->fNC, lpDrop->pt.x, lpDrop->pt.y, ((char*)lpDrop) + lpDrop->pFiles,
                    debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles)));