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

Timestamp:

Feb 9, 2021 12:54:29 PM (4 years ago)

Author:

vboxsync

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

142695

Message:

Shared Clipboard/Transfers: Added ShClTransferCopyCallbacks(). ​bugref:9437

File:

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

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

@@ -2016 +2016 @@
 
 /**
+ * Copies a transfer callback table from source to destination.
+ *
+ * @param   pCallbacksDst       Callback destination.
+ * @param   pCallbacksSrc       Callback source. If set to NULL, the
+ *                              destination callback table will be unset.
+ */
+void ShClTransferCopyCallbacks(PSHCLTRANSFERCALLBACKTABLE pCallbacksDst,
+                               PSHCLTRANSFERCALLBACKTABLE pCallbacksSrc)
+{
+    AssertPtrReturnVoid(pCallbacksDst);
+
+    if (pCallbacksSrc) /* Set */
+    {
+#define SET_CALLBACK(a_pfnCallback) \
+        if (pCallbacksSrc->a_pfnCallback) \
+            pCallbacksDst->a_pfnCallback = pCallbacksSrc->a_pfnCallback
+
+        SET_CALLBACK(pfnOnInitialize);
+        SET_CALLBACK(pfnOnStart);
+        SET_CALLBACK(pfnOnCompleted);
+        SET_CALLBACK(pfnOnError);
+        SET_CALLBACK(pfnOnRegistered);
+        SET_CALLBACK(pfnOnUnregistered);
+
+#undef SET_CALLBACK
+
+        pCallbacksDst->pvUser = pCallbacksSrc->pvUser;
+        pCallbacksDst->cbUser = pCallbacksSrc->cbUser;
+    }
+    else /* Unset */
+        RT_BZERO(pCallbacksDst, sizeof(SHCLTRANSFERCALLBACKTABLE));
+}
+
+/**
  * 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.
+ * @param   pCallbacks          Pointer to callback table to set. If set to NULL,
+ *                              existing callbacks for this transfer will be unset.
  */
 void ShClTransferSetCallbacks(PSHCLTRANSFER pTransfer,
@@ -2026 +2061 @@
 {
     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;
+    /* pCallbacks can be NULL. */
+
+    ShClTransferCopyCallbacks(&pTransfer->Callbacks, pCallbacks);
 }