Changeset 51170 in vbox for trunk/src/VBox/Installer/win/Stub

Timestamp:

Apr 30, 2014 8:42:52 AM (11 years ago)

Author:

vboxsync

Message:

Installer/win/VBoxStub: Fixed singleton mutex leaks + specifying multiple MSI parameters, added verbose switch ("/v") and optional console output support.

File:

• trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp (modified) (12 diffs)

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -21 +21 @@
 #include <Windows.h>
 #include <commctrl.h>
+#include <fcntl.h>
+#include <io.h>
 #include <lmerr.h>
 #include <msiquery.h>
@@ -56 +58 @@
 #endif
 
+#ifdef DEBUG
+/* Use an own console window if run in debug mode. */
+# define VBOX_STUB_WITH_OWN_CONSOLE
+#endif
 
 /*******************************************************************************
@@ -90 +96 @@
 /** List of temporary files. */
 static RTLISTANCHOR     g_TmpFiles;
+/** Verbosity flag. */
+static int              g_iVerbosity = 0;
 
 
@@ -802 +810 @@
     int vrc = RTR3InitExe(argc, &argv, 0);
     if (RT_FAILURE(vrc))
+    {
+        /* Close the mutex for this application instance. */
+        CloseHandle(hMutexAppRunning);
+        hMutexAppRunning = NULL;
         return RTMsgInitFailure(vrc);
+    }
+
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0501
+# ifndef VBOX_STUB_WITH_OWN_CONSOLE /* Use an own console window if run in debug mode. */
+    if (!AllocConsole())
+    {
+        DWORD dwErr = GetLastError();
+        ShowError("Unable to allocate console, error = %ld\n",
+                  dwErr);
+
+        /* Close the mutex for this application instance. */
+        CloseHandle(hMutexAppRunning);
+        hMutexAppRunning = NULL;
+        return RTEXITCODE_FAILURE;
+    }
+# else
+    if (!AttachConsole(ATTACH_PARENT_PROCESS))
+    {
+        DWORD dwErr = GetLastError();
+        /* Does the program have a console to attach to? */
+        if (dwErr != ERROR_INVALID_HANDLE)
+        {
+            ShowError("Unable to attach to console, error = %ld\n",
+                      dwErr);
+
+            /* Close the mutex for this application instance. */
+            CloseHandle(hMutexAppRunning);
+            hMutexAppRunning = NULL;
+            return RTEXITCODE_FAILURE;
+        }
+    }
+# endif /* DEBUG */
+
+    long lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
+    int iConHandleStdOut = _open_osfhandle(lStdHandle, _O_TEXT);
+    FILE *hFileStdOut = _fdopen(iConHandleStdOut, "w");
+    *stdout = *hFileStdOut;
+
+    lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
+    int iConHandleStdErr = _open_osfhandle(lStdHandle, _O_TEXT);
+    FILE *hFileStdErr = _fdopen(iConHandleStdErr, "w");
+    *stderr = *hFileStdErr;
+
+setvbuf( stdout, NULL, _IONBF, 0 );
+
+#endif
 
     /*
@@ -815 +873 @@
 #endif
     char szExtractPath[RTPATH_MAX] = {0};
-    char szMSIArgs[4096]           = {0};
+    char szMSIArgs[_4K]            = {0};
 
     /* Parameter definitions. */
@@ -844 +902 @@
         { "-reinstall",         'f', RTGETOPT_REQ_NOTHING },
         { "/reinstall",         'f', RTGETOPT_REQ_NOTHING },
+        { "--verbose",          'v', RTGETOPT_REQ_NOTHING },
+        { "-verbose",           'v', RTGETOPT_REQ_NOTHING },
+        { "/verbose",           'v', RTGETOPT_REQ_NOTHING },
         { "--version",          'V', RTGETOPT_REQ_NOTHING },
         { "-version",           'V', RTGETOPT_REQ_NOTHING },
@@ -854 +915 @@
     };
 
+    RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
+
     /* Parse the parameters. */
     int ch;
+    bool fParsingDone = false;
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
     RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0);
-    while ((ch = RTGetOpt(&GetState, &ValueUnion)))
+    while (   (ch = RTGetOpt(&GetState, &ValueUnion))
+           && rcExit == RTEXITCODE_SUCCESS
+           && !fParsingDone)
     {
         switch (ch)
@@ -870 +936 @@
                                    "REINSTALLMODE=vomus REINSTALL=ALL");
                 if (RT_FAILURE(vrc))
-                    return ShowError("MSI parameters are too long.");
+                    rcExit = ShowError("MSI parameters are too long.");
                 break;
 
@@ -886 +952 @@
                 break;
 #endif
-
             case 'l':
                 fEnableLogging = true;
@@ -894 +959 @@
                 vrc = RTStrCopy(szExtractPath, sizeof(szExtractPath), ValueUnion.psz);
                 if (RT_FAILURE(vrc))
-                    return ShowError("Extraction path is too long.");
+                    rcExit = ShowError("Extraction path is too long.");
                 break;
 
@@ -903 +968 @@
                     vrc = RTStrCat(szMSIArgs, sizeof(szMSIArgs), ValueUnion.psz);
                 if (RT_FAILURE(vrc))
-                    return ShowError("MSI parameters are too long.");
+                    rcExit = ShowError("MSI parameters are too long.");
                 break;
 
             case 'V':
                 ShowInfo("Version: %d.%d.%d.%d",
-                         VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV);
-                return VINF_SUCCESS;
+                         VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD,
+                         VBOX_SVN_REV);
+                fParsingDone = true;
+                break;
+
+            case 'v':
+                g_iVerbosity++;
+                break;
 
             case 'h':
@@ -929 +1000 @@
                          VBOX_STUB_TITLE, VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV,
                          argv[0], argv[0]);
-                return VINF_SUCCESS;
+                fParsingDone = true;
+                break;
+
+            case VINF_GETOPT_NOT_OPTION:
+                /* Are (optional) MSI parameters specified and this is the last
+                 * parameter? Append everything to the MSI parameter list then. */
+                if (szMSIArgs[0])
+                {
+                    vrc = RTStrCat(szMSIArgs, sizeof(szMSIArgs), " ");
+                    if (RT_SUCCESS(vrc))
+                        vrc = RTStrCat(szMSIArgs, sizeof(szMSIArgs), ValueUnion.psz);
+                    if (RT_FAILURE(vrc))
+                        rcExit = ShowError("MSI parameters are too long.");
+                    continue;
+                }
+                /* Fall through is intentional. */
 
             default:
                 if (g_fSilent)
-                    return RTGetOptPrintError(ch, &ValueUnion);
-                if (ch == VINF_GETOPT_NOT_OPTION || ch == VERR_GETOPT_UNKNOWN_OPTION)
-                    ShowError("Unknown option \"%s\"!\n"
-                              "Please refer to the command line help by specifying \"/?\"\n"
-                              "to get more information.", ValueUnion.psz);
+                    rcExit = RTGetOptPrintError(ch, &ValueUnion);
+                if (ch == VERR_GETOPT_UNKNOWN_OPTION)
+                    rcExit = ShowError("Unknown option \"%s\"\n"
+                                       "Please refer to the command line help by specifying \"/?\"\n"
+                                       "to get more information.", ValueUnion.psz);
                 else
-                    ShowError("Parameter parsing error: %Rrc\n"
-                              "Please refer to the command line help by specifying \"/?\"\n"
-                              "to get more information.", ch);
-                return RTEXITCODE_SYNTAX;
-
-        }
-    }
-
-    /*
-     * Determine the extration path if not given by the user, and gather some
-     * other bits we'll be needing later.
-     */
-    if (szExtractPath[0] == '\0')
-    {
-        vrc = RTPathTemp(szExtractPath, sizeof(szExtractPath));
-        if (RT_SUCCESS(vrc))
-            vrc = RTPathAppend(szExtractPath, sizeof(szExtractPath), "VirtualBox");
-        if (RT_FAILURE(vrc))
-            return ShowError("Failed to determin extraction path (%Rrc)", vrc);
-
-    }
-    else
-    {
-        /** @todo should check if there is a .custom subdirectory there or not. */
-    }
-    RTPathChangeToDosSlashes(szExtractPath, true /* Force conversion. */); /* MSI requirement. */
+                    rcExit = ShowError("Parameter parsing error: %Rrc\n"
+                                       "Please refer to the command line help by specifying \"/?\"\n"
+                                       "to get more information.", ch);
+                break;
+        }
+    }
+
+    if (rcExit != RTEXITCODE_SUCCESS)
+        vrc = VERR_PARSE_ERROR;
+
+    if (   RT_SUCCESS(vrc)
+        && g_iVerbosity)
+    {
+        RTPrintf("Silent installation      : %RTbool\n", g_fSilent);
+        RTPrintf("Logging enabled          : %RTbool\n", fEnableLogging);
+        RTPrintf("Certificate installation : %RTbool\n", fEnableSilentCert);
+        RTPrintf("Additional MSI parameters: %s\n",
+                 szMSIArgs[0] ? szMSIArgs : "<None>");
+    }
+
+    if (RT_SUCCESS(vrc))
+    {
+        /*
+         * Determine the extration path if not given by the user, and gather some
+         * other bits we'll be needing later.
+         */
+        if (szExtractPath[0] == '\0')
+        {
+            vrc = RTPathTemp(szExtractPath, sizeof(szExtractPath));
+            if (RT_SUCCESS(vrc))
+                vrc = RTPathAppend(szExtractPath, sizeof(szExtractPath), "VirtualBox");
+            if (RT_FAILURE(vrc))
+                ShowError("Failed to determine extraction path (%Rrc)", vrc);
+
+        }
+        else
+        {
+            /** @todo should check if there is a .custom subdirectory there or not. */
+        }
+        RTPathChangeToDosSlashes(szExtractPath,
+                                 true /* Force conversion. */); /* MSI requirement. */
+    }
 
     /* Read our manifest. */
     PVBOXSTUBPKGHEADER pHeader;
-    vrc = FindData("MANIFEST", (PVOID *)&pHeader, NULL);
-    if (RT_FAILURE(vrc))
-        return ShowError("Internal package error: Manifest not found (%Rrc)", vrc);
-    /** @todo If we could, we should validate the header. Only the magic isn't
-     *        commonly defined, nor the version number... */
-
-    RTListInit(&g_TmpFiles);
-
-    /*
-     * Up to this point, we haven't done anything that requires any cleanup.
-     * From here on, we do everything in function so we can counter clean up.
-     */
-    bool fCreatedExtractDir;
-    RTEXITCODE rcExit = ExtractFiles(pHeader->byCntPkgs, szExtractPath, fExtractOnly, &fCreatedExtractDir);
-    if (rcExit == RTEXITCODE_SUCCESS)
-    {
-        if (fExtractOnly)
-            ShowInfo("Files were extracted to: %s", szExtractPath);
-        else
-        {
-            rcExit = CopyCustomDir(szExtractPath);
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = FindData("MANIFEST", (PVOID *)&pHeader, NULL);
+        if (RT_FAILURE(vrc))
+            rcExit = ShowError("Internal package error: Manifest not found (%Rrc)", vrc);
+    }
+    if (RT_SUCCESS(vrc))
+    {
+        /** @todo If we could, we should validate the header. Only the magic isn't
+         *        commonly defined, nor the version number... */
+
+        RTListInit(&g_TmpFiles);
+
+        /*
+         * Up to this point, we haven't done anything that requires any cleanup.
+         * From here on, we do everything in function so we can counter clean up.
+         */
+        bool fCreatedExtractDir;
+        rcExit = ExtractFiles(pHeader->byCntPkgs, szExtractPath,
+                              fExtractOnly, &fCreatedExtractDir);
+        if (rcExit == RTEXITCODE_SUCCESS)
+        {
+            if (fExtractOnly)
+                ShowInfo("Files were extracted to: %s", szExtractPath);
+            else
+            {
+                rcExit = CopyCustomDir(szExtractPath);
 #ifdef VBOX_WITH_CODE_SIGNING
-            if (rcExit == RTEXITCODE_SUCCESS && fEnableSilentCert && g_fSilent)
-                rcExit = InstallCertificate();
+                if (rcExit == RTEXITCODE_SUCCESS && fEnableSilentCert && g_fSilent)
+                    rcExit = InstallCertificate();
 #endif
-            unsigned iPackage = 0;
-            while (iPackage < pHeader->byCntPkgs && rcExit == RTEXITCODE_SUCCESS)
-            {
-                rcExit = ProcessPackage(iPackage, szExtractPath, szMSIArgs, fEnableLogging);
-                iPackage++;
+                unsigned iPackage = 0;
+                while (   iPackage < pHeader->byCntPkgs
+                       && rcExit == RTEXITCODE_SUCCESS)
+                {
+                    rcExit = ProcessPackage(iPackage, szExtractPath,
+                                            szMSIArgs, fEnableLogging);
+                    iPackage++;
+                }
+
+                /* Don't fail if cleanup fail. At least for now. */
+                CleanUp(pHeader->byCntPkgs,
+                           !fEnableLogging
+                        && fCreatedExtractDir ? szExtractPath : NULL);
             }
-
-            /* Don't fail if cleanup fail. At least for now. */
-            CleanUp(pHeader->byCntPkgs, !fEnableLogging && fCreatedExtractDir ? szExtractPath : NULL);
-        }
-    }
-
-    /* Free any left behind cleanup records (not strictly needed). */
-    PSTUBCLEANUPREC pCur, pNext;
-    RTListForEachSafe(&g_TmpFiles, pCur, pNext, STUBCLEANUPREC, ListEntry)
-    {
-        RTListNodeRemove(&pCur->ListEntry);
-        RTMemFree(pCur);
-    }
+        }
+
+        /* Free any left behind cleanup records (not strictly needed). */
+        PSTUBCLEANUPREC pCur, pNext;
+        RTListForEachSafe(&g_TmpFiles, pCur, pNext, STUBCLEANUPREC, ListEntry)
+        {
+            RTListNodeRemove(&pCur->ListEntry);
+            RTMemFree(pCur);
+        }
+    }
+
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0501
+# ifndef VBOX_STUB_WITH_OWN_CONSOLE
+    if (iConHandleStdErr)
+        _close(iConHandleStdErr);
+    if (hFileStdErr)
+        fclose(hFileStdErr);
+    if (iConHandleStdOut)
+        _close(iConHandleStdOut);
+    if (hFileStdOut)
+        fclose(hFileStdOut);
+# endif /* VBOX_STUB_WITH_OWN_CONSOLE */
+    FreeConsole();
+#endif
 
     /*