Applied Corona688's patch for output redirection on Windows CE
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40576
This commit is contained in:
parent
a6b0410071
commit
a9a711e9f8
1 changed files with 44 additions and 24 deletions
|
@ -10,30 +10,44 @@
|
|||
#include <stdlib.h>
|
||||
|
||||
#include <windows.h>
|
||||
#include <malloc.h> /* For _alloca() */
|
||||
#include <io.h> /* For _getcwd() */
|
||||
#include <malloc.h> /* For _alloca() */
|
||||
|
||||
#ifdef _WIN32_WCE
|
||||
# define DIR_SEPERATOR TEXT("\\")
|
||||
# define _getcwd(str,len) wcscpy(str,DIR_SEPERATOR);
|
||||
# define setbuf(x)
|
||||
# define setvbuf(x)
|
||||
# define fopen _wfopen
|
||||
# define freopen _wfreopen
|
||||
# define remove(x) DeleteFile(x)
|
||||
# define strcat wcscat
|
||||
#else
|
||||
# define DIR_SEPERATOR TEXT("/")
|
||||
# include <direct.h>
|
||||
#endif
|
||||
|
||||
/* Include the SDL main definition header */
|
||||
#include "SDL.h"
|
||||
#include "SDL_main.h"
|
||||
#ifdef main
|
||||
#ifndef _WIN32_WCE_EMULATION
|
||||
#undef main
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Do we really not want stdio redirection with Windows CE? */
|
||||
#ifdef _WIN32_WCE
|
||||
#define NO_STDIO_REDIRECT
|
||||
#endif
|
||||
#ifdef main
|
||||
# ifndef _WIN32_WCE_EMULATION
|
||||
# undef main
|
||||
# endif /* _WIN32_WCE_EMULATION */
|
||||
#endif /* main */
|
||||
|
||||
/* The standard output files */
|
||||
#define STDOUT_FILE TEXT("stdout.txt")
|
||||
#define STDERR_FILE TEXT("stderr.txt")
|
||||
|
||||
#ifndef NO_STDIO_REDIRECT
|
||||
static char stdoutPath[MAX_PATH];
|
||||
static char stderrPath[MAX_PATH];
|
||||
# ifdef _WIN32_WCE
|
||||
static wchar_t stdoutPath[MAX_PATH];
|
||||
static wchar_t stderrPath[MAX_PATH];
|
||||
# else
|
||||
static char stdoutPath[MAX_PATH];
|
||||
static char stderrPath[MAX_PATH];
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32_WCE) && _WIN32_WCE < 300
|
||||
|
@ -145,7 +159,7 @@ static void __cdecl cleanup_output(void)
|
|||
#ifndef NO_STDIO_REDIRECT
|
||||
/* See if the files have any output in them */
|
||||
if ( stdoutPath[0] ) {
|
||||
file = fopen(stdoutPath, "rb");
|
||||
file = fopen(stdoutPath, TEXT("rb"));
|
||||
if ( file ) {
|
||||
empty = (fgetc(file) == EOF) ? 1 : 0;
|
||||
fclose(file);
|
||||
|
@ -155,7 +169,7 @@ static void __cdecl cleanup_output(void)
|
|||
}
|
||||
}
|
||||
if ( stderrPath[0] ) {
|
||||
file = fopen(stderrPath, "rb");
|
||||
file = fopen(stderrPath, TEXT("rb"));
|
||||
if ( file ) {
|
||||
empty = (fgetc(file) == EOF) ? 1 : 0;
|
||||
fclose(file);
|
||||
|
@ -272,35 +286,41 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
|
|||
|
||||
#ifndef NO_STDIO_REDIRECT
|
||||
_getcwd( stdoutPath, sizeof( stdoutPath ) );
|
||||
strcat( stdoutPath, "/" STDOUT_FILE );
|
||||
strcat( stdoutPath, DIR_SEPERATOR STDOUT_FILE );
|
||||
|
||||
/* Redirect standard input and standard output */
|
||||
newfp = freopen(stdoutPath, "w", stdout);
|
||||
newfp = freopen(stdoutPath, TEXT("w"), stdout);
|
||||
|
||||
#ifndef _WIN32_WCE
|
||||
if ( newfp == NULL ) { /* This happens on NT */
|
||||
#if !defined(stdout)
|
||||
stdout = fopen(stdoutPath, "w");
|
||||
stdout = fopen(stdoutPath, TEXT("w"));
|
||||
#else
|
||||
newfp = fopen(stdoutPath, "w");
|
||||
newfp = fopen(stdoutPath, TEXT("w"));
|
||||
if ( newfp ) {
|
||||
*stdout = *newfp;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif /* _WIN32_WCE */
|
||||
|
||||
_getcwd( stderrPath, sizeof( stderrPath ) );
|
||||
strcat( stderrPath, "/" STDERR_FILE );
|
||||
strcat( stderrPath, DIR_SEPERATOR STDERR_FILE );
|
||||
|
||||
newfp = freopen(stderrPath, "w", stderr);
|
||||
newfp = freopen(stderrPath, TEXT("w"), stderr);
|
||||
#ifndef _WIN32_WCE
|
||||
if ( newfp == NULL ) { /* This happens on NT */
|
||||
#if !defined(stderr)
|
||||
stderr = fopen(stderrPath, "w");
|
||||
stderr = fopen(stderrPath, TEXT("w"));
|
||||
#else
|
||||
newfp = fopen(stderrPath, "w");
|
||||
newfp = fopen(stderrPath, TEXT("w"));
|
||||
if ( newfp ) {
|
||||
*stderr = *newfp;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif /* _WIN32_WCE */
|
||||
|
||||
setvbuf(stdout, NULL, _IOLBF, BUFSIZ); /* Line buffered */
|
||||
setbuf(stderr, NULL); /* No buffering */
|
||||
#endif /* !NO_STDIO_REDIRECT */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue