ole32/ole2: After IDropTarget::DragEnter() failure target doesn't count as valid.

9c44ed8a · Nikolay Sivov · Alexandre Julliard · 071d16d6 · 9c44ed8a
Commit 9c44ed8a authored May 02, 2010 by Nikolay Sivov Committed by Alexandre Julliard May 03, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

ole2.c dlls/ole32/ole2.c +14 -6

No files found.
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -2081,13 +2081,21 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo)
      /*
       * If there is, notify it that we just dragged-in
       */
-      if (trackerInfo->curDragTarget!=0)
+      if (trackerInfo->curDragTarget)
      {
-	IDropTarget_DragEnter(trackerInfo->curDragTarget,
-			      trackerInfo->dataObject,
-                              trackerInfo->dwKeyState,
-                              trackerInfo->curMousePos,
-			      trackerInfo->pdwEffect);
+        hr = IDropTarget_DragEnter(trackerInfo->curDragTarget,
+                                   trackerInfo->dataObject,
+                                   trackerInfo->dwKeyState,
+                                   trackerInfo->curMousePos,
+                                   trackerInfo->pdwEffect);
+
+        /* failed DragEnter() means invalid target */
+        if (hr != S_OK)
+        {
+          trackerInfo->curDragTargetHWND = 0;
+          trackerInfo->curTargetHWND     = 0;
+          trackerInfo->curDragTarget     = 0;
+        }
      }
    }
    else