dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed NSIS_CONFIG_LOG_STDOUT output in Unicode exehead

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6629 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-10-31 18:52:07 +00:00
parent 252adb2f39
commit 7b814407a3
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/exehead/util.c
View file

@ -1014,7 +1014,7 @@ void log_timestamp(TCHAR *buf)
void log_printf(TCHAR *format, ...) void log_printf(TCHAR *format, ...)
{ {
#ifdef NSIS_CONFIG_LOG_STDOUT #if defined(NSIS_CONFIG_LOG_STDOUT)
HANDLE hStdOut; HANDLE hStdOut;
#endif #endif
va_list val; va_list val;
@ -1025,18 +1025,28 @@ void log_printf(TCHAR *format, ...)
wvsprintf(log_text+mystrlen(log_text),format,val); wvsprintf(log_text+mystrlen(log_text),format,val);
va_end(val); va_end(val);
#ifdef NSIS_CONFIG_LOG_ODS #if defined(NSIS_CONFIG_LOG_ODS)
if (log_dolog) if (log_dolog)
OutputDebugString(log_text); OutputDebugString(log_text);
#endif #elif defined(NSIS_CONFIG_LOG_STDOUT)
#ifdef NSIS_CONFIG_LOG_STDOUT
if (log_dolog && (hStdOut = GetStdHandle(STD_OUTPUT_HANDLE)) != INVALID_HANDLE_VALUE) if (log_dolog && (hStdOut = GetStdHandle(STD_OUTPUT_HANDLE)) != INVALID_HANDLE_VALUE)
{ {
myWriteFile(hStdOut, log_text, lstrlen(log_text)); // BUGBUG: Should this be lstrlen*sizeof(TCHAR)? const DWORD cch = lstrlen(log_text), cb = cch * sizeof(TCHAR);
myWriteFile(hStdOut, _T("\n"), 1); // BUGBUG: sizeof(TCHAR)? #ifdef UNICODE
DWORD conmode, cchio;
if (GetConsoleMode(hStdOut, &conmode))
{
WriteConsoleW(hStdOut, log_text, cch, &cchio, 0);
myWriteFile(hStdOut, "\n", 1);
}
else
#endif //~ UNICODE
{
myWriteFile(hStdOut, log_text, cb);
myWriteFile(hStdOut, _T("\n"), 1 * sizeof(TCHAR));
}
} }
#endif #else
#if !defined(NSIS_CONFIG_LOG_ODS) && !defined(NSIS_CONFIG_LOG_STDOUT)
log_write(0); log_write(0);
#endif #endif
} }