Module: wine Branch: master Commit: bcb6bf98e09ca9802ea08a2b91bb12ca6e8c8540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb6bf98e09ca9802ea08a2b91...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Nov 2 10:20:52 2017 +0100
cmd: Use WINAPIV calling convention for variadic functions.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/cmd/wcmd.h | 6 +++--- programs/cmd/wcmdmain.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 1180251..557be14 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -75,9 +75,9 @@ void WCMD_if (WCHAR *, CMD_LIST **cmdList); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); void WCMD_move (void); -WCHAR* CDECL WCMD_format_string (const WCHAR *format, ...); -void CDECL WCMD_output (const WCHAR *format, ...); -void CDECL WCMD_output_stderr (const WCHAR *format, ...); +WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...); +void WINAPIV WCMD_output (const WCHAR *format, ...); +void WINAPIV WCMD_output_stderr (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 102e485..cec6df0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -128,7 +128,7 @@ static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device) * */
-void CDECL WCMD_output (const WCHAR *format, ...) { +void WINAPIV WCMD_output (const WCHAR *format, ...) {
__ms_va_list ap; WCHAR* string; @@ -154,7 +154,7 @@ void CDECL WCMD_output (const WCHAR *format, ...) { * */
-void CDECL WCMD_output_stderr (const WCHAR *format, ...) { +void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) {
__ms_va_list ap; WCHAR* string; @@ -180,8 +180,8 @@ void CDECL WCMD_output_stderr (const WCHAR *format, ...) { * */
-WCHAR* CDECL WCMD_format_string (const WCHAR *format, ...) { - +WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) +{ __ms_va_list ap; WCHAR* string; DWORD len;