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

Timestamp:

Dec 10, 2020 10:01:11 AM (4 years ago)

Author:

vboxsync

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

141862

Message:

Shared Clipboard: Simplified and cleaned up the X11 callback handling to actually do what they advertise in case no data is available. This also makes the surround code a lot easier to understand / follow.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (4 diffs)

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

@@ -325 +325 @@
  * Callback implementation for reading clipboard data from the guest.
  *
- * @note   Runs in Xt event thread.
+ * @note Runs in Xt event thread.
  *
  * @returns VBox status code. VERR_NO_DATA if no data available.
  * @param   pCtx                Pointer to the host clipboard structure.
- * @param   fFormat             The format in which the data should be transferred
+ * @param   uFmt                The format in which the data should be transferred
  *                              (VBOX_SHCL_FMT_XXX).
- * @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.
- */
-DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, SHCLFORMAT fFormat, void **ppv, uint32_t *pcb)
-{
-    LogFlowFunc(("pCtx=%p, Format=0x%x\n", pCtx, fFormat));
+ * @param   ppv                 Returns an allocated buffer with data read from the guest on success.
+ *                              Needs to be free'd with RTMemFree() by the caller.
+ * @param   pcb                 Returns the amount of data read (in bytes) on success.
+ */
+DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, SHCLFORMAT uFmt, void **ppv, uint32_t *pcb)
+{
+    LogFlowFunc(("pCtx=%p, uFmt=0x%x\n", pCtx, uFmt));
 
     if (pCtx->fShuttingDown)
@@ -349 +349 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    if (fFormat == VBOX_SHCL_FMT_URI_LIST)
-        rc = VINF_SUCCESS;
+    if (uFmt == VBOX_SHCL_FMT_URI_LIST)
+    {
+        *ppv = NULL;
+        *pcb = 0;
+
+        rc = VERR_NO_DATA;
+    }
     else
 #endif
@@ -356 +361 @@
         /* Request data from the guest. */
         SHCLEVENTID idEvent;
-        rc = ShClSvcGuestDataRequest(pCtx->pClient, fFormat, &idEvent);
+        rc = ShClSvcGuestDataRequest(pCtx->pClient, uFmt, &idEvent);
         if (RT_SUCCESS(rc))
         {
@@ -381 +386 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("Shared Clipboard: Requesting data in format %#x for X11 host failed with %Rrc\n", fFormat, rc));
+        LogRel(("Shared Clipboard: Requesting data in format %#x for X11 host failed with %Rrc\n", uFmt, rc));
 
     LogFlowFuncLeaveRC(rc);