From 9ac9ea591469a9c2cc45c53df2447abdc525d6a9 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Thu, 28 Apr 2022 11:22:40 +0200 Subject: [PATCH] net: Use OEM code page for output. Signed-off-by: Eric Pouech Signed-off-by: Alexandre Julliard --- programs/net/net.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index f9e64d2e2b9..758c667dd49 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -29,25 +29,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(net); static int output_write(const WCHAR* str, int len) { - DWORD ret, count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); - if (!ret) + DWORD count; + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL)) { DWORD lenA; char* strA; /* 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. */ - lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, + lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); strA = HeapAlloc(GetProcessHeap(), 0, lenA); if (!strA) return 0; - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, - NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); HeapFree(GetProcessHeap(), 0, strA); }