[PATCH 1/1] user32:Unify drop_target cleanup at end of drag_drop_drop to avoid spurious DragLeave in next DnD session

[zhangzhou]

From: zhangzhou <[e-mail]>

Change-Id: I1213239a7c7981c4d3f7cb56281e3687527c7885
---
 dlls/user32/clipboard.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c
index 3c3ba7c584c..074e81c13b0 100644
--- a/dlls/user32/clipboard.c
+++ b/dlls/user32/clipboard.c
@@ -1276,8 +1276,6 @@ DWORD drag_drop_drop( HWND hwnd )
     {
         HRESULT hr = IDropTarget_DragLeave( object->drop_target );
         if (FAILED(hr)) WARN( "IDropTarget_DragLeave returned %#lx\n", hr );
-        IDropTarget_Release( object->drop_target );
-        object->drop_target = NULL;
     }
 
     if (drop_file)
@@ -1306,6 +1304,12 @@ DWORD drag_drop_drop( HWND hwnd )
         }
     }
 
+     if (object->drop_target)
+    {
+        IDropTarget_Release( object->drop_target );
+        object->drop_target = NULL;
+    }
+
     TRACE("effectRequested(0x%lx) accept(%d) performed(0x%lx) at x(%ld),y(%ld)\n",
           object->target_effect, accept, effect, object->target_pos.x, object->target_pos.y);
 
-- 
GitLab

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