Changeset 86869 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Nov 12, 2020 7:59:52 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141323

Message:

DnD: Termination fixes / clarification.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (4 diffs)

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

@@ -61 +61 @@
  *
  * @returns IPRT status code.
+ *          Will return VERR_CANCELLED (implemented by the host service) if we need to bail out.
  * @param   pCtx                DnD context to use.
  * @param   puMsg               Where to store the message type.
@@ -72 +73 @@
     AssertPtrReturn(pcParms, VERR_INVALID_POINTER);
 
-    HGCMMsgGetNext Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GET_NEXT_HOST_MSG, 3);
-    Msg.uMsg.SetUInt32(0);
-    Msg.cParms.SetUInt32(0);
-    Msg.fBlock.SetUInt32(fWait ? 1 : 0);
-
-    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-    {
-        rc = Msg.uMsg.GetUInt32(puMsg);     AssertRC(rc);
-        rc = Msg.cParms.GetUInt32(pcParms); AssertRC(rc);
-    }
+    int rc;
+
+    do
+    {
+        HGCMMsgGetNext Msg;
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GET_NEXT_HOST_MSG, 3);
+        Msg.uMsg.SetUInt32(0);
+        Msg.cParms.SetUInt32(0);
+        Msg.fBlock.SetUInt32(fWait ? 1 : 0);
+
+        rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+        if (RT_SUCCESS(rc))
+        {
+            rc = Msg.uMsg.GetUInt32(puMsg);     AssertRC(rc);
+            rc = Msg.cParms.GetUInt32(pcParms); AssertRC(rc);
+        }
+
+    } while (rc == VERR_INTERRUPTED);
 
     return rc;
@@ -1078 +1085 @@
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+
+    if (!pCtx->uClientID) /* Already disconnected? Bail out early. */
+        return VINF_SUCCESS;
+
     int rc = VbglR3HGCMDisconnect(pCtx->uClientID);
     if (RT_SUCCESS(rc))
         pCtx->uClientID = 0;
+
     return rc;
 }
@@ -1162 +1174 @@
                 rc = VbglR3DnDConnect(pCtx);
         }
+    }
+
+    if (rc == VERR_CANCELLED) /* Host service told us that we have to bail out. */
+    {
+        pEvent->enmType = VBGLR3DNDEVENTTYPE_QUIT;
+
+        *ppEvent = pEvent;
+
+        return VINF_SUCCESS;
     }