Changeset 99169 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

Timestamp:

Mar 24, 2023 9:44:55 AM (21 months ago)

Author:

vboxsync

Message:

Guest Control/VbglR3: More bugfixes required for the initial patch given; re-ordered the arguments for the internal process startup info functions, so that these match the structure parameters order. bugref:8053

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -1391 +1391 @@
  * @param   pStartupInfo        Process startup info to initializes.
  * @param   cbCmd               Size (in bytes) to use for the command buffer.
+ * @param   cbArgs              Size (in bytes) to use for the arguments buffer.
+ * @param   cbEnv               Size (in bytes) to use for the environment buffer.
  * @param   cbCwd               Size (in bytes) to use for the current working directory.
  * @param   cbUser              Size (in bytes) to use for the user name buffer.
  * @param   cbPassword          Size (in bytes) to use for the password buffer.
  * @param   cbDomain            Size (in bytes) to use for the domain buffer.
- * @param   cbArgs              Size (in bytes) to use for the arguments buffer.
- * @param   cbEnv               Size (in bytes) to use for the environment buffer.
  */
 VBGLR3DECL(int) VbglR3GuestCtrlProcStartupInfoInitEx(PVBGLR3GUESTCTRLPROCSTARTUPINFO pStartupInfo,
-                                                     size_t cbCmd,
+                                                     size_t cbCmd, size_t cbArgs, size_t cbEnv,
                                                      size_t cbCwd,
-                                                     size_t cbUser, size_t cbPassword, size_t cbDomain,
-                                                     size_t cbArgs, size_t cbEnv)
+                                                     size_t cbUser, size_t cbPassword, size_t cbDomain)
 {
     AssertPtrReturn(pStartupInfo, VERR_INVALID_POINTER);
     AssertReturn(cbCmd,           VERR_INVALID_PARAMETER);
+    AssertReturn(cbArgs,          VERR_INVALID_PARAMETER);
+    AssertReturn(cbEnv,           VERR_INVALID_PARAMETER);
     AssertReturn(cbCwd,           VERR_INVALID_PARAMETER);
     AssertReturn(cbUser,          VERR_INVALID_PARAMETER);
     AssertReturn(cbPassword,      VERR_INVALID_PARAMETER);
     AssertReturn(cbDomain,        VERR_INVALID_PARAMETER);
-    AssertReturn(cbArgs,          VERR_INVALID_PARAMETER);
-    AssertReturn(cbEnv,           VERR_INVALID_PARAMETER);
 
     RT_BZERO(pStartupInfo, sizeof(VBGLR3GUESTCTRLPROCSTARTUPINFO));
@@ -1426 +1425 @@
     {
         ALLOC_STR(Cmd,      cbCmd);
-        ALLOC_STR(Cwd,      cbCwd);
         ALLOC_STR(Args,     cbArgs);
         ALLOC_STR(Env,      cbEnv);
+        ALLOC_STR(Cwd,      cbCwd);
         ALLOC_STR(User,     cbUser);
         ALLOC_STR(Password, cbPassword);
@@ -1446 +1445 @@
  * Initializes a process startup info with default values.
  *
- * @param   pStartupInfo        Process startup info to initializes.
+ * @param   pStartupInfo        Process startup info to initialize.
  */
 VBGLR3DECL(int) VbglR3GuestCtrlProcStartupInfoInit(PVBGLR3GUESTCTRLPROCSTARTUPINFO pStartupInfo)
 {
     return VbglR3GuestCtrlProcStartupInfoInitEx(pStartupInfo,
-                                                GUEST_PROC_DEF_CMD_LEN,
+                                                GUEST_PROC_DEF_CMD_LEN, GUEST_PROC_DEF_ARGS_LEN, GUEST_PROC_DEF_ENV_LEN,
                                                 GUEST_PROC_DEF_CWD_LEN,
                                                 GUEST_PROC_DEF_USER_LEN     /* Deprecated, now handled via session creation. */,
                                                 GUEST_PROC_DEF_PASSWORD_LEN /* Ditto. */,
-                                                GUEST_PROC_DEF_DOMAIN_LEN   /* Ditto. */,
-                                                GUEST_PROC_DEF_ARGS_LEN, GUEST_PROC_DEF_ENV_LEN);
+                                                GUEST_PROC_DEF_DOMAIN_LEN   /* Ditto. */);
 }
 
@@ -1470 +1468 @@
 
     RTStrFree(pStartupInfo->pszCmd);
-    RTStrFree(pStartupInfo->pszCwd);
     RTStrFree(pStartupInfo->pszArgs);
     RTStrFree(pStartupInfo->pszEnv);
+    RTStrFree(pStartupInfo->pszCwd);
     RTStrFree(pStartupInfo->pszUser);
     RTStrFree(pStartupInfo->pszPassword);
@@ -1516 +1514 @@
             pStartupInfoDup->pszArgs     = NULL;
             pStartupInfoDup->pszEnv      = NULL;
+            pStartupInfoDup->pszCwd      = NULL;
             pStartupInfoDup->pszUser     = NULL;
             pStartupInfoDup->pszPassword = NULL;
@@ -1539 +1538 @@
             DUP_MEM(Args);
             DUP_MEM(Env);
+            DUP_MEM(Cwd);
             DUP_STR(User);
             DUP_STR(Password);
@@ -1633 +1633 @@
                 /* We can't tell which parameter doesn't fit, so we have to resize all. */
                 GROW_STR(Cmd , GUEST_PROC_MAX_CMD_LEN);
-                GROW_STR(Cwd,  GUEST_PROC_MAX_CWD_LEN);
                 GROW_STR(Args, GUEST_PROC_MAX_ARGS_LEN);
                 GROW_STR(Env,  GUEST_PROC_MAX_ENV_LEN);
-
+                GROW_STR(Cwd,  GUEST_PROC_MAX_CWD_LEN);
 #undef GROW_STR
                 LogRel(("VbglR3GuestCtrlProcGetStart: 2 - %Rrc (retry %u, cbCmd=%RU32, cbCwd=%RU32, cbArgs=%RU32, cbEnv=%RU32)\n",