Commit c03c1727 authored by Akihiro Sagawa's avatar Akihiro Sagawa Committed by Alexandre Julliard

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

Fixes a regression from 1d337249. 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
parent 6ea417d3
...@@ -233,7 +233,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size ) ...@@ -233,7 +233,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size )
} }
} }
if (XDNDAccepted) if (XDNDAccepted && XDNDDropEffect != DROPEFFECT_NONE)
accept = 1; accept = 1;
else else
{ {
...@@ -246,7 +246,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size ) ...@@ -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 ) NTSTATUS x11drv_dnd_drop_event( UINT arg )
...@@ -319,7 +319,7 @@ 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", TRACE("effectRequested(0x%lx) accept(%d) performed(0x%lx) at x(%ld),y(%ld)\n",
XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y); XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y);
return accept ? effect : 0; return accept ? effect : DROPEFFECT_NONE;
} }
/************************************************************************** /**************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment