Changeset 80563 in vbox for trunk/src

Timestamp:

Sep 3, 2019 9:59:30 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Build fix.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (2 diffs)

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

@@ -778 +778 @@
     LogFlowFunc(("uFormats=0x%x, hWnd=%p\n", pFormats->uFormats, pCtx->Win.hWnd));
 
-    if (!(pFormats->uFormats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST))
-    {
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+    if (pFormats->uFormats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
+    {
+        PSHAREDCLIPBOARDURITRANSFER pTransfer;
+        rc = vboxSvcClipboardURITransferStart(pClient,
+                                              SHAREDCLIPBOARDURITRANSFERDIR_READ, SHAREDCLIPBOARDSOURCE_REMOTE,
+                                              &pTransfer);
+        if (RT_SUCCESS(rc))
+        {
+            /* Create the IDataObject implementation the host OS needs and assign
+             * the newly created transfer to this object. */
+            rc = VBoxClipboardWinURITransferCreate(&pCtx->Win, pTransfer);
+
+            /*  Note: The actual requesting + retrieving of data will be done in the IDataObject implementation
+                      (ClipboardDataObjectImpl::GetData()). */
+        }
+    }
+    else
+    {
+#endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
+
         /*
          * The guest announced formats. Forward to the window thread.
@@ -787 +806 @@
 
         rc = VINF_SUCCESS;
-    }
+
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-    else if (pFormats->uFormats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
-    {
-        PSHAREDCLIPBOARDURITRANSFER pTransfer;
-        rc = vboxSvcClipboardURITransferStart(pClient,
-                                              SHAREDCLIPBOARDURITRANSFERDIR_READ, SHAREDCLIPBOARDSOURCE_REMOTE,
-                                              &pTransfer);
-        if (RT_SUCCESS(rc))
-        {
-            /* Create the IDataObject implementation the host OS needs and assign
-             * the newly created transfer to this object. */
-            rc = VBoxClipboardWinURITransferCreate(&pCtx->Win, pTransfer);
-
-            /*  Note: The actual requesting + retrieving of data will be done in the IDataObject implementation
-                      (ClipboardDataObjectImpl::GetData()). */
-        }
-    }
-#endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
+    }
+
     else
         rc = VERR_NOT_SUPPORTED;
+#endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
 
     LogFlowFuncLeaveRC(rc);