start: 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
de54872524
commit
18f9d2dd9d
|
@ -38,25 +38,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(start);
|
||||||
static void output(const WCHAR *message)
|
static void output(const WCHAR *message)
|
||||||
{
|
{
|
||||||
DWORD count;
|
DWORD count;
|
||||||
DWORD res;
|
|
||||||
int wlen = lstrlenW(message);
|
int wlen = lstrlenW(message);
|
||||||
|
|
||||||
if (!wlen) return;
|
if (!wlen) return;
|
||||||
|
|
||||||
res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), message, wlen, &count, NULL);
|
|
||||||
|
|
||||||
/* If writing to console fails, assume it's file
|
/* If writing to console fails, assume it's file
|
||||||
* i/o so convert to OEM codepage and output
|
* i/o so convert to OEM codepage and output
|
||||||
*/
|
*/
|
||||||
if (!res)
|
if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), message, wlen, &count, NULL))
|
||||||
{
|
{
|
||||||
DWORD len;
|
DWORD len;
|
||||||
char *mesA;
|
char *mesA;
|
||||||
/* Convert to OEM, then output */
|
/* Convert to OEM, then output */
|
||||||
len = WideCharToMultiByte( GetConsoleOutputCP(), 0, message, wlen, NULL, 0, NULL, NULL );
|
len = WideCharToMultiByte( GetOEMCP(), 0, message, wlen, NULL, 0, NULL, NULL );
|
||||||
mesA = HeapAlloc(GetProcessHeap(), 0, len*sizeof(char));
|
mesA = HeapAlloc(GetProcessHeap(), 0, len*sizeof(char));
|
||||||
if (!mesA) return;
|
if (!mesA) return;
|
||||||
WideCharToMultiByte( GetConsoleOutputCP(), 0, message, wlen, mesA, len, NULL, NULL );
|
WideCharToMultiByte( GetOEMCP(), 0, message, wlen, mesA, len, NULL, NULL );
|
||||||
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), mesA, len, &count, FALSE);
|
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), mesA, len, &count, FALSE);
|
||||||
HeapFree(GetProcessHeap(), 0, mesA);
|
HeapFree(GetProcessHeap(), 0, mesA);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue