msvcrt: Use WINAPIV calling convention for variadic functions.

dlls/msvcp90/msvcp_main.c

@@ -113,7 +113,7 @@ void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const
    _invalid_parameter_noinfo();
 }
 
-int __cdecl _scprintf(const char* fmt, ...)
+int WINAPIV _scprintf(const char* fmt, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -123,7 +123,7 @@ int __cdecl _scprintf(const char* fmt, ...)
     return ret;
 }
 
-int __cdecl sprintf(char *buf, const char *fmt, ...)
+int WINAPIV sprintf(char *buf, const char *fmt, ...)
 {
     int ret;
     __ms_va_list valist;

dlls/msvcr120/tests/msvcr120.c

@@ -913,7 +913,7 @@ static void test_wctype(void)
     }
 }
 
-static int __cdecl _vsscanf_wrapper(const char *buffer, const char *format, ...)
+static int WINAPIV _vsscanf_wrapper(const char *buffer, const char *format, ...)
 {
     int ret;
     __ms_va_list valist;

dlls/msvcr90/tests/msvcr90.c

@@ -1179,7 +1179,7 @@ static void test_getptd(void)
     ok(p_get_unexpected() == ptd->unexpected_handler, "ptd->unexpected_handler != _get_unexpected()\n");
 }
 
-static int __cdecl __vswprintf_l_wrapper(wchar_t *buf,
+static int WINAPIV __vswprintf_l_wrapper(wchar_t *buf,
         const wchar_t *format, _locale_t locale, ...)
 {
     int ret;
@@ -1190,7 +1190,7 @@ static int __cdecl __vswprintf_l_wrapper(wchar_t *buf,
     return ret;
 }
 
-static int __cdecl _vswprintf_l_wrapper(wchar_t *buf,
+static int WINAPIV _vswprintf_l_wrapper(wchar_t *buf,
         const wchar_t *format, _locale_t locale, ...)
 {
     int ret;

dlls/msvcrt/console.c

@@ -525,7 +525,7 @@ int CDECL _vcprintf(const char* format, __ms_va_list valist)
 /*********************************************************************
  *		_cprintf (MSVCRT.@)
  */
-int CDECL _cprintf(const char* format, ...)
+int WINAPIV _cprintf(const char* format, ...)
 {
   int retval;
   __ms_va_list valist;
@@ -549,7 +549,7 @@ int CDECL _vcwprintf(const MSVCRT_wchar_t* format, __ms_va_list valist)
 /*********************************************************************
  *		_cwprintf (MSVCRT.@)
  */
-int CDECL _cwprintf(const MSVCRT_wchar_t* format, ...)
+int WINAPIV _cwprintf(const MSVCRT_wchar_t* format, ...)
 {
   int retval;
   __ms_va_list valist;

dlls/msvcrt/except_i386.c

@@ -1071,7 +1071,7 @@ int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp
  *		_setjmp3 (MSVCRT.@)
  */
 DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 )
-int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...)
+int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...)
 {
     jmp->Cookie = MSVCRT_JMP_MAGIC;
     jmp->UnwindFunc = 0;

dlls/msvcrt/file.c

@@ -2334,7 +2334,7 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int
 /*********************************************************************
  *              _wsopen (MSVCRT.@)
  */
-int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t *path, int oflags, int shflags, ... )
+int WINAPIV MSVCRT__wsopen( const MSVCRT_wchar_t *path, int oflags, int shflags, ... )
 {
   int pmode;
   int fd;
@@ -2385,7 +2385,7 @@ int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, i
 /*********************************************************************
  *              _sopen (MSVCRT.@)
  */
-int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... )
+int WINAPIV MSVCRT__sopen( const char *path, int oflags, int shflags, ... )
 {
   int pmode;
   int fd;
@@ -2407,7 +2407,7 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... )
 /*********************************************************************
  *              _open (MSVCRT.@)
  */
-int CDECL MSVCRT__open( const char *path, int flags, ... )
+int WINAPIV MSVCRT__open( const char *path, int flags, ... )
 {
   __ms_va_list ap;
 
@@ -2426,7 +2426,7 @@ int CDECL MSVCRT__open( const char *path, int flags, ... )
 /*********************************************************************
  *              _wopen (MSVCRT.@)
  */
-int CDECL MSVCRT__wopen(const MSVCRT_wchar_t *path,int flags,...)
+int WINAPIV MSVCRT__wopen(const MSVCRT_wchar_t *path,int flags,...)
 {
   __ms_va_list ap;
 
@@ -5301,7 +5301,7 @@ int CDECL MSVCRT_vwprintf_s(const MSVCRT_wchar_t *format, __ms_va_list valist)
 /*********************************************************************
  *		fprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...)
+int WINAPIV MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...)
 {
     __ms_va_list valist;
     int res;
@@ -5314,7 +5314,7 @@ int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...)
 /*********************************************************************
  *		fprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_fprintf_s(MSVCRT_FILE* file, const char *format, ...)
+int WINAPIV MSVCRT_fprintf_s(MSVCRT_FILE* file, const char *format, ...)
 {
     __ms_va_list valist;
     int res;
@@ -5327,7 +5327,7 @@ int CDECL MSVCRT_fprintf_s(MSVCRT_FILE* file, const char *format, ...)
 /*********************************************************************
  *		fwprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
+int WINAPIV MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
 {
     __ms_va_list valist;
     int res;
@@ -5340,7 +5340,7 @@ int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
 /*********************************************************************
  *		fwprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_fwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
+int WINAPIV MSVCRT_fwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
 {
     __ms_va_list valist;
     int res;
@@ -5353,7 +5353,7 @@ int CDECL MSVCRT_fwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...
 /*********************************************************************
  *              _fwprintf_l (MSVCRT.@)
  */
-int CDECL MSVCRT__fwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...)
+int WINAPIV MSVCRT__fwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...)
 {
     __ms_va_list valist;
     int res;
@@ -5366,7 +5366,7 @@ int CDECL MSVCRT__fwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MS
 /*********************************************************************
  *		printf (MSVCRT.@)
  */
-int CDECL MSVCRT_printf(const char *format, ...)
+int WINAPIV MSVCRT_printf(const char *format, ...)
 {
     __ms_va_list valist;
     int res;
@@ -5379,7 +5379,7 @@ int CDECL MSVCRT_printf(const char *format, ...)
 /*********************************************************************
  *		printf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_printf_s(const char *format, ...)
+int WINAPIV MSVCRT_printf_s(const char *format, ...)
 {
     __ms_va_list valist;
     int res;
@@ -5496,7 +5496,7 @@ MSVCRT_wint_t CDECL MSVCRT__ungetwc_nolock(MSVCRT_wint_t wc, MSVCRT_FILE * file)
 /*********************************************************************
  *		wprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_wprintf(const MSVCRT_wchar_t *format, ...)
+int WINAPIV MSVCRT_wprintf(const MSVCRT_wchar_t *format, ...)
 {
     __ms_va_list valist;
     int res;
@@ -5509,7 +5509,7 @@ int CDECL MSVCRT_wprintf(const MSVCRT_wchar_t *format, ...)
 /*********************************************************************
  *		wprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_wprintf_s(const MSVCRT_wchar_t *format, ...)
+int WINAPIV MSVCRT_wprintf_s(const MSVCRT_wchar_t *format, ...)
 {
     __ms_va_list valist;
     int res;

dlls/msvcrt/msvcrt.h

@@ -1069,10 +1069,10 @@ MSVCRT_FILE*   __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *);
 int            __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist);
 int            __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len,
                                        const MSVCRT_wchar_t *format, __ms_va_list valist );
-int            __cdecl MSVCRT__snwprintf(MSVCRT_wchar_t*, unsigned int, const MSVCRT_wchar_t*, ...);
-int            __cdecl MSVCRT_sprintf(char*,const char*,...);
-int            __cdecl MSVCRT__snprintf(char*,unsigned int,const char*,...);
-int            __cdecl MSVCRT__scprintf(const char*,...);
+int            WINAPIV MSVCRT__snwprintf(MSVCRT_wchar_t*, unsigned int, const MSVCRT_wchar_t*, ...);
+int            WINAPIV MSVCRT_sprintf(char*,const char*,...);
+int            WINAPIV MSVCRT__snprintf(char*,unsigned int,const char*,...);
+int            WINAPIV MSVCRT__scprintf(const char*,...);
 int            __cdecl MSVCRT_raise(int sig);
 int            __cdecl MSVCRT__set_printf_count_output(int);
 
@@ -1110,8 +1110,8 @@ char* __cdecl    MSVCRT__strnset(char*,int,MSVCRT_size_t);
 char* __cdecl    _strset(char*,int);
 int __cdecl      _ungetch(int);
 int __cdecl      _cputs(const char*);
-int __cdecl      _cprintf(const char*,...);
-int __cdecl      _cwprintf(const MSVCRT_wchar_t*,...);
+int WINAPIV      _cprintf(const char*,...);
+int WINAPIV      _cwprintf(const MSVCRT_wchar_t*,...);
 char*** __cdecl  MSVCRT___p__environ(void);
 int*    __cdecl  __p___mb_cur_max(void);
 unsigned int*  __cdecl __p__fmode(void);

dlls/msvcrt/process.c

@@ -389,7 +389,7 @@ MSVCRT_intptr_t CDECL _cwait(int *status, MSVCRT_intptr_t pid, int action)
  *
  * Unicode version of _execl
  */
-MSVCRT_intptr_t CDECL _wexecl(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
+MSVCRT_intptr_t WINAPIV _wexecl(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *args;
@@ -411,7 +411,7 @@ MSVCRT_intptr_t CDECL _wexecl(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t*
  * Like on Windows, this function does not handle arguments with spaces
  * or double-quotes.
  */
-MSVCRT_intptr_t CDECL _execl(const char* name, const char* arg0, ...)
+MSVCRT_intptr_t WINAPIV _execl(const char* name, const char* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *nameW, *args;
@@ -435,7 +435,7 @@ MSVCRT_intptr_t CDECL _execl(const char* name, const char* arg0, ...)
  *
  * Unicode version of _execle
  */
-MSVCRT_intptr_t CDECL _wexecle(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
+MSVCRT_intptr_t WINAPIV _wexecle(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *args, *envs = NULL;
@@ -462,7 +462,7 @@ MSVCRT_intptr_t CDECL _wexecle(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t*
 /*********************************************************************
  *		_execle (MSVCRT.@)
  */
-MSVCRT_intptr_t CDECL _execle(const char* name, const char* arg0, ...)
+MSVCRT_intptr_t WINAPIV _execle(const char* name, const char* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *nameW, *args, *envs = NULL;
@@ -494,7 +494,7 @@ MSVCRT_intptr_t CDECL _execle(const char* name, const char* arg0, ...)
  *
  * Unicode version of _execlp
  */
-MSVCRT_intptr_t CDECL _wexeclp(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
+MSVCRT_intptr_t WINAPIV _wexeclp(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *args;
@@ -516,7 +516,7 @@ MSVCRT_intptr_t CDECL _wexeclp(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t*
  * Like on Windows, this function does not handle arguments with spaces
  * or double-quotes.
  */
-MSVCRT_intptr_t CDECL _execlp(const char* name, const char* arg0, ...)
+MSVCRT_intptr_t WINAPIV _execlp(const char* name, const char* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *nameW, *args;
@@ -540,7 +540,7 @@ MSVCRT_intptr_t CDECL _execlp(const char* name, const char* arg0, ...)
  *
  * Unicode version of _execlpe
  */
-MSVCRT_intptr_t CDECL _wexeclpe(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
+MSVCRT_intptr_t WINAPIV _wexeclpe(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *args, *envs = NULL;
@@ -567,7 +567,7 @@ MSVCRT_intptr_t CDECL _wexeclpe(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t
 /*********************************************************************
  *		_execlpe (MSVCRT.@)
  */
-MSVCRT_intptr_t CDECL _execlpe(const char* name, const char* arg0, ...)
+MSVCRT_intptr_t WINAPIV _execlpe(const char* name, const char* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *nameW, *args, *envs = NULL;
@@ -683,7 +683,7 @@ MSVCRT_intptr_t CDECL _execvp(const char* name, const char* const* argv)
  *
  * Unicode version of _spawnl
  */
-MSVCRT_intptr_t CDECL _wspawnl(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
+MSVCRT_intptr_t WINAPIV _wspawnl(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *args;
@@ -705,7 +705,7 @@ MSVCRT_intptr_t CDECL _wspawnl(int flags, const MSVCRT_wchar_t* name, const MSVC
  * Like on Windows, this function does not handle arguments with spaces
  * or double-quotes.
  */
-MSVCRT_intptr_t CDECL _spawnl(int flags, const char* name, const char* arg0, ...)
+MSVCRT_intptr_t WINAPIV _spawnl(int flags, const char* name, const char* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *nameW, *args;
@@ -729,7 +729,7 @@ MSVCRT_intptr_t CDECL _spawnl(int flags, const char* name, const char* arg0, ...
  *
  * Unicode version of _spawnle
  */
-MSVCRT_intptr_t CDECL _wspawnle(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
+MSVCRT_intptr_t WINAPIV _wspawnle(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *args, *envs = NULL;
@@ -756,7 +756,7 @@ MSVCRT_intptr_t CDECL _wspawnle(int flags, const MSVCRT_wchar_t* name, const MSV
 /*********************************************************************
  *		_spawnle (MSVCRT.@)
  */
-MSVCRT_intptr_t CDECL _spawnle(int flags, const char* name, const char* arg0, ...)
+MSVCRT_intptr_t WINAPIV _spawnle(int flags, const char* name, const char* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *nameW, *args, *envs = NULL;
@@ -788,7 +788,7 @@ MSVCRT_intptr_t CDECL _spawnle(int flags, const char* name, const char* arg0, ..
  *
  * Unicode version of _spawnlp
  */
-MSVCRT_intptr_t CDECL _wspawnlp(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
+MSVCRT_intptr_t WINAPIV _wspawnlp(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *args;
@@ -810,7 +810,7 @@ MSVCRT_intptr_t CDECL _wspawnlp(int flags, const MSVCRT_wchar_t* name, const MSV
  * Like on Windows, this function does not handle arguments with spaces
  * or double-quotes.
  */
-MSVCRT_intptr_t CDECL _spawnlp(int flags, const char* name, const char* arg0, ...)
+MSVCRT_intptr_t WINAPIV _spawnlp(int flags, const char* name, const char* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *nameW, *args;
@@ -834,7 +834,7 @@ MSVCRT_intptr_t CDECL _spawnlp(int flags, const char* name, const char* arg0, ..
  *
  * Unicode version of _spawnlpe
  */
-MSVCRT_intptr_t CDECL _wspawnlpe(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
+MSVCRT_intptr_t WINAPIV _wspawnlpe(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *args, *envs = NULL;
@@ -861,7 +861,7 @@ MSVCRT_intptr_t CDECL _wspawnlpe(int flags, const MSVCRT_wchar_t* name, const MS
 /*********************************************************************
  *		_spawnlpe (MSVCRT.@)
  */
-MSVCRT_intptr_t CDECL _spawnlpe(int flags, const char* name, const char* arg0, ...)
+MSVCRT_intptr_t WINAPIV _spawnlpe(int flags, const char* name, const char* arg0, ...)
 {
   __ms_va_list ap;
   MSVCRT_wchar_t *nameW, *args, *envs = NULL;

dlls/msvcrt/scheduler.c

@@ -560,7 +560,7 @@ SchedulerPolicy* __thiscall SchedulerPolicy_ctor(SchedulerPolicy *this)
 /* ??0SchedulerPolicy@Concurrency@@QAA@IZZ */
 /* ??0SchedulerPolicy@Concurrency@@QEAA@_KZZ */
 /* TODO: don't leak policy_container on exception */
-SchedulerPolicy* __cdecl SchedulerPolicy_ctor_policies(
+SchedulerPolicy* WINAPIV SchedulerPolicy_ctor_policies(
         SchedulerPolicy *this, MSVCRT_size_t n, ...)
 {
     unsigned int min_concurrency, max_concurrency;

dlls/msvcrt/tests/printf.c

@@ -1194,7 +1194,7 @@ static void test_xcvt(void)
         win_skip("_fcvt_s not available\n");
 }
 
-static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)
+static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1228,7 +1228,7 @@ static void test_vsnwprintf(void)
     ok( ret == 11 || broken(ret == -1 /* Win2k */), "got %d, expected 11\n", ret );
 }
 
-static int __cdecl vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)
+static int WINAPIV vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1238,7 +1238,7 @@ static int __cdecl vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)
     return ret;
 }
 
-static int __cdecl _vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)
+static int WINAPIV _vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1248,7 +1248,7 @@ static int __cdecl _vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)
     return ret;
 }
 
-static int __cdecl _vswprintf_l_wrapper(wchar_t *str, const wchar_t *format, void *locale, ...)
+static int WINAPIV _vswprintf_l_wrapper(wchar_t *str, const wchar_t *format, void *locale, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1258,7 +1258,7 @@ static int __cdecl _vswprintf_l_wrapper(wchar_t *str, const wchar_t *format, voi
     return ret;
 }
 
-static int __cdecl _vswprintf_c_wrapper(wchar_t *str, size_t size, const wchar_t *format, ...)
+static int WINAPIV _vswprintf_c_wrapper(wchar_t *str, size_t size, const wchar_t *format, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1268,7 +1268,7 @@ static int __cdecl _vswprintf_c_wrapper(wchar_t *str, size_t size, const wchar_t
     return ret;
 }
 
-static int __cdecl _vswprintf_c_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...)
+static int WINAPIV _vswprintf_c_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1278,7 +1278,7 @@ static int __cdecl _vswprintf_c_l_wrapper(wchar_t *str, size_t size, const wchar
     return ret;
 }
 
-static int __cdecl _vswprintf_p_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...)
+static int WINAPIV _vswprintf_p_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1334,7 +1334,7 @@ static void test_vswprintf(void)
     ok(!memcmp(buf, out, sizeof(out)), "buf = %s\n", wine_dbgstr_w(buf));
 }
 
-static int __cdecl _vscprintf_wrapper(const char *format, ...)
+static int WINAPIV _vscprintf_wrapper(const char *format, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1358,7 +1358,7 @@ static void test_vscprintf(void)
     ok( ret == 8, "got %d expected 8\n", ret );
 }
 
-static int __cdecl _vscwprintf_wrapper(const wchar_t *format, ...)
+static int WINAPIV _vscwprintf_wrapper(const wchar_t *format, ...)
 {
     int ret;
     __ms_va_list valist;
@@ -1385,7 +1385,7 @@ static void test_vscwprintf(void)
     ok( ret == 8, "got %d expected 8\n", ret );
 }
 
-static int __cdecl _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer,
+static int WINAPIV _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer,
                                  size_t count, const wchar_t *format, ...)
 {
     int ret;
@@ -1443,7 +1443,7 @@ static void test_vsnwprintf_s(void)
     ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
 }
 
-static int __cdecl _vsprintf_p_wrapper(char *str, size_t sizeOfBuffer,
+static int WINAPIV _vsprintf_p_wrapper(char *str, size_t sizeOfBuffer,
                                  const char *format, ...)
 {
     int ret;

dlls/msvcrt/tests/scanf.c

@@ -259,7 +259,7 @@ static void test_sscanf( void )
 
 static void test_sscanf_s(void)
 {
-    int (__cdecl *psscanf_s)(const char*,const char*,...);
+    int (WINAPIV *psscanf_s)(const char*,const char*,...);
     HMODULE hmod = GetModuleHandleA("msvcrt.dll");
     int i, ret;
     char buf[100];

dlls/msvcrt/wcs.c

@@ -801,7 +801,7 @@ int CDECL MSVCRT_vsprintf_l( char *str, const char *format,
 /*********************************************************************
  *		_sprintf_l (MSVCRT.@)
  */
-int CDECL MSVCRT_sprintf_l(char *str, const char *format,
+int WINAPIV MSVCRT_sprintf_l(char *str, const char *format,
                            MSVCRT__locale_t locale, ...)
 {
     int retval;
@@ -897,8 +897,8 @@ int CDECL MSVCRT_vsprintf_s_l( char *str, MSVCRT_size_t count, const char *forma
 /*********************************************************************
  *		_sprintf_s_l (MSVCRT.@)
  */
-int CDECL MSVCRT_sprintf_s_l( char *str, MSVCRT_size_t count, const char *format,
-                              MSVCRT__locale_t locale, ...)
+int WINAPIV MSVCRT_sprintf_s_l( char *str, MSVCRT_size_t count, const char *format,
+                                MSVCRT__locale_t locale, ...)
 {
     int retval;
     __ms_va_list valist;
@@ -1028,7 +1028,7 @@ int CDECL MSVCRT__vscprintf_p(const char *format, __ms_va_list argptr)
 /*********************************************************************
  *		_snprintf (MSVCRT.@)
  */
-int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)
+int WINAPIV MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)
 {
     int retval;
     __ms_va_list valist;
@@ -1041,7 +1041,7 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)
 /*********************************************************************
  *		_snprintf_l (MSVCRT.@)
  */
-int CDECL MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t locale,
+int WINAPIV MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t locale,
     const char *format, ...)
 {
     int retval;
@@ -1055,7 +1055,7 @@ int CDECL MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t loc
 /*********************************************************************
  *		_snprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,
+int WINAPIV MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,
     const char *format, ...)
 {
     int retval;
@@ -1069,7 +1069,7 @@ int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,
 /*********************************************************************
  *              _scprintf (MSVCRT.@)
  */
-int CDECL MSVCRT__scprintf(const char *format, ...)
+int WINAPIV MSVCRT__scprintf(const char *format, ...)
 {
     int retval;
     __ms_va_list valist;
@@ -1193,7 +1193,7 @@ int CDECL MSVCRT_vsnwprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer,
 /*********************************************************************
  *		_snwprintf (MSVCRT.@)
  */
-int CDECL MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, ...)
+int WINAPIV MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, ...)
 {
     int retval;
     __ms_va_list valist;
@@ -1206,7 +1206,7 @@ int CDECL MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT
 /*********************************************************************
  *		_snwprintf_l (MSVCRT.@)
  */
-int CDECL MSVCRT__snwprintf_l( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format,
+int WINAPIV MSVCRT__snwprintf_l( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format,
         MSVCRT__locale_t locale, ...)
 {
     int retval;
@@ -1220,7 +1220,7 @@ int CDECL MSVCRT__snwprintf_l( MSVCRT_wchar_t *str, unsigned int len, const MSVC
 /*********************************************************************
  *		_snwprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned int count,
+int WINAPIV MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned int count,
     const MSVCRT_wchar_t *format, ...)
 {
     int retval;
@@ -1234,7 +1234,7 @@ int CDECL MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned i
 /*********************************************************************
  *              _snwprintf_s_l (MSVCRT.@)
  */
-int CDECL MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, unsigned int len, unsigned int count,
+int WINAPIV MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, unsigned int len, unsigned int count,
         const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... )
 {
     int retval;
@@ -1294,7 +1294,7 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options,
 /*********************************************************************
  *		sprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_sprintf( char *str, const char *format, ... )
+int WINAPIV MSVCRT_sprintf( char *str, const char *format, ... )
 {
     __ms_va_list ap;
     int r;
@@ -1308,7 +1308,7 @@ int CDECL MSVCRT_sprintf( char *str, const char *format, ... )
 /*********************************************************************
  *		sprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format, ... )
+int WINAPIV MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format, ... )
 {
     __ms_va_list ap;
     int r;
@@ -1322,7 +1322,7 @@ int CDECL MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format, ..
 /*********************************************************************
  *		_scwprintf (MSVCRT.@)
  */
-int CDECL MSVCRT__scwprintf( const MSVCRT_wchar_t *format, ... )
+int WINAPIV MSVCRT__scwprintf( const MSVCRT_wchar_t *format, ... )
 {
     __ms_va_list ap;
     int r;
@@ -1336,7 +1336,7 @@ int CDECL MSVCRT__scwprintf( const MSVCRT_wchar_t *format, ... )
 /*********************************************************************
  *		swprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ... )
+int WINAPIV MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ... )
 {
     __ms_va_list ap;
     int r;
@@ -1350,7 +1350,7 @@ int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ..
 /*********************************************************************
  *		swprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
+int WINAPIV MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
         const MSVCRT_wchar_t *format, ... )
 {
     __ms_va_list ap;
@@ -1366,7 +1366,7 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
 /*********************************************************************
  *              _swprintf_s_l (MSVCRT.@)
  */
-int CDECL MSVCRT__swprintf_s_l(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
+int WINAPIV MSVCRT__swprintf_s_l(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
         const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... )
 {
     __ms_va_list ap;
@@ -1506,7 +1506,7 @@ int CDECL MSVCRT__stdio_common_vsprintf_p(unsigned __int64 options, char *buffer
 /*********************************************************************
  *		_sprintf_p_l (MSVCRT.@)
  */
-int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length,
+int WINAPIV MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length,
         const char *format, MSVCRT__locale_t locale, ...)
 {
     __ms_va_list valist;
@@ -1522,7 +1522,7 @@ int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length,
 /*********************************************************************
  *		__swprintf_l (MSVCRT.@)
  */
-int CDECL MSVCRT___swprintf_l( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format,
+int WINAPIV MSVCRT___swprintf_l( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format,
         MSVCRT__locale_t locale, ...)
 {
     int retval;
@@ -1536,7 +1536,7 @@ int CDECL MSVCRT___swprintf_l( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format
 /*********************************************************************
  * _sprintf_p (MSVCR100.@)
  */
-int CDECL MSVCRT__sprintf_p(char *buffer, MSVCRT_size_t length, const char *format, ...)
+int WINAPIV MSVCRT__sprintf_p(char *buffer, MSVCRT_size_t length, const char *format, ...)
 {
     __ms_va_list valist;
     int r;
@@ -1551,7 +1551,7 @@ int CDECL MSVCRT__sprintf_p(char *buffer, MSVCRT_size_t length, const char *form
 /*********************************************************************
  *		_swprintf_p_l (MSVCRT.@)
  */
-int CDECL MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length,
+int WINAPIV MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length,
         const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...)
 {
     __ms_va_list valist;

dlls/ucrtbase/tests/printf.c

@@ -152,7 +152,7 @@ static BOOL init( void )
     return TRUE;
 }
 
-static int __cdecl vsprintf_wrapper(unsigned __int64 options, char *str,
+static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str,
                                     size_t len, const char *format, ...)
 {
     int ret;
@@ -217,7 +217,7 @@ static void test_snprintf (void)
         "Failure to snprintf to NULL\n");
 }
 
-static int __cdecl vswprintf_wrapper(unsigned __int64 options, wchar_t *str,
+static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str,
                                      size_t len, const wchar_t *format, ...)
 {
     int ret;
@@ -291,7 +291,7 @@ static void test_swprintf (void)
     }
 }
 
-static int __cdecl vfprintf_wrapper(FILE *file,
+static int WINAPIV vfprintf_wrapper(FILE *file,
                                     const char *format, ...)
 {
     int ret;
@@ -364,7 +364,7 @@ static void test_fprintf(void)
     unlink(file_name);
 }
 
-static int __cdecl vfwprintf_wrapper(FILE *file,
+static int WINAPIV vfwprintf_wrapper(FILE *file,
                                      const wchar_t *format, ...)
 {
     int ret;
@@ -467,7 +467,7 @@ static void test_fwprintf(void)
             "Cannot reset invalid parameter handler\n");
 }
 
-static int __cdecl _vsnprintf_s_wrapper(char *str, size_t sizeOfBuffer,
+static int WINAPIV _vsnprintf_s_wrapper(char *str, size_t sizeOfBuffer,
                                         size_t count, const char *format, ...)
 {
     int ret;
@@ -519,7 +519,7 @@ static void test_vsnprintf_s(void)
     ok( !strcmp(out1, buffer), "buffer wrong, got=%s\n", buffer);
 }
 
-static int __cdecl _vsnwprintf_s_wrapper(WCHAR *str, size_t sizeOfBuffer,
+static int WINAPIV _vsnwprintf_s_wrapper(WCHAR *str, size_t sizeOfBuffer,
                                         size_t count, const WCHAR *format, ...)
 {
     int ret;

include/msvcrt/conio.h

@@ -15,9 +15,9 @@ extern "C" {
 #endif
 
 char* __cdecl _cgets(char*);
-int   __cdecl _cprintf(const char*,...);
+int   WINAPIV _cprintf(const char*,...);
 int   __cdecl _cputs(const char*);
-int   __cdecl _cscanf(const char*,...);
+int   WINAPIV _cscanf(const char*,...);
 int   __cdecl _getch(void);
 int   __cdecl _getche(void);
 int   __cdecl _kbhit(void);
@@ -53,8 +53,8 @@ static inline unsigned short outpw(unsigned short i, unsigned short j) { return
 #endif
 
 #if defined(__GNUC__) && (__GNUC__ < 4)
-extern int __cdecl cprintf(const char*,...) __attribute__((alias("_cprintf"),format(printf,1,2)));
-extern int __cdecl cscanf(const char*,...) __attribute__((alias("_cscanf"),format(scanf,1,2)));
+extern int WINAPIV cprintf(const char*,...) __attribute__((alias("_cprintf"),format(printf,1,2)));
+extern int WINAPIV cscanf(const char*,...) __attribute__((alias("_cscanf"),format(scanf,1,2)));
 #else
 #define cprintf _cprintf
 #define cscanf _cscanf

include/msvcrt/crtdbg.h

@@ -85,7 +85,7 @@ extern int _crtBreakAlloc;
 extern int _crtDbgFlag;
 
 int   __cdecl _CrtCheckMemory(void);
-int   __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber,
+int   WINAPIV _CrtDbgReport(int reportType, const char *filename, int linenumber,
                             const char *moduleName, const char *format, ...);
 int   __cdecl _CrtDumpMemoryLeaks(void);
 int   __cdecl _CrtSetBreakAlloc(int);

include/msvcrt/crtdefs.h

@@ -101,6 +101,10 @@
 # endif
 #endif
 
+#ifndef WINAPIV
+# define WINAPIV __cdecl
+#endif
+
 #ifndef DECLSPEC_ALIGN
 # if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS)
 #  define DECLSPEC_ALIGN(x) __declspec(align(x))

include/msvcrt/io.h

@@ -110,12 +110,12 @@ __msvcrt_long __cdecl _lseek(int,__msvcrt_long,int);
 __int64     __cdecl _lseeki64(int,__int64,int);
 char*       __cdecl _mktemp(char*);
 int         __cdecl _mktemp_s(char*,size_t);
-int         __cdecl _open(const char*,int,...);
+int         WINAPIV _open(const char*,int,...);
 int         __cdecl _open_osfhandle(intptr_t,int);
 int         __cdecl _pipe(int*,unsigned int,int);
 int         __cdecl _read(int,void*,unsigned int);
 int         __cdecl _setmode(int,int);
-int         __cdecl _sopen(const char*,int,int,...);
+int         WINAPIV _sopen(const char*,int,int,...);
 __msvcrt_long __cdecl _tell(int);
 __int64     __cdecl _telli64(int);
 int         __cdecl _umask(int);
@@ -135,9 +135,9 @@ intptr_t    __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
 int         __cdecl _wfindnext(intptr_t,struct _wfinddata_t*);
 int         __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*);
 wchar_t *   __cdecl _wmktemp(wchar_t*);
-int         __cdecl _wopen(const wchar_t*,int,...);
+int         WINAPIV _wopen(const wchar_t*,int,...);
 int         __cdecl _wrename(const wchar_t*,const wchar_t*);
-int         __cdecl _wsopen(const wchar_t*,int,int,...);
+int         WINAPIV _wsopen(const wchar_t*,int,int,...);
 int         __cdecl _wunlink(const wchar_t*);
 #endif /* _WIO_DEFINED */
 
@@ -173,8 +173,8 @@ static inline int unlink(const char* path) { return _unlink(path); }
 static inline int write(int fd, const void* buf, unsigned int size) { return _write(fd, buf, size); }
 
 #if defined(__GNUC__) && (__GNUC__ < 4)
-extern int __cdecl open(const char*,int,...) __attribute__((alias("_open")));
-extern int __cdecl sopen(const char*,int,int,...) __attribute__((alias("_sopen")));
+extern int WINAPIV open(const char*,int,...) __attribute__((alias("_open")));
+extern int WINAPIV sopen(const char*,int,int,...) __attribute__((alias("_sopen")));
 #else
 #define open _open
 #define sopen _sopen

include/msvcrt/process.h

@@ -32,19 +32,19 @@ uintptr_t __cdecl _beginthreadex(void*,unsigned int,_beginthreadex_start_routine
 intptr_t  __cdecl _cwait(int*,intptr_t,int);
 void      __cdecl _endthread(void);
 void      __cdecl _endthreadex(unsigned int);
-intptr_t  __cdecl _execl(const char*,const char*,...);
-intptr_t  __cdecl _execle(const char*,const char*,...);
-intptr_t  __cdecl _execlp(const char*,const char*,...);
-intptr_t  __cdecl _execlpe(const char*,const char*,...);
+intptr_t  WINAPIV _execl(const char*,const char*,...);
+intptr_t  WINAPIV _execle(const char*,const char*,...);
+intptr_t  WINAPIV _execlp(const char*,const char*,...);
+intptr_t  WINAPIV _execlpe(const char*,const char*,...);
 intptr_t  __cdecl _execv(const char*,const char* const *);
 intptr_t  __cdecl _execve(const char*,const char* const *,const char* const *);
 intptr_t  __cdecl _execvp(const char*,const char* const *);
 intptr_t  __cdecl _execvpe(const char*,const char* const *,const char* const *);
 int       __cdecl _getpid(void);
-intptr_t  __cdecl _spawnl(int,const char*,const char*,...);
-intptr_t  __cdecl _spawnle(int,const char*,const char*,...);
-intptr_t  __cdecl _spawnlp(int,const char*,const char*,...);
-intptr_t  __cdecl _spawnlpe(int,const char*,const char*,...);
+intptr_t  WINAPIV _spawnl(int,const char*,const char*,...);
+intptr_t  WINAPIV _spawnle(int,const char*,const char*,...);
+intptr_t  WINAPIV _spawnlp(int,const char*,const char*,...);
+intptr_t  WINAPIV _spawnlpe(int,const char*,const char*,...);
 intptr_t  __cdecl _spawnv(int,const char*,const char* const *);
 intptr_t  __cdecl _spawnve(int,const char*,const char* const *,const char* const *);
 intptr_t  __cdecl _spawnvp(int,const char*,const char* const *);
@@ -59,18 +59,18 @@ int       __cdecl system(const char*);
 
 #ifndef _WPROCESS_DEFINED
 #define _WPROCESS_DEFINED
-intptr_t __cdecl _wexecl(const wchar_t*,const wchar_t*,...);
-intptr_t __cdecl _wexecle(const wchar_t*,const wchar_t*,...);
-intptr_t __cdecl _wexeclp(const wchar_t*,const wchar_t*,...);
-intptr_t __cdecl _wexeclpe(const wchar_t*,const wchar_t*,...);
+intptr_t WINAPIV _wexecl(const wchar_t*,const wchar_t*,...);
+intptr_t WINAPIV _wexecle(const wchar_t*,const wchar_t*,...);
+intptr_t WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...);
+intptr_t WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...);
 intptr_t __cdecl _wexecv(const wchar_t*,const wchar_t* const *);
 intptr_t __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
 intptr_t __cdecl _wexecvp(const wchar_t*,const wchar_t* const *);
 intptr_t __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-intptr_t __cdecl _wspawnl(int,const wchar_t*,const wchar_t*,...);
-intptr_t __cdecl _wspawnle(int,const wchar_t*,const wchar_t*,...);
-intptr_t __cdecl _wspawnlp(int,const wchar_t*,const wchar_t*,...);
-intptr_t __cdecl _wspawnlpe(int,const wchar_t*,const wchar_t*,...);
+intptr_t WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...);
+intptr_t WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...);
+intptr_t WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...);
+intptr_t WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...);
 intptr_t __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *);
 intptr_t __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
 intptr_t __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *);
@@ -104,14 +104,14 @@ static inline intptr_t spawnvp(int flags, const char* name, const char* const* a
 static inline intptr_t spawnvpe(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnvpe(flags, name, argv, envv); }
 
 #if defined(__GNUC__) && (__GNUC__ < 4)
-extern intptr_t __cdecl execl(const char*,const char*,...) __attribute__((alias("_execl")));
-extern intptr_t __cdecl execle(const char*,const char*,...) __attribute__((alias("_execle")));
-extern intptr_t __cdecl execlp(const char*,const char*,...) __attribute__((alias("_execlp")));
-extern intptr_t __cdecl execlpe(const char*,const char*,...) __attribute__((alias("_execlpe")));
-extern intptr_t __cdecl spawnl(int,const char*,const char*,...) __attribute__((alias("_spawnl")));
-extern intptr_t __cdecl spawnle(int,const char*,const char*,...) __attribute__((alias("_spawnle")));
-extern intptr_t __cdecl spawnlp(int,const char*,const char*,...) __attribute__((alias("_spawnlp")));
-extern intptr_t __cdecl spawnlpe(int,const char*,const char*,...) __attribute__((alias("_spawnlpe")));
+extern intptr_t WINAPIV execl(const char*,const char*,...) __attribute__((alias("_execl")));
+extern intptr_t WINAPIV execle(const char*,const char*,...) __attribute__((alias("_execle")));
+extern intptr_t WINAPIV execlp(const char*,const char*,...) __attribute__((alias("_execlp")));
+extern intptr_t WINAPIV execlpe(const char*,const char*,...) __attribute__((alias("_execlpe")));
+extern intptr_t WINAPIV spawnl(int,const char*,const char*,...) __attribute__((alias("_spawnl")));
+extern intptr_t WINAPIV spawnle(int,const char*,const char*,...) __attribute__((alias("_spawnle")));
+extern intptr_t WINAPIV spawnlp(int,const char*,const char*,...) __attribute__((alias("_spawnlp")));
+extern intptr_t WINAPIV spawnlpe(int,const char*,const char*,...) __attribute__((alias("_spawnlpe")));
 #else
 #define execl    _execl
 #define execle   _execle

include/msvcrt/stdio.h

@@ -117,11 +117,11 @@ int    __cdecl _putw(int,FILE*);
 int    __cdecl _rmtmp(void);
 int    __cdecl _set_printf_count_output(int);
 int    __cdecl _setmaxstdio(int);
-int    __cdecl _snprintf(char*,size_t,const char*,...);
-int    __cdecl _snprintf_s(char*,size_t,size_t,const char*,...);
+int    WINAPIV _snprintf(char*,size_t,const char*,...);
+int    WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...);
 char*  __cdecl _tempnam(const char*,const char*);
 int    __cdecl _unlink(const char*);
-int    __cdecl _scprintf(const char*,...);
+int    WINAPIV _scprintf(const char*,...);
 int    __cdecl _vscprintf(const char*,__ms_va_list);
 int    __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list);
 int    __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list);
@@ -153,15 +153,15 @@ int    __cdecl fgetpos(FILE*,fpos_t*);
 char*  __cdecl fgets(char*,int,FILE*);
 FILE*  __cdecl fopen(const char*,const char*);
 errno_t __cdecl fopen_s(FILE**,const char*,const char*);
-int    __cdecl fprintf(FILE*,const char*,...);
-int    __cdecl fprintf_s(FILE*,const char*,...);
+int    WINAPIV fprintf(FILE*,const char*,...);
+int    WINAPIV fprintf_s(FILE*,const char*,...);
 int    __cdecl fputc(int,FILE*);
 int    __cdecl fputs(const char*,FILE*);
 size_t __cdecl fread(void*,size_t,size_t,FILE*);
 size_t __cdecl fread_s(void*,size_t,size_t,size_t,FILE*);
 FILE*  __cdecl freopen(const char*,const char*,FILE*);
-int    __cdecl fscanf(FILE*,const char*,...);
-int    __cdecl fscanf_s(FILE*,const char*,...);
+int    WINAPIV fscanf(FILE*,const char*,...);
+int    WINAPIV fscanf_s(FILE*,const char*,...);
 int    __cdecl fseek(FILE*,__msvcrt_long,int);
 int    __cdecl _fseeki64(FILE*,__int64,int);
 int    __cdecl fsetpos(FILE*,fpos_t*);
@@ -172,23 +172,23 @@ int    __cdecl getc(FILE*);
 int    __cdecl getchar(void);
 char*  __cdecl gets(char*);
 void   __cdecl perror(const char*);
-int    __cdecl printf(const char*,...);
-int    __cdecl printf_s(const char*,...);
+int    WINAPIV printf(const char*,...);
+int    WINAPIV printf_s(const char*,...);
 int    __cdecl putc(int,FILE*);
 int    __cdecl putchar(int);
 int    __cdecl puts(const char*);
 int    __cdecl remove(const char*);
 int    __cdecl rename(const char*,const char*);
 void   __cdecl rewind(FILE*);
-int    __cdecl scanf(const char*,...);
-int    __cdecl scanf_s(const char*,...);
+int    WINAPIV scanf(const char*,...);
+int    WINAPIV scanf_s(const char*,...);
 void   __cdecl setbuf(FILE*,char*);
 int    __cdecl setvbuf(FILE*,char*,int,size_t);
-int    __cdecl sprintf(char*,const char*,...);
-int    __cdecl sprintf_s(char*,size_t,const char*,...);
-int    __cdecl _scprintf(const char *, ...);
-int    __cdecl sscanf(const char*,const char*,...);
-int    __cdecl sscanf_s(const char*,const char*,...);
+int    WINAPIV sprintf(char*,const char*,...);
+int    WINAPIV sprintf_s(char*,size_t,const char*,...);
+int    WINAPIV _scprintf(const char *, ...);
+int    WINAPIV sscanf(const char*,const char*,...);
+int    WINAPIV sscanf_s(const char*,const char*,...);
 FILE*  __cdecl tmpfile(void);
 char*  __cdecl tmpnam(char*);
 int    __cdecl ungetc(int,FILE*);
@@ -211,9 +211,9 @@ wint_t   __cdecl _getwc_nolock(FILE*);
 wchar_t* __cdecl _getws(wchar_t*);
 wint_t   __cdecl _putwc_nolock(wint_t,FILE*);
 int      __cdecl _putws(const wchar_t*);
-int      __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...);
-int      __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...);
-int      __cdecl _scwprintf(const wchar_t*,...);
+int      WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...);
+int      WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...);
+int      WINAPIV _scwprintf(const wchar_t*,...);
 wint_t   __cdecl _ungetwc_nolock(wint_t,FILE*);
 int      __cdecl _vscwprintf(const wchar_t*,__ms_va_list);
 int      __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list);
@@ -235,21 +235,21 @@ wint_t   __cdecl fgetwc(FILE*);
 wchar_t* __cdecl fgetws(wchar_t*,int,FILE*);
 wint_t   __cdecl fputwc(wint_t,FILE*);
 int      __cdecl fputws(const wchar_t*,FILE*);
-int      __cdecl fwprintf(FILE*,const wchar_t*,...);
-int      __cdecl fwprintf_s(FILE*,const wchar_t*,...);
+int      WINAPIV fwprintf(FILE*,const wchar_t*,...);
+int      WINAPIV fwprintf_s(FILE*,const wchar_t*,...);
 int      __cdecl fputws(const wchar_t*,FILE*);
-int      __cdecl fwscanf(FILE*,const wchar_t*,...);
-int      __cdecl fwscanf_s(FILE*,const wchar_t*,...);
+int      WINAPIV fwscanf(FILE*,const wchar_t*,...);
+int      WINAPIV fwscanf_s(FILE*,const wchar_t*,...);
 wint_t   __cdecl getwc(FILE*);
 wint_t   __cdecl getwchar(void);
 wchar_t* __cdecl getws(wchar_t*);
 wint_t   __cdecl putwc(wint_t,FILE*);
 wint_t   __cdecl putwchar(wint_t);
 int      __cdecl putws(const wchar_t*);
-int      __cdecl swprintf(wchar_t*,const wchar_t*,...);
-int      __cdecl swprintf_s(wchar_t*,size_t,const wchar_t*,...);
-int      __cdecl swscanf(const wchar_t*,const wchar_t*,...);
-int      __cdecl swscanf_s(const wchar_t*,const wchar_t*,...);
+int      WINAPIV swprintf(wchar_t*,const wchar_t*,...);
+int      WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...);
+int      WINAPIV swscanf(const wchar_t*,const wchar_t*,...);
+int      WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...);
 wint_t   __cdecl ungetwc(wint_t,FILE*);
 int      __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list);
 int      __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list);
@@ -257,10 +257,10 @@ int      __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list);
 int      __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list);
 int      __cdecl vwprintf(const wchar_t*,__ms_va_list);
 int      __cdecl vwprintf_s(const wchar_t*,__ms_va_list);
-int      __cdecl wprintf(const wchar_t*,...);
-int      __cdecl wprintf_s(const wchar_t*,...);
-int      __cdecl wscanf(const wchar_t*,...);
-int      __cdecl wscanf_s(const wchar_t*,...);
+int      WINAPIV wprintf(const wchar_t*,...);
+int      WINAPIV wprintf_s(const wchar_t*,...);
+int      WINAPIV wscanf(const wchar_t*,...);
+int      WINAPIV wscanf_s(const wchar_t*,...);
 #endif /* _WSTDIO_DEFINED */
 
 #endif /* _STDIO_DEFINED */

include/msvcrt/wchar.h

@@ -271,9 +271,9 @@ intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
 int      __cdecl _wfindnext(intptr_t,struct _wfinddata_t*);
 int      __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*);
 wchar_t* __cdecl _wmktemp(wchar_t*);
-int      __cdecl _wopen(const wchar_t*,int,...);
+int      WINAPIV _wopen(const wchar_t*,int,...);
 int      __cdecl _wrename(const wchar_t*,const wchar_t*);
-int      __cdecl _wsopen(const wchar_t*,int,int,...);
+int      WINAPIV _wsopen(const wchar_t*,int,int,...);
 int      __cdecl _wunlink(const wchar_t*);
 #endif /* _WIO_DEFINED */
 
@@ -284,18 +284,18 @@ wchar_t* __cdecl _wsetlocale(int,const wchar_t*);
 
 #ifndef _WPROCESS_DEFINED
 #define _WPROCESS_DEFINED
-int      __cdecl _wexecl(const wchar_t*,const wchar_t*,...);
-int      __cdecl _wexecle(const wchar_t*,const wchar_t*,...);
-int      __cdecl _wexeclp(const wchar_t*,const wchar_t*,...);
-int      __cdecl _wexeclpe(const wchar_t*,const wchar_t*,...);
+int      WINAPIV _wexecl(const wchar_t*,const wchar_t*,...);
+int      WINAPIV _wexecle(const wchar_t*,const wchar_t*,...);
+int      WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...);
+int      WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...);
 int      __cdecl _wexecv(const wchar_t*,const wchar_t* const *);
 int      __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
 int      __cdecl _wexecvp(const wchar_t*,const wchar_t* const *);
 int      __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-int      __cdecl _wspawnl(int,const wchar_t*,const wchar_t*,...);
-int      __cdecl _wspawnle(int,const wchar_t*,const wchar_t*,...);
-int      __cdecl _wspawnlp(int,const wchar_t*,const wchar_t*,...);
-int      __cdecl _wspawnlpe(int,const wchar_t*,const wchar_t*,...);
+int      WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...);
+int      WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...);
+int      WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...);
+int      WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...);
 int      __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *);
 int      __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
 int      __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *);
@@ -321,9 +321,9 @@ wint_t   __cdecl _getwc_nolock(FILE*);
 wchar_t* __cdecl _getws(wchar_t*);
 wint_t   __cdecl _putwc_nolock(wint_t,FILE*);
 int      __cdecl _putws(const wchar_t*);
-int      __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...);
-int      __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...);
-int      __cdecl _scwprintf(const wchar_t*,...);
+int      WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...);
+int      WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...);
+int      WINAPIV _scwprintf(const wchar_t*,...);
 wint_t   __cdecl _ungetwc_nolock(wint_t,FILE*);
 int      __cdecl _vscwprintf(const wchar_t*,__ms_va_list);
 int      __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list);
@@ -345,21 +345,21 @@ wint_t   __cdecl fgetwc(FILE*);
 wchar_t* __cdecl fgetws(wchar_t*,int,FILE*);
 wint_t   __cdecl fputwc(wint_t,FILE*);
 int      __cdecl fputws(const wchar_t*,FILE*);
-int      __cdecl fwprintf(FILE*,const wchar_t*,...);
-int      __cdecl fwprintf_s(FILE*,const wchar_t*,...);
+int      WINAPIV fwprintf(FILE*,const wchar_t*,...);
+int      WINAPIV fwprintf_s(FILE*,const wchar_t*,...);
 int      __cdecl fputws(const wchar_t*,FILE*);
-int      __cdecl fwscanf(FILE*,const wchar_t*,...);
-int      __cdecl fwscanf_s(FILE*,const wchar_t*,...);
+int      WINAPIV fwscanf(FILE*,const wchar_t*,...);
+int      WINAPIV fwscanf_s(FILE*,const wchar_t*,...);
 wint_t   __cdecl getwc(FILE*);
 wint_t   __cdecl getwchar(void);
 wchar_t* __cdecl getws(wchar_t*);
 wint_t   __cdecl putwc(wint_t,FILE*);
 wint_t   __cdecl putwchar(wint_t);
 int      __cdecl putws(const wchar_t*);
-int      __cdecl swprintf(wchar_t*,const wchar_t*,...);
-int      __cdecl swprintf_s(wchar_t*,size_t,const wchar_t*,...);
-int      __cdecl swscanf(const wchar_t*,const wchar_t*,...);
-int      __cdecl swscanf_s(const wchar_t*,const wchar_t*,...);
+int      WINAPIV swprintf(wchar_t*,const wchar_t*,...);
+int      WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...);
+int      WINAPIV swscanf(const wchar_t*,const wchar_t*,...);
+int      WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...);
 wint_t   __cdecl ungetwc(wint_t,FILE*);
 int      __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list);
 int      __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list);
@@ -367,10 +367,10 @@ int      __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list);
 int      __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list);
 int      __cdecl vwprintf(const wchar_t*,__ms_va_list);
 int      __cdecl vwprintf_s(const wchar_t*,__ms_va_list);
-int      __cdecl wprintf(const wchar_t*,...);
-int      __cdecl wprintf_s(const wchar_t*,...);
-int      __cdecl wscanf(const wchar_t*,...);
-int      __cdecl wscanf_s(const wchar_t*,...);
+int      WINAPIV wprintf(const wchar_t*,...);
+int      WINAPIV wprintf_s(const wchar_t*,...);
+int      WINAPIV wscanf(const wchar_t*,...);
+int      WINAPIV wscanf_s(const wchar_t*,...);
 #endif /* _WSTDIO_DEFINED */
 
 #ifndef _WSTDLIB_DEFINED