Module: wine Branch: master Commit: 89cad8c4b77c85bdfdc006ccfe02584b5043aba7 URL: https://gitlab.winehq.org/wine/wine/-/commit/89cad8c4b77c85bdfdc006ccfe02584...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Nov 4 11:36:29 2022 +0100
msvcrt: Use WINAPIV calling convention for variadic functions.
---
dlls/msvcr80/tests/msvcr80.c | 2 +- dlls/msvcr90/tests/msvcr90.c | 2 +- dlls/msvcrt/file.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 81f05a472e7..a2a3734f6c0 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -57,7 +57,7 @@ typedef struct
static ioinfo **__pioinfo;
-static int (__cdecl *p__open)(const char *, int, ...); +static int (WINAPIV *p__open)(const char *, int, ...); static int (__cdecl *p__close)(int); static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_strcmp)(const char *, const char *); diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index cf73097b818..0d28df217ab 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -111,7 +111,7 @@ static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_tmpfile_s)(FILE**); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); -static int (__cdecl *p__open)(const char *, int, ...); +static int (WINAPIV *p__open)(const char *, int, ...); static int (__cdecl *p__close)(int); static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0874d52fbc4..4a8c3510bd7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5594,7 +5594,7 @@ int WINAPIV fprintf_s(FILE* file, const char *format, ...) /********************************************************************* * _fprintf_l (MSVCRT.@) */ -int CDECL _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) +int WINAPIV _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) { va_list valist; int res; @@ -5608,7 +5608,7 @@ int CDECL _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) /********************************************************************* * _fprintf_p (MSVCRT.@) */ -int CDECL _fprintf_p(FILE* file, const char *format, ...) +int WINAPIV _fprintf_p(FILE* file, const char *format, ...) { va_list valist; int res; @@ -5621,7 +5621,7 @@ int CDECL _fprintf_p(FILE* file, const char *format, ...) /********************************************************************* * _fprintf_p_l (MSVCRT.@) */ -int CDECL _fprintf_p_l(FILE* file, const char *format, _locale_t locale, ...) +int WINAPIV _fprintf_p_l(FILE* file, const char *format, _locale_t locale, ...) { va_list valist; int res; @@ -5634,7 +5634,7 @@ int CDECL _fprintf_p_l(FILE* file, const char *format, _locale_t locale, ...) /********************************************************************* * _fprintf_s_l (MSVCRT.@) */ -int CDECL _fprintf_s_l(FILE* file, const char *format, _locale_t locale, ...) +int WINAPIV _fprintf_s_l(FILE* file, const char *format, _locale_t locale, ...) { va_list valist; int res;