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

Timestamp:

Feb 19, 2024 1:51:37 PM (15 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

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (4 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -1233 +1233 @@
     pTransfer->Thread.fCancelled = false;
 
-    int rc = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_INITIALIZED);
+    int rc = VINF_SUCCESS;
+    if (pTransfer->Callbacks.pfnOnInitialize)
+        rc = pTransfer->Callbacks.pfnOnInitialize(&pTransfer->CallbackCtx);
+
+    if (RT_SUCCESS(rc))
+    {
+        /* Sanity: Make sure that the transfer we're gonna report as INITIALIZED
+         *         actually has some root entries set, as the other side can query for those at any time then. */
+        if (pTransfer->State.enmDir == SHCLTRANSFERDIR_TO_REMOTE)
+            AssertMsgStmt(ShClTransferRootsCount(pTransfer), ("Transfer has no root entries set\n"), rc = VERR_WRONG_ORDER);
+
+        rc = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_INITIALIZED);
+
+        if (   RT_SUCCESS(rc)
+            && pTransfer->Callbacks.pfnOnInitialized)
+            pTransfer->Callbacks.pfnOnInitialized(&pTransfer->CallbackCtx);
+    }
 
     shClTransferUnlock(pTransfer);
 
-    if (RT_SUCCESS(rc))
-    {
-        if (pTransfer->Callbacks.pfnOnInitialized)
-            pTransfer->Callbacks.pfnOnInitialized(&pTransfer->CallbackCtx);
-    }
+    if (RT_FAILURE(rc))
+        LogRel2(("Shared Clipboard: Initialziation of transfer failed with %Rrc\n", rc));
 
     LogFlowFuncLeaveRC(rc);
@@ -1575 +1588 @@
 
         SET_CALLBACK(pfnOnCreated);
+        SET_CALLBACK(pfnOnInitialize);
         SET_CALLBACK(pfnOnInitialized);
         SET_CALLBACK(pfnOnDestroy);
@@ -1775 +1789 @@
  * @returns VBox status code.
  * @param   pTransfer           Clipboard transfer to read root list for.
- *                              Must be in STARTED state.
  */
 int ShClTransferRootListRead(PSHCLTRANSFER pTransfer)
@@ -1782 +1795 @@
 
     LogFlowFuncEnter();
-
-#ifdef DEBUG
-    shClTransferLock(pTransfer);
-    AssertMsgReturn(   pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_INITIALIZED
-                    || pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_STARTED,
-                    ("Cannot read root list in status %s\n", ShClTransferStatusToStr(pTransfer->State.enmStatus)),
-                    VERR_WRONG_ORDER);
-    shClTransferUnlock(pTransfer);
-#endif
 
     int rc;