Changeset 46513 in vbox

Timestamp:

Jun 12, 2013 3:26:23 PM (11 years ago)

Author:

vboxsync

Message:

Forward ported / integrated r86363 (4.2: VBoxService/sysprep: Fixed slashes, more logging about looking up executable. Print warning when trying to execute sysprep on 64-bit OSes with 32-bit service executable).

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (3 diffs)

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

@@ -1452 +1452 @@
         /* Use a predefined sysprep path as default. */
         char szSysprepCmd[RTPATH_MAX] = "C:\\sysprep\\sysprep.exe";
+        /** @todo Check digital signature of file above before executing it? */
 
         /*
-         * On Windows Vista (and up) sysprep is located in "system32\\sysprep\\sysprep.exe",
+         * On Windows Vista (and up) sysprep is located in "system32\\Sysprep\\sysprep.exe",
          * so detect the OS and use a different path.
          */
@@ -1460 +1461 @@
         RT_ZERO(OSInfoEx);
         OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-        if (    GetVersionEx((LPOSVERSIONINFO) &OSInfoEx)
+        BOOL fRet = GetVersionEx((LPOSVERSIONINFO) &OSInfoEx);
+        if (    fRet
             &&  OSInfoEx.dwPlatformId == VER_PLATFORM_WIN32_NT
             &&  OSInfoEx.dwMajorVersion >= 6 /* Vista or later */)
         {
             rc = RTEnvGetEx(RTENV_DEFAULT, "windir", szSysprepCmd, sizeof(szSysprepCmd), NULL);
+#ifndef RT_ARCH_AMD64
+            /* Don't execute 64-bit sysprep from a 32-bit service host! */
+            char szSysWow64[RTPATH_MAX];
+            if (RTStrPrintf(szSysWow64, sizeof(szSysWow64), "%s", szSysprepCmd))
+            {
+                rc = RTPathAppend(szSysWow64, sizeof(szSysWow64), "SysWow64");
+                AssertRC(rc);
+            }
+            if (   RT_SUCCESS(rc)
+                && RTPathExists(szSysWow64))
+                VBoxServiceVerbose(0, "Warning: This service is 32-bit; could not execute sysprep on 64-bit OS!\n");
+#endif
             if (RT_SUCCESS(rc))
-                rc = RTPathAppend(szSysprepCmd, sizeof(szSysprepCmd), "system32\\sysprep\\sysprep.exe");
-        }
+                rc = RTPathAppend(szSysprepCmd, sizeof(szSysprepCmd), "system32\\Sysprep\\sysprep.exe");
+            if (RT_SUCCESS(rc))
+                RTPathChangeToDosSlashes(szSysprepCmd, false /* No forcing necessary */);
+
+            if (RT_FAILURE(rc))
+                VBoxServiceError("Failed to detect sysrep location, rc=%Rrc\n", rc);
+        }
+        else if (!fRet)
+            VBoxServiceError("Failed to retrieve OS information, last error=%ld\n", GetLastError());
+
+        VBoxServiceVerbose(3, "Sysprep executable is: %s\n", szSysprepCmd);
 
         if (RT_SUCCESS(rc))
@@ -1476 +1499 @@
             if (RT_SUCCESS(rc))
             {
+                /* As we don't specify credentials for the sysprep process, it will
+                 * run under behalf of the account VBoxService was started under, most
+                 * likely local system. */
                 rc = RTProcCreateEx(szSysprepCmd, papszArgsExp, hEnv, 0 /* fFlags */,
                                     phStdIn, phStdOut, phStdErr, NULL /* pszAsUser */,