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

Timestamp:

Feb 4, 2021 4:31:28 PM (4 years ago)

Author:

vboxsync

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

142646

Message:

Shared Clipboard/Transfers: More callback code. ​bugref:9437

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxClipboard.cpp (modified) (6 diffs)
• common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (1 diff)

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

@@ -97 +97 @@
  * Cleanup helper function for transfer callbacks.
  *
- * @param   pData               Callback data to cleanup.
+ * @param   pTransferCtx        Pointer to transfer context that the transfer contains.
+ * @param   pTransfer           Pointer to transfer to cleanup.
  */
-static void vboxClipboardTransferCallbackCleanup(PSHCLTXPROVIDERCTX pCtx)
+static void vboxClipboardTransferCallbackCleanup(PSHCLTRANSFERCTX pTransferCtx, PSHCLTRANSFER pTransfer)
 {
     LogFlowFuncEnter();
 
-    PSHCLTRANSFERCTX pCtx = (PSHCLTRANSFERCTX)pData->pvUser;
-    AssertPtr(pCtx);
-
-    PSHCLTRANSFER pTransfer = pData->pTransfer;
-    AssertPtr(pTransfer);
+    if (!pTransferCtx || !pTransfer)
+        return;
 
     if (pTransfer->pvUser) /* SharedClipboardWinTransferCtx */
@@ -115 +113 @@
     }
 
-    int rc2 = ShClTransferCtxTransferUnregister(pCtx, pTransfer->State.uID);
+    int rc2 = ShClTransferCtxTransferUnregister(pTransferCtx, pTransfer->State.uID);
     AssertRC(rc2);
 
@@ -124 +122 @@
 }
 
-static DECLCALLBACK(int)  vboxClipboardOnTransferInitCallback(PSHCLTXPROVIDERCTX pCtx)
-{
-    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pData->pvUser;
+/** @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnInitialize */
+static DECLCALLBACK(int) vboxClipboardOnTransferInitCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
+{
+    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pCbCtx->pvUser;
     AssertPtr(pCtx);
 
     LogFlowFunc(("pCtx=%p\n", pCtx));
 
-    RT_NOREF(pData, pCtx);
+    RT_NOREF(pCtx);
 
     return VINF_SUCCESS;
 }
 
-static DECLCALLBACK(int) vboxClipboardOnTransferStartCallback(PSHCLTXPROVIDERCTX pCtx)
-{
-    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pData->pvUser;
+/** @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnStart */
+static DECLCALLBACK(int) vboxClipboardOnTransferStartCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx)
+{
+    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pCbCtx->pvUser;
     AssertPtr(pCtx);
-    Assert(pData->cbUser == sizeof(SHCLCONTEXT));
-
-    PSHCLTRANSFER pTransfer = pData->pTransfer;
+
+    PSHCLTRANSFER pTransfer = pCbCtx->pTransfer;
     AssertPtr(pTransfer);
 
@@ -192 +191 @@
 }
 
-static DECLCALLBACK(void) vboxClipboardOnTransferCompleteCallback(PSHCLTXPROVIDERCTX pCtx, int rc)
-{
-    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pData->pvUser;
+/** @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnCompleted */
+static DECLCALLBACK(void) vboxClipboardOnTransferCompletedCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx, int rcCompletion)
+{
+    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pCbCtx->pvUser;
     AssertPtr(pCtx);
 
-    RT_NOREF(pCtx, rc);
-
-    LogFlowFunc(("pCtx=%p, rc=%Rrc\n", pCtx, rc));
-
-    LogRel2(("Shared Clipboard: Transfer to destination complete\n"));
-
-    vboxClipboardTransferCallbackCleanup(pData);
-}
-
-static DECLCALLBACK(void) vboxClipboardOnTransferErrorCallback(PSHCLTXPROVIDERCTX pCtx, int rc)
-{
-    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pData->pvUser;
+    LogRel2(("Shared Clipboard: Transfer to destination %s\n",
+             rcCompletion == VERR_CANCELLED ? "canceled" : "complete"));
+
+    vboxClipboardTransferCallbackCleanup(&pCtx->TransferCtx, pCbCtx->pTransfer);
+}
+
+/** @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnError */
+static DECLCALLBACK(void) vboxClipboardOnTransferErrorCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx, int rcError)
+{
+    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pCbCtx->pvUser;
     AssertPtr(pCtx);
 
-    RT_NOREF(pCtx, rc);
-
-    LogFlowFunc(("pCtx=%p, rc=%Rrc\n", pCtx, rc));
-
-    LogRel(("Shared Clipboard: Transfer to destination failed with %Rrc\n", rc));
-
-    vboxClipboardTransferCallbackCleanup(pData);
+    LogRel(("Shared Clipboard: Transfer to destination failed with %Rrc\n", rcError));
+
+    vboxClipboardTransferCallbackCleanup(&pCtx->TransferCtx, pCbCtx->pTransfer);
 }
 
@@ -883 +877 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    /* Install callbacks. */
+    /*
+     * Set callbacks.
+     * Those will be registered within VbglR3 when a new transfer gets initialized.
+     */
     RT_ZERO(pCtx->CmdCtx.Transfers.Callbacks);
 
@@ -889 +886 @@
     pCtx->CmdCtx.Transfers.Callbacks.cbUser = sizeof(SHCLCONTEXT);
 
-    pCtx->CmdCtx.Transfers.Callbacks.pfnTransferInitialize = vboxClipboardOnTransferInitCallback;
-    pCtx->CmdCtx.Transfers.Callbacks.pfnTransferStart      = vboxClipboardOnTransferStartCallback;
-    pCtx->CmdCtx.Transfers.Callbacks.pfnTransferComplete   = vboxClipboardOnTransferCompleteCallback;
-    pCtx->CmdCtx.Transfers.Callbacks.pfnTransferError      = vboxClipboardOnTransferErrorCallback;
+    pCtx->CmdCtx.Transfers.Callbacks.pfnOnInitialize = vboxClipboardOnTransferInitCallback;
+    pCtx->CmdCtx.Transfers.Callbacks.pfnOnStart      = vboxClipboardOnTransferStartCallback;
+    pCtx->CmdCtx.Transfers.Callbacks.pfnOnCompleted  = vboxClipboardOnTransferCompletedCallback;
+    pCtx->CmdCtx.Transfers.Callbacks.pfnOnError      = vboxClipboardOnTransferErrorCallback;
 #endif
 

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

@@ -1803 +1803 @@
     if (RT_SUCCESS(rc))
     {
+        ShClTransferSetCallbacks(pTransfer, &pCmdCtx->Transfers.Callbacks);
+
         rc = ShClTransferInit(pTransfer, enmDir, enmSource);
         if (RT_SUCCESS(rc))