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

Timestamp:

Apr 30, 2014 12:29:47 PM (11 years ago)

Author:

vboxsync

Message:

Installer/win/VBoxStub: Bugfixes.

File:

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

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

@@ -19 +19 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0501
+# undef  _WIN32_WINNT
+# define _WIN32_WINNT 0x0501 /* AttachConsole() / FreeConsole(). */
+#endif
+
 #include <Windows.h>
 #include <commctrl.h>
@@ -58 +63 @@
 #endif
 
-#ifdef DEBUG
-/* Use an own console window if run in debug mode. */
+#ifndef TARGET_NT4
+/* Use an own console window if run in verbose mode. */
 # define VBOX_STUB_WITH_OWN_CONSOLE
 #endif
@@ -816 +821 @@
         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
 
     /*
@@ -1035 +995 @@
         vrc = VERR_PARSE_ERROR;
 
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0501
+# ifdef VBOX_STUB_WITH_OWN_CONSOLE /* Use an own console window if run in debug mode. */
+    if (   RT_SUCCESS(vrc)
+        && g_iVerbosity)
+    {
+        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;
+        }
+
+        freopen("CONOUT$", "w", stdout);
+        setvbuf(stdout, NULL, _IONBF, 0);
+
+        freopen("CONOUT$", "w", stderr);
+    }
+# endif /* VBOX_STUB_WITH_OWN_CONSOLE */
+#endif
+
     if (   RT_SUCCESS(vrc)
         && g_iVerbosity)
@@ -1129 +1114 @@
 
 #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);
+# ifdef VBOX_STUB_WITH_OWN_CONSOLE
+    FreeConsole();
 # endif /* VBOX_STUB_WITH_OWN_CONSOLE */
-    FreeConsole();
 #endif