Changeset 86869 in vbox for trunk/src/VBox/HostServices

Timestamp:

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

Author:

vboxsync

Message:

DnD: Termination fixes / clarification.

File:

• trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp

@@ -147 +147 @@
 void DragAndDropClient::disconnect(void) RT_NOEXCEPT
 {
-    LogFlowThisFunc(("uClient=%RU32\n", m_idClient));
-
+    LogFlowThisFunc(("uClient=%RU32, fDeferred=%RTbool\n", m_idClient, IsDeferred()));
+
+    /*
+     * If the client still is waiting for a message (i.e in deferred mode),
+     * complete the call with a VERR_CANCELED status so that the client (VBoxTray / VBoxClient) knows
+     * it should bail out.
+     */
     if (IsDeferred())
-        CompleteDeferred(VERR_INTERRUPTED);
+        CompleteDeferred(VERR_CANCELLED);
 
     /*
@@ -471 +476 @@
             break;
     }
-
-#ifdef DEBUG_andy
-    LogFlowFunc(("Mode (%RU32) check rc=%Rrc\n", modeGet(), rc));
-#endif
 
 #define DO_HOST_CALLBACK();                                                                   \
@@ -1028 +1029 @@
     if (rc == VINF_HGCM_ASYNC_EXECUTE)
     {
+        LogFlowFunc(("Deferring client %RU32\n", idClient));
+
         try
         {