Changeset 82534 in vbox for trunk

Timestamp:

Dec 10, 2019 10:41:32 AM (5 years ago)

Author:

vboxsync

Message:

VBoxSharedClipboardSvc: Fixed unresolved ShClEventIDGenerate in ShClSvcImplReadData. bugref:9437

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard.h (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (4 diffs)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/SharedClipboard.h

@@ -205 +205 @@
 SHCLEVENTID ShClEventIDGenerate(PSHCLEVENTSOURCE pSource);
 SHCLEVENTID ShClEventGetLast(PSHCLEVENTSOURCE pSource);
-int ShClEventRegister(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
+/*int ShClEventRegister(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);*/
 int ShClEventUnregister(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent);
 int ShClEventWait(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent, RTMSINTERVAL uTimeoutMs, PSHCLEVENTPAYLOAD *ppPayload);

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

@@ -443 +443 @@
  * @param   uID                 Event ID to signal.
  * @param   pPayload            Event payload to associate. Takes ownership. Optional.
+ *
+ * @note    Caller must enter crit sect protecting the event source!
  */
 int ShClEventSignal(PSHCLEVENTSOURCE pSource, SHCLEVENTID uID,

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

@@ -189 +189 @@
     if (pReq)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pClient->EventSrc);
-
         pReq->pv        = pData->pvData;
         pReq->cb        = pData->cbData;
         pReq->pcbActual = pcbActual;
-        pReq->uEvent    = uEvent;
-
-        rc = ShClEventRegister(&pClient->EventSrc, uEvent);
-        if (RT_SUCCESS(rc))
+        const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pClient->EventSrc);
+        pReq->uEvent    = idEvent;
+        if (idEvent)
         {
             rc = ShClX11ReadDataFromX11(&pClient->State.pCtx->X11, pData->uFormat, pReq);
@@ -203 +200 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(&pClient->EventSrc, uEvent, 30 * 1000, &pPayload);
+                rc = ShClEventWait(&pClient->EventSrc, idEvent, 30 * 1000, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -213 +210 @@
             }
 
-            ShClEventUnregister(&pClient->EventSrc, uEvent);
+            ShClEventUnregister(&pClient->EventSrc, idEvent);
+        }
+        else
+        {
+            RTMemFree(pReq);
+            rc = VERR_GENERAL_FAILURE;
         }
     }
@@ -295 +297 @@
         }
 
+        RTCritSectEnter(&pCtx->pClient->CritSect);
         rc2 = ShClEventSignal(&pCtx->pClient->EventSrc, pReq->uEvent, pPayload);
         AssertRC(rc2);
+        RTCritSectLeave(&pCtx->pClient->CritSect);
     }
 

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

@@ -1236 +1236 @@
     if (RT_SUCCESS(rc))
     {
+        RTCritSectEnter(&pClient->CritSect);
         rc = ShClEventSignal(&pClient->EventSrc, uEvent, pPayload);
+        RTCritSectLeave(&pClient->CritSect);
         if (RT_FAILURE(rc))
             ShClPayloadFree(pPayload);