Changeset 74476 in vbox for trunk

Timestamp:

Sep 26, 2018 12:06:58 PM (6 years ago)

Author:

vboxsync

Message:

DnD: Fixed message handling on VM restore on Windows guests.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDnD.cpp (modified) (6 diffs)
• VBoxDnD.h (modified) (1 diff)

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

@@ -791 +791 @@
     setMode(HG);
 
-    int rc = VINF_SUCCESS;
+    /* Check if the VM session has changed and reconnect to the HGCM service if necessary. */
+    int rc = checkForSessionChange();
+    if (RT_FAILURE(rc))
+        return rc;
 
     try
@@ -1125 +1128 @@
 int VBoxDnDWnd::OnGhIsDnDPending(void)
 {
-    LogFlowThisFunc(("mMode=%ld, mState=%ld, uScreenID=%RU32\n", mMode, mState));
+    LogFlowThisFunc(("mMode=%ld, mState=%ld\n", mMode, mState));
 
     if (mMode == Unknown)
@@ -1142 +1145 @@
     if (mState == Initialized)
     {
-        rc = makeFullscreen();
+        /* Check if the VM session has changed and reconnect to the HGCM service if necessary. */
+        rc = checkForSessionChange();
         if (RT_SUCCESS(rc))
         {
-            /*
-             * We have to release the left mouse button to
-             * get into our (invisible) proxy window.
-             */
-            mouseRelease();
-
-            /*
-             * Even if we just released the left mouse button
-             * we're still in the dragging state to handle our
-             * own drop target (for the host).
-             */
-            mState = Dragging;
+            rc = makeFullscreen();
+            if (RT_SUCCESS(rc))
+            {
+                /*
+                 * We have to release the left mouse button to
+                 * get into our (invisible) proxy window.
+                 */
+                mouseRelease();
+
+                /*
+                 * Even if we just released the left mouse button
+                 * we're still in the dragging state to handle our
+                 * own drop target (for the host).
+                 */
+                mState = Dragging;
+            }
         }
     }
@@ -1201 +1209 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t dndActionDefault = VBOX_DND_ACTION_IGNORE;
+        VBOXDNDACTION dndActionDefault = VBOX_DND_ACTION_IGNORE;
 
         AssertPtr(pDropTarget);
@@ -1215 +1223 @@
         {
             strFormats = "unknown"; /* Prevent VERR_IO_GEN_FAILURE for IOCTL. */
-            LogFlowFunc(("No format data available yet\n"));
+            LogFlowFunc(("No format data from proxy window available yet\n"));
         }
 
@@ -1372 +1380 @@
 
 /**
+ * Checks if the VM session has changed (can happen when restoring the VM from a saved state)
+ * and do a reconnect to the DnD HGCM service.
+ *
+ * @returns IPRT status code.
+ */
+int VBoxDnDWnd::checkForSessionChange(void)
+{
+    uint64_t uSessionID;
+    int rc = VbglR3GetSessionId(&uSessionID);
+    if (   RT_SUCCESS(rc)
+        && uSessionID != mDnDCtx.uSessionID)
+    {
+        LogFlowThisFunc(("VM session has changed to %RU64\n", uSessionID));
+
+        rc = VbglR3DnDDisconnect(&mDnDCtx);
+        AssertRC(rc);
+
+        rc = VbglR3DnDConnect(&mDnDCtx);
+        AssertRC(rc);
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/**
  * Hides the proxy window again.
  *

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

@@ -353 +353 @@
 protected:
 
+    int checkForSessionChange(void);
     int hide(void);
     int makeFullscreen(void);