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

Timestamp:

Nov 13, 2019 3:59:22 PM (5 years ago)

Author:

vboxsync

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

134620

Message:

Shared Clipboard/Transfers: Got Linux hosts -> Windows guests working.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-transfers.cpp (modified) (3 diffs)
• VBoxSharedClipboardSvc-x11.cpp (modified) (1 diff)

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

@@ -1395 +1395 @@
                 break;
 
+            if (   ShClTransferGetSource(pTransfer) == SHCLSOURCE_LOCAL
+                && ShClTransferGetDir(pTransfer)    == SHCLTRANSFERDIR_WRITE)
+            {
+                /* Get roots if this is a local write transfer (host -> guest). */
+                rc = ShClSvcImplTransferGetRoots(pClient, pTransfer);
+            }
+            else
+            {
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
             SHCLROOTLISTHDR rootListHdr;
             RT_ZERO(rootListHdr);
@@ -1755 +1767 @@
 }
 
+int shClSvcTransferHostMsgHandler(PSHCLCLIENT pClient, PSHCLCLIENTMSG pMsg)
+{
+    RT_NOREF(pClient);
+
+    int rc;
+
+    switch (pMsg->uMsg)
+    {
+        default:
+            rc = VINF_SUCCESS;
+            break;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 /**
  * Registers an clipboard transfer area.
@@ -2073 +2102 @@
                         if (RT_SUCCESS(rc))
                         {
-                            if (   enmSource == SHCLSOURCE_LOCAL
-                                && enmDir    == SHCLTRANSFERDIR_WRITE) /* Get roots if this is a local write transfer. */
-                            {
-                                rc = ShClSvcImplTransferGetRoots(pClient, pTransfer);
-                            }
-
                             if (RT_SUCCESS(rc))
                                 rc = ShClTransferStart(pTransfer);

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

@@ -393 +393 @@
     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
+    SHCLEVENTID uEvent = ShClEventIDGenerate(&pClient->Events);
+
+    int rc = ShClEventRegister(&pClient->Events, uEvent);
+    if (RT_SUCCESS(rc))
+    {
+        CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)RTMemAllocZ(sizeof(CLIPREADCBREQ));
+        if (pReq)
+        {
+            pReq->uEvent = uEvent;
+
             rc = ClipReadDataFromX11(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 */);
+                PSHCLEVENTPAYLOAD pPayload;
+                rc = ShClEventWait(&pClient->Events, uEvent, 30 * 1000, &pPayload);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = ShClTransferRootsSet(pTransfer,
+                                              (char *)pPayload->pvData, pPayload->cbData + 1 /* Include termination */);
+                }
             }
-
-            ShClEventUnregister(&pClient->Events, uEvent);
-        }
-    #endif
-    }
-    else
-        rc = VERR_NO_MEMORY;
+        }
+
+        ShClEventUnregister(&pClient->Events, uEvent);
+    }
 
     LogFlowFuncLeaveRC(rc);