Alexandre Julliard : ntdll: Use WINAPIV calling convention for variadic functions.
Alexandre Julliard
julliard at winehq.org
Thu Nov 2 17:28:48 CDT 2017
Module: wine
Branch: master
Commit: a5b67f3fddd49645fc9afaeac25bb3a5782fe6d8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b67f3fddd49645fc9afaeac25bb3a5782fe6d8
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Nov 2 10:16:54 2017 +0100
ntdll: Use WINAPIV calling convention for variadic functions.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/printf.c | 8 ++++----
dlls/ntdll/string.c | 2 +-
dlls/ntdll/tests/string.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c
index b6b8b6c..8a966304 100644
--- a/dlls/ntdll/printf.c
+++ b/dlls/ntdll/printf.c
@@ -709,7 +709,7 @@ int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_v
/*********************************************************************
* _snprintf (NTDLL.@)
*/
-int CDECL NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... )
+int WINAPIV NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... )
{
int ret;
__ms_va_list valist;
@@ -724,7 +724,7 @@ int CDECL NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... )
/***********************************************************************
* _snwprintf (NTDLL.@)
*/
-int CDECL NTDLL__snwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, ... )
+int WINAPIV NTDLL__snwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, ... )
{
int ret;
__ms_va_list valist;
@@ -748,7 +748,7 @@ int CDECL NTDLL_vsprintf( char *str, const char *format, __ms_va_list args )
/*********************************************************************
* sprintf (NTDLL.@)
*/
-int CDECL NTDLL_sprintf( char *str, const char *format, ... )
+int WINAPIV NTDLL_sprintf( char *str, const char *format, ... )
{
int ret;
__ms_va_list valist;
@@ -763,7 +763,7 @@ int CDECL NTDLL_sprintf( char *str, const char *format, ... )
/***********************************************************************
* swprintf (NTDLL.@)
*/
-int CDECL NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... )
+int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... )
{
int ret;
__ms_va_list valist;
diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c
index e8d061a..eb762c6 100644
--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -1363,7 +1363,7 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap)
/*********************************************************************
* sscanf (NTDLL.@)
*/
-int __cdecl NTDLL_sscanf( const char *str, const char *format, ... )
+int WINAPIV NTDLL_sscanf( const char *str, const char *format, ... )
{
int ret;
__ms_va_list valist;
diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c
index 9bbaddd..8fca5d4 100644
--- a/dlls/ntdll/tests/string.c
+++ b/dlls/ntdll/tests/string.c
@@ -59,7 +59,7 @@ static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR);
static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) );
static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) );
-static int (__cdecl *p__snprintf)(char *, size_t, const char *, ...);
+static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...);
static void InitFunctionPtrs(void)
More information about the wine-cvs
mailing list