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

Timestamp:

Jun 29, 2009 1:52:08 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49250

Message:

HostServices/SharedClipboard: handle the "no data from guest" case correctly

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp (modified) (2 diffs)

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

@@ -310 +310 @@
     Assert(pCtx->pReq == NULL);
     RTCritSectLeave(&pCtx->clipboardMutex);
+    if (RT_SUCCESS(rc) && (pReq->pv == NULL))
+        rc = VERR_NO_DATA;
     LogFlowFunc(("returning %Rrc\n", rc));
     return rc;
@@ -584 +586 @@
     if (rc != VERR_TIMEOUT)
     {
-        RTPrintf("rc=%Rrc\n", rc);
+        RTPrintf("rc=%Rrc, expected VERR_TIMEOUT\n", rc);
+        ++cErrors;
+    }
+    pBackend->writeData.pv = NULL;
+    pBackend->writeData.cb = 0;
+    pBackend->writeData.timeout = false;
+    rc = ClipRequestDataForX11(client.pCtx, 23, &pv, &cb);
+    if (rc != VERR_NO_DATA)
+    {
+        RTPrintf("rc=%Rrc, expected VERR_NO_DATA\n", rc);
         ++cErrors;
     }