ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: 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:
Eric Pouech 2022-04-28 11:22:40 +02:00 committed by Alexandre Julliard
parent 8201fe2494
commit 9ac9ea5914
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
programs/net/net.c
View File

@ -29,25 +29,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(net);
static int output_write(const WCHAR* str, int len) static int output_write(const WCHAR* str, int len)
{ {
DWORD ret, count; DWORD count;
ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL))
if (!ret)
{ {
DWORD lenA; DWORD lenA;
char* strA; char* strA;
/* On Windows WriteConsoleW() fails if the output is redirected. So fall /* On Windows WriteConsoleW() fails if the output is redirected. So fall
* back to WriteFile(), assuming the console encoding is still the right * back to WriteFile() with OEM code page.
* one in that case.
*/ */
lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len,
NULL, 0, NULL, NULL); NULL, 0, NULL, NULL);
strA = HeapAlloc(GetProcessHeap(), 0, lenA); strA = HeapAlloc(GetProcessHeap(), 0, lenA);
if (!strA) if (!strA)
return 0; return 0;
WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL);
NULL, NULL);
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE);
HeapFree(GetProcessHeap(), 0, strA); HeapFree(GetProcessHeap(), 0, strA);
} }