Changeset 85983 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Sep 1, 2020 4:55:10 PM (5 years ago)

Author:

vboxsync

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

140179

Message:

Shared Clipboard/Host Service: No need to go forth and back between common service and backend-specific code when calling ShClBackendWriteData(). Just call ShClSvcGuestDataReceived() from the common service code after calling ShClBackendWriteData() instead.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-darwin.cpp (modified) (2 diffs)
• VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-x11.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc.cpp (modified) (1 diff)

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

@@ -270 +270 @@
     RT_NOREF(pCmdCtx);
 
+    LogFlowFuncEnter();
+
     ShClSvcLock();
 
@@ -276 +278 @@
     ShClSvcUnlock();
 
-    return VINF_SUCCESS;
+    LogFlowFuncLeaveRC(VINF_SUCCESS);
 }
 

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

@@ -832 +832 @@
                          SHCLFORMAT uFormat, void *pvData, uint32_t cbData)
 {
+    RT_NOREF(pClient, pCmdCtx, uFormat, pvData, cbData);
+
     LogFlowFuncEnter();
 
-    int rc = ShClSvcGuestDataReceived(pClient, pCmdCtx, uFormat, pvData, cbData);
+    /* Nothing to do here yet. */
+
+    LogFlowFuncLeave();
+    return VINF_SUCCESS;
+}
+
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+int ShClBackendTransferCreate(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
+{
+    RT_NOREF(pClient, pTransfer);
+
+    LogFlowFuncEnter();
+
+    return VINF_SUCCESS;
+}
+
+int ShClBackendTransferDestroy(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
+{
+    LogFlowFuncEnter();
+
+    SharedClipboardWinTransferDestroy(&pClient->State.pCtx->Win, pTransfer);
+
+    return VINF_SUCCESS;
+}
+
+int ShClBackendTransferGetRoots(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
+{
+    LogFlowFuncEnter();
+
+    const PSHCLWINCTX pWinCtx = &pClient->State.pCtx->Win;
+
+    int rc = SharedClipboardWinGetRoots(pWinCtx, pTransfer);
 
     LogFlowFuncLeaveRC(rc);
     return rc;
 }
-
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int ShClBackendTransferCreate(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
-{
-    RT_NOREF(pClient, pTransfer);
-
-    LogFlowFuncEnter();
-
-    return VINF_SUCCESS;
-}
-
-int ShClBackendTransferDestroy(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
-{
-    LogFlowFuncEnter();
-
-    SharedClipboardWinTransferDestroy(&pClient->State.pCtx->Win, pTransfer);
-
-    return VINF_SUCCESS;
-}
-
-int ShClBackendTransferGetRoots(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
-{
-    LogFlowFuncEnter();
-
-    const PSHCLWINCTX pWinCtx = &pClient->State.pCtx->Win;
-
-    int rc = SharedClipboardWinGetRoots(pWinCtx, pTransfer);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 

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

@@ -237 +237 @@
                          PSHCLCLIENTCMDCTX pCmdCtx, SHCLFORMAT uFormat, void *pvData, uint32_t cbData)
 {
-    AssertPtrReturn(pClient, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCmdCtx, VERR_INVALID_POINTER);
-    AssertPtrReturn(pvData,  VERR_INVALID_POINTER);
-
-    LogFlowFunc(("pClient=%p, pv=%p, cb=%RU32, uFormat=%02X\n",
-                 pClient, pvData, cbData, uFormat));
-
-    int rc = ShClSvcGuestDataReceived(pClient, pCmdCtx, uFormat, pvData, cbData);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    RT_NOREF(pClient, pCmdCtx, uFormat, pvData, cbData);
+
+    LogFlowFuncEnter();
+
+    /* Nothing to do here yet. */
+
+    LogFlowFuncLeave();
+    return VINF_SUCCESS;
 }
 

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

@@ -1727 +1727 @@
     }
     else
+    {
+        /* Let the backend implementation know. */
         rc = ShClBackendWriteData(pClient, &cmdCtx, uFormat, pvData, cbData);
+
+        int rc2; /* Don't return internals back to the guest. */
+        rc2 = ShClSvcGuestDataReceived(pClient, &cmdCtx, uFormat, pvData, cbData); /* To complete pending events, if any. */
+        AssertRC(rc2);
+    }
 
     LogFlowFuncLeaveRC(rc);