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

Timestamp:

Sep 17, 2019 9:05:21 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: More code for transfer channel handling.

File:

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

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

@@ -180 +180 @@
     RTListForEachSafe(&pSource->lstEvents, pEvIt, pEvItNext, SHCLEVENT, Node)
     {
+        RTListNodeRemove(&pEvIt->Node);
+
         SharedClipboardEventDestroy(pEvIt);
+
         RTMemFree(pEvIt);
+        pEvIt = NULL;
     }
 
@@ -199 +203 @@
 
     LogFlowFunc(("uSource=%RU16: New event: %RU16\n", pSource->uID, pSource->uEventIDNext));
-    return pSource->uEventIDNext++; /** @todo Handle rollovers? */
+
+    pSource->uEventIDNext++;
+    if (pSource->uEventIDNext == VBOX_SHARED_CLIPBOARD_MAX_EVENTS)
+        pSource->uEventIDNext = 0;
+
+    return pSource->uEventIDNext;
 }
 
@@ -235 +244 @@
 
     return 0;
+}
+
+/**
+ * Detaches a payload from an event, internal version.
+ *
+ * @param   pEvent              Event to detach payload for.
+ */
+static void sharedClipboardEventPayloadDetachInternal(PSHCLEVENT pEvent)
+{
+    AssertPtrReturnVoid(pEvent);
+
+    pEvent->pPayload = NULL;
 }
 
@@ -324 +345 @@
  * @param   uTimeoutMs          Timeout (in ms) to wait.
  * @param   ppPayload           Where to store the (allocated) event payload on success. Needs to be free'd with
- *                              SharedClipboardPayloadFree().
+ *                              SharedClipboardPayloadFree(). Optional.
  */
 int SharedClipboardEventWait(PSHCLEVENTSOURCE pSource, SHCLEVENTID uID, RTMSINTERVAL uTimeoutMs,
@@ -330 +351 @@
 {
     AssertPtrReturn(pSource, VERR_INVALID_POINTER);
+    /** ppPayload is optional. */
 
     LogFlowFuncEnter();
@@ -341 +363 @@
         if (RT_SUCCESS(rc))
         {
-            *ppPayload = pEvent->pPayload;
-
-            pEvent->pPayload = NULL;
+            if (ppPayload)
+            {
+                *ppPayload = pEvent->pPayload;
+
+                /* Make sure to detach payload here, as the caller now owns the data. */
+                sharedClipboardEventPayloadDetachInternal(pEvent);
+            }
         }
     }
@@ -402 +428 @@
     if (pEvent)
     {
-        pEvent->pPayload = NULL;
+        sharedClipboardEventPayloadDetachInternal(pEvent);
     }
 #ifdef DEBUG_andy
@@ -803 +829 @@
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_TRANSFER_START);
+        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_TRANSFER_STATUS);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ROOT_LIST_HDR_READ);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ROOT_LIST_HDR_WRITE);