marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regsvr32: Add WriteFile fallback if WriteConsole fails.

oldstable
Hugh McMaster 2015-06-23 21:27:23 +10:00 committed by Alexandre Julliard
parent fdae80d45f
commit 485b8dfcf2
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/regsvr32/regsvr32.c
View File

@ -93,9 +93,23 @@ static void __cdecl output_write(UINT id, ...)
ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL);
/* WriteConsole fails if its output is redirected to a file.
* If this occurs, we should use an OEM codepage and call WriteFile.
*/
if (!ret)
WINE_WARN("regsvr32: WriteConsoleW() failed.\n");
{
DWORD lenA;
char *strA;
lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, NULL, 0, NULL, NULL);
strA = HeapAlloc(GetProcessHeap(), 0, lenA);
if (strA)
{
WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, NULL, NULL);
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &nOut, FALSE);
HeapFree(GetProcessHeap(), 0, strA);
}
}
LocalFree(str);
}