msvcrt: Use the standard va_list instead of __ms_va_list.

dlls/msvcr120/tests/msvcr120.c

@@ -191,7 +191,7 @@ static int (CDECL *p__clearfp)(void);
 static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *);
 static void (__cdecl *p_free_locale)(_locale_t);
 static unsigned short (__cdecl *p_wctype)(const char*);
-static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist);
+static int (__cdecl *p_vsscanf)(const char*, const char *, va_list valist);
 static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double);
 static double (__cdecl *p_creal)(_Dcomplex);
 static double (__cdecl *p_nexttoward)(double, double);
@@ -1114,10 +1114,10 @@ static void test_wctype(void)
 static int WINAPIV _vsscanf_wrapper(const char *buffer, const char *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p_vsscanf(buffer, format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 

dlls/msvcr90/tests/msvcr90.c

@@ -110,8 +110,8 @@ static int* (__cdecl *p_fpecode)(void);
 static int (__cdecl *p_configthreadlocale)(int);
 static void* (__cdecl *p_get_terminate)(void);
 static void* (__cdecl *p_get_unexpected)(void);
-static int (__cdecl *p__vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va_list);
-static int (__cdecl *p_vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va_list);
+static int (__cdecl *p__vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, va_list);
+static int (__cdecl *p_vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, va_list);
 static FILE* (__cdecl *p_fopen)(const char*, const char*);
 static int (__cdecl *p_fclose)(FILE*);
 static int (__cdecl *p_unlink)(const char*);
@@ -134,7 +134,7 @@ static int (__cdecl *p__setmbcp)(int);
 static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*));
 static int (__cdecl *p__memicmp)(const char*, const char*, size_t);
 static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t);
-static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist);
+static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, va_list valist);
 static size_t (__cdecl *p___strncnt)(const char *str, size_t count);
 static int (WINAPIV *p_swscanf)(const wchar_t *str, const wchar_t* format, ...);
 static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale);
@@ -1220,10 +1220,10 @@ static int WINAPIV __vswprintf_l_wrapper(wchar_t *buf,
         const wchar_t *format, _locale_t locale, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, locale);
+    va_list valist;
+    va_start(valist, locale);
     ret = p__vswprintf_l(buf, format, locale, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -1231,10 +1231,10 @@ static int WINAPIV _vswprintf_l_wrapper(wchar_t *buf,
         const wchar_t *format, _locale_t locale, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, locale);
+    va_list valist;
+    va_start(valist, locale);
     ret = p_vswprintf_l(buf, format, locale, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -1898,10 +1898,10 @@ static void test__memicmp_l(void)
 static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p__vsnwprintf(str, len, format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 

dlls/msvcrt/concurrency.c

@@ -1026,7 +1026,7 @@ SchedulerPolicy* WINAPIV SchedulerPolicy_ctor_policies(
         SchedulerPolicy *this, size_t n, ...)
 {
     unsigned int min_concurrency, max_concurrency;
-    __ms_va_list valist;
+    va_list valist;
     size_t i;
 
     TRACE("(%p %Iu)\n", this, n);
@@ -1035,7 +1035,7 @@ SchedulerPolicy* WINAPIV SchedulerPolicy_ctor_policies(
     min_concurrency = this->policy_container->policies[MinConcurrency];
     max_concurrency = this->policy_container->policies[MaxConcurrency];
 
-    __ms_va_start(valist, n);
+    va_start(valist, n);
     for(i=0; i<n; i++) {
         PolicyElementKey policy = va_arg(valist, PolicyElementKey);
         unsigned int val = va_arg(valist, unsigned int);
@@ -1047,7 +1047,7 @@ SchedulerPolicy* WINAPIV SchedulerPolicy_ctor_policies(
         else
             SchedulerPolicy_SetPolicyValue(this, policy, val);
     }
-    __ms_va_end(valist);
+    va_end(valist);
 
     SchedulerPolicy_SetConcurrencyLimits(this, min_concurrency, max_concurrency);
     return this;

dlls/msvcrt/console.c

@@ -525,7 +525,7 @@ static int puts_clbk_console_w(void *ctx, int len, const wchar_t *str)
 /*********************************************************************
  *		_vcprintf (MSVCRT.@)
  */
-int CDECL _vcprintf(const char* format, __ms_va_list valist)
+int CDECL _vcprintf(const char* format, va_list valist)
 {
     return pf_printf_a(puts_clbk_console_a, NULL, format, NULL, 0, arg_clbk_valist, NULL, &valist);
 }
@@ -536,11 +536,11 @@ int CDECL _vcprintf(const char* format, __ms_va_list valist)
 int WINAPIV _cprintf(const char* format, ...)
 {
   int retval;
-  __ms_va_list valist;
+  va_list valist;
 
-  __ms_va_start( valist, format );
+  va_start( valist, format );
   retval = _vcprintf(format, valist);
-  __ms_va_end(valist);
+  va_end(valist);
 
   return retval;
 }
@@ -549,7 +549,7 @@ int WINAPIV _cprintf(const char* format, ...)
 /*********************************************************************
  *		_vcwprintf (MSVCRT.@)
  */
-int CDECL _vcwprintf(const wchar_t* format, __ms_va_list valist)
+int CDECL _vcwprintf(const wchar_t* format, va_list valist)
 {
     return pf_printf_w(puts_clbk_console_w, NULL, format, NULL, 0, arg_clbk_valist, NULL, &valist);
 }
@@ -560,11 +560,11 @@ int CDECL _vcwprintf(const wchar_t* format, __ms_va_list valist)
 int WINAPIV _cwprintf(const wchar_t* format, ...)
 {
   int retval;
-  __ms_va_list valist;
+  va_list valist;
 
-  __ms_va_start( valist, format );
+  va_start( valist, format );
   retval = _vcwprintf(format, valist);
-  __ms_va_end(valist);
+  va_end(valist);
 
   return retval;
 }
@@ -575,7 +575,7 @@ int WINAPIV _cwprintf(const wchar_t* format, ...)
  *		__conio_common_vcprintf (UCRTBASE.@)
  */
 int CDECL __conio_common_vcprintf(unsigned __int64 options, const char* format,
-                                        _locale_t locale, __ms_va_list valist)
+                                        _locale_t locale, va_list valist)
 {
     if (options & ~UCRTBASE_PRINTF_MASK)
         FIXME("options %s not handled\n", wine_dbgstr_longlong(options));
@@ -587,7 +587,7 @@ int CDECL __conio_common_vcprintf(unsigned __int64 options, const char* format,
  *		__conio_common_vcwprintf (UCRTBASE.@)
  */
 int CDECL __conio_common_vcwprintf(unsigned __int64 options, const wchar_t* format,
-                                         _locale_t locale, __ms_va_list valist)
+                                         _locale_t locale, va_list valist)
 {
     if (options & ~UCRTBASE_PRINTF_MASK)
         FIXME("options %s not handled\n", wine_dbgstr_longlong(options));

dlls/msvcrt/misc.c

@@ -536,9 +536,9 @@ BOOL CDECL __crtInitializeCriticalSectionEx(
 /*********************************************************************
  * _vacopy (MSVCR120.@)
  */
-void CDECL _vacopy(__ms_va_list *dest, __ms_va_list src)
+void CDECL _vacopy(va_list *dest, va_list src)
 {
-    __ms_va_copy(*dest, src);
+    va_copy(*dest, src);
 }
 #endif
 

dlls/msvcrt/msvcrt.h

@@ -337,15 +337,15 @@ typedef union _printf_arg
     LONGLONG get_longlong;
     double get_double;
 } printf_arg;
-typedef printf_arg (*args_clbk)(void*, int, int, __ms_va_list*);
+typedef printf_arg (*args_clbk)(void*, int, int, va_list*);
 int pf_printf_a(puts_clbk_a, void*, const char*, _locale_t,
-        DWORD, args_clbk, void*, __ms_va_list*) DECLSPEC_HIDDEN;
+        DWORD, args_clbk, void*, va_list*) DECLSPEC_HIDDEN;
 int pf_printf_w(puts_clbk_w, void*, const wchar_t*, _locale_t,
-        DWORD, args_clbk, void*, __ms_va_list*) DECLSPEC_HIDDEN;
-int create_positional_ctx_a(void*, const char*, __ms_va_list) DECLSPEC_HIDDEN;
-int create_positional_ctx_w(void*, const wchar_t*, __ms_va_list) DECLSPEC_HIDDEN;
-printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN;
-printf_arg arg_clbk_positional(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN;
+        DWORD, args_clbk, void*, va_list*) DECLSPEC_HIDDEN;
+int create_positional_ctx_a(void*, const char*, va_list) DECLSPEC_HIDDEN;
+int create_positional_ctx_w(void*, const wchar_t*, va_list) DECLSPEC_HIDDEN;
+printf_arg arg_clbk_valist(void*, int, int, va_list*) DECLSPEC_HIDDEN;
+printf_arg arg_clbk_positional(void*, int, int, va_list*) DECLSPEC_HIDDEN;
 
 extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int);
 

dlls/msvcrt/printf.h

@@ -965,7 +965,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu
 
 int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const APICHAR *fmt,
         _locale_t locale, DWORD options,
-        args_clbk pf_args, void *args_ctx, __ms_va_list *valist)
+        args_clbk pf_args, void *args_ctx, va_list *valist)
 {
     const APICHAR *q, *p = fmt;
     APICHAR buf[32];
@@ -1228,7 +1228,7 @@ enum types_clbk_flags {
 };
 
 /* This functions stores types of arguments. It uses args[0] internally */
-static printf_arg arg_clbk_type(void *ctx, int pos, int type, __ms_va_list *valist)
+static printf_arg arg_clbk_type(void *ctx, int pos, int type, va_list *valist)
 {
     static const printf_arg ret;
     printf_arg *args = ctx;
@@ -1250,7 +1250,7 @@ static printf_arg arg_clbk_type(void *ctx, int pos, int type, __ms_va_list *vali
 }
 #endif
 
-int FUNC_NAME(create_positional_ctx)(void *args_ctx, const APICHAR *format, __ms_va_list valist)
+int FUNC_NAME(create_positional_ctx)(void *args_ctx, const APICHAR *format, va_list valist)
 {
     struct FUNC_NAME(_str_ctx) puts_ctx = {INT_MAX, NULL};
     printf_arg *args = args_ctx;

dlls/msvcrt/scanf.h

@@ -52,15 +52,15 @@
 #define _UNLOCK_FILE_(file) _unlock_file(MSVCRT_stdin)
 #ifdef WIDE_SCANF
 #ifdef SECURE
-#define _FUNCTION_ static int vcwscanf_s_l(const wchar_t *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vcwscanf_s_l(const wchar_t *format, _locale_t locale, va_list ap)
 #else  /* SECURE */
-#define _FUNCTION_ static int vcwscanf_l(const wchar_t *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vcwscanf_l(const wchar_t *format, _locale_t locale, va_list ap)
 #endif /* SECURE */
 #else  /* WIDE_SCANF */
 #ifdef SECURE
-#define _FUNCTION_ static int vcscanf_s_l(const char *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vcscanf_s_l(const char *format, _locale_t locale, va_list ap)
 #else  /* SECURE */
-#define _FUNCTION_ static int vcscanf_l(const char *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vcscanf_l(const char *format, _locale_t locale, va_list ap)
 #endif /* SECURE */
 #endif /* WIDE_SCANF */
 #else
@@ -84,15 +84,15 @@
 #define _UNLOCK_FILE_(file) do {} while(0)
 #ifdef WIDE_SCANF
 #ifdef SECURE
-#define _FUNCTION_ static int vsnwscanf_s_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vsnwscanf_s_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, va_list ap)
 #else  /* SECURE */
-#define _FUNCTION_ static int vsnwscanf_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vsnwscanf_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, va_list ap)
 #endif /* SECURE */
 #else /* WIDE_SCANF */
 #ifdef SECURE
-#define _FUNCTION_ static int vsnscanf_s_l(const char *file, size_t length, const char *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vsnscanf_s_l(const char *file, size_t length, const char *format, _locale_t locale, va_list ap)
 #else  /* SECURE */
-#define _FUNCTION_ static int vsnscanf_l(const char *file, size_t length, const char *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vsnscanf_l(const char *file, size_t length, const char *format, _locale_t locale, va_list ap)
 #endif /* SECURE */
 #endif /* WIDE_SCANF */
 #else /* STRING_LEN */
@@ -106,15 +106,15 @@
 #define _UNLOCK_FILE_(file) do {} while(0)
 #ifdef WIDE_SCANF
 #ifdef SECURE
-#define _FUNCTION_ static int vswscanf_s_l(const wchar_t *file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vswscanf_s_l(const wchar_t *file, const wchar_t *format, _locale_t locale, va_list ap)
 #else  /* SECURE */
-#define _FUNCTION_ static int vswscanf_l(const wchar_t *file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vswscanf_l(const wchar_t *file, const wchar_t *format, _locale_t locale, va_list ap)
 #endif /* SECURE */
 #else /* WIDE_SCANF */
 #ifdef SECURE
-#define _FUNCTION_ static int vsscanf_s_l(const char *file, const char *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vsscanf_s_l(const char *file, const char *format, _locale_t locale, va_list ap)
 #else  /* SECURE */
-#define _FUNCTION_ static int vsscanf_l(const char *file, const char *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vsscanf_l(const char *file, const char *format, _locale_t locale, va_list ap)
 #endif /* SECURE */
 #endif /* WIDE_SCANF */
 #endif /* STRING_LEN */
@@ -127,9 +127,9 @@
 #define _LOCK_FILE_(file) _lock_file(file)
 #define _UNLOCK_FILE_(file) _unlock_file(file)
 #ifdef SECURE
-#define _FUNCTION_ static int vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale, va_list ap)
 #else  /* SECURE */
-#define _FUNCTION_ static int vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale, va_list ap)
 #endif /* SECURE */
 #else /* WIDE_SCANF */
 #define _GETC_FUNC_(file) fgetc(file)
@@ -139,9 +139,9 @@
 #define _LOCK_FILE_(file) _lock_file(file)
 #define _UNLOCK_FILE_(file) _unlock_file(file)
 #ifdef SECURE
-#define _FUNCTION_ static int vfscanf_s_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vfscanf_s_l(FILE* file, const char *format, _locale_t locale, va_list ap)
 #else  /* SECURE */
-#define _FUNCTION_ static int vfscanf_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap)
+#define _FUNCTION_ static int vfscanf_l(FILE* file, const char *format, _locale_t locale, va_list ap)
 #endif /* SECURE */
 #endif /* WIDE_SCANF */
 #endif /* STRING */

dlls/msvcrt/tests/printf.c

@@ -43,11 +43,11 @@ static inline float __port_ind(void)
 }
 #define IND __port_ind()
 
-static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist);
-static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist);
+static int (__cdecl *p__vscprintf)(const char *format, va_list valist);
+static int (__cdecl *p__vscwprintf)(const wchar_t *format, va_list valist);
 static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer,
                                       size_t count, const wchar_t *format,
-                                      __ms_va_list valist);
+                                      va_list valist);
 static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number,
                                 int ndigits, int *decpt, int *sign);
 static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number,
@@ -55,17 +55,17 @@ static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number,
 static unsigned int (__cdecl *p__get_output_format)(void);
 static unsigned int (__cdecl *p__set_output_format)(unsigned int);
 static int (WINAPIV *p_sprintf)(char*, ...);
-static int (__cdecl *p__vsprintf_p)(char*, size_t, const char*, __ms_va_list);
-static int (__cdecl *p_vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist);
-static int (__cdecl *p__vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist);
+static int (__cdecl *p__vsprintf_p)(char*, size_t, const char*, va_list);
+static int (__cdecl *p_vswprintf)(wchar_t *str, const wchar_t *format, va_list valist);
+static int (__cdecl *p__vswprintf)(wchar_t *str, const wchar_t *format, va_list valist);
 static int (__cdecl *p__vswprintf_l)(wchar_t *str, const wchar_t *format,
-                                     void *locale, __ms_va_list valist);
+                                     void *locale, va_list valist);
 static int (__cdecl *p__vswprintf_c)(wchar_t *str, size_t size, const wchar_t *format,
-                                     __ms_va_list valist);
+                                     va_list valist);
 static int (__cdecl *p__vswprintf_c_l)(wchar_t *str, size_t size, const wchar_t *format,
-                                       void *locale, __ms_va_list valist);
+                                       void *locale, va_list valist);
 static int (__cdecl *p__vswprintf_p_l)(wchar_t *str, size_t size, const wchar_t *format,
-                                       void *locale, __ms_va_list valist);
+                                       void *locale, va_list valist);
 
 static void init( void )
 {
@@ -783,10 +783,10 @@ static void test_xcvt(void)
 static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = _vsnwprintf(str, len, format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -811,60 +811,60 @@ static void test_vsnwprintf(void)
 static int WINAPIV vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p_vswprintf(str, format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
 static int WINAPIV _vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p__vswprintf(str, format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
 static int WINAPIV _vswprintf_l_wrapper(wchar_t *str, const wchar_t *format, void *locale, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, locale);
+    va_list valist;
+    va_start(valist, locale);
     ret = p__vswprintf_l(str, format, locale, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
 static int WINAPIV _vswprintf_c_wrapper(wchar_t *str, size_t size, const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p__vswprintf_c(str, size, format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
 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;
-    __ms_va_start(valist, locale);
+    va_list valist;
+    va_start(valist, locale);
     ret = p__vswprintf_c_l(str, size, format, locale, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
 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;
-    __ms_va_start(valist, locale);
+    va_list valist;
+    va_start(valist, locale);
     ret = p__vswprintf_p_l(str, size, format, locale, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -918,10 +918,10 @@ static void test_vswprintf(void)
 static int WINAPIV _vscprintf_wrapper(const char *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p__vscprintf(format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -942,10 +942,10 @@ static void test_vscprintf(void)
 static int WINAPIV _vscwprintf_wrapper(const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p__vscwprintf(format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -967,10 +967,10 @@ static int WINAPIV _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer,
                                  size_t count, const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p__vsnwprintf_s(str, sizeOfBuffer, count, format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -1016,10 +1016,10 @@ static int WINAPIV _vsprintf_p_wrapper(char *str, size_t sizeOfBuffer,
                                  const char *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = p__vsprintf_p(str, sizeOfBuffer, format, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 

dlls/ucrtbase/tests/printf.c

@@ -81,10 +81,10 @@ static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str,
                                     size_t len, const char *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = __stdio_common_vsprintf(options, str, len, format, NULL, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -165,10 +165,10 @@ static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str,
                                      size_t len, const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = __stdio_common_vswprintf(options, str, len, format, NULL, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -259,10 +259,10 @@ static int WINAPIV vfprintf_wrapper(FILE *file,
                                     const char *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = __stdio_common_vfprintf(0, file, format, NULL, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -332,10 +332,10 @@ static int WINAPIV vfwprintf_wrapper(FILE *file,
                                      const wchar_t *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = __stdio_common_vfwprintf(0, file, format, NULL, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -429,10 +429,10 @@ static int WINAPIV _vsnprintf_s_wrapper(char *str, size_t sizeOfBuffer,
                                         size_t count, const char *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = __stdio_common_vsnprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 
@@ -481,10 +481,10 @@ static int WINAPIV _vsnwprintf_s_wrapper(WCHAR *str, size_t sizeOfBuffer,
                                         size_t count, const WCHAR *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = __stdio_common_vsnwprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }
 

dlls/ucrtbase/tests/scanf.c

@@ -30,10 +30,10 @@
 static int WINAPIV vsscanf_wrapper(unsigned __int64 options, const char *str, size_t len, const char *format, ...)
 {
     int ret;
-    __ms_va_list valist;
-    __ms_va_start(valist, format);
+    va_list valist;
+    va_start(valist, format);
     ret = __stdio_common_vsscanf(options, str, len, format, NULL, valist);
-    __ms_va_end(valist);
+    va_end(valist);
     return ret;
 }