Index: /trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
===================================================================
--- /trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp	(revision 82497)
+++ /trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp	(revision 82498)
@@ -258,4 +258,7 @@
 static void shclEventPayloadDetachInternal(PSHCLEVENT pEvent)
 {
+    /** @todo r=bird: This should return pPayload.  It should also not need
+     *        assert the validity of pEvent in non-strict builds, given that this
+     *        is an static + internal function, that's a complete waste of time. */
     AssertPtrReturnVoid(pEvent);
 
@@ -426,4 +429,8 @@
 void ShClEventPayloadDetach(PSHCLEVENTSOURCE pSource, SHCLEVENTID uID)
 {
+    /** @todo r=bird: This API is not needed, it either is a no-op as it
+     *        replicates work done by ShClEventWait or it leaks the payload as
+     *        ShClEventWait is the only way to get it as far as I can tell. */
+
     AssertPtrReturnVoid(pSource);
 
Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp
===================================================================
--- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp	(revision 82497)
+++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp	(revision 82498)
@@ -197,4 +197,9 @@
             /* Detach the payload, as the caller then will own the data. */
             ShClEventPayloadDetach(&pCtx->pClient->Events, uEvent);
+            /**
+             * @todo r=bird: The payload has already been detached,
+             * ShClEventPayloadDetach and ShClEventWait does the exact same
+             * thing, except for the extra waiting in the latter.
+             */
         }