From: Akihiro Sagawa sagawa.aki@gmail.com
This is winemac.drv port of 846a8f6c8dcf7ad0bc72437d7ea79cc9e00c8ab7.
Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com Signed-off-by: Ken Thomases ken@codeweavers.com --- v2: Fixed order of arguments in TRACE() to match format string
dlls/winemac.drv/dragdrop.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 788cb002303..7de50e5881c 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -455,9 +455,10 @@ BOOL query_drag_drop(macdrv_query* query) { dropfiles->pt.x = pt.x; dropfiles->pt.y = pt.y; - dropfiles->fNC = FALSE; + dropfiles->fNC = !ScreenToClient(hwnd, &dropfiles->pt);
- TRACE("sending WM_DROPFILES: hwnd %p pt %s %s\n", hwnd, wine_dbgstr_point(&pt), + TRACE("sending WM_DROPFILES: hwnd %p nc %d pt %s %s\n", hwnd, + dropfiles->fNC, wine_dbgstr_point(&dropfiles->pt), debugstr_w((WCHAR*)((char*)dropfiles + dropfiles->pFiles)));
GlobalUnlock(hdrop);
From: Akihiro Sagawa sagawa.aki@gmail.com
Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com Signed-off-by: Ken Thomases ken@codeweavers.com --- dlls/winemac.drv/dragdrop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 7de50e5881c..a07b66ac14a 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -453,9 +453,12 @@ BOOL query_drag_drop(macdrv_query* query) DROPFILES *dropfiles = GlobalLock(hdrop); if (dropfiles) { + RECT rect; dropfiles->pt.x = pt.x; dropfiles->pt.y = pt.y; - dropfiles->fNC = !ScreenToClient(hwnd, &dropfiles->pt); + dropfiles->fNC = !(ScreenToClient(hwnd, &dropfiles->pt) && + GetClientRect(hwnd, &rect) && + PtInRect(&rect, dropfiles->pt));
TRACE("sending WM_DROPFILES: hwnd %p nc %d pt %s %s\n", hwnd, dropfiles->fNC, wine_dbgstr_point(&dropfiles->pt),