Changeset 83405 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 25, 2020 12:45:01 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Main + VBoxService: Resolved another @todo: Added ability for guest processes to use argv[0] independently of the actual execution command. bugref:9320

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (1 diff)
• VBoxServiceControlProcess.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -216 +216 @@
              * Report features to the host.
              */
-            rc = VbglR3GuestCtrlReportFeatures(g_idControlSvcClient, VBOX_GUESTCTRL_GF_0_SET_SIZE, &g_fControlHostFeatures0);
+            const uint64_t fGuestFeatures = VBOX_GUESTCTRL_GF_0_SET_SIZE
+                                          | VBOX_GUESTCTRL_GF_0_PROCESS_ARGV0;
+
+            rc = VbglR3GuestCtrlReportFeatures(g_idControlSvcClient, fGuestFeatures, &g_fControlHostFeatures0);
             if (RT_SUCCESS(rc))
                 VGSvcVerbose(3, "Host features: %#RX64\n", g_fControlHostFeatures0);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -1071 +1071 @@
 #endif
 
-    /* HACK ALERT! Since we still don't allow the user to really specify the first
-                   argument separately from the executable image, we have to fudge
+    /* HACK ALERT! Older hosts (< VBox 6.1.x) did not allow the user to really specify the first
+                   argument separately from the executable image, so we have to fudge
                    a little in the unquoted argument case to deal with executables
                    containing spaces. */
-    /** @todo Fix the stupid host/guest protocol so the user can do this for us! */
     if (   !(fFlags & EXECUTEPROCESSFLAG_UNQUOTED_ARGS)
         || !strpbrk(pszArgv0, " \t\n\r")
@@ -1094 +1093 @@
         }
     }
+
     if (RT_SUCCESS(rc))
     {
@@ -1342 +1342 @@
     if (RT_SUCCESS(rc))
     {
+        const char *pszArgv0 = RT_BOOL(g_fControlHostFeatures0 & VBOX_GUESTCTRL_HF_0_PROCESS_ARGV0)
+                             ? papszArgs[0] : pszExec;
         char **papszArgsExp;
-        /** @todo r-bird: pszExec != argv[0]! When are you going to get that?!? How many
-         * times does this need to be pointed out?  HOST/GUEST INTERFACE IS MISDESIGNED! */
-        rc = vgsvcGstCtrlProcessAllocateArgv(pszExec /* Always use the unmodified executable name as argv0. */,
-                                             papszArgs /* Append the rest of the argument vector (if any). */,
+        rc = vgsvcGstCtrlProcessAllocateArgv(pszArgv0, papszArgs,
                                              fFlags, &papszArgsExp);
         if (RT_FAILURE(rc))