mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- return early if Windows text console creation fails 

- set title of text console for wxWidgets on win32
This commit is contained in:
Volker Ruppert 2006-10-15 10:45:15 +00:00
parent 87d906295f
commit a614b2613e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bochs/main.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.345 2006-09-23 09:07:15 vruppert Exp $ // $Id: main.cc,v 1.346 2006-10-15 10:45:15 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -396,15 +396,17 @@ int split_string_into_argv (
// It creates a console window. // It creates a console window.
// //
// NOTE: It could probably be written so that it can safely be called for all // NOTE: It could probably be written so that it can safely be called for all
// win32 builds. Right now it appears to have absolutely no error checking: // win32 builds.
// for example if AllocConsole returns false we should probably return early. int RedirectIOToConsole()
void RedirectIOToConsole()
{ {
int hConHandle; int hConHandle;
long lStdHandle; long lStdHandle;
FILE *fp; FILE *fp;
// allocate a console for this app // allocate a console for this app
AllocConsole(); if (!AllocConsole()) {
MessageBox(NULL, "Failed to create text console", "Error", MB_ICONERROR);
return 0;
}
// redirect unbuffered STDOUT to the console // redirect unbuffered STDOUT to the console
lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE); lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
hConHandle = _open_osfhandle(lStdHandle, _O_TEXT); hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
@ -423,6 +425,7 @@ void RedirectIOToConsole()
fp = _fdopen( hConHandle, "w" ); fp = _fdopen( hConHandle, "w" );
*stderr = *fp; *stderr = *fp;
setvbuf(stderr, NULL, _IONBF, 0); setvbuf(stderr, NULL, _IONBF, 0);
return 1;
} }
#endif /* if defined(__WXMSW__) || (BX_WITH_SDL && defined(WIN32)) */ #endif /* if defined(__WXMSW__) || (BX_WITH_SDL && defined(WIN32)) */
@ -439,7 +442,10 @@ int WINAPI WinMain(
bx_startup_flags.hPrevInstance = hPrevInstance; bx_startup_flags.hPrevInstance = hPrevInstance;
bx_startup_flags.m_lpCmdLine = m_lpCmdLine; bx_startup_flags.m_lpCmdLine = m_lpCmdLine;
bx_startup_flags.nCmdShow = nCmdShow; bx_startup_flags.nCmdShow = nCmdShow;
RedirectIOToConsole (); if (!RedirectIOToConsole()) {
return 1;
}
SetConsoleTitle("Bochs for Windows (wxWidgets port) - Console");
int max_argv = 20; int max_argv = 20;
bx_startup_flags.argv = (char**) malloc (max_argv * sizeof (char*)); bx_startup_flags.argv = (char**) malloc (max_argv * sizeof (char*));
split_string_into_argv(m_lpCmdLine, &bx_startup_flags.argc, bx_startup_flags.argv, max_argv); split_string_into_argv(m_lpCmdLine, &bx_startup_flags.argc, bx_startup_flags.argv, max_argv);
@ -456,7 +462,9 @@ int main (int argc, char *argv[])
bx_startup_flags.argv = argv; bx_startup_flags.argv = argv;
#if BX_WITH_SDL && defined(WIN32) #if BX_WITH_SDL && defined(WIN32)
// if SDL/win32, try to create a console window. // if SDL/win32, try to create a console window.
RedirectIOToConsole (); if (!RedirectIOToConsole()) {
return 1;
}
#endif #endif
#if defined(WIN32) #if defined(WIN32)
SetConsoleTitle("Bochs for Windows - Console"); SetConsoleTitle("Bochs for Windows - Console");