Commit ba21de83 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

winex11.drv: XDNDDropEffect stores OLE Drag&Drop effect so don't use it…

winex11.drv: XDNDDropEffect stores OLE Drag&Drop effect so don't use it WS_EX_ACCEPTFILES related drops. Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 76f7d8c7
...@@ -339,12 +339,10 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) ...@@ -339,12 +339,10 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event )
if (XDNDAccepted) if (XDNDAccepted)
accept = 1; accept = 1;
else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) &&
(effect & DROPEFFECT_COPY) &&
X11DRV_XDND_HasHDROP()) X11DRV_XDND_HasHDROP())
{ {
accept = 1; accept = 1;
effect = DROPEFFECT_COPY; effect = DROPEFFECT_COPY;
XDNDDropEffect = effect;
} }
TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n", TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n",
...@@ -432,7 +430,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) ...@@ -432,7 +430,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event )
/* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set.
* Doing both causes winamp to duplicate the dropped files (#29081) */ * Doing both causes winamp to duplicate the dropped files (#29081) */
if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) &&
(XDNDDropEffect & DROPEFFECT_COPY) &&
X11DRV_XDND_HasHDROP()) X11DRV_XDND_HasHDROP())
{ {
HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd );
......
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