Changeset 87611 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

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/GuestHost/SharedClipboard

Files:

• ClipboardDataObjectImpl-win.cpp (modified) (2 diffs)
• clipboard-transfers.cpp (modified) (6 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

@@ -353 +353 @@
 
     PSHCLROOTLIST pRootList;
-    rc = ShClTransferRootsGet(pTransfer, &pRootList);
+    int rc = ShClTransferRootsGet(pTransfer, &pRootList);
     if (RT_SUCCESS(rc))
     {
@@ -967 +967 @@
     logFormat(pFormatEtc->cfFormat);
 }
-

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

@@ -1267 +1267 @@
         pTransfer->uObjHandleNext  = 1;
 
-        if (pTransfer->ProviderIface.pfnInitialize)
-            rc = pTransfer->ProviderIface.pfnInitialize(&pTransfer->ProviderCtx);
+        if (pTransfer->Callbacks.pfnOnInitialize)
+            rc = pTransfer->Callbacks.pfnOnInitialize(&pTransfer->CallbackCtx);
     }
 
@@ -2016 +2016 @@
 
 /**
+ * Sets or unsets the callback table to be used for a Shared Clipboard transfer.
+ *
+ * @returns VBox status code.
+ * @param   pTransfer           Clipboard transfer to set callbacks for.
+ * @param   pCallbacks          Pointer to callback table to set.
+ */
+void ShClTransferSetCallbacks(PSHCLTRANSFER pTransfer,
+                              PSHCLTRANSFERCALLBACKTABLE pCallbacks)
+{
+    AssertPtrReturnVoid(pTransfer);
+    AssertPtrReturnVoid(pCallbacks);
+
+    LogFlowFunc(("pCallbacks=%p\n", pCallbacks));
+
+#define SET_CALLBACK(a_pfnCallback)             \
+    if (pCallbacks->a_pfnCallback)              \
+        pTransfer->Callbacks.a_pfnCallback = pCallbacks->a_pfnCallback
+
+    SET_CALLBACK(pfnOnInitialize);
+    SET_CALLBACK(pfnOnStart);
+    SET_CALLBACK(pfnOnCompleted);
+    SET_CALLBACK(pfnOnError);
+    SET_CALLBACK(pfnOnRegistered);
+    SET_CALLBACK(pfnOnUnregistered);
+
+#undef SET_CALLBACK
+
+    pTransfer->Callbacks.pvUser = pCallbacks->pvUser;
+    pTransfer->Callbacks.cbUser = pCallbacks->cbUser;
+}
+
+/**
  * Sets the transfer provider interface for a given transfer.
  *
@@ -2484 +2516 @@
     int rc;
 
-    if (pTransfer->ProviderIface.pfnStart)
-    {
-        rc = pTransfer->ProviderIface.pfnStart(&pTransfer->ProviderCtx);
+    if (pTransfer->Callbacks.pfnOnStart)
+    {
+        rc = pTransfer->Callbacks.pfnOnStart(&pTransfer->CallbackCtx);
     }
     else
@@ -2788 +2820 @@
     pTransferCtx->cTransfers++;
 
-    if (pTransfer->ProviderIface.pfnRegistered)
-        pTransfer->ProviderIface.pfnRegistered(&pTransfer->ProviderCtx, pTransferCtx);
+    if (pTransfer->Callbacks.pfnOnRegistered)
+        pTransfer->Callbacks.pfnOnRegistered(&pTransfer->CallbackCtx, pTransferCtx);
 
     if (pidTransfer)
@@ -2820 +2852 @@
             pTransfer->State.uID = idTransfer;
 
-            if (pTransfer->ProviderIface.pfnRegistered)
-                pTransfer->ProviderIface.pfnRegistered(&pTransfer->ProviderCtx, pTransferCtx);
+            if (pTransfer->Callbacks.pfnOnRegistered)
+                pTransfer->Callbacks.pfnOnRegistered(&pTransfer->CallbackCtx, pTransferCtx);
 
             pTransferCtx->cTransfers++;
@@ -2849 +2881 @@
     Assert(pTransferCtx->cTransfers >= pTransferCtx->cRunning);
 
-    if (pTransfer->ProviderIface.pfnUnregistered)
-        pTransfer->ProviderIface.pfnUnregistered(&pTransfer->ProviderCtx, pTransferCtx);
+    if (pTransfer->Callbacks.pfnOnUnregistered)
+        pTransfer->Callbacks.pfnOnUnregistered(&pTransfer->CallbackCtx, pTransferCtx);
 
     LogFlowFunc(("Now %RU32 transfers left\n", pTransferCtx->cTransfers));