[PATCH v2 0/1] MR4663: winex11: Do window search if IDropTarget::DragOver() returns DROPEFFECT_NONE.

[Akihiro Sagawa (＠sgwaki)]

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-Bugs: https://bugs.winehq.org/show_bug.cgi?id=55179

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

https://gitlab.winehq.org/wine/wine/-/merge_requests/4663

[PATCH v2 1/1] winex11: Do window search if IDropTarget::DragOver() returns DROPEFFECT_NONE.

[Akihiro Sagawa]

From: Akihiro Sagawa

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-Bugs: 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;
 }

/**************************************************************************

[Akihiro Sagawa (＠sgwaki)]

On Mon Dec 11 14:36:25 2023 +0000, Akihiro Sagawa wrote:
> changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/4663/diffs?diff_id=89427&start_sha=c701810f36fecc2d79b7affb264919a41fab6a50#a7e0c6c36c36b09dc6716ff547bda76b5e1b8ee9_166_166)

Updated. Thanks for reviewing.

[PATCH v2 0/1] MR4663: winex11: Do window search if IDropTarget::DragOver() returns DROPEFFECT_NONE. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.