ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: allow stdio redirect in some cases where it was broken before

This commit is contained in:
zeromus 2011-05-01 05:49:25 +00:00
parent 9432c70bd2
commit b26e760d2c
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
desmume/src/windows/console.cpp
View File

@ -36,9 +36,20 @@ void OpenConsole()
SMALL_RECT srect = {0}; SMALL_RECT srect = {0};
char buf[256] = {0}; char buf[256] = {0};
//dont do anything if we're already attached //dont do anything if we're already analyzed
if (hConsole) return; if (hConsole) return;
hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
DWORD fileType = GetFileType(hConsole);
//is FILE_TYPE_UNKNOWN (0) with no redirect
//is FILE_TYPE_DISK (1) for redirect to file
//is FILE_TYPE_PIPE (3) for pipe
//i think it is FILE_TYPE_CHAR (2) for console
//stdout is already connected to something. keep using it and dont let the console interfere
bool shouldRedirectStdout = fileType == FILE_TYPE_UNKNOWN;
//attach to an existing console (if we can; this is circuitous because AttachConsole wasnt added until XP) //attach to an existing console (if we can; this is circuitous because AttachConsole wasnt added until XP)
//remember to abstract this late bound function notion if we end up having to do this anywhere else //remember to abstract this late bound function notion if we end up having to do this anywhere else
bool attached = false; bool attached = false;
@ -61,8 +72,6 @@ void OpenConsole()
if (!AllocConsole()) return; if (!AllocConsole()) return;
} }
hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
if (hConsole == INVALID_HANDLE_VALUE) return; if (hConsole == INVALID_HANDLE_VALUE) return;
//redirect stdio //redirect stdio
long lStdHandle = (long)hConsole; long lStdHandle = (long)hConsole;
@ -70,14 +79,12 @@ void OpenConsole()
if(hConHandle == -1) if(hConHandle == -1)
return; //this fails from a visual studio command prompt return; //this fails from a visual studio command prompt
#if 1
FILE *fp = _fdopen( hConHandle, "w" ); if(shouldRedirectStdout)
#else {
FILE *fp = fopen( "c:\\desmume.log", "w" ); freopen("CONOUT$", "w", stdout);
#endif freopen("CONOUT$", "w", stderr);
*stdout = *fp; }
//and stderr
*stderr = *fp;
sprintf(buf,"%s OUTPUT", EMU_DESMUME_NAME_AND_VERSION()); sprintf(buf,"%s OUTPUT", EMU_DESMUME_NAME_AND_VERSION());
SetConsoleTitle(TEXT(buf)); SetConsoleTitle(TEXT(buf));