diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2017-01-16 18:43:29 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2017-01-16 18:56:28 +0100 |
| commit | 3df934acadeadaf7b2f2920411016dcb3bde7d99 (patch) | |
| tree | d95f2955bcd2077860e6ad734e97768ae1cb2263 /platform/windows | |
| parent | 6a3dae5be944d9e226cca7bf0bd80fb0036e8324 (diff) | |
Fix gibberish output for windows/mingw.
%ls should be used instead of %s or %S to speficy narrow/wide charstring
in wprintf fwprintf
Fixes #6252
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/os_windows.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index c15f5225d9..113bcf9c86 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1325,18 +1325,10 @@ void OS_Windows::vprint(const char* p_format, va_list p_list, bool p_stderr) { MultiByteToWideChar(CP_UTF8,0,buf,len,wbuf,wlen); wbuf[wlen]=0; -// Recent MinGW and MSVC compilers seem to disagree on the case here -#ifdef __MINGW32__ if (p_stderr) - fwprintf(stderr, L"%S", wbuf); + fwprintf(stderr, L"%ls", wbuf); else - wprintf(L"%S", wbuf); -#else // MSVC - if (p_stderr) - fwprintf(stderr, L"%s", wbuf); - else - wprintf(L"%s", wbuf); -#endif + wprintf(L"%ls", wbuf); #ifdef STDOUT_FILE //vwfprintf(stdo,p_format,p_list); |