From f39c3464a3535dd65b7c39315d36a050725783e3 Mon Sep 17 00:00:00 2001 From: mlankhorst Date: Tue, 25 Nov 2008 09:15:55 +0100 Subject: [PATCH] dlls: Fix va_list -> ms_va_list for variadic api calls --- dlls/kernel32/format_msg.c | 19 +++-- dlls/kernel32/string.c | 10 +-- dlls/msvcrt/console.c | 8 +-- dlls/msvcrt/except.c | 12 ++-- dlls/msvcrt/file.c | 64 ++++++++--------- dlls/msvcrt/msvcrt.h | 4 +- dlls/msvcrt/process.c | 172 ++++++++++++++++++++++----------------------- dlls/msvcrt/scanf.c | 42 +++++------ dlls/msvcrt/scanf.h | 10 +-- dlls/msvcrt/undname.c | 18 ++--- dlls/msvcrt/wcs.c | 56 +++++++-------- dlls/ntdll/resource.c | 4 +- dlls/ntdll/rtl.c | 16 ++--- dlls/ntdll/string.c | 22 +++--- dlls/ntdll/wcstring.c | 14 ++-- dlls/shell32/shellord.c | 12 ++-- dlls/shell32/shlfileop.c | 2 +- dlls/shlwapi/ordinal.c | 36 +++++----- dlls/shlwapi/wsprintf.c | 36 +++++----- dlls/user32/user16.c | 8 +-- dlls/user32/wsprintf.c | 40 +++++------ dlls/wined3d/baseshader.c | 6 +- dlls/wldap32/ber.c | 42 +++++------ include/shlwapi.h | 4 +- include/winbase.h | 4 +- include/windef.h | 25 +++++++ include/winternl.h | 6 +- include/winuser.h | 4 +- 28 files changed, 363 insertions(+), 333 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 0920d66c949..3fcefee4ff6 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -135,7 +135,7 @@ DWORD WINAPI FormatMessageA( DWORD dwLanguageId, LPSTR lpBuffer, DWORD nSize, - va_list* _args ) + ms_va_list* _args ) { LPDWORD args=(LPDWORD)_args; DWORD ret = 0; @@ -265,6 +265,10 @@ DWORD WINAPI FormatMessageA( b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz = 1000); /* CMF - This makes a BIG assumption about va_list */ TRACE("A BIG assumption\n"); +#ifdef _WIN64 + /* We need to link to msvcrt here */ + ERR("This code is broken for WIN64\n"); +#endif vsnprintf(b, sz, fmtstr, (va_list) argliststart); } for (x=b; *x; x++) ADD_TO_T(*x); @@ -356,11 +360,11 @@ DWORD WINAPI FormatMessageW( DWORD dwLanguageId, LPWSTR lpBuffer, DWORD nSize, - va_list* _args ) + ms_va_list* _args ) { LPDWORD args=(LPDWORD)_args; #if defined(__i386__) || defined(__sparc__) -/* This implementation is completely dependent on the format of the va_list on x86 CPUs */ +/* This implementation is completely dependent on the format of the ms_va_list on x86 CPUs */ LPWSTR target,t; DWORD talloced; LPWSTR from,f; @@ -481,13 +485,13 @@ DWORD WINAPI FormatMessageW( xarr[2]=*(argliststart+2); sprintfbuf=HeapAlloc(GetProcessHeap(),0,(strlenW((LPWSTR)argliststart[0])*2+1)*sizeof(WCHAR)); - /* CMF - This makes a BIG assumption about va_list */ - vsprintfW(sprintfbuf, fmtstr, (va_list) xarr); + /* CMF - This makes a BIG assumption about ms_va_list */ + vsprintfW(sprintfbuf, fmtstr, (ms_va_list) xarr); } else { sprintfbuf=HeapAlloc(GetProcessHeap(),0,100); - /* CMF - This makes a BIG assumption about va_list */ - vsprintfW(sprintfbuf, fmtstr, (va_list) argliststart); + /* CMF - This makes a BIG assumption about ms_va_list */ + vsprintfW(sprintfbuf, fmtstr, (ms_va_list) argliststart); } x=sprintfbuf; while (*x) { @@ -560,6 +564,7 @@ DWORD WINAPI FormatMessageW( strlenW(*(LPWSTR*)lpBuffer): strlenW(lpBuffer); #else + ERR("Not implemented!\n"); return 0; #endif /* __i386__ */ } diff --git a/dlls/kernel32/string.c b/dlls/kernel32/string.c index ecac281f133..4ad96a5c248 100644 --- a/dlls/kernel32/string.c +++ b/dlls/kernel32/string.c @@ -36,7 +36,7 @@ static INT (WINAPI *pLoadStringA)(HINSTANCE, UINT, LPSTR, INT); -static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, va_list); +static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, ms_va_list); /*********************************************************************** @@ -118,7 +118,7 @@ INT WINAPI k32LoadStringA(HINSTANCE instance, UINT resource_id, /*********************************************************************** * k32wvsprintfA (KERNEL32.16) */ -INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, va_list args) +INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, ms_va_list args) { if(!pwvsprintfA) pwvsprintfA = user32_proc_address("wvsprintfA"); return (*pwvsprintfA)(buffer, spec, args); @@ -130,12 +130,12 @@ INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, va_list args) */ INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...) { - va_list args; + ms_va_list args; INT res; - va_start(args, spec); + ms_va_start(args, spec); res = k32wvsprintfA(buffer, spec, args); - va_end(args); + ms_va_end(args); return res; } diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 267e0e1f748..217f5bc9152 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -289,9 +289,9 @@ int CDECL _cprintf(const char* format, ...) { char buf[2048], *mem = buf; int written, resize = sizeof(buf), retval; - va_list valist; + ms_va_list valist; - va_start( valist, format ); + ms_va_start( valist, format ); /* There are two conventions for snprintf failing: * Return -1 if we truncated, or * Return the number of bytes that would have been written @@ -305,9 +305,9 @@ int CDECL _cprintf(const char* format, ...) MSVCRT_free (mem); if (!(mem = MSVCRT_malloc(resize))) return MSVCRT_EOF; - va_start( valist, format ); + ms_va_start( valist, format ); } - va_end(valist); + ms_va_end(valist); LOCK_CONSOLE; retval = _cputs( mem ); UNLOCK_CONSOLE; diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 6a6fed35f6d..a9ab8fd37f7 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -342,15 +342,15 @@ int CDECL __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, else { int i; - va_list args; + ms_va_list args; - va_start( args, nb_args ); - if (nb_args > 0) jmp->UnwindFunc = va_arg( args, unsigned long ); - if (nb_args > 1) jmp->TryLevel = va_arg( args, unsigned long ); + ms_va_start( args, nb_args ); + if (nb_args > 0) jmp->UnwindFunc = ms_va_arg( args, unsigned long ); + if (nb_args > 1) jmp->TryLevel = ms_va_arg( args, unsigned long ); else jmp->TryLevel = ((MSVCRT_EXCEPTION_FRAME*)jmp->Registration)->trylevel; for (i = 0; i < 6 && i < nb_args - 2; i++) - jmp->UnwindData[i] = va_arg( args, unsigned long ); - va_end( args ); + jmp->UnwindData[i] = ms_va_arg( args, unsigned long ); + ms_va_end( args ); } TRACE("buf=%p ebx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx eip=%08lx frame=%08lx\n", diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 055ccac7e46..5b8d2fa6dc5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1418,7 +1418,7 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) */ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) { - va_list ap; + ms_va_list ap; int pmode; DWORD access = 0, creation = 0, attrib; DWORD sharing; @@ -1440,9 +1440,9 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) if (oflags & MSVCRT__O_CREAT) { - va_start(ap, shflags); - pmode = va_arg(ap, int); - va_end(ap); + ms_va_start(ap, shflags); + pmode = ms_va_arg(ap, int); + ms_va_end(ap); if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) FIXME(": pmode 0x%04x ignored\n", pmode); @@ -1516,12 +1516,12 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t* path, int oflags, int shflags, . { const unsigned int len = strlenW(path); char *patha = MSVCRT_calloc(len + 1,1); - va_list ap; + ms_va_list ap; int pmode; - va_start(ap, shflags); - pmode = va_arg(ap, int); - va_end(ap); + ms_va_start(ap, shflags); + pmode = ms_va_arg(ap, int); + ms_va_end(ap); if (patha && WideCharToMultiByte(CP_ACP,0,path,len,patha,len,NULL,NULL)) { @@ -1539,14 +1539,14 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t* path, int oflags, int shflags, . */ int CDECL MSVCRT__open( const char *path, int flags, ... ) { - va_list ap; + ms_va_list ap; if (flags & MSVCRT__O_CREAT) { int pmode; - va_start(ap, flags); - pmode = va_arg(ap, int); - va_end(ap); + ms_va_start(ap, flags); + pmode = ms_va_arg(ap, int); + ms_va_end(ap); return MSVCRT__sopen( path, flags, MSVCRT__SH_DENYNO, pmode ); } else @@ -1560,12 +1560,12 @@ int CDECL _wopen(const MSVCRT_wchar_t *path,int flags,...) { const unsigned int len = strlenW(path); char *patha = MSVCRT_calloc(len + 1,1); - va_list ap; + ms_va_list ap; int pmode; - va_start(ap, flags); - pmode = va_arg(ap, int); - va_end(ap); + ms_va_start(ap, flags); + pmode = ms_va_arg(ap, int); + ms_va_end(ap); if (patha && WideCharToMultiByte(CP_ACP,0,path,len,patha,len,NULL,NULL)) { @@ -3018,7 +3018,7 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) /********************************************************************* * vfprintf (MSVCRT.@) */ -int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, va_list valist) +int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, ms_va_list valist) { char buf[2048], *mem = buf; int written, resize = sizeof(buf), retval; @@ -3048,7 +3048,7 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, va_list valist) * Is final char included in written (then resize is too big) or not * (then we must test for equality too)? */ -int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, va_list valist) +int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ms_va_list valist) { MSVCRT_wchar_t buf[2048], *mem = buf; int written, resize = sizeof(buf) / sizeof(MSVCRT_wchar_t), retval; @@ -3071,7 +3071,7 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, va_l /********************************************************************* * vprintf (MSVCRT.@) */ -int CDECL MSVCRT_vprintf(const char *format, va_list valist) +int CDECL MSVCRT_vprintf(const char *format, ms_va_list valist) { return MSVCRT_vfprintf(MSVCRT_stdout,format,valist); } @@ -3079,7 +3079,7 @@ int CDECL MSVCRT_vprintf(const char *format, va_list valist) /********************************************************************* * vwprintf (MSVCRT.@) */ -int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, va_list valist) +int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, ms_va_list valist) { return MSVCRT_vfwprintf(MSVCRT_stdout,format,valist); } @@ -3089,11 +3089,11 @@ int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, va_list valist) */ int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vfprintf(file, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -3102,11 +3102,11 @@ int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...) */ int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vfwprintf(file, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -3115,11 +3115,11 @@ int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...) */ int CDECL MSVCRT_printf(const char *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vfprintf(MSVCRT_stdout, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -3164,11 +3164,11 @@ MSVCRT_wint_t CDECL MSVCRT_ungetwc(MSVCRT_wint_t wc, MSVCRT_FILE * file) */ int CDECL MSVCRT_wprintf(const MSVCRT_wchar_t *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vwprintf(format, valist); - va_end(valist); + ms_va_end(valist); return res; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3a894e9457b..cefa28779a8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -665,9 +665,9 @@ double __cdecl MSVCRT_difftime(MSVCRT_time_t time1, MSVCRT_time_t time2); MSVCRT_time_t __cdecl MSVCRT_time(MSVCRT_time_t*); MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); -int __cdecl MSVCRT_vsnprintf(char *str, unsigned int len, const char *format, va_list valist); +int __cdecl MSVCRT_vsnprintf(char *str, unsigned int len, const char *format, ms_va_list valist); int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, unsigned int len, - const MSVCRT_wchar_t *format, va_list valist ); + const MSVCRT_wchar_t *format, ms_va_list valist ); int __cdecl MSVCRT_raise(int sig); #ifndef __WINE_MSVCRT_TEST diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index bb57b9f79c3..915edc192ac 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -266,16 +266,16 @@ static MSVCRT_wchar_t *msvcrt_argvtos_aw(const char * const *arg, MSVCRT_wchar_t return ret; } -/* INTERNAL: Convert wide va_list to a single 'delim'-separated wide string, with an +/* INTERNAL: Convert wide ms_va_list to a single 'delim'-separated wide string, with an * extra '\0' to terminate it. */ -static MSVCRT_wchar_t *msvcrt_valisttos(const MSVCRT_wchar_t *arg0, va_list alist, MSVCRT_wchar_t delim) +static MSVCRT_wchar_t *msvcrt_valisttos(const MSVCRT_wchar_t *arg0, ms_va_list alist, MSVCRT_wchar_t delim) { unsigned int size = 0, pos = 0; const MSVCRT_wchar_t *arg; MSVCRT_wchar_t *new, *ret = NULL; - for (arg = arg0; arg; arg = va_arg( alist, MSVCRT_wchar_t * )) + for (arg = arg0; arg; arg = ms_va_arg( alist, MSVCRT_wchar_t * )) { unsigned int len = strlenW( arg ) + 1; if (pos + len >= size) @@ -301,16 +301,16 @@ static MSVCRT_wchar_t *msvcrt_valisttos(const MSVCRT_wchar_t *arg0, va_list alis return ret; } -/* INTERNAL: Convert ansi va_list to a single 'delim'-separated wide string, with an +/* INTERNAL: Convert ansi ms_va_list to a single 'delim'-separated wide string, with an * extra '\0' to terminate it. */ -static MSVCRT_wchar_t *msvcrt_valisttos_aw(const char *arg0, va_list alist, MSVCRT_wchar_t delim) +static MSVCRT_wchar_t *msvcrt_valisttos_aw(const char *arg0, ms_va_list alist, MSVCRT_wchar_t delim) { unsigned int size = 0, pos = 0; const char *arg; MSVCRT_wchar_t *new, *ret = NULL; - for (arg = arg0; arg; arg = va_arg( alist, char * )) + for (arg = arg0; arg; arg = ms_va_arg( alist, char * )) { unsigned int len = MultiByteToWideChar( CP_ACP, 0, arg, -1, NULL, 0 ); if (pos + len >= size) @@ -391,13 +391,13 @@ MSVCRT_intptr_t CDECL _cwait(int *status, MSVCRT_intptr_t pid, int action) */ MSVCRT_intptr_t CDECL _wexecl(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *args; MSVCRT_intptr_t ret; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, NULL, 0); @@ -413,15 +413,15 @@ MSVCRT_intptr_t CDECL _wexecl(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* */ MSVCRT_intptr_t CDECL _execl(const char* name, const char* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *nameW, *args; MSVCRT_intptr_t ret; if (!(nameW = msvcrt_wstrdupa(name))) return -1; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, NULL, 0); @@ -437,20 +437,20 @@ MSVCRT_intptr_t CDECL _execl(const char* name, const char* arg0, ...) */ MSVCRT_intptr_t CDECL _wexecle(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *args, *envs = NULL; const MSVCRT_wchar_t * const *envp; MSVCRT_intptr_t ret; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); - va_start(ap, arg0); - while (va_arg( ap, MSVCRT_wchar_t * ) != NULL) /*nothing*/; - envp = va_arg( ap, const MSVCRT_wchar_t * const * ); + ms_va_start(ap, arg0); + while (ms_va_arg( ap, MSVCRT_wchar_t * ) != NULL) /*nothing*/; + envp = ms_va_arg( ap, const MSVCRT_wchar_t * const * ); if (envp) envs = msvcrt_argvtos(envp, 0); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, envs, 0); @@ -464,22 +464,22 @@ MSVCRT_intptr_t CDECL _wexecle(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* */ MSVCRT_intptr_t CDECL _execle(const char* name, const char* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *nameW, *args, *envs = NULL; const char * const *envp; MSVCRT_intptr_t ret; if (!(nameW = msvcrt_wstrdupa(name))) return -1; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); - va_start(ap, arg0); - while (va_arg( ap, char * ) != NULL) /*nothing*/; - envp = va_arg( ap, const char * const * ); + ms_va_start(ap, arg0); + while (ms_va_arg( ap, char * ) != NULL) /*nothing*/; + envp = ms_va_arg( ap, const char * const * ); if (envp) envs = msvcrt_argvtos_aw(envp, 0); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, envs, 0); @@ -496,13 +496,13 @@ MSVCRT_intptr_t CDECL _execle(const char* name, const char* arg0, ...) */ MSVCRT_intptr_t CDECL _wexeclp(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *args; MSVCRT_intptr_t ret; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, NULL, 1); @@ -518,15 +518,15 @@ MSVCRT_intptr_t CDECL _wexeclp(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* */ MSVCRT_intptr_t CDECL _execlp(const char* name, const char* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *nameW, *args; MSVCRT_intptr_t ret; if (!(nameW = msvcrt_wstrdupa(name))) return -1; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, NULL, 1); @@ -542,20 +542,20 @@ MSVCRT_intptr_t CDECL _execlp(const char* name, const char* arg0, ...) */ MSVCRT_intptr_t CDECL _wexeclpe(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *args, *envs = NULL; const MSVCRT_wchar_t * const *envp; MSVCRT_intptr_t ret; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); - va_start(ap, arg0); - while (va_arg( ap, MSVCRT_wchar_t * ) != NULL) /*nothing*/; - envp = va_arg( ap, const MSVCRT_wchar_t * const * ); + ms_va_start(ap, arg0); + while (ms_va_arg( ap, MSVCRT_wchar_t * ) != NULL) /*nothing*/; + envp = ms_va_arg( ap, const MSVCRT_wchar_t * const * ); if (envp) envs = msvcrt_argvtos(envp, 0); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, envs, 1); @@ -569,22 +569,22 @@ MSVCRT_intptr_t CDECL _wexeclpe(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t */ MSVCRT_intptr_t CDECL _execlpe(const char* name, const char* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *nameW, *args, *envs = NULL; const char * const *envp; MSVCRT_intptr_t ret; if (!(nameW = msvcrt_wstrdupa(name))) return -1; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); - va_start(ap, arg0); - while (va_arg( ap, char * ) != NULL) /*nothing*/; - envp = va_arg( ap, const char * const * ); + ms_va_start(ap, arg0); + while (ms_va_arg( ap, char * ) != NULL) /*nothing*/; + envp = ms_va_arg( ap, const char * const * ); if (envp) envs = msvcrt_argvtos_aw(envp, 0); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, envs, 1); @@ -685,13 +685,13 @@ MSVCRT_intptr_t CDECL _execvp(const char* name, char* const* argv) */ MSVCRT_intptr_t CDECL _wspawnl(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *args; MSVCRT_intptr_t ret; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(flags, name, args, NULL, 0); @@ -707,15 +707,15 @@ MSVCRT_intptr_t CDECL _wspawnl(int flags, const MSVCRT_wchar_t* name, const MSVC */ MSVCRT_intptr_t CDECL _spawnl(int flags, const char* name, const char* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *nameW, *args; MSVCRT_intptr_t ret; if (!(nameW = msvcrt_wstrdupa(name))) return -1; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(flags, nameW, args, NULL, 0); @@ -731,20 +731,20 @@ MSVCRT_intptr_t CDECL _spawnl(int flags, const char* name, const char* arg0, ... */ MSVCRT_intptr_t CDECL _wspawnle(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *args, *envs = NULL; const MSVCRT_wchar_t * const *envp; MSVCRT_intptr_t ret; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); - va_start(ap, arg0); - while (va_arg( ap, MSVCRT_wchar_t * ) != NULL) /*nothing*/; - envp = va_arg( ap, const MSVCRT_wchar_t * const * ); + ms_va_start(ap, arg0); + while (ms_va_arg( ap, MSVCRT_wchar_t * ) != NULL) /*nothing*/; + envp = ms_va_arg( ap, const MSVCRT_wchar_t * const * ); if (envp) envs = msvcrt_argvtos(envp, 0); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(flags, name, args, envs, 0); @@ -758,22 +758,22 @@ MSVCRT_intptr_t CDECL _wspawnle(int flags, const MSVCRT_wchar_t* name, const MSV */ MSVCRT_intptr_t CDECL _spawnle(int flags, const char* name, const char* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *nameW, *args, *envs = NULL; const char * const *envp; MSVCRT_intptr_t ret; if (!(nameW = msvcrt_wstrdupa(name))) return -1; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); - va_start(ap, arg0); - while (va_arg( ap, char * ) != NULL) /*nothing*/; - envp = va_arg( ap, const char * const * ); + ms_va_start(ap, arg0); + while (ms_va_arg( ap, char * ) != NULL) /*nothing*/; + envp = ms_va_arg( ap, const char * const * ); if (envp) envs = msvcrt_argvtos_aw(envp, 0); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(flags, nameW, args, envs, 0); @@ -790,13 +790,13 @@ MSVCRT_intptr_t CDECL _spawnle(int flags, const char* name, const char* arg0, .. */ MSVCRT_intptr_t CDECL _wspawnlp(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *args; MSVCRT_intptr_t ret; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(flags, name, args, NULL, 1); @@ -812,15 +812,15 @@ MSVCRT_intptr_t CDECL _wspawnlp(int flags, const MSVCRT_wchar_t* name, const MSV */ MSVCRT_intptr_t CDECL _spawnlp(int flags, const char* name, const char* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *nameW, *args; MSVCRT_intptr_t ret; if (!(nameW = msvcrt_wstrdupa(name))) return -1; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(flags, nameW, args, NULL, 1); @@ -836,20 +836,20 @@ MSVCRT_intptr_t CDECL _spawnlp(int flags, const char* name, const char* arg0, .. */ MSVCRT_intptr_t CDECL _wspawnlpe(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *args, *envs = NULL; const MSVCRT_wchar_t * const *envp; MSVCRT_intptr_t ret; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); - va_start(ap, arg0); - while (va_arg( ap, MSVCRT_wchar_t * ) != NULL) /*nothing*/; - envp = va_arg( ap, const MSVCRT_wchar_t * const * ); + ms_va_start(ap, arg0); + while (ms_va_arg( ap, MSVCRT_wchar_t * ) != NULL) /*nothing*/; + envp = ms_va_arg( ap, const MSVCRT_wchar_t * const * ); if (envp) envs = msvcrt_argvtos(envp, 0); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(flags, name, args, envs, 1); @@ -863,22 +863,22 @@ MSVCRT_intptr_t CDECL _wspawnlpe(int flags, const MSVCRT_wchar_t* name, const MS */ MSVCRT_intptr_t CDECL _spawnlpe(int flags, const char* name, const char* arg0, ...) { - va_list ap; + ms_va_list ap; MSVCRT_wchar_t *nameW, *args, *envs = NULL; const char * const *envp; MSVCRT_intptr_t ret; if (!(nameW = msvcrt_wstrdupa(name))) return -1; - va_start(ap, arg0); + ms_va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); - va_end(ap); + ms_va_end(ap); - va_start(ap, arg0); - while (va_arg( ap, char * ) != NULL) /*nothing*/; - envp = va_arg( ap, const char * const * ); + ms_va_start(ap, arg0); + while (ms_va_arg( ap, char * ) != NULL) /*nothing*/; + envp = ms_va_arg( ap, const char * const * ); if (envp) envs = msvcrt_argvtos_aw(envp, 0); - va_end(ap); + ms_va_end(ap); ret = msvcrt_spawn(flags, nameW, args, envs, 1); diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index c51c5ab0967..ffdd27ac7a1 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -93,12 +93,12 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { */ int CDECL MSVCRT_fscanf(MSVCRT_FILE *file, const char *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vfscanf(file, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -107,12 +107,12 @@ int CDECL MSVCRT_fscanf(MSVCRT_FILE *file, const char *format, ...) */ int CDECL MSVCRT_scanf(const char *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vfscanf(MSVCRT_stdin, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -121,12 +121,12 @@ int CDECL MSVCRT_scanf(const char *format, ...) */ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vfwscanf(file, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -136,12 +136,12 @@ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...) */ int CDECL MSVCRT_wscanf(const MSVCRT_wchar_t *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vfwscanf(MSVCRT_stdin, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -151,12 +151,12 @@ int CDECL MSVCRT_wscanf(const MSVCRT_wchar_t *format, ...) */ int CDECL MSVCRT_sscanf(const char *str, const char *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vsscanf(str, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -166,12 +166,12 @@ int CDECL MSVCRT_sscanf(const char *str, const char *format, ...) */ int CDECL MSVCRT_swscanf(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vswscanf(str, format, valist); - va_end(valist); + ms_va_end(valist); return res; } @@ -181,11 +181,11 @@ int CDECL MSVCRT_swscanf(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format */ int CDECL _cscanf(const char *format, ...) { - va_list valist; + ms_va_list valist; int res; - va_start(valist, format); + ms_va_start(valist, format); res = MSVCRT_vcscanf(format, valist); - va_end(valist); + ms_va_end(valist); return res; } diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index c236f48c4fd..d7d87a51aa6 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -48,7 +48,7 @@ #ifdef CONSOLE #define _GETC_(file) (consumed++, _getch()) #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) -#define _FUNCTION_ static int MSVCRT_vcscanf(const char *format, va_list ap) +#define _FUNCTION_ static int MSVCRT_vcscanf(const char *format, ms_va_list ap) #else #ifdef STRING #undef _EOF_ @@ -56,19 +56,19 @@ #define _GETC_(file) (consumed++, *file++) #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #ifdef WIDE_SCANF -#define _FUNCTION_ static int MSVCRT_vswscanf(const MSVCRT_wchar_t *file, const MSVCRT_wchar_t *format, va_list ap) +#define _FUNCTION_ static int MSVCRT_vswscanf(const MSVCRT_wchar_t *file, const MSVCRT_wchar_t *format, ms_va_list ap) #else /* WIDE_SCANF */ -#define _FUNCTION_ static int MSVCRT_vsscanf(const char *file, const char *format, va_list ap) +#define _FUNCTION_ static int MSVCRT_vsscanf(const char *file, const char *format, ms_va_list ap) #endif /* WIDE_SCANF */ #else /* STRING */ #ifdef WIDE_SCANF #define _GETC_(file) (consumed++, MSVCRT_fgetwc(file)) #define _UNGETC_(nch, file) do { MSVCRT_ungetwc(nch, file); consumed--; } while(0) -#define _FUNCTION_ static int MSVCRT_vfwscanf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, va_list ap) +#define _FUNCTION_ static int MSVCRT_vfwscanf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ms_va_list ap) #else /* WIDE_SCANF */ #define _GETC_(file) (consumed++, MSVCRT_fgetc(file)) #define _UNGETC_(nch, file) do { MSVCRT_ungetc(nch, file); consumed--; } while(0) -#define _FUNCTION_ static int MSVCRT_vfscanf(MSVCRT_FILE* file, const char *format, va_list ap) +#define _FUNCTION_ static int MSVCRT_vfscanf(MSVCRT_FILE* file, const char *format, ms_va_list ap) #endif /* WIDE_SCANF */ #endif /* STRING */ #endif /* CONSOLE */ diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 317d7d33c64..91fb426f631 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -233,30 +233,30 @@ static char* str_array_get_ref(struct array* cref, unsigned idx) */ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) { - va_list args; + ms_va_list args; size_t len = 1, i, sz; char* tmp; char* p; char* t; - va_start(args, format); + ms_va_start(args, format); for (i = 0; format[i]; i++) { if (format[i] == '%') { switch (format[++i]) { - case 's': t = va_arg(args, char*); if (t) len += strlen(t); break; - case 'c': (void)va_arg(args, int); len++; break; + case 's': t = ms_va_arg(args, char*); if (t) len += strlen(t); break; + case 'c': (void)ms_va_arg(args, int); len++; break; default: i--; /* fall thru */ case '%': len++; break; } } else len++; } - va_end(args); + ms_va_end(args); if (!(tmp = und_alloc(sym, len))) return NULL; - va_start(args, format); + ms_va_start(args, format); for (p = tmp, i = 0; format[i]; i++) { if (format[i] == '%') @@ -264,7 +264,7 @@ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) switch (format[++i]) { case 's': - t = va_arg(args, char*); + t = ms_va_arg(args, char*); if (t) { sz = strlen(t); @@ -273,7 +273,7 @@ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) } break; case 'c': - *p++ = (char)va_arg(args, int); + *p++ = (char)ms_va_arg(args, int); break; default: i--; /* fall thru */ case '%': *p++ = '%'; break; @@ -281,7 +281,7 @@ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) } else *p++ = format[i]; } - va_end(args); + ms_va_end(args); *p = '\0'; return tmp; } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 65b8c2e8793..166e6815518 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -525,7 +525,7 @@ static void pf_fixup_exponent( char *buf ) * * implements both A and W vsnprintf functions */ -static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) +static int pf_vsnprintf( pf_output *out, const WCHAR *format, ms_va_list valist ) { int r; LPCWSTR q, p = format; @@ -592,7 +592,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) flags.FieldLength = 0; if( *p == '*' ) { - flags.FieldLength = va_arg( valist, int ); + flags.FieldLength = ms_va_arg( valist, int ); if (flags.FieldLength < 0) { flags.LeftAlign = '-'; @@ -614,7 +614,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) p++; if( *p == '*' ) { - flags.Precision = va_arg( valist, int ); + flags.Precision = ms_va_arg( valist, int ); p++; } else while( isdigit(*p) ) @@ -664,13 +664,13 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) } /* output a string */ if( flags.Format == 's' || flags.Format == 'S' ) - r = pf_handle_string_format( out, va_arg(valist, const void*), -1, + r = pf_handle_string_format( out, ms_va_arg(valist, const void*), -1, &flags, (flags.Format == 'S') ); /* output a single character */ else if( flags.Format == 'c' || flags.Format == 'C' ) { - INT ch = va_arg( valist, int ); + INT ch = ms_va_arg( valist, int ); r = pf_handle_string_format( out, &ch, 1, &flags, (flags.Format == 'C') ); } @@ -682,16 +682,16 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) flags.PadZero = 0; if( flags.Alternate ) - sprintf(pointer, "0X%08lX", va_arg(valist, long)); + sprintf(pointer, "0X%08lX", ms_va_arg(valist, long)); else - sprintf(pointer, "%08lX", va_arg(valist, long)); + sprintf(pointer, "%08lX", ms_va_arg(valist, long)); r = pf_output_format_A( out, pointer, -1, &flags ); } /* deal with %n */ else if( flags.Format == 'n' ) { - int *x = va_arg(valist, int *); + int *x = ms_va_arg(valist, int *); *x = out->used; } @@ -711,7 +711,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) if( x_len >= sizeof number) x = HeapAlloc( GetProcessHeap(), 0, x_len ); - pf_integer_conv( x, x_len, &flags, va_arg(valist, LONGLONG) ); + pf_integer_conv( x, x_len, &flags, ms_va_arg(valist, LONGLONG) ); r = pf_output_format_A( out, x, -1, &flags ); if( x != number ) @@ -738,12 +738,12 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) if( pf_is_double_format( flags.Format ) ) { - sprintf( x, fmt, va_arg(valist, double) ); + sprintf( x, fmt, ms_va_arg(valist, double) ); if (toupper(flags.Format) == 'E' || toupper(flags.Format) == 'G') pf_fixup_exponent( x ); } else - sprintf( x, fmt, va_arg(valist, int) ); + sprintf( x, fmt, ms_va_arg(valist, int) ); r = pf_output_stringA( out, x, -1 ); if( x != number ) @@ -768,7 +768,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) * _vsnprintf (MSVCRT.@) */ int CDECL MSVCRT_vsnprintf( char *str, unsigned int len, - const char *format, va_list valist ) + const char *format, ms_va_list valist ) { DWORD sz; LPWSTR formatW = NULL; @@ -797,7 +797,7 @@ int CDECL MSVCRT_vsnprintf( char *str, unsigned int len, /********************************************************************* * vsprintf (MSVCRT.@) */ -int CDECL MSVCRT_vsprintf( char *str, const char *format, va_list valist) +int CDECL MSVCRT_vsprintf( char *str, const char *format, ms_va_list valist) { return MSVCRT_vsnprintf(str, INT_MAX, format, valist); } @@ -808,10 +808,10 @@ int CDECL MSVCRT_vsprintf( char *str, const char *format, va_list valist) int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) { int retval; - va_list valist; - va_start(valist, format); + ms_va_list valist; + ms_va_start(valist, format); retval = MSVCRT_vsnprintf(str, len, format, valist); - va_end(valist); + ms_va_end(valist); return retval; } @@ -819,7 +819,7 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) * _vsnwsprintf (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, - const MSVCRT_wchar_t *format, va_list valist ) + const MSVCRT_wchar_t *format, ms_va_list valist ) { pf_output out; @@ -837,10 +837,10 @@ int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, int CDECL MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, ...) { int retval; - va_list valist; - va_start(valist, format); + ms_va_list valist; + ms_va_start(valist, format); retval = MSVCRT_vsnwprintf(str, len, format, valist); - va_end(valist); + ms_va_end(valist); return retval; } @@ -849,12 +849,12 @@ int CDECL MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT */ int CDECL MSVCRT_sprintf( char *str, const char *format, ... ) { - va_list ap; + ms_va_list ap; int r; - va_start( ap, format ); + ms_va_start( ap, format ); r = MSVCRT_vsnprintf( str, INT_MAX, format, ap ); - va_end( ap ); + ms_va_end( ap ); return r; } @@ -863,19 +863,19 @@ int CDECL MSVCRT_sprintf( char *str, const char *format, ... ) */ int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ... ) { - va_list ap; + ms_va_list ap; int r; - va_start( ap, format ); + ms_va_start( ap, format ); r = MSVCRT_vsnwprintf( str, INT_MAX, format, ap ); - va_end( ap ); + ms_va_end( ap ); return r; } /********************************************************************* * vswprintf (MSVCRT.@) */ -int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, va_list args ) +int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, ms_va_list args ) { return MSVCRT_vsnwprintf( str, INT_MAX, format, args ); } @@ -883,7 +883,7 @@ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, v /********************************************************************* * vswprintf_s (MSVCRT.@) */ -int CDECL MSVCRT_vswprintf_s( MSVCRT_wchar_t* str, MSVCRT_size_t num, const MSVCRT_wchar_t* format, va_list args ) +int CDECL MSVCRT_vswprintf_s( MSVCRT_wchar_t* str, MSVCRT_size_t num, const MSVCRT_wchar_t* format, ms_va_list args ) { /* FIXME: must handle positional arguments */ return MSVCRT_vsnwprintf( str, num, format, args ); diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 4a8b260e233..85e67ce43b1 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -429,7 +429,7 @@ NTSTATUS WINAPI RtlFindMessage( HMODULE hmod, ULONG type, ULONG lang, * MaxWidth [I] Maximum width in characters of each output line. * IgnoreInserts [I] Whether to copy the message without processing inserts. * Ansi [I] Whether Arguments may have ANSI strings. - * ArgumentsIsArray [I] Whether Arguments is actually an array rather than a va_list *. + * ArgumentsIsArray [I] Whether Arguments is actually an array rather than a ms_va_list *. * Buffer [O] Buffer to store processed message in. * BufferSize [I] Size of Buffer (in bytes?). * @@ -438,7 +438,7 @@ NTSTATUS WINAPI RtlFindMessage( HMODULE hmod, ULONG type, ULONG lang, */ NTSTATUS WINAPI RtlFormatMessage( LPWSTR Message, UCHAR MaxWidth, BOOLEAN IgnoreInserts, BOOLEAN Ansi, - BOOLEAN ArgumentIsArray, va_list * Arguments, + BOOLEAN ArgumentIsArray, ms_va_list * Arguments, LPWSTR Buffer, ULONG BufferSize ) { FIXME("(%s, %u, %s, %s, %s, %p, %p, %d)\n", debugstr_w(Message), diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index a4d1dacbdb7..565f13a6bc2 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -303,11 +303,11 @@ void WINAPI RtlDumpResource(LPRTL_RWLOCK rwl) NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...) { char buf[512]; - va_list args; + ms_va_list args; - va_start(args, fmt); + ms_va_start(args, fmt); vsprintf(buf,fmt, args); - va_end(args); + ms_va_end(args); MESSAGE("DbgPrint says: %s",buf); /* hmm, raise exception? */ @@ -321,18 +321,18 @@ NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...) NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...) { NTSTATUS ret; - va_list args; + ms_va_list args; - va_start(args, fmt); + ms_va_start(args, fmt); ret = vDbgPrintEx(iComponentId, Level, fmt, args); - va_end(args); + ms_va_end(args); return ret; } /****************************************************************************** * vDbgPrintEx [NTDLL.@] */ -NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, va_list args ) +NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, ms_va_list args ) { return vDbgPrintExWithPrefix( "", id, level, fmt, args ); } @@ -340,7 +340,7 @@ NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, va_list args ) /****************************************************************************** * vDbgPrintExWithPrefix [NTDLL.@] */ -NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPCSTR fmt, va_list args ) +NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPCSTR fmt, ms_va_list args ) { char buf[1024]; diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 604154cc7c1..f97c948a765 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -758,10 +758,10 @@ LONG __cdecl NTDLL_atol( const char *nptr ) int __cdecl NTDLL_sprintf( char *str, const char *format, ... ) { int ret; - va_list valist; - va_start( valist, format ); + ms_va_list valist; + ms_va_start( valist, format ); ret = vsprintf( str, format, valist ); - va_end( valist ); + ms_va_end( valist ); return ret; } @@ -769,7 +769,7 @@ int __cdecl NTDLL_sprintf( char *str, const char *format, ... ) /********************************************************************* * vsprintf (NTDLL.@) */ -int __cdecl NTDLL_vsprintf( char *str, const char *format, va_list args ) +int __cdecl NTDLL_vsprintf( char *str, const char *format, ms_va_list args ) { return vsprintf( str, format, args ); } @@ -781,10 +781,10 @@ int __cdecl NTDLL_vsprintf( char *str, const char *format, va_list args ) int __cdecl _snprintf( char *str, size_t len, const char *format, ... ) { int ret; - va_list valist; - va_start( valist, format ); + ms_va_list valist; + ms_va_start( valist, format ); ret = vsnprintf( str, len, format, valist ); - va_end( valist ); + ms_va_end( valist ); return ret; } @@ -792,7 +792,7 @@ int __cdecl _snprintf( char *str, size_t len, const char *format, ... ) /********************************************************************* * _vsnprintf (NTDLL.@) */ -int __cdecl _vsnprintf( char *str, size_t len, const char *format, va_list args ) +int __cdecl _vsnprintf( char *str, size_t len, const char *format, ms_va_list args ) { return vsnprintf( str, len, format, args ); } @@ -804,10 +804,10 @@ int __cdecl _vsnprintf( char *str, size_t len, const char *format, va_list args int __cdecl NTDLL_sscanf( const char *str, const char *format, ... ) { int ret; - va_list valist; - va_start( valist, format ); + ms_va_list valist; + ms_va_start( valist, format ); ret = vsscanf( str, format, valist ); - va_end( valist ); + ms_va_end( valist ); return ret; } diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index f987fc25854..80d9f3b88e9 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -731,10 +731,10 @@ LONGLONG __cdecl _wtoi64( LPCWSTR str ) int __cdecl _snwprintf(WCHAR *str, unsigned int len, const WCHAR *format, ...) { int retval; - va_list valist; - va_start(valist, format); + ms_va_list valist; + ms_va_start(valist, format); retval = vsnprintfW(str, len, format, valist); - va_end(valist); + ms_va_end(valist); return retval; } @@ -745,10 +745,10 @@ int __cdecl _snwprintf(WCHAR *str, unsigned int len, const WCHAR *format, ...) int __cdecl NTDLL_swprintf(WCHAR *str, const WCHAR *format, ...) { int retval; - va_list valist; - va_start(valist, format); + ms_va_list valist; + ms_va_start(valist, format); retval = vsnprintfW(str, INT_MAX, format, valist); - va_end(valist); + ms_va_end(valist); return retval; } @@ -756,7 +756,7 @@ int __cdecl NTDLL_swprintf(WCHAR *str, const WCHAR *format, ...) /*********************************************************************** * _vsnwprintf (NTDLL.@) */ -int __cdecl _vsnwprintf( WCHAR *str, unsigned int len, const WCHAR *format, va_list args ) +int __cdecl _vsnwprintf( WCHAR *str, unsigned int len, const WCHAR *format, ms_va_list args ) { return vsnprintfW( str, len, format, args ); } diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index a9455692b36..fd36b192ac5 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -356,10 +356,10 @@ int WINAPIV ShellMessageBoxW( WCHAR szText[100],szTitle[100]; LPCWSTR pszText = szText, pszTitle = szTitle; LPWSTR pszTemp; - va_list args; + ms_va_list args; int ret; - va_start(args, uType); + ms_va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ TRACE("(%p,%p,%p,%p,%08x)\n", @@ -378,7 +378,7 @@ int WINAPIV ShellMessageBoxW( FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args); - va_end(args); + ms_va_end(args); ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType); LocalFree((HLOCAL)pszTemp); @@ -414,10 +414,10 @@ int WINAPIV ShellMessageBoxA( char szText[100],szTitle[100]; LPCSTR pszText = szText, pszTitle = szTitle; LPSTR pszTemp; - va_list args; + ms_va_list args; int ret; - va_start(args, uType); + ms_va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ TRACE("(%p,%p,%p,%p,%08x)\n", @@ -436,7 +436,7 @@ int WINAPIV ShellMessageBoxA( FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPSTR)&pszTemp, 0, &args); - va_end(args); + ms_va_end(args); ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType); LocalFree((HLOCAL)pszTemp); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 9176420da55..8191205524e 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -291,7 +291,7 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); + szText, 0, 0, szBuffer, sizeof(szBuffer), (ms_va_list*)args); hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 68e934f216c..a5e7c67d787 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2816,7 +2816,7 @@ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEM * * _SHPackDispParamsV */ -HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, va_list valist) +HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ms_va_list valist) { VARIANTARG *iter; @@ -2830,32 +2830,32 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, iter = args+cnt; while(iter-- > args) { - V_VT(iter) = va_arg(valist, enum VARENUM); + V_VT(iter) = ms_va_arg(valist, enum VARENUM); TRACE("vt=%d\n", V_VT(iter)); if(V_VT(iter) & VT_BYREF) { - V_BYREF(iter) = va_arg(valist, LPVOID); + V_BYREF(iter) = ms_va_arg(valist, LPVOID); } else { switch(V_VT(iter)) { case VT_I4: - V_I4(iter) = va_arg(valist, LONG); + V_I4(iter) = ms_va_arg(valist, LONG); break; case VT_BSTR: - V_BSTR(iter) = va_arg(valist, BSTR); + V_BSTR(iter) = ms_va_arg(valist, BSTR); break; case VT_DISPATCH: - V_DISPATCH(iter) = va_arg(valist, IDispatch*); + V_DISPATCH(iter) = ms_va_arg(valist, IDispatch*); break; case VT_BOOL: - V_BOOL(iter) = va_arg(valist, int); + V_BOOL(iter) = ms_va_arg(valist, int); break; case VT_UNKNOWN: - V_UNKNOWN(iter) = va_arg(valist, IUnknown*); + V_UNKNOWN(iter) = ms_va_arg(valist, IUnknown*); break; default: V_VT(iter) = VT_I4; - V_I4(iter) = va_arg(valist, LONG); + V_I4(iter) = ms_va_arg(valist, LONG); } } } @@ -2870,14 +2870,14 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, */ HRESULT WINAPIV SHPackDispParams(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ...) { - va_list valist; + ms_va_list valist; HRESULT hres; - va_start(valist, cnt); + ms_va_start(valist, cnt); hres = SHPackDispParamsV(params, args, cnt, valist); - va_end(valist); + ms_va_end(valist); return hres; } @@ -3003,7 +3003,7 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam( IConnectionPoint *iCP; IConnectionPointContainer *iCPC; DISPPARAMS dispParams = {buffer, NULL, cParams, 0}; - va_list valist; + ms_va_list valist; if (!container) return E_NOINTERFACE; @@ -3017,9 +3017,9 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam( if(FAILED(result)) return result; - va_start(valist, cParams); + ms_va_start(valist, cParams); SHPackDispParamsV(&dispParams, buffer, cParams, valist); - va_end(valist); + ms_va_end(valist); result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams); IConnectionPoint_Release(iCP); @@ -4311,10 +4311,10 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, WCHAR szText[100], szTitle[100]; LPCWSTR pszText = szText, pszTitle = szTitle; LPWSTR pszTemp; - va_list args; + ms_va_list args; int ret; - va_start(args, uType); + ms_va_start(args, uType); TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType); @@ -4331,7 +4331,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args); - va_end(args); + ms_va_end(args); ret = MessageBoxW(hWnd, pszTemp, pszTitle, uType); LocalFree(pszTemp); diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index d10881f02df..37353170996 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -284,7 +284,7 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, * Success: The number of characters written. * Failure: -1. */ -INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args ) +INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, ms_va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -304,21 +304,21 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args ) switch(format.type) { case WPR_WCHAR: - argData.wchar_view = (WCHAR)va_arg( args, int ); + argData.wchar_view = (WCHAR)ms_va_arg( args, int ); break; case WPR_CHAR: - argData.char_view = (CHAR)va_arg( args, int ); + argData.char_view = (CHAR)ms_va_arg( args, int ); break; case WPR_STRING: - argData.lpcstr_view = va_arg( args, LPCSTR ); + argData.lpcstr_view = ms_va_arg( args, LPCSTR ); break; case WPR_WSTRING: - argData.lpcwstr_view = va_arg( args, LPCWSTR ); + argData.lpcwstr_view = ms_va_arg( args, LPCWSTR ); break; case WPR_HEXA: case WPR_SIGNED: case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); + argData.int_view = ms_va_arg( args, INT ); break; default: argData.wchar_view = 0; @@ -389,7 +389,7 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args ) * * See wvnsprintfA. */ -INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args ) +INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, ms_va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer; @@ -409,21 +409,21 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args ) switch(format.type) { case WPR_WCHAR: - argData.wchar_view = (WCHAR)va_arg( args, int ); + argData.wchar_view = (WCHAR)ms_va_arg( args, int ); break; case WPR_CHAR: - argData.char_view = (CHAR)va_arg( args, int ); + argData.char_view = (CHAR)ms_va_arg( args, int ); break; case WPR_STRING: - argData.lpcstr_view = va_arg( args, LPCSTR ); + argData.lpcstr_view = ms_va_arg( args, LPCSTR ); break; case WPR_WSTRING: - argData.lpcwstr_view = va_arg( args, LPCWSTR ); + argData.lpcwstr_view = ms_va_arg( args, LPCWSTR ); break; case WPR_HEXA: case WPR_SIGNED: case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); + argData.int_view = ms_va_arg( args, INT ); break; default: argData.wchar_view = 0; @@ -504,12 +504,12 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args ) */ int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...) { - va_list valist; + ms_va_list valist; INT res; - va_start( valist, lpFmt ); + ms_va_start( valist, lpFmt ); res = wvnsprintfA( lpOut, cchLimitIn, lpFmt, valist ); - va_end( valist ); + ms_va_end( valist ); return res; } @@ -521,11 +521,11 @@ int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...) */ int WINAPIV wnsprintfW(LPWSTR lpOut, int cchLimitIn, LPCWSTR lpFmt, ...) { - va_list valist; + ms_va_list valist; INT res; - va_start( valist, lpFmt ); + ms_va_start( valist, lpFmt ); res = wvnsprintfW( lpOut, cchLimitIn, lpFmt, valist ); - va_end( valist ); + ms_va_end( valist ); return res; } diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 64a160fec87..cd8bb60fb0f 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -1688,10 +1688,10 @@ DWORD WINAPI FormatMessage16( WORD dwLanguageId, LPSTR lpBuffer, /* [out] NOTE: *((HLOCAL16*)) for FORMAT_MESSAGE_ALLOCATE_BUFFER*/ WORD nSize, - LPDWORD args ) /* [in] NOTE: va_list *args */ + LPDWORD args ) /* [in] NOTE: ms_va_list *args */ { #ifdef __i386__ -/* This implementation is completely dependent on the format of the va_list on x86 CPUs */ +/* This implementation is completely dependent on the format of the ms_va_list on x86 CPUs */ LPSTR target,t; DWORD talloced; LPSTR from,f; @@ -1800,8 +1800,8 @@ DWORD WINAPI FormatMessage16( argliststart=args+insertnr-1; - /* CMF - This makes a BIG assumption about va_list */ - while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart) < 0) || (ret >= sz)) { + /* CMF - This makes a BIG assumption about ms_va_list */ + while ((ret = vsnprintf(b, sz, fmtstr, (ms_va_list) argliststart) < 0) || (ret >= sz)) { sz = (ret == -1 ? sz + 100 : ret + 1); b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); } diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index 7f98bee01a6..1c8b3a70623 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -385,7 +385,7 @@ static INT16 wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec, VA_LIST16 a /*********************************************************************** * wvsnprintfA (internal) */ -static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) +static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, ms_va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -405,21 +405,21 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) switch(format.type) { case WPR_WCHAR: - argData.wchar_view = (WCHAR)va_arg( args, int ); + argData.wchar_view = (WCHAR)ms_va_arg( args, int ); break; case WPR_CHAR: - argData.char_view = (CHAR)va_arg( args, int ); + argData.char_view = (CHAR)ms_va_arg( args, int ); break; case WPR_STRING: - argData.lpcstr_view = va_arg( args, LPCSTR ); + argData.lpcstr_view = ms_va_arg( args, LPCSTR ); break; case WPR_WSTRING: - argData.lpcwstr_view = va_arg( args, LPCWSTR ); + argData.lpcwstr_view = ms_va_arg( args, LPCWSTR ); break; case WPR_HEXA: case WPR_SIGNED: case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); + argData.int_view = ms_va_arg( args, INT ); break; default: argData.wchar_view = 0; @@ -488,7 +488,7 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) /*********************************************************************** * wvsnprintfW (internal) */ -static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args ) +static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, ms_va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer; @@ -508,21 +508,21 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args ) switch(format.type) { case WPR_WCHAR: - argData.wchar_view = (WCHAR)va_arg( args, int ); + argData.wchar_view = (WCHAR)ms_va_arg( args, int ); break; case WPR_CHAR: - argData.char_view = (CHAR)va_arg( args, int ); + argData.char_view = (CHAR)ms_va_arg( args, int ); break; case WPR_STRING: - argData.lpcstr_view = va_arg( args, LPCSTR ); + argData.lpcstr_view = ms_va_arg( args, LPCSTR ); break; case WPR_WSTRING: - argData.lpcwstr_view = va_arg( args, LPCWSTR ); + argData.lpcwstr_view = ms_va_arg( args, LPCWSTR ); break; case WPR_HEXA: case WPR_SIGNED: case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); + argData.int_view = ms_va_arg( args, INT ); break; default: argData.wchar_view = 0; @@ -603,7 +603,7 @@ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, VA_LIST16 args ) /*********************************************************************** * wvsprintfA (USER32.@) */ -INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) +INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, ms_va_list args ) { INT res = wvsnprintfA( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -613,7 +613,7 @@ INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) /*********************************************************************** * wvsprintfW (USER32.@) */ -INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args ) +INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, ms_va_list args ) { INT res = wvsnprintfW( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -637,12 +637,12 @@ INT16 WINAPIV wsprintf16( LPSTR buffer, LPCSTR spec, VA_LIST16 valist ) */ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) { - va_list valist; + ms_va_list valist; INT res; - va_start( valist, spec ); + ms_va_start( valist, spec ); res = wvsnprintfA( buffer, 1024, spec, valist ); - va_end( valist ); + ms_va_end( valist ); return ( res == -1 ) ? 1024 : res; } @@ -652,11 +652,11 @@ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) */ INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... ) { - va_list valist; + ms_va_list valist; INT res; - va_start( valist, spec ); + ms_va_start( valist, spec ); res = wvsnprintfW( buffer, 1024, spec, valist ); - va_end( valist ); + ms_va_end( valist ); return ( res == -1 ) ? 1024 : res; } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ade458627f4..9d97bee7f5c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -61,10 +61,10 @@ int shader_addline( char* base = buffer->buffer + buffer->bsize; int rc; - va_list args; - va_start(args, format); + ms_va_list args; + ms_va_start(args, format); rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->bsize, format, args); - va_end(args); + ms_va_end(args); if (rc < 0 || /* C89 */ rc > SHADER_PGMSIZE - 1 - buffer->bsize) { /* C99 */ diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 5615135f369..9751a43bba2 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -325,12 +325,12 @@ ULONG CDECL WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len ) INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP - va_list list; + ms_va_list list; int ret = 0; char new_fmt[2]; new_fmt[1] = 0; - va_start( list, fmt ); + ms_va_start( list, fmt ); while (*fmt) { new_fmt[0] = *fmt++; @@ -340,39 +340,39 @@ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) case 'e': case 'i': { - int i = va_arg( list, int ); + int i = ms_va_arg( list, int ); ret = ber_printf( berelement, new_fmt, i ); break; } case 'o': case 's': { - char *str = va_arg( list, char * ); + char *str = ms_va_arg( list, char * ); ret = ber_printf( berelement, new_fmt, str ); break; } case 't': { - unsigned int tag = va_arg( list, unsigned int ); + unsigned int tag = ms_va_arg( list, unsigned int ); ret = ber_printf( berelement, new_fmt, tag ); break; } case 'v': { - char **array = va_arg( list, char ** ); + char **array = ms_va_arg( list, char ** ); ret = ber_printf( berelement, new_fmt, array ); break; } case 'V': { - struct berval **array = va_arg( list, struct berval ** ); + struct berval **array = ms_va_arg( list, struct berval ** ); ret = ber_printf( berelement, new_fmt, array ); break; } case 'X': { - char *str = va_arg( list, char * ); - int len = va_arg( list, int ); + char *str = ms_va_arg( list, char * ); + int len = ms_va_arg( list, int ); new_fmt[0] = 'B'; /* 'X' is deprecated */ ret = ber_printf( berelement, new_fmt, str, len ); break; @@ -391,7 +391,7 @@ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) } if (ret == -1) break; } - va_end( list ); + ms_va_end( list ); return ret; #else return LBER_ERROR; @@ -420,12 +420,12 @@ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP - va_list list; + ms_va_list list; int ret = 0; char new_fmt[2]; new_fmt[1] = 0; - va_start( list, fmt ); + ms_va_start( list, fmt ); while (*fmt) { new_fmt[0] = *fmt++; @@ -433,7 +433,7 @@ INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) { case 'a': { - char **ptr = va_arg( list, char ** ); + char **ptr = ms_va_arg( list, char ** ); ret = ber_scanf( berelement, new_fmt, ptr ); break; } @@ -441,38 +441,38 @@ INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) case 'e': case 'i': { - int *i = va_arg( list, int * ); + int *i = ms_va_arg( list, int * ); ret = ber_scanf( berelement, new_fmt, i ); break; } case 't': { - unsigned int *tag = va_arg( list, unsigned int * ); + unsigned int *tag = ms_va_arg( list, unsigned int * ); ret = ber_scanf( berelement, new_fmt, tag ); break; } case 'v': { - char ***array = va_arg( list, char *** ); + char ***array = ms_va_arg( list, char *** ); ret = ber_scanf( berelement, new_fmt, array ); break; } case 'B': { - char **str = va_arg( list, char ** ); - int *len = va_arg( list, int * ); + char **str = ms_va_arg( list, char ** ); + int *len = ms_va_arg( list, int * ); ret = ber_scanf( berelement, new_fmt, str, len ); break; } case 'O': { - struct berval **ptr = va_arg( list, struct berval ** ); + struct berval **ptr = ms_va_arg( list, struct berval ** ); ret = ber_scanf( berelement, new_fmt, ptr ); break; } case 'V': { - struct berval ***array = va_arg( list, struct berval *** ); + struct berval ***array = ms_va_arg( list, struct berval *** ); ret = ber_scanf( berelement, new_fmt, array ); break; } @@ -491,7 +491,7 @@ INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) } if (ret == -1) break; } - va_end( list ); + ms_va_end( list ); return ret; #else return LBER_ERROR; diff --git a/include/shlwapi.h b/include/shlwapi.h index b723e546575..6754c4bbc10 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -859,8 +859,8 @@ BOOL WINAPI StrTrimA(LPSTR,LPCSTR); BOOL WINAPI StrTrimW(LPWSTR,LPCWSTR); #define StrTrim WINELIB_NAME_AW(StrTrim) -INT WINAPI wvnsprintfA(LPSTR,INT,LPCSTR,va_list); -INT WINAPI wvnsprintfW(LPWSTR,INT,LPCWSTR,va_list); +INT WINAPI wvnsprintfA(LPSTR,INT,LPCSTR,ms_va_list); +INT WINAPI wvnsprintfW(LPWSTR,INT,LPCWSTR,ms_va_list); #define wvnsprintf WINELIB_NAME_AW(wvnsprintf) INT WINAPIV wnsprintfA(LPSTR,INT,LPCSTR, ...); diff --git a/include/winbase.h b/include/winbase.h index f7bb9bf27ff..0a2d37ea3c0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1533,8 +1533,8 @@ WINBASEAPI BOOL WINAPI FlsSetValue(DWORD,PVOID); WINBASEAPI BOOL WINAPI FlushFileBuffers(HANDLE); WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,SIZE_T); WINBASEAPI BOOL WINAPI FlushViewOfFile(LPCVOID,SIZE_T); -WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*); -WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*); +WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,ms_va_list*); +WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,ms_va_list*); #define FormatMessage WINELIB_NAME_AW(FormatMessage) WINBASEAPI BOOL WINAPI FreeEnvironmentStringsA(LPSTR); WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); diff --git a/include/windef.h b/include/windef.h index 3c9de7a9137..5ceb8e6ae4e 100644 --- a/include/windef.h +++ b/include/windef.h @@ -84,6 +84,31 @@ extern "C" { # endif #endif /* __cdecl */ +#if defined(__x86_64__) && defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4))) && !defined(__MINGW64__) +/* redefine va_XXX to be compatible only with ms calling convention + * Note: This means all variadic functions in wine will have to have the ms calling convention too, + * including the functions in wine/debug.h + */ +/* Include first to avoid conflicts */ +#include + +#define ms_va_list __builtin_ms_va_list +/* va_arg is same for ms and sysv */ +#define ms_va_arg __builtin_va_arg +#define ms_va_start __builtin_ms_va_start +#define ms_va_copy __builtin_ms_va_copy +#define ms_va_end __builtin_ms_va_end +#elif !defined(RC_INVOKED) +/* Include first to avoid conflicts */ +#include + +#define ms_va_list va_list +#define ms_va_arg va_arg +#define ms_va_start va_start +#define ms_va_copy va_copy +#define ms_va_end va_end +#endif + #ifdef __WINESRC__ #define __ONLY_IN_WINELIB(x) do_not_use_this_in_wine #else diff --git a/include/winternl.h b/include/winternl.h index ed93bbf516c..4c38a9d54cc 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2331,7 +2331,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); -NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPWSTR,UCHAR,BOOLEAN,BOOLEAN,BOOLEAN,va_list *,LPWSTR,ULONG); +NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPWSTR,UCHAR,BOOLEAN,BOOLEAN,BOOLEAN,ms_va_list *,LPWSTR,ULONG); NTSYSAPI void WINAPI RtlFreeAnsiString(PANSI_STRING); NTSYSAPI BOOLEAN WINAPI RtlFreeHandle(RTL_HANDLE_TABLE *,RTL_HANDLE *); NTSYSAPI BOOLEAN WINAPI RtlFreeHeap(HANDLE,ULONG,PVOID); @@ -2500,8 +2500,8 @@ NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRI NTSYSAPI NTSTATUS WINAPI RtlpNtEnumerateSubKey(HANDLE,UNICODE_STRING *, ULONG); NTSYSAPI NTSTATUS WINAPI RtlpWaitForCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); -NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,va_list); -NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,va_list); +NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,ms_va_list); +NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,ms_va_list); /* Wine internal functions */ diff --git a/include/winuser.h b/include/winuser.h index 8382a07f22f..224eefe3ed8 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -5068,8 +5068,8 @@ WINUSERAPI VOID WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR); WINUSERAPI INT WINAPIV wsprintfA(LPSTR,LPCSTR,...); WINUSERAPI INT WINAPIV wsprintfW(LPWSTR,LPCWSTR,...); #define wsprintf WINELIB_NAME_AW(wsprintf) -WINUSERAPI INT WINAPI wvsprintfA(LPSTR,LPCSTR,va_list); -WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list); +WINUSERAPI INT WINAPI wvsprintfA(LPSTR,LPCSTR,ms_va_list); +WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,ms_va_list); #define wvsprintf WINELIB_NAME_AW(wvsprintf) /* Undocumented functions */ -- 2.11.4.GIT