pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update SDL_LogOutput for WIN32 so it writes to the console

Browse source
This commit is contained in:
Andreas Schiffler 2013-06-05 07:22:45 -07:00
parent e569ac658f
commit 6c06aefaf2
1 changed files with 60 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/SDL_log.c
View file

@ -39,6 +39,9 @@
#define DEFAULT_APPLICATION_PRIORITY SDL_LOG_PRIORITY_INFO #define DEFAULT_APPLICATION_PRIORITY SDL_LOG_PRIORITY_INFO
#define DEFAULT_TEST_PRIORITY SDL_LOG_PRIORITY_VERBOSE #define DEFAULT_TEST_PRIORITY SDL_LOG_PRIORITY_VERBOSE
/* Forward definition of error function */
extern int SDL_SetError(const char *fmt, ...);
typedef struct SDL_LogLevel typedef struct SDL_LogLevel
{ {
int category; int category;
@ -288,6 +291,14 @@ SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list
SDL_stack_free(message); SDL_stack_free(message);
} }
#if defined(__WIN32__)
/* Flag tracking the attachment of the console: 0=unattached, 1=attached, -1=error */
static int consoleAttached = 0;
/* Handle to stderr output of console. */
static HANDLE stderrHandle = NULL;
#endif
static void static void
SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority, SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
const char *message) const char *message)
@ -298,12 +309,60 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
char *output; char *output;
size_t length; size_t length;
LPTSTR tstr; LPTSTR tstr;
BOOL pbRemoteDebuggerPresent;
BOOL attachResult;
DWORD attachError;
unsigned long charsWritten;
/* Maybe attach console and get stderr handle */
if (consoleAttached == 0) {
attachResult = AttachConsole(ATTACH_PARENT_PROCESS);
if (!attachResult) {
attachError = GetLastError();
if (attachError == ERROR_INVALID_HANDLE) {
SDL_SetError("Parent process has no console");
consoleAttached = -1;
} else if (attachError == ERROR_GEN_FAILURE) {
SDL_SetError("Could not attach to console of parent process");
consoleAttached = -1;
} else if (attachError == ERROR_ACCESS_DENIED) {
/* Already attached */
consoleAttached = 1;
} else {
SDL_SetError("Error %d attaching console", attachError);
consoleAttached = -1;
}
} else {
/* Newly attached */
consoleAttached = 1;
}
if (consoleAttached == 1) {
stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
}
}
length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1 + 1; length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1 + 1;
output = SDL_stack_alloc(char, length); output = SDL_stack_alloc(char, length);
SDL_snprintf(output, length, "%s: %s\n", SDL_priority_prefixes[priority], message); SDL_snprintf(output, length, "%s: %s\n", SDL_priority_prefixes[priority], message);
tstr = WIN_UTF8ToString(output); tstr = WIN_UTF8ToString(output);
OutputDebugString(tstr);
/* Debugger output, if attached. Check each time since debugger can be attached at runtime. */
CheckRemoteDebuggerPresent(GetCurrentProcess(), &pbRemoteDebuggerPresent);
if (pbRemoteDebuggerPresent || IsDebuggerPresent()) {
OutputDebugString(tstr);
}
/* Screen output to stderr, if console was attached. */
if (consoleAttached == 1) {
if (!WriteConsole(stderrHandle, tstr, lstrlen(tstr), &charsWritten, NULL)) {
SDL_SetError("Error %d calling WriteConsole", GetLastError());
}
if (charsWritten == ERROR_NOT_ENOUGH_MEMORY) {
SDL_SetError("Insufficient heap memory to write message of size %d", length);
}
}
SDL_free(tstr); SDL_free(tstr);
SDL_stack_free(output); SDL_stack_free(output);
} }