Changeset 82851 in vbox for trunk/src/VBox

Timestamp:

Jan 24, 2020 10:58:39 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Set the transfer source for all platforms in a common way in ShClSvcHostReportFormats(). bugref:9437

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-win.cpp (modified) (3 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (4 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2019 Oracle Corporation
+ * Copyright (C) 2006-2020 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -235 +235 @@
                     /* Clipboard was updated by another application, retrieve formats and report back. */
                     rc = vboxClipboardSvcWinSyncInternal(pCtx);
-                    if (RT_SUCCESS(rc))
-                        rc = shClSvcSetSource(pCtx->pClient, SHCLSOURCE_LOCAL);
                 }
                 else
@@ -277 +275 @@
                     /* Clipboard was updated by another application, retrieve formats and report back. */
                     rc = vboxClipboardSvcWinSyncInternal(pCtx);
-                    if (RT_SUCCESS(rc))
-                        shClSvcSetSource(pCtx->pClient, SHCLSOURCE_LOCAL);
                 }
                 else

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

@@ -1285 +1285 @@
         RTCritSectLeave(&pClient->CritSect);
 
-        /*
-         * ...
-         */
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-# error fixme
         /* If we announce an URI list, create a transfer locally and also tell the guest to create
          * a transfer on the guest side. */
@@ -1296 +1292 @@
             rc = shClSvcTransferStart(pClient, SHCLTRANSFERDIR_TO_REMOTE, SHCLSOURCE_LOCAL,
                                       NULL /* pTransfer */);
+            if (RT_SUCCESS(rc))
+                rc = shClSvcSetSource(pClient, SHCLSOURCE_LOCAL);
+
             if (RT_FAILURE(rc))
                 LogRel(("Shared Clipboard: Initializing host write transfer failed with %Rrc\n", rc));
@@ -1305 +1304 @@
             rc = VINF_SUCCESS;
         }
-        /** @todo r=bird: shouldn't we also call shClSvcSetSource(pClient, SHCLSOURCE_LOCAL) here??
-         * Looks like the caller of this function does it, but only on windows.  Very helpful. */
     }
     else
@@ -1713 +1710 @@
 }
 
+/**
+ * Sets the transfer source type of a Shared Clipboard client.
+ *
+ * @returns VBox status code.
+ * @param   pClient             Client to set transfer source type for.
+ * @param   enmSource           Source type to set.
+ */
 int shClSvcSetSource(PSHCLCLIENT pClient, SHCLSOURCE enmSource)
 {