Commit 2538d3114074bb8046d40df17200fcffae57449f
2013-08-28T22:05:16
Fix endlines for logging via OutputDebugString().
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/src/SDL_log.c b/src/SDL_log.c
index 2245946..e472490 100644
--- a/src/SDL_log.c
+++ b/src/SDL_log.c
@@ -332,16 +332,16 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
if (!attachResult) {
attachError = GetLastError();
if (attachError == ERROR_INVALID_HANDLE) {
- OutputDebugString(TEXT("Parent process has no console"));
+ OutputDebugString(TEXT("Parent process has no console\r\n"));
consoleAttached = -1;
} else if (attachError == ERROR_GEN_FAILURE) {
- OutputDebugString(TEXT("Could not attach to console of parent process"));
+ OutputDebugString(TEXT("Could not attach to console of parent process\r\n"));
consoleAttached = -1;
} else if (attachError == ERROR_ACCESS_DENIED) {
/* Already attached */
consoleAttached = 1;
} else {
- OutputDebugString(TEXT("Error attaching console"));
+ OutputDebugString(TEXT("Error attaching console\r\n"));
consoleAttached = -1;
}
} else {
@@ -354,9 +354,9 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
}
}
- 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 + 1;
output = SDL_stack_alloc(char, length);
- SDL_snprintf(output, length, "%s: %s\n", SDL_priority_prefixes[priority], message);
+ SDL_snprintf(output, length, "%s: %s\r\n", SDL_priority_prefixes[priority], message);
tstr = WIN_UTF8ToString(output);
/* Output to debugger */
@@ -365,10 +365,10 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
/* Screen output to stderr, if console was attached. */
if (consoleAttached == 1) {
if (!WriteConsole(stderrHandle, tstr, lstrlen(tstr), &charsWritten, NULL)) {
- OutputDebugString(TEXT("Error calling WriteConsole"));
+ OutputDebugString(TEXT("Error calling WriteConsole\r\n"));
}
if (charsWritten == ERROR_NOT_ENOUGH_MEMORY) {
- OutputDebugString(TEXT("Insufficient heap memory to write message"));
+ OutputDebugString(TEXT("Insufficient heap memory to write message\r\n"));
}
}