Changeset 99966 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

May 25, 2023 8:35:13 AM (21 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Use a define for clipboard timeouts. bugref:9437

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

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

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

@@ -168 +168 @@
     {
         PSHCLEVENTPAYLOAD pPayload;
-        rc = ShClEventWait(pEvent, 30 * 1000, &pPayload);
+        rc = ShClEventWait(pEvent, VBOX_SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
         if (RT_SUCCESS(rc))
         {
@@ -638 +638 @@
             if (RT_SUCCESS(rc))
             {
-                int rc2 = RTThreadUserWait(pCtx->hThread, 30 * 1000 /* Timeout in ms */);
+                int rc2 = RTThreadUserWait(pCtx->hThread, RT_MS_30SEC /* Timeout in ms */);
                 AssertRC(rc2);
             }
@@ -682 +682 @@
 
             /* Wait for the window thread to terminate. */
-            rc = RTThreadWait(pCtx->hThread, 30 * 1000 /* Timeout in ms */, NULL);
+            rc = RTThreadWait(pCtx->hThread, RT_MS_30SEC /* Timeout in ms */, NULL);
             if (RT_FAILURE(rc))
                 LogRel(("Shared Clipboard: Waiting for window thread termination failed with rc=%Rrc\n", rc));

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

@@ -288 +288 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(pEvent, 30 * 1000, &pPayload);
+                rc = ShClEventWait(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -469 +469 @@
 
             PSHCLEVENTPAYLOAD pPayload;
-            rc = ShClEventWait(pEvent, 30 * 1000, &pPayload);
+            rc = ShClEventWait(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
             if (RT_SUCCESS(rc))
             {
@@ -547 +547 @@
                 /* X supplies the data asynchronously, so we need to wait for data to arrive first. */
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(pEvent, 30 * 1000, &pPayload);
+                rc = ShClEventWait(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
                 if (RT_SUCCESS(rc))
                 {