From cc1e4cfed27eb1f14f38499ecc147a532ff3cdd0 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fridrich.strba@bluewin.ch>
Date: Fri, 3 Jul 2009 19:05:44 +0200
Subject: [win32] When started from a console, get console output (Windows XP
 or later only).

---
 shell/main.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'shell')

diff --git a/shell/main.c b/shell/main.c
index 2eb2b2a5f3..54d118a41d 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -27,6 +27,12 @@
 
 #ifdef G_OS_WIN32
 #define WIN32_LEAN_AND_MEAN
+#ifdef DATADIR
+#undef DATADIR
+#endif
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0500
 #include <windows.h>
 #endif
 
@@ -566,6 +572,28 @@ gint
 main (gint argc, gchar **argv)
 {
 #ifdef G_OS_WIN32
+    if (fileno (stdout) != -1 &&
+ 	  _get_osfhandle (fileno (stdout)) != -1)
+	{
+	  /* stdout is fine, presumably redirected to a file or pipe */
+	}
+    else
+    {
+	  typedef BOOL (* WINAPI AttachConsole_t) (DWORD);
+
+	  AttachConsole_t p_AttachConsole =
+	    (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
+
+	  if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+      {
+	      freopen ("CONOUT$", "w", stdout);
+	      dup2 (fileno (stdout), 1);
+	      freopen ("CONOUT$", "w", stderr);
+	      dup2 (fileno (stderr), 2);
+
+      }
+	}
+
 	extern void link_shutdown (void);
 #endif
 
-- 
cgit