Ticket #7792: console.diff

README

@@ -924 +924 @@
   -z, --list-games         Display list of supported games and exit
   -t, --list-targets       Display list of configured targets and exit
   --list-saves=TARGET      Display a list of savegames for the game (TARGET) specified
+  --no-console             Disable the console window (Windows only)
 
   -c, --config=CONFIG      Use alternate configuration file
   -p, --path=PATH          Path to where the game is installed
@@ -1955 +1956 @@
 
     confirm_exit    bool     Ask for confirmation by the user before quitting
                              (SDL backend only).
+    no_console      bool     Disable the console window (Windows only).
     cdrom           number   Number of CD-ROM unit to use for audio. If
                              negative, don't even try to access the CD-ROM.
     joystick_num    number   Number of joystick device to use for input

backends/platform/sdl/sdl.cpp

@@ -116 +116 @@
 }
 #endif
 
-#if defined(WIN32)
-        struct SdlConsoleHidingWin32 {
-                DWORD myPid;
-                DWORD myTid;
-                HWND consoleHandle;
-        };
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+static Common::String getLogPath() {
+        char appDataPath[MAXPATHLEN];
+        OSVERSIONINFO win32OsVersion;
+        ZeroMemory(&win32OsVersion, sizeof(OSVERSIONINFO));
+        win32OsVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+        GetVersionEx(&win32OsVersion);
+        // Check for non-9X version of Windows.
+        if (win32OsVersion.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) {
+                // Use the Application Data directory of the user profile.
+                if (win32OsVersion.dwMajorVersion >= 5) {
+                        if (!GetEnvironmentVariable("APPDATA", appDataPath, sizeof(appDataPath)))
+                                error("Unable to access application data directory");
+                } else {
+                        if (!GetEnvironmentVariable("USERPROFILE", appDataPath, sizeof(appDataPath)))
+                                error("Unable to access user profile directory");
 
-        // console hiding for win32
-        static BOOL CALLBACK initBackendFindConsoleWin32Proc(HWND hWnd, LPARAM lParam) {
-                DWORD pid, tid;
-                SdlConsoleHidingWin32 *variables = (SdlConsoleHidingWin32 *)lParam;
-                tid = GetWindowThreadProcessId(hWnd, &pid);
-                if ((tid == variables->myTid) && (pid == variables->myPid)) {
-                        variables->consoleHandle = hWnd;
-                        return FALSE;
+                        strcat(appDataPath, "\\Application Data");
+                        CreateDirectory(appDataPath, NULL);
                 }
-                return TRUE;
+
+                strcat(appDataPath, "\\ScummVM");
+                CreateDirectory(appDataPath, NULL);
+        } else {
+                // Use current working directory
+                GetCurrentDirectory(MAXPATHLEN, appDataPath);
         }
+
+        return appDataPath;
+}
 #endif
 
 void OSystem_SDL::initBackend() {
@@ -155 +167 @@
         if (joystick_num > -1)
                 sdlFlags |= SDL_INIT_JOYSTICK;
 
-#if 0
-        // NEW CODE TO HIDE CONSOLE FOR WIN32
-#if defined(WIN32)
-        // console hiding for win32
-        SdlConsoleHidingWin32 consoleHidingWin32;
-        consoleHidingWin32.consoleHandle = 0;
-        consoleHidingWin32.myPid = GetCurrentProcessId();
-        consoleHidingWin32.myTid = GetCurrentThreadId();
-        EnumWindows (initBackendFindConsoleWin32Proc, (LPARAM)&consoleHidingWin32);
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+        if (ConfMan.getBool("no_console")) {
+                FreeConsole();
+                /* Redirect standard input and standard output */
+                char STDOUT_FILE[MAX_PATH], STDERR_FILE[MAX_PATH];
 
-        if (!ConfMan.getBool("show_console")) {
-                if (consoleHidingWin32.consoleHandle) {
-                        // We won't find a window with our TID/PID in case we were started from command-line
-                        ShowWindow(consoleHidingWin32.consoleHandle, SW_HIDE);
+                strcpy(STDOUT_FILE, getLogPath().c_str());
+                strcpy(STDERR_FILE, getLogPath().c_str());
+                strcat(STDOUT_FILE, "\\scummvm.stdout.txt");
+                strcat(STDERR_FILE, "\\scummvm.stderr.txt");
+
+                freopen(STDOUT_FILE, "w", stdout);
+                freopen(STDERR_FILE, "w", stderr);
+                setbuf(stdout, NULL);   /* No buffering */
+                setbuf(stderr, NULL);   /* No buffering */
+        } else {
+                if (AllocConsole()) {
+                        freopen("CONIN$","r",stdin);
+                        freopen("CONOUT$","w",stdout);
+                        freopen("CONOUT$","w",stderr);
                 }
+                SetConsoleTitle("ScummVM Status Window");
         }
 #endif
-#endif
 
         if (SDL_Init(sdlFlags) == -1) {
                 error("Could not initialize SDL: %s", SDL_GetError());

base/commandLine.cpp

@@ -60 +60 @@
         "  -z, --list-games         Display list of supported games and exit\n"
         "  -t, --list-targets       Display list of configured targets and exit\n"
         "  --list-saves=TARGET      Display a list of savegames for the game (TARGET) specified\n"
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+        "  --no-console             Disable the console window\n"
+#endif
         "\n"
         "  -c, --config=CONFIG      Use alternate configuration file\n"
         "  -p, --path=PATH          Path to where the game is installed\n"
@@ -220 +223 @@
         ConfMan.registerDefault("record_temp_file_name", "record.tmp");
         ConfMan.registerDefault("record_time_file_name", "record.time");
 
-#if 0
-        // NEW CODE TO HIDE CONSOLE FOR WIN32
-#ifdef WIN32
-        // console hiding for win32
-        ConfMan.registerDefault("show_console", false);
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+        // Console window is enabled by default on Windows
+        ConfMan.registerDefault("no_console", false);
 #endif
-#endif
 }
 
 //
@@ -554 +554 @@
                         END_OPTION
 #endif
 
-#if 0
-        // NEW CODE TO HIDE CONSOLE FOR WIN32
-#ifdef WIN32
-                        // console hiding for win32
-                        DO_LONG_OPTION_BOOL("show-console")
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+                        // Optional disabling of console window on Windows
+                        DO_LONG_OPTION_BOOL("no-console")
                         END_OPTION
 #endif
-#endif
 
 unknownOption:
                         // If we get till here, the option is unhandled and hence unknown.