Changeset 92735 in vbox for trunk/include/VBox/GuestHost

Timestamp:

Dec 3, 2021 4:03:24 PM (3 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Resolved @todos: Revamped event [source] interface to now use the event objects directly instead of the event ID. bugref:9437

File:

• trunk/include/VBox/GuestHost/SharedClipboard.h (modified) (7 diffs)

trunk/include/VBox/GuestHost/SharedClipboard.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #endif
 
+#include <iprt/critsect.h>
 #include <iprt/types.h>
 #include <iprt/list.h>
@@ -136 +137 @@
 #define NIL_SHCLEVENTID                          UINT32_MAX
 
+/* Forward declaration, needed for SHCLEVENT. */
+struct SHCLEVENTSOURCE;
+
 /**
  * Shared Clipboard event.
@@ -143 +147 @@
     /** List node. */
     RTLISTNODE          Node;
+    /** Parent (source) this event belongs to. */
+    SHCLEVENTSOURCE    *pParent;
     /** The event's ID, for self-reference. */
     SHCLEVENTID         idEvent;
@@ -165 +171 @@
     /** The event source ID. */
     SHCLEVENTSOURCEID uID;
+    /** Critical section for serializing access. */
+    RTCRITSECT        CritSect;
     /** Next upcoming event ID. */
     SHCLEVENTID       idNextEvent;
@@ -184 +192 @@
  */
 int ShClEventSourceCreate(PSHCLEVENTSOURCE pSource, SHCLEVENTSOURCEID idEvtSrc);
-void ShClEventSourceDestroy(PSHCLEVENTSOURCE pSource);
+int ShClEventSourceDestroy(PSHCLEVENTSOURCE pSource);
 void ShClEventSourceReset(PSHCLEVENTSOURCE pSource);
+int ShClEventSourceGenerateAndRegisterEvent(PSHCLEVENTSOURCE pSource, PSHCLEVENT *ppEvent);
+PSHCLEVENT ShClEventSourceGetFromId(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
+PSHCLEVENT ShClEventSourceGetLast(PSHCLEVENTSOURCE pSource);
 /** @} */
 
@@ -191 +202 @@
  *  @{
  */
-SHCLEVENTID ShClEventIdGenerateAndRegister(PSHCLEVENTSOURCE pSource);
-PSHCLEVENT ShClEventGet(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
-SHCLEVENTID ShClEventGetLast(PSHCLEVENTSOURCE pSource);
-uint32_t ShClEventGetRefs(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
-uint32_t ShClEventRetain(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
-uint32_t ShClEventRelease(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
-int ShClEventSignal(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent, PSHCLEVENTPAYLOAD pPayload);
-int ShClEventUnregister(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
-int ShClEventWait(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent, RTMSINTERVAL uTimeoutMs, PSHCLEVENTPAYLOAD *ppPayload);
+uint32_t ShClEventGetRefs(PSHCLEVENT pEvent);
+uint32_t ShClEventRetain(PSHCLEVENT pEvent);
+uint32_t ShClEventRelease(PSHCLEVENT pEvent);
+int ShClEventSignal(PSHCLEVENT pEvent, PSHCLEVENTPAYLOAD pPayload);
+int ShClEventWait(PSHCLEVENT pEvent, RTMSINTERVAL uTimeoutMs, PSHCLEVENTPAYLOAD *ppPayload);
 /** @} */