Changeset 93334 in vbox for trunk

Timestamp:

Jan 18, 2022 10:38:13 PM (3 years ago)

Author:

vboxsync

Message:

Installer/win/InstallHelper: Don't use RT_ZERO on hProcess in procRun, we've got NIL_XXXX defines for such things. Removed unused cArgs parameter for procRun since it wasn't even correct (it counted the NULL).

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (4 diffs)

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -184 +184 @@
  * @param   pszImage            Absolute path of executable to run.
  * @param   papszArgs           Pointer to command line arguments to use for calling the executable.
- * @param   cArgs               Number of command line arguments in \a papszArgs.
  */
-static int procRun(MSIHANDLE hModule, const char *pszImage, const char * const *papszArgs, size_t cArgs)
-{
-    RT_NOREF(cArgs);
-
-    RTPROCESS Process;
-    RT_ZERO(Process);
-
-    uint32_t fProcess = 0;
-#ifndef DEBUG
-    fProcess |= RTPROC_FLAGS_HIDDEN;
+static int procRun(MSIHANDLE hModule, const char *pszImage, const char * const *papszArgs)
+{
+#ifdef DEBUG
+    uint32_t  const fProcess = 0;
+#else
+    uint32_t  const fProcess = RTPROC_FLAGS_HIDDEN;
 #endif
-
+    RTPROCESS       Process  = NIL_RTPROCESS;
     int rc = RTProcCreate(pszImage, papszArgs, RTENV_DEFAULT, fProcess, &Process);
     if (RT_SUCCESS(rc))
@@ -352 +347 @@
     const char *papszArgs[] = { pcszPythonExe, "-c", "import win32api", NULL};
 
-    int rc = procRun(hModule, pcszPythonExe, papszArgs, RT_ELEMENTS(papszArgs));
+    int rc = procRun(hModule, pcszPythonExe, papszArgs);
     if (RT_SUCCESS(rc))
         logStringF(hModule, "checkPythonDependencies: win32api found\n");
@@ -477 +472 @@
                 const char *papszArgs[] = { pszPythonExe, "vboxapisetup.py", "install", NULL};
 
-                rc = procRun(hModule, pszPythonExe, papszArgs, RT_ELEMENTS(papszArgs));
+                rc = procRun(hModule, pszPythonExe, papszArgs);
                 if (RT_SUCCESS(rc))
                     logStringF(hModule, "InstallPythonAPI: Installation of vboxapisetup.py successful\n");
@@ -503 +498 @@
         const char *papszArgs[] = { pszPythonExe, "-c", "from vboxapi import VirtualBoxManager", NULL};
 
-        rc = procRun(hModule, pszPythonExe, papszArgs, RT_ELEMENTS(papszArgs));
+        rc = procRun(hModule, pszPythonExe, papszArgs);
         if (RT_SUCCESS(rc))
             logStringF(hModule, "InstallPythonAPI: VBox API looks good.\n");