Changeset 103615 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

Timestamp:

Feb 29, 2024 6:36:37 PM (9 months ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Made code a bit easier to follow / read, removed some unnecessary locking (cleanup). bugref:9437

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)

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

@@ -165 +165 @@
  *
  * Called by ShClTransferInit via VbglR3.
- * For G->H: Called on transfer intialization to notify the "in-flight" IDataObject about a data transfer.
- * For H->G: Called on transfer intialization to populate the transfer's root list.
+ * For H->G: Called on transfer intialization to initialize the "in-flight" IDataObject for a data transfer.
+ * For G->H: Called on transfer intialization to populate the transfer's root list.
  *
  * @thread  Clipboard main thread.
@@ -184 +184 @@
     switch(ShClTransferGetDir(pTransfer))
     {
-        case SHCLTRANSFERDIR_FROM_REMOTE: /* G->H */
-        {
-            rc = SharedClipboardWinTransferHandOffToDataObject(&pCtx->Win, pTransfer);
-            break;
-        }
-
-        case SHCLTRANSFERDIR_TO_REMOTE: /* H->G */
+        case SHCLTRANSFERDIR_FROM_REMOTE: /* H->G */
+        {
+            rc = SharedClipboardWinTransferInitialize(&pCtx->Win, pTransfer);
+            break;
+        }
+
+        case SHCLTRANSFERDIR_TO_REMOTE: /* G->H */
         {
             rc = SharedClipboardWinTransferGetRootsFromClipboard(&pCtx->Win, pTransfer);
@@ -202 +202 @@
     LogFlowFuncLeaveRC(rc);
     return rc;
+}
+
+/**
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialized
+ *
+ * Called by ShClTransferInit via VbglR3.
+ * For H->G: Called on transfer intialization to start the data transfer for the "in-flight" IDataObject.
+ * For G->H: Nothing to do here.
+ *
+ * @thread  Clipboard main thread.
+ */
+static DECLCALLBACK(void) vbtrShClTransferInitializedCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
+{
+    LogFlowFuncEnter();
+
+    int rc = VINF_SUCCESS;
+
+    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pCbCtx->pvUser;
+    AssertPtr(pCtx);
+
+    PSHCLTRANSFER pTransfer = pCbCtx->pTransfer;
+    AssertPtr(pTransfer);
+
+    switch(ShClTransferGetDir(pTransfer))
+    {
+        case SHCLTRANSFERDIR_FROM_REMOTE: /* H->G */
+        {
+            rc = SharedClipboardWinTransferStart(&pCtx->Win, pTransfer);
+            break;
+        }
+
+        case SHCLTRANSFERDIR_TO_REMOTE: /* G->H */
+            break;
+
+        default:
+            break;
+    }
+
+    LogFlowFuncLeaveRC(rc);
 }
 
@@ -973 +1012 @@
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnDestroy     = vbtrShClTransferDestroyCallback;
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnInitialize  = vbtrShClTransferInitializeCallback;
+    pCtx->CmdCtx.Transfers.Callbacks.pfnOnInitialized = vbtrShClTransferInitializedCallback;
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnStarted     = vbtrShClTransferStartedCallback;
     pCtx->CmdCtx.Transfers.Callbacks.pfnOnCompleted   = vbtrShClTransferCompletedCallback;