[PATCH v4 1/4] cmd: Use the OEM code page if GetConsoleOutputCP fails.

[Akihiro Sagawa]

From: Akihiro Sagawa

Instead of the ANSI code page (code page zero).
---
 programs/cmd/wcmdmain.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 84d3f52970e..49419d02caa 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -99,12 +99,19 @@ static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device)
       char *buffer;

if (!unicodeOutput) {
+        UINT code_page;

if (!(buffer = get_file_buffer()))
             return;

+        /* On Wine, GetConsoleOutputCP function fails
+           if Shell-no-window console is used */
+        code_page = GetConsoleOutputCP();
+        if (!code_page)
+            code_page = GetOEMCP();
+
         /* Convert to OEM, then output */
-        convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, message,
+        convertedChars = WideCharToMultiByte(code_page, 0, message,
                             len, buffer, MAX_WRITECONSOLE_SIZE,
                             "?", &usedDefaultChar);
         WriteFile(device, buffer, convertedChars,