Eric Pouech : taskkill: Use OEM code page for output.
Alexandre Julliard
julliard at winehq.org
Mon May 2 16:02:10 CDT 2022
Module: wine
Branch: master
Commit: 8fdf397505522cc8e41b58cd960899ef7cdf322b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fdf397505522cc8e41b58cd960899ef7cdf322b
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Thu Apr 28 11:22:40 2022 +0200
taskkill: Use OEM code page for output.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/taskkill/taskkill.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c
index 6704b121aa9..2904e64f40a 100644
--- a/programs/taskkill/taskkill.c
+++ b/programs/taskkill/taskkill.c
@@ -42,30 +42,27 @@ struct pid_close_info
static int taskkill_vprintfW(const WCHAR *msg, va_list va_args)
{
int wlen;
- DWORD count, ret;
+ DWORD count;
WCHAR msg_buffer[8192];
wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer,
ARRAY_SIZE(msg_buffer), &va_args);
- ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL);
- if (!ret)
+ if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL))
{
DWORD len;
char *msgA;
/* On Windows WriteConsoleW() fails if the output is redirected. So fall
- * back to WriteFile(), assuming the console encoding is still the right
- * one in that case.
+ * back to WriteFile() using OEM code page.
*/
- len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen,
+ len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen,
NULL, 0, NULL, NULL);
msgA = HeapAlloc(GetProcessHeap(), 0, len);
if (!msgA)
return 0;
- WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len,
- NULL, NULL);
+ WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL);
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE);
HeapFree(GetProcessHeap(), 0, msgA);
}
More information about the wine-cvs
mailing list