Akihiro Sagawa : shell32: Fix return value for DragQueryPoint.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 7bad7c13876c4e3124dfb9fa941f314cc5d2ea44
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7bad7c13876c4e3124dfb9fa9...

Author: Akihiro Sagawa <sagawa.aki(a)gmail.com>
Date:   Wed Aug  7 22:48:46 2019 +0900

shell32: Fix return value for DragQueryPoint.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47514
Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 4c6aa8b2fa1678c39aa5a89d9b26cfc4002e744e)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/shell32/shellole.c       | 2 +-
 dlls/shell32/tests/shellole.c | 2 +-
 dlls/winemac.drv/dragdrop.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 3fe96801aa..3adabda0ee 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -556,7 +556,7 @@ BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p)
 	lpDropFileStruct = GlobalLock(hDrop);
 
         *p = lpDropFileStruct->pt;
-	bRet = lpDropFileStruct->fNC;
+	bRet = !lpDropFileStruct->fNC;
 
 	GlobalUnlock(hDrop);
 	return bRet;
diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c
index a96e8695a1..a4158aaf3c 100644
--- a/dlls/shell32/tests/shellole.c
+++ b/dlls/shell32/tests/shellole.c
@@ -777,7 +777,7 @@ static LRESULT WINAPI drop_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA
         ok(num == strlen(DROPTEST_FILENAME), "got %u\n", num);
         ok(!strcmp(filename, DROPTEST_FILENAME), "got %s\n", filename);
         r = DragQueryPoint(hDrop, &pt);
-        todo_wine ok(r == expected, "expected %d, got %d\n", expected, r);
+        ok(r == expected, "expected %d, got %d\n", expected, r);
         ok(pt.x == 10, "expected 10, got %d\n", pt.x);
         ok(pt.y == 20, "expected 20, got %d\n", pt.y);
         DragFinish(hDrop);
diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c
index e0890183bc..8174c3f510 100644
--- a/dlls/winemac.drv/dragdrop.c
+++ b/dlls/winemac.drv/dragdrop.c
@@ -455,7 +455,7 @@ BOOL query_drag_drop(macdrv_query* query)
             {
                 dropfiles->pt.x = pt.x;
                 dropfiles->pt.y = pt.y;
-                dropfiles->fNC  = TRUE;
+                dropfiles->fNC  = FALSE;
 
                 TRACE("sending WM_DROPFILES: hwnd %p pt %s %s\n", hwnd, wine_dbgstr_point(&pt),
                       debugstr_w((WCHAR*)((char*)dropfiles + dropfiles->pFiles)));