Changeset 81746 in vbox for trunk/src/VBox

Timestamp:

Nov 8, 2019 8:28:06 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Update.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-darwin.cpp (modified) (2 diffs)
• VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• VBoxSharedClipboardSvc-win.cpp (modified) (3 diffs)
• VBoxSharedClipboardSvc-x11.cpp (modified) (11 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (8 diffs)

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

@@ -76 +76 @@
         formatData.uFormats = fFormats;
 
-        rc = shClSvcFormatsReport(pCtx->pClient, &formatData);
+        rc = ShClSvcFormatsReport(pCtx->pClient, &formatData);
     }
 
@@ -223 +223 @@
     dataReq.cbSize = _64K; /** @todo Make this more dynamic. */
 
-    return shClSvcDataReadRequest(pClient, &dataReq, NULL /* puEvent */);
+    return ShClSvcDataReadRequest(pClient, &dataReq, NULL /* puEvent */);
 }
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -179 +179 @@
 } SHCLEXTSTATE, *PSHCLEXTSTATE;
 
-/*
- * The service functions. Locking is between the service thread and the platform-dependent (window) thread.
- */
-int shClSvcDataReadRequest(PSHCLCLIENT pClient, PSHCLDATAREQ pDataReq, PSHCLEVENTID puEvent);
-int shClSvcDataReadSignal(PSHCLCLIENT pClient, PSHCLCLIENTCMDCTX pCmdCtx, PSHCLDATABLOCK pData);
-int shClSvcFormatsReport(PSHCLCLIENT pClient, PSHCLFORMATDATA pFormats);
-
 int shClSvcSetSource(PSHCLCLIENT pClient, SHCLSOURCE enmSource);
 

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

@@ -179 +179 @@
 
     SHCLEVENTID uEvent = 0;
-    int rc = shClSvcDataReadRequest(pCtx->pClient, &dataReq, &uEvent);
+    int rc = ShClSvcDataReadRequest(pCtx->pClient, &dataReq, &uEvent);
     if (RT_SUCCESS(rc))
     {
@@ -591 +591 @@
             && Formats.uFormats != VBOX_SHCL_FMT_NONE)
         {
-            rc = shClSvcFormatsReport(pCtx->pClient, &Formats);
+            rc = ShClSvcFormatsReport(pCtx->pClient, &Formats);
         }
     }
@@ -864 +864 @@
     LogFlowFuncEnter();
 
-    int rc = shClSvcDataReadSignal(pClient, pCmdCtx, pData);
+    int rc = ShClSvcDataReadSignal(pClient, pCmdCtx, pData);
 
     LogFlowFuncLeaveRC(rc);

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

@@ -50 +50 @@
     CLIPBACKEND         *pBackend;
     /** Pointer to the VBox host client data structure. */
-    PSHCLCLIENT pClient;
+    PSHCLCLIENT          pClient;
     /** We set this when we start shutting down as a hint not to post any new
      * requests. */
@@ -56 +56 @@
 };
 
-
-/**
- * Report formats available in the X11 clipboard to VBox.
- * @param  pCtx                 Opaque context pointer for the glue code.
- * @param  u32Formats           The formats available.
- */
-DECLCALLBACK(void) ClipReportX11FormatsCallback(SHCLCONTEXT *pCtx, uint32_t u32Formats)
-{
-    LogFlowFunc(("pCtx=%p, u32Formats=%02X\n", pCtx, u32Formats));
-
-    if (u32Formats == VBOX_SHCL_FMT_NONE) /* No formats to report? Bail out early. */
-        return;
-
-    SHCLFORMATDATA formatData;
-    RT_ZERO(formatData);
-
-    formatData.uFormats = u32Formats;
-
-    int rc = shClSvcFormatsReport(pCtx->pClient, &formatData);
-    RT_NOREF(rc);
-
-    LogFlowFuncLeaveRC(rc);
-}
 
 int ShClSvcImplInit(void)
@@ -144 +121 @@
     formatData.uFormats = VBOX_SHCL_FMT_NONE;
 
-    return shClSvcFormatsReport(pClient, &formatData);
+    return ShClSvcFormatsReport(pClient, &formatData);
 }
 
@@ -193 +170 @@
 struct _CLIPREADCBREQ
 {
-    /** Where to write the returned data to. Weak pointer! */
+    /** User-supplied data pointer, based on the request type. */
     void                *pv;
-    /** The size of the buffer in pv. */
+    /** The size (in bytes) of the the user-supplied pointer in pv. */
     uint32_t             cb;
     /** The actual size of the data written. */
     uint32_t            *pcbActual;
     /** The request's event ID. */
-    SHCLEVENTID uEvent;
+    SHCLEVENTID          uEvent;
 };
 
@@ -229 +206 @@
         pReq->uEvent    = uEvent;
 
-        rc = ClipRequestDataFromX11(pClient->State.pCtx->pBackend, pData->uFormat, pReq);
+        rc = ShClEventRegister(&pClient->Events, uEvent);
         if (RT_SUCCESS(rc))
         {
-            rc = ShClEventRegister(&pClient->Events, uEvent);
+            rc = ClipRequestDataFromX11(pClient->State.pCtx->pBackend, pData->uFormat, pReq);
             if (RT_SUCCESS(rc))
             {
@@ -244 +221 @@
                     Assert(pData->cbData == pPayload->cbData); /* Sanity. */
                 }
-
-                ShClEventUnregister(&pClient->Events, uEvent);
             }
+
+            ShClEventUnregister(&pClient->Events, uEvent);
         }
     }
@@ -266 +243 @@
                  pClient, pData->pvData, pData->cbData, pData->uFormat));
 
-    int rc = shClSvcDataReadSignal(pClient, pCmdCtx, pData);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    int rc = ShClSvcDataReadSignal(pClient, pCmdCtx, pData);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/**
+ * Reports formats available in the X11 clipboard to VBox.
+ *
+ * @note   Runs in Xt event thread.
+ *
+ * @param  pCtx                 Opaque context pointer for the glue code.
+ * @param  u32Formats           The formats available.
+ */
+DECLCALLBACK(void) ClipReportX11FormatsCallback(PSHCLCONTEXT pCtx, uint32_t u32Formats)
+{
+    LogFlowFunc(("pCtx=%p, u32Formats=%02X\n", pCtx, u32Formats));
+
+    if (u32Formats == VBOX_SHCL_FMT_NONE) /* No formats to report? Bail out early. */
+        return;
+
+    SHCLFORMATDATA formatData;
+    RT_ZERO(formatData);
+
+    formatData.uFormats = u32Formats;
+
+    int rc = ShClSvcFormatsReport(pCtx->pClient, &formatData);
+    RT_NOREF(rc);
+
+    LogFlowFuncLeaveRC(rc);
 }
 
@@ -276 +279 @@
  * The data should be written to the buffer provided in the initial request.
  *
+ * @note   Runs in Xt event thread.
+ *
  * @param  pCtx                 Request context information.
- * @param  rc                   The completion status of the request.
- * @param  pReq                 Request.
- * @param  pv                   Address.
- * @param  cb                   Size.
+ * @param  rcCompletion         The completion status of the request.
+ * @param  pReq                 Request to complete.
+ * @param  pv                   Address of data from completed request. Optional.
+ * @param  cb                   Size (in bytes) of data from completed request. Optional.
  *
  * @todo   Change this to deal with the buffer issues rather than offloading them onto the caller.
  */
-void ClipRequestFromX11CompleteCallback(SHCLCONTEXT *pCtx, int rc,
-                                        CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
-{
-    AssertMsgRC(rc, ("Clipboard data completion from X11 failed with %Rrc\n", rc));
-
-    PSHCLEVENTPAYLOAD pPayload;
-    int rc2 = ShClPayloadAlloc(pReq->uEvent, pv, cb, &pPayload);
-    if (RT_SUCCESS(rc2))
+DECLCALLBACK(void) ClipRequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int rcCompletion,
+                                                      CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
+{
+    RT_NOREF(rcCompletion);
+
+    LogFlowFunc(("rcCompletion=%Rrc, pReq=%p, pv=%p, cb=%RU32, uEvent=%RU32\n", rcCompletion, pReq, pv, cb, pReq->uEvent));
+
+    AssertMsgRC(rcCompletion, ("Clipboard data completion from X11 failed with %Rrc\n", rcCompletion));
+
+    if (pReq->uEvent != NIL_SHCLEVENTID)
+    {
+        int rc2;
+
+        PSHCLEVENTPAYLOAD pPayload = NULL;
+        if (pv && cb)
+        {
+            rc2 = ShClPayloadAlloc(pReq->uEvent, pv, cb, &pPayload);
+            AssertRC(rc2);
+        }
+
         rc2 = ShClEventSignal(&pCtx->pClient->Events, pReq->uEvent, pPayload);
-
-    AssertRC(rc);
+        AssertRC(rc2);
+    }
 
     RTMemFree(pReq);
@@ -302 +319 @@
  * Reads clipboard data from the guest and passes it to the X11 clipboard.
  *
- * @param  pCtx      Pointer to the host clipboard structure
+ * @note   Runs in Xt event thread.
+ *
+ * @param  pCtx      Pointer to the host clipboard structure.
  * @param  u32Format The format in which the data should be transferred
  * @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
- * @note   Host glue code.
- */
-DECLCALLBACK(int) ClipRequestDataForX11Callback(SHCLCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
+ *                   returned.
+ */
+DECLCALLBACK(int) ClipRequestDataForX11Callback(PSHCLCONTEXT pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
 {
     LogFlowFunc(("pCtx=%p, u32Format=%02X, ppv=%p\n", pCtx, u32Format, ppv));
@@ -329 +347 @@
 
     SHCLEVENTID uEvent;
-    int rc = shClSvcDataReadRequest(pCtx->pClient, &dataReq, &uEvent);
+    int rc = ShClSvcDataReadRequest(pCtx->pClient, &dataReq, &uEvent);
     if (RT_SUCCESS(rc))
     {
@@ -373 +391 @@
 int ShClSvcImplTransferGetRoots(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
 {
-    RT_NOREF(pClient, pTransfer);
-
-    int rc = VINF_SUCCESS;
+    LogFlowFuncEnter();
+
+    int rc;
+
+    CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)RTMemAllocZ(sizeof(CLIPREADCBREQ));
+    if (pReq)
+    {
+        pReq->pv        = pTransfer;
+        pReq->cb        = sizeof(SHCLTRANSFER);
+        pReq->uEvent    = NIL_SHCLEVENTID; /* No event handling needed. */
+
+    #if 0
+        SHCLEVENTID uEvent = ShClEventIDGenerate(&pClient->Events);
+
+        rc = ShClEventRegister(&pClient->Events, uEvent);
+        if (RT_SUCCESS(rc))
+        {
+    #endif
+            rc = ClipRequestDataFromX11(pClient->State.pCtx->pBackend, VBOX_SHCL_FMT_URI_LIST, pReq);
+    #if 0
+            if (RT_SUCCESS(rc))
+            {
+                /* X supplies the data asynchronously, so we need to wait for data to arrive first. */
+                rc = ShClEventWait(&pClient->Events, uEvent, 30 * 1000, NULL /* pPayload */);
+            }
+
+            ShClEventUnregister(&pClient->Events, uEvent);
+        }
+    #endif
+    }
+    else
+        rc = VERR_NO_MEMORY;
 
     LogFlowFuncLeaveRC(rc);

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

@@ -1061 +1061 @@
  * @param   puEvent             Event ID for waiting for new data. Optional.
  */
-int shClSvcDataReadRequest(PSHCLCLIENT pClient, PSHCLDATAREQ pDataReq,
+int ShClSvcDataReadRequest(PSHCLCLIENT pClient, PSHCLDATAREQ pDataReq,
                            PSHCLEVENTID puEvent)
 {
@@ -1067 +1067 @@
     AssertPtrReturn(pDataReq, VERR_INVALID_POINTER);
     /* puEvent is optional. */
+
+    LogFlowFuncEnter();
 
     int rc;
@@ -1105 +1107 @@
 }
 
-int shClSvcDataReadSignal(PSHCLCLIENT pClient, PSHCLCLIENTCMDCTX pCmdCtx,
+int ShClSvcDataReadSignal(PSHCLCLIENT pClient, PSHCLCLIENTCMDCTX pCmdCtx,
                           PSHCLDATABLOCK pData)
 {
@@ -1112 +1114 @@
     AssertPtrReturn(pData,   VERR_INVALID_POINTER);
 
+    LogFlowFuncEnter();
+
     SHCLEVENTID uEvent;
     if (!(pClient->State.fGuestFeatures0 & VBOX_SHCL_GF_0_CONTEXT_ID)) /* Legacy */
@@ -1139 +1143 @@
 }
 
-int shClSvcFormatsReport(PSHCLCLIENT pClient, PSHCLFORMATDATA pFormats)
+int ShClSvcFormatsReport(PSHCLCLIENT pClient, PSHCLFORMATDATA pFormats)
 {
     AssertPtrReturn(pClient,  VERR_INVALID_POINTER);
     AssertPtrReturn(pFormats, VERR_INVALID_POINTER);
+
+    LogFlowFuncEnter();
 
     int rc;
@@ -1650 +1656 @@
                                 Assert(formatData.uFormats != VBOX_SHCL_FMT_NONE); /* There better is *any* format here now. */
 
-                                int rc2 = shClSvcFormatsReport(pClient, &formatData);
+                                int rc2 = ShClSvcFormatsReport(pClient, &formatData);
                                 AssertRC(rc2);
 
@@ -2128 +2134 @@
                     formatData.uFormats = u32Format;
 
-                    rc = shClSvcFormatsReport(pClient, &formatData);
+                    rc = ShClSvcFormatsReport(pClient, &formatData);
                 }
 
@@ -2143 +2149 @@
                 dataReq.cbSize = _64K; /** @todo Make this more dynamic. */
 
-                rc = shClSvcDataReadRequest(pClient, &dataReq, NULL /* puEvent */);
+                rc = ShClSvcDataReadRequest(pClient, &dataReq, NULL /* puEvent */);
                 break;
             }