From c1fa005024186113d43d7406b79e625c960b14c7 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 7 Sep 2006 21:52:21 +0000 Subject: (svn r6420) -Feature [Win32]: Use an existing console if openttd was started from one. Unfortunately this only works for WindowsXP or higher, all older MS-OS's are stuck with the old behaviour. --- win32.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/win32.c b/win32.c index 4070f8546..9119aed37 100644 --- a/win32.c +++ b/win32.c @@ -786,16 +786,27 @@ static int ParseCommandLine(char *line, char **argv, int max_argc) return n; } +#ifndef ATTACH_PARENT_PROCESS +#define ATTACH_PARENT_PROCESS ((DWORD)-1) +#endif + void CreateConsole(void) { HANDLE hand; CONSOLE_SCREEN_BUFFER_INFO coninfo; + BOOL (WINAPI *AttachConsole)(DWORD); if (_has_console) return; _has_console = true; - AllocConsole(); + /* Attach to an existing console if one exists. Unfortunately this function + * only exists on WindowsXP or higher, so for all other users out there: + * you're stuck with an additional console even if you started openttd from + * the command line */ + if (!LoadLibraryList((Function*)&AttachConsole, "kernel32.dll\0AttachConsole\0") || + !AttachConsole(ATTACH_PARENT_PROCESS)) + AllocConsole(); hand = GetStdHandle(STD_OUTPUT_HANDLE); GetConsoleScreenBufferInfo(hand, &coninfo); -- cgit v1.2.3-70-g09d2