Changeset 76105 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

Timestamp:

Dec 10, 2018 11:21:07 AM (6 years ago)

Author:

vboxsync

Message:

DnD/VBoxTray: Added VBoxDnDWnd::Abort() to (hopefully) properly abort an in-flight DnD operation on the guest. Besides hiding the proxy window we also have to let the Windows data object know that we're done.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

@@ -769 +769 @@
 
 /**
+ * Aborts an in-flight DnD operation on the guest.
+ *
+ * @return  VBox status code.
+ */
+int VBoxDnDWnd::Abort(void)
+{
+    LogFlowThisFunc(("mMode=%ld, mState=%RU32\n", mMode, mState));
+    LogRel(("DnD: Drag and drop operation aborted\n"));
+
+    int rc = RTCritSectEnter(&mCritSect);
+    if (RT_SUCCESS(rc))
+    {
+        if (startupInfo.pDataObject)
+            startupInfo.pDataObject->Abort();
+
+        RTCritSectLeave(&mCritSect);
+    }
+
+    /* Post ESC to our window to officially abort the
+     * drag and drop operation. */
+    this->PostMessage(WM_KEYDOWN, VK_ESCAPE /* wParam */, 0 /* lParam */);
+
+    Reset();
+
+    return rc;
+}
+
+/**
  * Handles actions required when the host cursor enters
  * the guest's screen to initiate a host -> guest DnD operation.
@@ -977 +1005 @@
         return VERR_WRONG_ORDER;
 
-    LogFlowThisFunc(("mMode=%ld, mState=%RU32\n", mMode, mState));
-    LogRel(("DnD: Drag and drop operation aborted\n"));
-
-    Reset();
-
-    int rc = VINF_SUCCESS;
-
-    /* Post ESC to our window to officially abort the
-     * drag and drop operation. */
-    this->PostMessage(WM_KEYDOWN, VK_ESCAPE /* wParam */, 0 /* lParam */);
+    int rc = Abort();
 
     LogFlowFuncLeaveRC(rc);
@@ -1086 +1105 @@
 int VBoxDnDWnd::OnHgCancel(void)
 {
-    int rc = RTCritSectEnter(&mCritSect);
-    if (RT_SUCCESS(rc))
-    {
-        if (startupInfo.pDataObject)
-            startupInfo.pDataObject->Abort();
-
-        RTCritSectLeave(&mCritSect);
-    }
-
-    int rc2 = mouseRelease();
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    Reset();
-
-    return rc;
+    return Abort();
 }
 
@@ -1875 +1879 @@
             /* Make sure our proxy window is hidden when an error occured to
              * not block the guest's UI. */
-            pWnd->Reset();
+            int rc2 = pWnd->Abort();
+            AssertRC(rc2);
         }