Eric Pouech : whoami: Use OEM code page for output.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 98838aaf97ba64c4dfc3a16bb724ed470d18bb51
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=98838aaf97ba64c4dfc3a16bb...

Author: Eric Pouech <eric.pouech(a)gmail.com>
Date:   Thu Apr 28 11:22:40 2022 +0200

whoami: Use OEM code page for output.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 programs/whoami/main.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/programs/whoami/main.c b/programs/whoami/main.c
index 7f6381d161a..7e93de998ef 100644
--- a/programs/whoami/main.c
+++ b/programs/whoami/main.c
@@ -26,24 +26,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(whoami);
 
 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,
+        WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA,
                             NULL, NULL);
         WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE);
         HeapFree(GetProcessHeap(), 0, strA);