Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TASKKILL] Sync with Wine Staging 3.17. CORE-15127

Browse source
This commit is contained in:
Amine Khaldi 2018-10-01 00:14:52 +01:00
parent 5260a37425
commit cb0f46bddf
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/applications/cmdutils/taskkill/CMakeLists.txt
View file

@ -1,4 +1,5 @@
add_definitions(-D__WINESRC__)
add_executable(taskkill taskkill.c taskkill.rc) add_executable(taskkill taskkill.c taskkill.rc)
target_link_libraries(taskkill wine) target_link_libraries(taskkill wine)
set_module_type(taskkill win32cui UNICODE) set_module_type(taskkill win32cui UNICODE)

8
base/applications/cmdutils/taskkill/taskkill.c
View file

@ -47,7 +47,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args)
WCHAR msg_buffer[8192]; WCHAR msg_buffer[8192];
wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer,
sizeof(msg_buffer)/sizeof(*msg_buffer), &va_args); ARRAY_SIZE(msg_buffer), &va_args);
ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL);
if (!ret) if (!ret)
@ -92,8 +92,7 @@ static int WINAPIV taskkill_message_printfW(int msg, ...)
WCHAR msg_buffer[8192]; WCHAR msg_buffer[8192];
int len; int len;
LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
sizeof(msg_buffer)/sizeof(WCHAR));
__ms_va_start(va_args, msg); __ms_va_start(va_args, msg);
len = taskkill_vprintfW(msg_buffer, va_args); len = taskkill_vprintfW(msg_buffer, va_args);
@ -107,8 +106,7 @@ static int taskkill_message(int msg)
static const WCHAR formatW[] = {'%','1',0}; static const WCHAR formatW[] = {'%','1',0};
WCHAR msg_buffer[8192]; WCHAR msg_buffer[8192];
LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
sizeof(msg_buffer)/sizeof(WCHAR));
return taskkill_printfW(formatW, msg_buffer); return taskkill_printfW(formatW, msg_buffer);
} }

2
media/doc/README.WINE
View file

@ -229,7 +229,7 @@ ReactOS shares the following programs with Winehq.
reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3
reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3
reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3