Changeset 74472 in vbox for trunk/src

Timestamp:

Sep 26, 2018 8:16:36 AM (6 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (1 diff)
• x11/VBoxClient/draganddrop.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp

@@ -1186 +1186 @@
             && (uSessionID != pCtx->uSessionID))
         {
-            LogFlowFunc(("VM session ID changed to %RU64, doing reconnect\n", uSessionID));
-
-            /* Try a reconnect to the DnD service. */
-            rc2 = VbglR3DnDDisconnect(pCtx);
-            AssertRC(rc2);
-            rc2 = VbglR3DnDConnect(pCtx);
-            AssertRC(rc2);
-
-            /* At this point we continue processing the messsages with the new client ID. */
+            LogFlowFunc(("VM session ID changed to %RU64\n", uSessionID));
         }
     }

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -503 +503 @@
     bool waitForX11ClientMsg(XClientMessageEvent &evMsg, Atom aType, RTMSINTERVAL uTimeoutMS = 100);
 
+    /* Session handling. */
+    int checkForSessionChange(void);
+
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    /* Guest -> Host handling. */
+    int ghIsDnDPending(void);
+    int ghDropped(const RTCString &strFormat, VBOXDNDACTION dndActionRequested);
+#endif
+
     /* Host -> Guest handling. */
     int hgEnter(const RTCList<RTCString> &formats, VBOXDNDACTIONLIST dndListActionsAllowed);
@@ -509 +518 @@
     int hgDrop(uint32_t uPosX, uint32_t uPosY, VBOXDNDACTION dndActionDefault);
     int hgDataReceive(PVBGLR3GUESTDNDMETADATA pMetaData);
-
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    /* Guest -> Host handling. */
-    int ghIsDnDPending(void);
-    int ghDropped(const RTCString &strFormat, VBOXDNDACTION dndActionRequested);
-#endif
 
     /* X11 helpers. */
@@ -1615 +1618 @@
     do
     {
+        /* Check if the VM session has changed and reconnect to the HGCM service if necessary. */
+        rc = checkForSessionChange();
+        if (RT_FAILURE(rc))
+            break;
+
         rc = toAtomList(lstFormats, m_lstFormats);
         if (RT_FAILURE(rc))
@@ -1980 +1988 @@
 }
 
+/**
+ * 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 DragInstance::checkForSessionChange(void)
+{
+    uint64_t uSessionID;
+    int rc = VbglR3GetSessionId(&uSessionID);
+    if (   RT_SUCCESS(rc)
+        && uSessionID != m_dndCtx.uSessionID)
+    {
+        LogFlowThisFunc(("VM session has changed to %RU64\n", uSessionID));
+
+        rc = VbglR3DnDDisconnect(&m_dndCtx);
+        AssertRC(rc);
+
+        rc = VbglR3DnDConnect(&m_dndCtx);
+        AssertRC(rc);
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
 /**
@@ -2013 +2047 @@
     else
     {
-        rc = VINF_SUCCESS;
+        /* Check if the VM session has changed and reconnect to the HGCM service if necessary. */
+        rc = checkForSessionChange();
 
         /* Determine the current window which currently has the XdndSelection set. */
@@ -2020 +2055 @@
 
         /* Is this another window which has a Xdnd selection and not our proxy window? */
-        if (   wndSelection
+        if (   RT_SUCCESS(rc)
+            && wndSelection
             && wndSelection != m_wndCur)
         {
@@ -3331 +3367 @@
         /* Wait for new events. */
         rc = VbglR3DnDEventGetNext(&dndCtx, &e.hgcm);
-        if (   RT_SUCCESS(rc)
-            || rc == VERR_CANCELLED)
+        if (RT_SUCCESS(rc))
         {
             cMsgSkippedInvalid = 0; /* Reset skipped messages count. */
@@ -3348 +3383 @@
              * don't support the stuff we do on the guest side, so make sure we
              * don't process invalid messages forever. */
-            if (rc == VERR_INVALID_PARAMETER)
-                cMsgSkippedInvalid++;
-            if (cMsgSkippedInvalid > 32)
+            if (cMsgSkippedInvalid++ > 32)
             {
                 LogRel(("DnD: Too many invalid/skipped messages from host, exiting ...\n"));