Changeset 103442 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 19, 2024 1:51:37 PM (14 months ago)

Author:

vboxsync

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

161773

Message:

Shared Clipboard: Condensed more code by adding a SHCLTRANSFERCALLBACKS::pfnOnInitialize() callback function. bugref:9437

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)
• common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (1 diff)
• x11/VBoxClient/clipboard-x11.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -162 +162 @@
 
 /**
- * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialized
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialize
  *
  * Called by ShClTransferInit via VbglR3.
@@ -170 +170 @@
  * @thread  Clipboard main thread.
  */
-static DECLCALLBACK(void) vbtrShClTransferInitializedCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
+static DECLCALLBACK(int) vbtrShClTransferInitializeCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
 {
     LogFlowFuncEnter();
@@ -209 +209 @@
 
     LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -979 +980 @@
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnCreated     = vbtrShClTransferCreatedCallback;
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnDestroy     = vbtrShClTransferDestroyCallback;
-    pCtx->CmdCtx.Transfers.Callbacks.pfnOnInitialized = vbtrShClTransferInitializedCallback;
+    pCtx->CmdCtx.Transfers.Callbacks.pfnOnInitialize  = vbtrShClTransferInitializeCallback;
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnStarted     = vbtrShClTransferStartedCallback;
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnCompleted   = vbtrShClTransferCompletedCallback;

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

@@ -2152 +2152 @@
     int rc = ShClTransferSetProvider(pTransfer, &Provider);
     if (RT_SUCCESS(rc))
-    {
         rc = ShClTransferInit(pTransfer);
-        if (RT_SUCCESS(rc))
-        {
-            /* As soon as we report the INITIALIZED state to the host, the host can start reading stuff from the transfer.
-             * So make sure that we really are ready here. */
-            if (enmDir == SHCLTRANSFERDIR_TO_REMOTE)
-                AssertMsgStmt(ShClTransferRootsCount(pTransfer), ("No root entries set yet!\n"
-                                                                  "Those have to be present as soon we report the transfer as being INITIALIZED to the host\n"),
-                              rc = VERR_WRONG_ORDER);
-        }
-    }
 
     SHCLTRANSFERID const idTransfer = ShClTransferGetID(pTransfer);

trunk/src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp

@@ -57 +57 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
 /**
- * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialized
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialize
  *
  * @thread Clipboard main thread.
  */
-static DECLCALLBACK(void) vbclX11OnTransferInitializedCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
+static DECLCALLBACK(int) vbclX11OnTransferInitializeCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
 {
     LogFlowFuncEnter();
@@ -111 +111 @@
 
     LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -384 +385 @@
     pCtx->CmdCtx.Transfers.Callbacks.cbUser = sizeof(SHCLCONTEXT);
 
-    pCtx->CmdCtx.Transfers.Callbacks.pfnOnInitialized  = vbclX11OnTransferInitializedCallback;
+    pCtx->CmdCtx.Transfers.Callbacks.pfnOnInitialize   = vbclX11OnTransferInitializeCallback;
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnRegistered   = vbclX11OnTransferRegisteredCallback;
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnUnregistered = vbclX11OnTransferUnregisteredCallback;