hostname: Use OEM code page for output.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
92135f66a8
commit
aebe845316
|
@ -32,28 +32,26 @@
|
|||
static int hostname_vprintfW(const WCHAR *msg, va_list va_args)
|
||||
{
|
||||
int wlen;
|
||||
DWORD count, ret;
|
||||
DWORD count;
|
||||
WCHAR msg_buffer[8192];
|
||||
|
||||
wlen = vswprintf(msg_buffer, ARRAY_SIZE(msg_buffer), msg, va_args);
|
||||
|
||||
ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL);
|
||||
if (!ret)
|
||||
if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL))
|
||||
{
|
||||
DWORD len;
|
||||
char *msgA;
|
||||
|
||||
/* On Windows WriteConsoleW() fails if the output is redirected. So fall
|
||||
* back to WriteFile(), assuming the console encoding is still the right
|
||||
* one in that case.
|
||||
* back to WriteFile() with OEM code page.
|
||||
*/
|
||||
len = WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen,
|
||||
len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen,
|
||||
NULL, 0, NULL, NULL);
|
||||
msgA = HeapAlloc(GetProcessHeap(), 0, len);
|
||||
if (!msgA)
|
||||
return 0;
|
||||
|
||||
WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, msgA, len, NULL, NULL);
|
||||
WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL);
|
||||
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE);
|
||||
HeapFree(GetProcessHeap(), 0, msgA);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue