Changeset 80883 in vbox for trunk

Timestamp:

Sep 18, 2019 11:22:57 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Simplified client call completion in host service.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-transfers.cpp (modified) (6 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp

@@ -1239 +1239 @@
  * transfer client (guest) handler for the Shared Clipboard host service.
  *
- * @returns VBox status code.
+ * @returns VBox status code, or VINF_HGCM_ASYNC_EXECUTE if returning to the client will be deferred.
  * @param   pClient             Pointer to associated client.
  * @param   callHandle          The client's call handle of this call.
@@ -1248 +1248 @@
  */
 int sharedClipboardSvcTransferHandler(PSHCLCLIENT pClient,
-                                VBOXHGCMCALLHANDLE callHandle,
-                                uint32_t u32Function,
-                                uint32_t cParms,
-                                VBOXHGCMSVCPARM paParms[],
-                                uint64_t tsArrival)
-{
-    RT_NOREF(paParms, tsArrival);
+                                      VBOXHGCMCALLHANDLE callHandle,
+                                      uint32_t u32Function,
+                                      uint32_t cParms,
+                                      VBOXHGCMSVCPARM paParms[],
+                                      uint64_t tsArrival)
+{
+    RT_NOREF(callHandle, paParms, tsArrival);
 
     LogFlowFunc(("uClient=%RU32, u32Function=%RU32 (%s), cParms=%RU32, g_ExtState.pfnExtension=%p\n",
@@ -1284 +1284 @@
      * Pre-check: For certain messages we need to make sure that a (right) transfer is present.
      */
-    uint32_t         uCID      = 0; /* Context ID */
+    uint32_t      uCID      = 0; /* Context ID */
     PSHCLTRANSFER pTransfer = NULL;
 
@@ -1323 +1323 @@
 
     rc = VERR_INVALID_PARAMETER; /* Play safe. */
-
-    bool fDoCallComplete = true;
 
     switch (u32Function)
@@ -1432 +1430 @@
         {
             rc = sharedClipboardSvcTransferHandleReply(pClient, pTransfer, cParms, paParms);
-
-            /* This message does not need any completion, as it can happen at any time from the guest side. */
-            fDoCallComplete = false;
             break;
         }
@@ -1858 +1853 @@
             LogFunc(("Not implemented\n"));
             break;
-    }
-
-    if (fDoCallComplete)
-    {
-        /* Tell the client that the call is complete (unblocks waiting). */
-        LogFlowFunc(("[Client %RU32] Calling pfnCallComplete w/ rc=%Rrc\n", pClient->State.uClientID, rc));
-        AssertPtr(g_pHelpers);
-        g_pHelpers->pfnCallComplete(callHandle, rc);
     }
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -1201 +1201 @@
 #endif
 
-    bool fDoCallComplete = true;
-
     switch (u32Function)
     {
@@ -1208 +1206 @@
         {
             rc = sharedClipboardSvcMsgGetOld(pClient, callHandle, cParms, paParms);
-            if (rc == VINF_HGCM_ASYNC_EXECUTE)
-                fDoCallComplete = false;
             break;
         }
@@ -1259 +1255 @@
         {
             rc = sharedClipboardSvcMsgPeek(pClient, callHandle, cParms, paParms, true /*fWait*/);
-            if (rc == VINF_HGCM_ASYNC_EXECUTE)
-                fDoCallComplete = false;
             break;
         }
@@ -1267 +1261 @@
         {
             rc = sharedClipboardSvcMsgGet(pClient, callHandle, cParms, paParms);
-            if (rc == VINF_HGCM_ASYNC_EXECUTE)
-                fDoCallComplete = false;
             break;
         }
@@ -1484 +1476 @@
     }
 
-    LogFlowFunc(("u32ClientID=%RU32, fDoCallComplete=%RTbool, rc=%Rrc\n", pClient->State.uClientID, fDoCallComplete, rc));
-
-    if (fDoCallComplete)
+    LogFlowFunc(("[Client %RU32] rc=%Rrc\n", pClient->State.uClientID, rc));
+
+    if (rc != VINF_HGCM_ASYNC_EXECUTE)
         g_pHelpers->pfnCallComplete(callHandle, rc);
-
-    LogFlowFuncLeaveRC(rc);
 }