Changeset 82893 in vbox for trunk/src/VBox

Timestamp:

Jan 28, 2020 4:53:51 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Dealt with event retention for ShClSvcDataReadRequest(). bugref:9437

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-x11.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -188 +188 @@
             *ppvData = pPayload ? pPayload->pvData : NULL;
             *pcbData = pPayload ? pPayload->cbData : 0;
-
-            /* Detach the payload, as the caller then will own the data. */
-            ShClEventPayloadDetach(&pCtx->pClient->EventSrc, idEvent);
-            /**
-             * @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.
-             */
-        }
-
+        }
+
+        ShClEventRelease(&pCtx->pClient->EventSrc, idEvent);
         ShClEventUnregister(&pCtx->pClient->EventSrc, idEvent);
     }

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

@@ -354 +354 @@
                 *ppv = pPayload ? pPayload->pvData : NULL;
                 *pcb = pPayload ? pPayload->cbData : 0;
-
-                /* Detach the payload, as the caller then will own the data. */
-                ShClEventPayloadDetach(&pCtx->pClient->EventSrc, idEvent);
             }
 
+            ShClEventRelease(&pCtx->pClient->EventSrc, idEvent);
             ShClEventUnregister(&pCtx->pClient->EventSrc, idEvent);
         }

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -1204 +1204 @@
     int rc = VERR_NOT_SUPPORTED;
 
+    SHCLEVENTID idEvent = NIL_SHCLEVENTID;
+
     while (fFormats)
     {
@@ -1238 +1240 @@
             RTCritSectEnter(&pClient->CritSect);
 
-            const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pClient->EventSrc);
+            idEvent = ShClEventIdGenerateAndRegister(&pClient->EventSrc);
             if (idEvent != NIL_SHCLEVENTID)
             {
@@ -1273 +1275 @@
         RTCritSectEnter(&pClient->CritSect);
 
+        /* Retain the last event generated (in case there were multiple clipboard formats)
+         * if we need to return the event ID to the caller. */
+        if (pidEvent)
+        {
+            ShClEventRetain(&pClient->EventSrc, idEvent);
+            *pidEvent = idEvent;
+        }
+
         shClSvcClientWakeup(pClient);
 
         RTCritSectLeave(&pClient->CritSect);
     }
-
-    /** @todo BUGBUG What to do with allocated events? Which one to return? */
 
     LogFlowFuncLeaveRC(rc);