We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fixed SDL_Log not working on windows if the output is being redirected.

SDL_log.patch (text/plain), 2.20 KB, created by Olli Kallioinen on 2017-12-04 17:35:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Kallioinen

Created: 2017-12-04 17:35:16 UTC

Size: 2.20 KB

patch

obsolete

># HG changeset patch
># User Olli Kallioinen <olli.kallioinen@iki.fi>
># Date 1512408483 -7200
>#      Mon Dec 04 19:28:03 2017 +0200
># Node ID 18d15196eb9bdbeece13ba04858ebf3b1c58fcc4
># Parent  93edd752e9663ef3d6805da13b07229ec7ab02dd
>Fixed SDL_Log not working on windows if the output is being redirected.
>
>diff -r 93edd752e966 -r 18d15196eb9b src/SDL_log.c
>--- a/src/SDL_log.c	Tue Nov 28 18:31:18 2017 -0800
>+++ b/src/SDL_log.c	Mon Dec 04 19:28:03 2017 +0200
>@@ -303,7 +303,7 @@
> }
> 
> #if defined(__WIN32__) && !defined(HAVE_STDIO_H) && !defined(__WINRT__)
>-/* Flag tracking the attachment of the console: 0=unattached, 1=attached, -1=error */
>+/* Flag tracking the attachment of the console: 0=unattached, 1=attached to a console, 2=attached to a file, -1=error */
> static int consoleAttached = 0;
> 
> /* Handle to stderr output of console. */
>@@ -326,6 +326,7 @@
>         BOOL attachResult;
>         DWORD attachError;
>         unsigned long charsWritten; 
>+        DWORD consoleMode;
> 
>         /* Maybe attach console and get stderr handle */
>         if (consoleAttached == 0) {
>@@ -350,9 +351,15 @@
>                     /* Newly attached */
>                     consoleAttached = 1;
>                 }
>-			
>+
>                 if (consoleAttached == 1) {
>                         stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
>+
>+                        if (GetConsoleMode(stderrHandle, &consoleMode) == 0) {
>+                            /* WriteConsole fails if the output is redirected to a file. Must use WriteFile instead. */
>+                            OutputDebugString(TEXT("Console ouput is being redirected\r\n"));
>+                            consoleAttached = 2;
>+                        }
>                 }
>         }
> #endif /* !defined(HAVE_STDIO_H) && !defined(__WINRT__) */
>@@ -374,6 +381,11 @@
>                         OutputDebugString(TEXT("Insufficient heap memory to write message\r\n"));
>                     }
>                 }
>+
>+        } else if (consoleAttached == 2) {
>+            if (!WriteFile(stderrHandle, output, lstrlenA(output), &charsWritten, NULL)) {
>+                OutputDebugString(TEXT("Error calling WriteFile\r\n"));
>+            }
>         }
> #endif /* !defined(HAVE_STDIO_H) && !defined(__WINRT__) */
>

Actions: View | Diff

Attachments on bug 3990: 3108

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.