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

Timestamp:

Nov 6, 2019 10:54:35 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Update.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

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

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

@@ -74 +74 @@
     formatData.uFormats = u32Formats;
 
-    int rc2 = shClSvcFormatsReport(pCtx->pClient, &formatData);
-    AssertRC(rc2);
+    int rc = shClSvcFormatsReport(pCtx->pClient, &formatData);
+    RT_NOREF(rc);
+
+    LogFlowFuncLeaveRC(rc);
 }
 
@@ -182 +184 @@
     RT_NOREF(pCmdCtx);
 
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    if (pFormats->uFormats & VBOX_SHCL_FMT_URI_LIST) /* No transfer support yet. */
-        return VINF_SUCCESS;
-#endif
-
-    ClipAnnounceFormatToX11(pClient->State.pCtx->pBackend, pFormats->uFormats);
-
-    return VINF_SUCCESS;
+    int rc = ClipAnnounceFormatToX11(pClient->State.pCtx->pBackend, pFormats->uFormats);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -356 +354 @@
 {
     RT_NOREF(pClient, pTransfer);
-    return VINF_SUCCESS;
+
+    int rc = VINF_SUCCESS;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -362 +364 @@
 {
     RT_NOREF(pClient, pTransfer);
-    return VINF_SUCCESS;
+
+    int rc = VINF_SUCCESS;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -368 +374 @@
 {
     RT_NOREF(pClient, pTransfer);
-    return VINF_SUCCESS;
+
+    int rc = VINF_SUCCESS;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 #endif

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

@@ -1732 +1732 @@
             }
             else
+            {
+                LogRel2(("Shared Clipboard: File transfers are disabled for this VM\n"));
                 rc = VERR_ACCESS_DENIED;
+            }
 #else
-            rc = VERR_NOT_IMPLEMENTED;
+            rc = VERR_NOT_SUPPORTED;
 #endif
             break;