From ba21de83a6d28c6c418804c62bbb03ac04748754 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Mon, 21 Dec 2015 11:21:31 +0100 Subject: [PATCH] winex11.drv: XDNDDropEffect stores OLE Drag&Drop effect so don't use it WS_EX_ACCEPTFILES related drops. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/winex11.drv/xdnd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0c34b4f1b54..8b2c5825fa1 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -339,12 +339,10 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (effect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { accept = 1; effect = DROPEFFECT_COPY; - XDNDDropEffect = effect; } TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n", @@ -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. * Doing both causes winamp to duplicate the dropped files (#29081) */ if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (XDNDDropEffect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd );