Changeset 81960 in vbox

Timestamp:

Nov 18, 2019 7:00:50 PM (5 years ago)

Author:

vboxsync

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

134757

Message:

Shared Clipboard/Transfers: Update.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (1 diff)
• Additions/x11/VBoxClient/clipboard.cpp (modified) (2 diffs)
• GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (5 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -1145 +1145 @@
     }
 
-    LogRel(("Shared Clipboard: Worker loop ended\n"));
+    LogRel2(("Shared Clipboard: Worker loop ended\n"));
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -1862 +1862 @@
                                                    RT_SUCCESS(rc)
                                                  ? SHCLTRANSFERSTATUS_STARTED : SHCLTRANSFERSTATUS_ERROR, rc);
-    AssertRC(rc2);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
     if (RT_FAILURE(rc))

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

@@ -230 +230 @@
         {
             rc = VbglR3ClipboardConnectEx(&g_Ctx.CmdCtx);
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+            if (RT_SUCCESS(rc))
+                rc = ShClTransferCtxInit(&g_Ctx.TransferCtx);
+#endif
+            if (RT_FAILURE(rc))
+                ClipStopX11(g_Ctx.pBackend);
         }
     }
@@ -458 +464 @@
 {
     RT_NOREF(ppInterface);
+
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+    ShClTransferCtxDestroy(&g_Ctx.TransferCtx);
+#endif
+
     VbglR3Term();
 }

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

@@ -154 +154 @@
 static Atom clipAtomForX11Format(CLIPBACKEND *pCtx, CLIPX11FORMAT format)
 {
+    LogFlowFunc(("format=%u -> pcszAtom=%s\n", format, g_aFormats[format].pcszAtom));
+    AssertReturn(format <= RT_ELEMENTS(g_aFormats), 0);
     return clipGetAtom(pCtx, g_aFormats[format].pcszAtom);
 }
@@ -162 +164 @@
 static CLIPFORMAT clipRealFormatForX11Format(CLIPX11FORMAT format)
 {
+    AssertReturn(format <= RT_ELEMENTS(g_aFormats), INVALID);
     return g_aFormats[format].enmFormat;
 }
@@ -168 +171 @@
 static uint32_t clipVBoxFormatForX11Format(CLIPX11FORMAT format)
 {
+    AssertReturn(format <= RT_ELEMENTS(g_aFormats), VBOX_SHCL_FMT_NONE);
     return g_aFormats[format].u32VBoxFormat;
 }
@@ -251 +255 @@
     CLIPX11FORMAT X11URIListFormat;
 #endif
-    /** What formats does VBox have on offer? */
+    /** What kind of formats does VBox have to offer? */
     SHCLFORMATS vboxFormats;
     /** Cache of the last unicode data that we received */
@@ -1272 +1276 @@
         if (RT_SUCCESS(rc))
         {
+            AssertPtrReturn(pCtx->pvUnicodeCache, VERR_INVALID_POINTER);
+            AssertReturn   (pCtx->cbUnicodeCache, VERR_INVALID_PARAMETER);
+
             *ppv = RTMemDup(pCtx->pvUnicodeCache, pCtx->cbUnicodeCache);
             *pcb = pCtx->cbUnicodeCache;

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

@@ -1193 +1193 @@
 }
 
+/**
+ * Reports available VBox clipboard formats to the guest.
+ *
+ * @returns VBox status code.
+ * @param   pClient             Client to request to read data form.
+ * @param   pFormats            Formats to report.
+ */
 int ShClSvcFormatsReport(PSHCLCLIENT pClient, PSHCLFORMATDATA pFormats)
 {
@@ -1200 +1207 @@
     LogFlowFuncEnter();
 
+    uint32_t fFormats = pFormats->Formats;
+    uint32_t fFlags   = pFormats->fFlags;
+
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+    /* If transfer mode is set to disabled, don't report the URI list format to the guest. */
+    if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_ENABLED))
+        fFormats &= ~VBOX_SHCL_FMT_URI_LIST;
+#endif
+
+    LogFlowFunc(("fFormats=0x%x -> 0x%x\n", pFormats->Formats, fFormats));
+
+    /* Nothing to report? Bail out early. */
+    if (fFormats == VBOX_SHCL_FMT_NONE)
+        return VINF_SUCCESS;
+
+    LogRel2(("Shared Clipboard: Reporting formats 0x%x to guest\n", fFormats));
+
     int rc;
 
@@ -1209 +1233 @@
         HGCMSvcSetU64(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
                                                                   pClient->Events.uID, uEvent));
-        HGCMSvcSetU32(&pMsg->paParms[1], pFormats->Formats);
-        HGCMSvcSetU32(&pMsg->paParms[2], 0 /* fFlags */);
+        HGCMSvcSetU32(&pMsg->paParms[1], fFormats);
+        HGCMSvcSetU32(&pMsg->paParms[2], fFlags);
 
         rc = shClSvcMsgAdd(pClient, pMsg, true /* fAppend */);
@@ -1216 +1240 @@
         {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-            /* If this is an URI list, create a transfer locally and also tell the guest to create
+            /* If we announce an URI list, create a transfer locally and also tell the guest to create
              * a transfer on the guest side. */
-            if (pFormats->Formats & VBOX_SHCL_FMT_URI_LIST)
+            if (fFormats & VBOX_SHCL_FMT_URI_LIST)
             {
                 rc = shClSvcTransferStart(pClient, SHCLTRANSFERDIR_WRITE, SHCLSOURCE_LOCAL,