forked from Mirrors/wine-wine
winex11.drv: Don't call IDropTarget::{DragOver,DragLeave,Drop} functions if DragEnter fails.
Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>oldstable
parent
701bb45203
commit
a19fe8d9c8
|
@ -285,7 +285,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event )
|
||||||
/* Notify OLE of DragEnter. Result determines if we accept */
|
/* Notify OLE of DragEnter. Result determines if we accept */
|
||||||
HWND dropTargetWindow;
|
HWND dropTargetWindow;
|
||||||
|
|
||||||
if (XDNDLastDropTargetWnd)
|
if (XDNDAccepted && XDNDLastDropTargetWnd)
|
||||||
{
|
{
|
||||||
dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd);
|
dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd);
|
||||||
if (dropTarget)
|
if (dropTarget)
|
||||||
|
@ -387,35 +387,38 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event )
|
||||||
TRACE("\n");
|
TRACE("\n");
|
||||||
|
|
||||||
/* Notify OLE of Drop */
|
/* Notify OLE of Drop */
|
||||||
dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd);
|
if (XDNDAccepted)
|
||||||
if (dropTarget)
|
|
||||||
{
|
{
|
||||||
HRESULT hr;
|
dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd);
|
||||||
POINTL pointl;
|
if (dropTarget)
|
||||||
|
|
||||||
pointl.x = XDNDxy.x;
|
|
||||||
pointl.y = XDNDxy.y;
|
|
||||||
hr = IDropTarget_Drop(dropTarget, &XDNDDataObject, MK_LBUTTON,
|
|
||||||
pointl, &effect);
|
|
||||||
if (hr == S_OK)
|
|
||||||
{
|
{
|
||||||
if (effect != DROPEFFECT_NONE)
|
HRESULT hr;
|
||||||
|
POINTL pointl;
|
||||||
|
|
||||||
|
pointl.x = XDNDxy.x;
|
||||||
|
pointl.y = XDNDxy.y;
|
||||||
|
hr = IDropTarget_Drop(dropTarget, &XDNDDataObject, MK_LBUTTON,
|
||||||
|
pointl, &effect);
|
||||||
|
if (hr == S_OK)
|
||||||
{
|
{
|
||||||
TRACE("drop succeeded\n");
|
if (effect != DROPEFFECT_NONE)
|
||||||
accept = 1;
|
{
|
||||||
|
TRACE("drop succeeded\n");
|
||||||
|
accept = 1;
|
||||||
|
drop_file = FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
TRACE("the application refused the drop\n");
|
||||||
|
}
|
||||||
|
else if (FAILED(hr))
|
||||||
|
WARN("drop failed, error 0x%08X\n", hr);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WARN("drop returned 0x%08X\n", hr);
|
||||||
drop_file = FALSE;
|
drop_file = FALSE;
|
||||||
}
|
}
|
||||||
else
|
IDropTarget_Release(dropTarget);
|
||||||
TRACE("the application refused the drop\n");
|
|
||||||
}
|
}
|
||||||
else if (FAILED(hr))
|
|
||||||
WARN("drop failed, error 0x%08X\n", hr);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WARN("drop returned 0x%08X\n", hr);
|
|
||||||
drop_file = FALSE;
|
|
||||||
}
|
|
||||||
IDropTarget_Release(dropTarget);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (drop_file)
|
if (drop_file)
|
||||||
|
@ -465,13 +468,16 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event )
|
||||||
TRACE("DND Operation canceled\n");
|
TRACE("DND Operation canceled\n");
|
||||||
|
|
||||||
/* Notify OLE of DragLeave */
|
/* Notify OLE of DragLeave */
|
||||||
dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd);
|
if (XDNDAccepted)
|
||||||
if (dropTarget)
|
|
||||||
{
|
{
|
||||||
HRESULT hr = IDropTarget_DragLeave(dropTarget);
|
dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd);
|
||||||
if (FAILED(hr))
|
if (dropTarget)
|
||||||
WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr);
|
{
|
||||||
IDropTarget_Release(dropTarget);
|
HRESULT hr = IDropTarget_DragLeave(dropTarget);
|
||||||
|
if (FAILED(hr))
|
||||||
|
WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr);
|
||||||
|
IDropTarget_Release(dropTarget);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
X11DRV_XDND_FreeDragDropOp();
|
X11DRV_XDND_FreeDragDropOp();
|
||||||
|
|
Loading…
Reference in New Issue