https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7f635d47839d5742ace1f80fc1a9a252550710e
commit f7f635d47839d5742ace1f80fc1a9a252550710e Author: Amine Khaldi <[email protected]> AuthorDate: Sun Jan 21 22:07:31 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sun Jan 21 22:07:31 2018 +0100 [TASKKILL] Sync with Wine 3.0. CORE-14225 --- base/applications/cmdutils/taskkill/taskkill.c | 4 ++-- media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/cmdutils/taskkill/taskkill.c b/base/applications/cmdutils/taskkill/taskkill.c index 894e06a5ea..db3fab414e 100644 --- a/base/applications/cmdutils/taskkill/taskkill.c +++ b/base/applications/cmdutils/taskkill/taskkill.c @@ -77,7 +77,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) return count; } -static int CDECL taskkill_printfW(const WCHAR *msg, ...) +static int WINAPIV taskkill_printfW(const WCHAR *msg, ...) { __ms_va_list va_args; int len; @@ -89,7 +89,7 @@ static int CDECL taskkill_printfW(const WCHAR *msg, ...) return len; } -static int CDECL taskkill_message_printfW(int msg, ...) +static int WINAPIV taskkill_message_printfW(int msg, ...) { __ms_va_list va_args; WCHAR msg_buffer[8192]; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5e66b918b0..5afbe03c2f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -229,7 +229,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/reg # Synced to Wine-3.0 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-2.9 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/taskkill # Synced to Wine-3.0 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9
