diff options
author | Darkvater <darkvater@openttd.org> | 2006-09-07 21:52:21 +0000 |
---|---|---|
committer | Darkvater <darkvater@openttd.org> | 2006-09-07 21:52:21 +0000 |
commit | 67e9294b22fde227201659a8d48fefa3dcc0293d (patch) | |
tree | d3160fcbd7510e31f7f84ae26b74f891d9d5fef7 | |
parent | bfb41a5d26e4f1bed408a62602cbfe49a875f50f (diff) | |
download | openttd-67e9294b22fde227201659a8d48fefa3dcc0293d.tar.xz |
(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.
-rw-r--r-- | win32.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -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); |