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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-transfers.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-win.cpp (modified) (4 diffs)
• VBoxSharedClipboardSvc-x11.cpp (modified) (5 diffs)

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

@@ -2410 +2410 @@
 
         rc = ShClTransferInit(pTransfer);
-        if (RT_SUCCESS(rc))
-        {
-            /* Sanity: Make sure that the transfer we're gonna report as INITIALIZED to the guest
-             *         actually has some root entries set, as the guest can query for those at any time then. */
-            if (enmDir == SHCLTRANSFERDIR_TO_REMOTE)
-                AssertMsgStmt(ShClTransferRootsCount(pTransfer), ("Transfer has no root entries set\n"), rc = VERR_WRONG_ORDER);
-        }
     }
     else

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

@@ -289 +289 @@
 
 /**
- * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialized
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialize
  *
  * For G->H: Called on transfer intialization to notify the "in-flight" IDataObject about a data transfer.
@@ -296 +296 @@
  * @thread  Service main thread.
  */
-static DECLCALLBACK(void) shClSvcWinTransferOnInitializedCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
+static DECLCALLBACK(void) shClSvcWinTransferOnInitializeCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
 {
     LogFlowFuncEnter();
@@ -346 +346 @@
 
     LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -857 +858 @@
         pClient->Transfers.Callbacks.cbUser = sizeof(SHCLCONTEXT);
 
-        pClient->Transfers.Callbacks.pfnOnCreated     = shClSvcWinTransferOnCreatedCallback;
-        pClient->Transfers.Callbacks.pfnOnInitialized = shClSvcWinTransferOnInitializedCallback;
-        pClient->Transfers.Callbacks.pfnOnDestroy     = shClSvcWinTransferOnDestroyCallback;
+        pClient->Transfers.Callbacks.pfnOnCreated    = shClSvcWinTransferOnCreatedCallback;
+        pClient->Transfers.Callbacks.pfnOnInitialize = shClSvcWinTransferOnInitializeCallback;
+        pClient->Transfers.Callbacks.pfnOnDestroy    = shClSvcWinTransferOnDestroyCallback;
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
     }

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

@@ -89 +89 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
 static DECLCALLBACK(void) shClSvcX11TransferOnCreatedCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx);
-static DECLCALLBACK(void) shClSvcX11TransferOnInitCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx);
+static DECLCALLBACK(int)  shClSvcX11TransferOnInitCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx);
 static DECLCALLBACK(void) shClSvcX11TransferOnDestroyCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx);
 static DECLCALLBACK(void) shClSvcX11TransferOnUnregisteredCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx, PSHCLTRANSFERCTX pTransferCtx);
@@ -178 +178 @@
 
                 pClient->Transfers.Callbacks.pfnOnCreated      = shClSvcX11TransferOnCreatedCallback;
-                pClient->Transfers.Callbacks.pfnOnInitialized  = shClSvcX11TransferOnInitCallback;
+                pClient->Transfers.Callbacks.pfnOnInitialize   = shClSvcX11TransferOnInitCallback;
                 pClient->Transfers.Callbacks.pfnOnDestroy      = shClSvcX11TransferOnDestroyCallback;
                 pClient->Transfers.Callbacks.pfnOnUnregistered = shClSvcX11TransferOnUnregisteredCallback;
@@ -411 +411 @@
 
 /**
- * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialized
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialize
  *
  * For G->H: Starts the HTTP server if not done yet and registers the transfer with it.
@@ -418 +418 @@
  * @thread  Service main thread.
  */
-static DECLCALLBACK(void) shClSvcX11TransferOnInitCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
+static DECLCALLBACK(int) shClSvcX11TransferOnInitCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
 {
     LogFlowFuncEnter();
@@ -455 +455 @@
 
     LogFlowFuncLeaveRC(rc);
+    return rc;
 }