Changeset 100432 in vbox for trunk/src/VBox

Timestamp:

Jul 7, 2023 10:27:52 AM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Added missing SharedClipboardWinTransferCreate() function and use it in shClSvcWinTransferOnCreatedCallback(). ​​bugref:9437

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-win.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)

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

@@ -1127 +1127 @@
 
 /**
- * Destroys implementation-specific data for an Shared Clipboard transfer.
- *
+ * Creates implementation-specific data for a Windows Shared Clipboard transfer.
+ *
+ * @returns VBox status code.
  * @param   pWinCtx             Windows context to use.
  * @param   pTransfer           Shared Clipboard transfer to create implementation-specific data for.
+ */
+int SharedClipboardWinTransferCreate(PSHCLWINCTX pWinCtx, PSHCLTRANSFER pTransfer)
+{
+    RT_NOREF(pWinCtx);
+
+    AssertMsgReturn(   pTransfer->pvUser == NULL
+                    && pTransfer->cbUser == 0, ("Already initialized Windows-specific data\n"), VERR_WRONG_ORDER);
+
+    pTransfer->pvUser = new SharedClipboardWinTransferCtx();  /** @todo Can this throw? */
+    AssertPtrReturn(pTransfer->pvUser, VERR_INVALID_POINTER);
+    pTransfer->cbUser = sizeof(SharedClipboardWinTransferCtx);
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Destroys implementation-specific data for a Windows Shared Clipboard transfer.
+ *
+ * @returns VBox status code.
+ * @param   pWinCtx             Windows context to use.
+ * @param   pTransfer           Shared Clipboard transfer to destroy implementation-specific data for.
  */
 void SharedClipboardWinTransferDestroy(PSHCLWINCTX pWinCtx, PSHCLTRANSFER pTransfer)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -286 +286 @@
 
     if (RT_SUCCESS(rc))
+    {
         rc = ShClTransferSetProvider(pTransfer, &pClient->Transfers.Provider); RT_NOREF(rc);
+        if (RT_SUCCESS(rc))
+            rc = SharedClipboardWinTransferCreate(&pCtx->Win, pTransfer);
+    }
 
     LogFlowFuncLeaveRC(rc);