Changeset 100204 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

Timestamp:

Jun 19, 2023 9:11:37 AM (18 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Unified root list entry code to also use the generic list entry code, a lot of updates for the cross OS transfer handling code, more updates for HTTP server transfer handling.

This also changed the handling of how that transfers are being initiated, as we needed to have this for X11: Before, transfers were initiated as soon as on side announced the URI list format -- now we postpone initiating the transfer until the receiving side requests the data as URI list.

bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (4 diffs)

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

@@ -63 +63 @@
  * @returns VBox status code.
  * @param   uID                 Payload ID to set for this payload. Useful for consequtive payloads.
- * @param   pvData              Data block to associate to this payload.
- * @param   cbData              Size (in bytes) of data block to associate.
+ * @param   pvData              Data to associate to this payload.
+ *                              The payload owns the data then.
+ * @param   cbData              Size (in bytes) of data to associate.
+ * @param   ppPayload           Where to store the allocated event payload on success.
+ */
+int ShClPayloadInit(uint32_t uID, void *pvData, uint32_t cbData,
+                    PSHCLEVENTPAYLOAD *ppPayload)
+{
+    AssertPtrReturn(pvData, VERR_INVALID_POINTER);
+    AssertReturn(cbData > 0, VERR_INVALID_PARAMETER);
+
+    PSHCLEVENTPAYLOAD pPayload = (PSHCLEVENTPAYLOAD)RTMemAlloc(sizeof(SHCLEVENTPAYLOAD));
+    if (pPayload)
+    {
+        pPayload->pvData = pvData;
+        pPayload->cbData = cbData;
+        pPayload->uID    = uID;
+
+        *ppPayload = pPayload;
+        return VINF_SUCCESS;
+    }
+
+    return VERR_NO_MEMORY;
+}
+
+/**
+ * Allocates a new event payload.
+ *
+ * @returns VBox status code.
+ * @param   uID                 Payload ID to set for this payload. Useful for consequtive payloads.
+ * @param   pvData              Data block to allocate (duplicate) to this payload.
+ * @param   cbData              Size (in bytes) of data block to allocate.
  * @param   ppPayload           Where to store the allocated event payload on success.
  */
@@ -73 +103 @@
     AssertReturn(cbData > 0, VERR_INVALID_PARAMETER);
 
-    PSHCLEVENTPAYLOAD pPayload = (PSHCLEVENTPAYLOAD)RTMemAlloc(sizeof(SHCLEVENTPAYLOAD));
-    if (pPayload)
-    {
-        pPayload->pvData = RTMemDup(pvData, cbData);
-        if (pPayload->pvData)
-        {
-            pPayload->cbData = cbData;
-            pPayload->uID    = uID;
-
-            *ppPayload = pPayload;
-            return VINF_SUCCESS;
-        }
-
-        RTMemFree(pPayload);
-    }
+    void *pvDataDup = RTMemDup(pvData, cbData);
+    if (pvDataDup)
+        return ShClPayloadInit(uID, pvDataDup, cbData, ppPayload);
+
     return VERR_NO_MEMORY;
 }
@@ -418 +437 @@
  * Detaches a payload from an event, internal version.
  *
- * @returns Pointer to the detached payload. Can be NULL if the payload has no payload.
+ * @returns Pointer to the detached payload. Can be NULL if the event has no payload.
  * @param   pEvent              Event to detach payload for.
  */
@@ -480 +499 @@
 
 /**
- * Releases an event by decreasing its reference count.
+ * Releases event by decreasing its reference count. Will be destroys once the reference count reaches 0.
  *
  * @returns New reference count, or UINT32_MAX if failed.