Akihiro Sagawa : winex11: Do window search if IDropTarget::DragOver() returns DROPEFFECT_NONE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c03c17277f4a2ffa49f97ea43f201abf09e25a78
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c03c17277f4a2ffa49f97ea43f201ab...

Author: Akihiro Sagawa <sagawa.aki(a)gmail.com>
Date:   Mon Dec 11 23:09:31 2023 +0900

winex11: Do window search if IDropTarget::DragOver() returns DROPEFFECT_NONE.

Fixes a regression from 1d337249f16ed61163315019f5dbbe4db3386390.

Prior to the commit, we were solving this case in a different way.
If IDropTarget::DragOver() returned DROPEFFECT_NONE,
X11DRV_XDND_DROPEFFECTToXdndAction() would convert it to XdndActionCopy.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55179

---

 dlls/winex11.drv/xdnd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c
index ce99941c021..0e1a747b604 100644
--- a/dlls/winex11.drv/xdnd.c
+++ b/dlls/winex11.drv/xdnd.c
@@ -233,7 +233,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size )
         }
     }
 
-    if (XDNDAccepted)
+    if (XDNDAccepted && XDNDDropEffect != DROPEFFECT_NONE)
         accept = 1;
     else
     {
@@ -246,7 +246,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size )
         }
     }
 
-    return accept ? effect : 0;
+    return accept ? effect : DROPEFFECT_NONE;
 }
 
 NTSTATUS x11drv_dnd_drop_event( UINT arg )
@@ -319,7 +319,7 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg )
     TRACE("effectRequested(0x%lx) accept(%d) performed(0x%lx) at x(%ld),y(%ld)\n",
           XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y);
 
-    return accept ? effect : 0;
+    return accept ? effect : DROPEFFECT_NONE;
 }
 
 /**************************************************************************