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

Timestamp:

Nov 5, 2021 2:38:31 PM (3 years ago)

Author:

vboxsync

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

148076

Message:

SharedClipboard: Made svcConnect just never return any informational status code, instead of just supressing VINF_NO_CHANGE because that's bound to fail again some time. Left a todo regarding g_mapClient being unsafe and overkill. bugref:9437

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (3 diffs)

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

@@ -2049 +2049 @@
     if (RT_SUCCESS(rc))
     {
-        /* Assign weak pointer to client map .*/
+        /* Assign weak pointer to client map. */
+        /** @todo r=bird: The g_mapClients is only there for looking up
+         *        g_ExtState.uClientID (unserialized btw), so why not use store the
+         *        pClient value directly in g_ExtState instead of the ID?  It cannot
+         *        crash any worse that racing map insertion/removal. */
         g_mapClients[u32ClientID] = pClient; /** @todo Handle OOM / collisions? */
 
@@ -2057 +2061 @@
             /* Sync the host clipboard content with the client. */
             rc = ShClBackendSync(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))
             {
@@ -2078 +2070 @@
                     g_ExtState.uClientID = u32ClientID;
 
-                LogFunc(("Successfully connected client %#x\n", u32ClientID));
-                return rc;
+                /* The sync could return VINF_NO_CHANGE if nothing has changed on the host, but
+                   older Guest Additions didn't use RT_SUCCESS to but == VINF_SUCCESS to check for
+                   success.  So just return VINF_SUCCESS here to not break older Guest Additions. */
+                LogFunc(("Successfully connected client %#x%s\n",
+                         u32ClientID, g_ExtState.uClientID == u32ClientID ? " - Use by ExtState too" : ""));
+                return VINF_SUCCESS;
             }