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

Timestamp:

Sep 6, 2019 10:05:11 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Removed old protocol handling cruft on the host side and added message translation support for serving older Guest Additions. Updated docs / protocol changelog.

File:

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

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

@@ -183 +183 @@
         RTMemFree(pEvIt);
     }
+
+    pSource->uID          = 0;
+    pSource->uEventIDNext = 0;
 }
 
@@ -216 +219 @@
 
     return NULL;
+}
+
+/**
+ * Returns the last (newest) event ID which has been registered for an event source.
+ *
+ * @returns Last registered event ID, or 0 if not found.
+ * @param   pSource             Event source to get last registered event from.
+ */
+VBOXCLIPBOARDEVENTID SharedClipboardEventGetLast(PSHAREDCLIPBOARDEVENTSOURCE pSource)
+{
+    AssertPtrReturn(pSource, 0);
+    PSHAREDCLIPBOARDEVENT pEvent = RTListGetLast(&pSource->lstEvents, SHAREDCLIPBOARDEVENT, Node);
+    if (pEvent)
+        return pEvent->uID;
+
+    return 0;
 }
 
@@ -281 +300 @@
         LogFlowFunc(("Event %RU16\n", pEvent->uID));
 
+        RTListNodeRemove(&pEvent->Node);
+
         SharedClipboardEventDestroy(pEvent);
+
         RTMemFree(pEvent);
-
-        RTListNodeRemove(&pEvent->Node);
+        pEvent = NULL;
 
         rc = VINF_SUCCESS;
@@ -290 +311 @@
     else
         rc = VERR_NOT_FOUND;
-
-    AssertRC(rc);
 
     LogFlowFuncLeaveRC(rc);
@@ -362 +381 @@
     else
         rc = VERR_NOT_FOUND;
-
-#ifdef DEBUG_andy
-    AssertRC(rc);
-#endif
 
     LogFlowFuncLeaveRC(rc);
@@ -787 +802 @@
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE);
+        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_ROOT_LIST_HDR_READ);
@@ -820 +835 @@
     {
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_GET_HOST_MSG_OLD);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_WRITE);
+        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_REPORT);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_DATA_READ);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_DATA_WRITE);