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

regsvr32: 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 b111fab953
commit de54872524
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/regsvr32/regsvr32.c
View File

@ -41,7 +41,7 @@ static void WINAPIV output_write(UINT id, ...)
WCHAR fmt[1024]; WCHAR fmt[1024];
va_list va_args; va_list va_args;
WCHAR *str; WCHAR *str;
DWORD len, nOut, ret; DWORD len, nOut;
if (Silent) return; if (Silent) return;
@ -61,21 +61,19 @@ static void WINAPIV output_write(UINT id, ...)
return; return;
} }
ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL);
/* WriteConsole fails if its output is redirected to a file. /* WriteConsole fails if its output is redirected to a file.
* If this occurs, we should use an OEM codepage and call WriteFile. * If this occurs, we should use an OEM codepage and call WriteFile.
*/ */
if (!ret) if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL))
{ {
DWORD lenA; DWORD lenA;
char *strA; char *strA;
lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, NULL, 0, NULL, NULL); lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL);
strA = HeapAlloc(GetProcessHeap(), 0, lenA); strA = HeapAlloc(GetProcessHeap(), 0, lenA);
if (strA) if (strA)
{ {
WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, NULL, NULL); WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL);
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &nOut, FALSE); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &nOut, FALSE);
HeapFree(GetProcessHeap(), 0, strA); HeapFree(GetProcessHeap(), 0, strA);
} }