[PATCH] [cmd]: use correct codepage when outputing unicode text to an ANSI stream

Eric Pouech eric.pouech at orange.fr
Tue May 13 14:04:20 CDT 2008


#13189

A+
---

 programs/cmd/wcmdmain.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 8d09967..09978cd 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -95,7 +95,7 @@ extern struct env_stack *pushd_directories;
 static const WCHAR *pagedMessage = NULL;
 static char  *output_bufA = NULL;
 #define MAX_WRITECONSOLE_SIZE 65535
-BOOL unicodePipes = FALSE;
+static BOOL unicodePipes = FALSE;
 
 static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forvar, WCHAR *forVal);
 static void WCMD_output_asis_len(const WCHAR *message, int len, HANDLE device);
@@ -1437,7 +1437,7 @@ static void WCMD_output_asis_len(const WCHAR *message, int len, HANDLE device) {
         }
 
         /* Convert to OEM, then output */
-        convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, message,
+        convertedChars = WideCharToMultiByte(CP_UNIXCP, 0, message,
                             len, output_bufA, MAX_WRITECONSOLE_SIZE,
                             "?", &usedDefaultChar);
         WriteFile(device, output_bufA, convertedChars,





More information about the wine-patches mailing list