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

Timestamp:

Sep 2, 2020 2:43:13 PM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Host Service: Use and check for a context ID (CID) in ShClSvcGuestDataRequest() / shClSvcClientWriteData() for old(er) Guest Additions. Untested. bugref:9437 [Forgot files; build fix]

File:

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

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

@@ -35 +35 @@
 
 
+/*********************************************************************************************************************************
+*   Prototypes                                                                                                                   *
+*********************************************************************************************************************************/
+DECLINLINE(PSHCLEVENT) shclEventGet(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
+
+
+/*********************************************************************************************************************************
+*   Implementation                                                                                                               *
+*********************************************************************************************************************************/
+
 /**
  * Allocates a new event payload.
@@ -178 +188 @@
         pEvIt = NULL;
     }
-}
-
-/**
- * Returns a specific event of a event source.
- *
- * @returns Pointer to event if found, or NULL if not found.
- * @param   pSource             Event source to get event from.
- * @param   uID                 Event ID to get.
- */
-DECLINLINE(PSHCLEVENT) shclEventGet(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent)
-{
-    PSHCLEVENT pEvent;
-    RTListForEach(&pSource->lstEvents, pEvent, SHCLEVENT, Node)
-    {
-        if (pEvent->idEvent == idEvent)
-            return pEvent;
-    }
-
-    return NULL;
 }
 
@@ -244 +235 @@
     RTMemFree(pEvent);
     return NIL_SHCLEVENTID;
+}
+
+/**
+ * Returns a specific event of a event source. Inlined version.
+ *
+ * @returns Pointer to event if found, or NULL if not found.
+ * @param   pSource             Event source to get event from.
+ * @param   uID                 Event ID to get.
+ */
+DECLINLINE(PSHCLEVENT) shclEventGet(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent)
+{
+    PSHCLEVENT pEvent;
+    RTListForEach(&pSource->lstEvents, pEvent, SHCLEVENT, Node)
+    {
+        if (pEvent->idEvent == idEvent)
+            return pEvent;
+    }
+
+    return NULL;
+}
+
+/**
+ * Returns a specific event of a event source.
+ *
+ * @returns Pointer to event if found, or NULL if not found.
+ * @param   pSource             Event source to get event from.
+ * @param   uID                 Event ID to get.
+ */
+PSHCLEVENT ShClEventGet(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent)
+{
+    return shclEventGet(pSource, idEvent);
 }