Changeset 13523 in vbox

Timestamp:

Oct 23, 2008 9:21:21 AM (16 years ago)

Author:

vboxsync

Message:

HostServices/SharedClipboard (x11): handle certain errors and timeouts better

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11.cpp (modified) (3 diffs)

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

@@ -1401 +1401 @@
             /* No data available. */
             *pcbActual = 0;
-            return VINF_SUCCESS;
+            return VERR_NO_DATA;  /* The guest thinks we have data and we don't */
         }
         /* Only one of the host and the guest should ever be waiting. */
@@ -1413 +1413 @@
         g_ctx.requestBufferSize = cb;
         g_ctx.requestActualSize = pcbActual;
+        /* Initially set the size of the data read to zero in case we fail
+         * somewhere. */
+        *pcbActual = 0;
         /* Send out a request for the data to the current clipboard owner */
         XtGetSelectionValue(g_ctx.widget, g_ctx.atomClipboard, g_ctx.atomHostTextFormat,
@@ -1421 +1424 @@
         if (RTSemEventWait(g_ctx.waitForData, CLIPBOARDTIMEOUT) != VINF_SUCCESS)
         {
-            LogRel(("vboxClipboardReadDataFromClient: XtGetSelectionValue failed to complete within %d milliseconds\n", CLIPBOARDTIMEOUT));
-            g_ctx.hostTextFormat = INVALID;
-            g_ctx.hostBitmapFormat = INVALID;
+            /* No need to polute the release log for this. */
+            // LogRel(("vboxClipboardReadDataFromClient: XtGetSelectionValue failed to complete within %d milliseconds\n", CLIPBOARDTIMEOUT));
+            /* A time out can legitimately occur if a client is temporarily too busy to answer fast */
+            // g_ctx.hostTextFormat = INVALID;
+            // g_ctx.hostBitmapFormat = INVALID;
             g_ctx.waiter = 0;
             return VERR_TIMEOUT;