Changeset 81824 in vbox

Timestamp:

Nov 13, 2019 1:28:48 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Generalized initial (host to guest) clipboard syncing code.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-darwin.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc.cpp (modified) (1 diff)

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

@@ -169 +169 @@
     pClient->State.pCtx->pClient = pClient;
 
-    /* Initially sync the host clipboard content with the client. */
-    int rc = ShClSvcImplSync(pClient);
-
     ShClSvcUnlock();
     return rc;

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -237 +237 @@
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 
-/** @name Platform-dependent implementations for the Shared Clipboard host service.
+/** @name Platform-dependent implementations for the Shared Clipboard host service, called *only* by the host service.
  * @{
  */

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

@@ -660 +660 @@
         pClient->State.pCtx = pCtx;
         pClient->State.pCtx->pClient = pClient;
-
-        /* Sync the host clipboard content with the client. */
-        rc = ShClSvcImplSync(pClient);
-        if (rc == VINF_NO_CHANGE)
-        {
-            /*
-             * The sync could return VINF_NO_CHANGE if nothing has changed on the host, but older
-             * Guest Additions rely on the fact that only VINF_SUCCESS indicates a successful connect
-             * to the host service (instead of using RT_SUCCESS()).
-             *
-             * So implicitly set VINF_SUCCESS here to not break older Guest Additions.
-             */
-            rc = VINF_SUCCESS;
-        }
     }
     else

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

@@ -1613 +1613 @@
         if (RT_SUCCESS(rc))
         {
-            /* Assign weak pointer to client map .*/
-            g_mapClients[u32ClientID] = pClient; /** @todo Handle OOM / collisions? */
-
-            /* For now we ASSUME that the first client ever connected is in charge for
-             * communicating withe the service extension.
-             *
-             ** @todo This needs to be fixed ASAP w/o breaking older guest / host combos. */
-            if (g_ExtState.uClientID == 0)
-                g_ExtState.uClientID = u32ClientID;
+            /* Sync the host clipboard content with the client. */
+            rc = ShClSvcImplSync(pClient);
+            if (rc == VINF_NO_CHANGE)
+            {
+                /*
+                 * The sync could return VINF_NO_CHANGE if nothing has changed on the host, but older
+                 * Guest Additions rely on the fact that only VINF_SUCCESS indicates a successful connect
+                 * to the host service (instead of using RT_SUCCESS()).
+                 *
+                 * So implicitly set VINF_SUCCESS here to not break older Guest Additions.
+                 */
+                rc = VINF_SUCCESS;
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                /* Assign weak pointer to client map .*/
+                g_mapClients[u32ClientID] = pClient; /** @todo Handle OOM / collisions? */
+
+                /* For now we ASSUME that the first client ever connected is in charge for
+                 * communicating withe the service extension.
+                 *
+                 ** @todo This needs to be fixed ASAP w/o breaking older guest / host combos. */
+                if (g_ExtState.uClientID == 0)
+                    g_ExtState.uClientID = u32ClientID;
+            }
         }
     }