Changeset 85834 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Aug 19, 2020 2:05:37 PM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/X11: Return VERR_NO_DATA in X11 callback implementations to make it easier to spot that there is no data available.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -80 +80 @@
 
 /**
- * Get clipboard data from the host.
+ * Callback implementation for getting clipboard data from the host.
  *
- * @returns VBox result code
+ * @returns VBox status code. VERR_NO_DATA if no data available.
  * @param   pCtx                Our context information.
  * @param   Format              The format of the data being requested.
  * @param   ppv                 On success and if pcb > 0, this will point to a buffer
  *                              to be freed with RTMemFree containing the data read.
- * @param   pcb                 On success, this contains the number of bytes of data
- *                              returned.
+ * @param   pcb                 On success, this contains the number of bytes of data returned.
  */
 DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, SHCLFORMAT Format, void **ppv, uint32_t *pcb)
@@ -138 +137 @@
         }
 
+        if (!cbRead)
+            rc = VERR_NO_DATA;
+
         if (RT_SUCCESS(rc))
         {
@@ -143 +145 @@
             *ppv = pvData;
         }
-
-        /*
-         * Catch other errors. This also catches the case in which the buffer was
-         * too small a second time, possibly because the clipboard contents
-         * changed half-way through the operation.  Since we can't say whether or
-         * not this is actually an error, we just return size 0.
-         */
-        if (RT_FAILURE(rc))
+        else
+        {
+            /*
+             * Catch other errors. This also catches the case in which the buffer was
+             * too small a second time, possibly because the clipboard contents
+             * changed half-way through the operation.  Since we can't say whether or
+             * not this is actually an error, we just return size 0.
+             */
             RTMemFree(pvData);
+        }
     }