Skip to content

W
wine-cw
Commit 2a92c58e authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

include: Use the standard va_list instead of __ms_va_list when building with msvcrt.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 29717168
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 197 deletions
dlls/msi/action.c
View file @ 2a92c58e
......@@ -1998,7 +1998,7 @@ static WCHAR *create_temp_dir( MSIDATABASE *db )
* A \ will not be added after the last segment, however if the
* last segment is NULL, then the last character will be a \
*/
WCHAR *msi_build_directory_name( DWORD count, ... )
WCHAR * WINAPIV msi_build_directory_name( DWORD count, ... )
{
DWORD sz = 1, i;
WCHAR *dir;
......
dlls/msi/msipriv.h
View file @ 2a92c58e
......@@ -1039,7 +1039,7 @@ extern MSIFOLDER *msi_get_loaded_folder(MSIPACKAGE *package, const WCHAR *dir) D
extern WCHAR *msi_create_temp_file(MSIDATABASE *db) DECLSPEC_HIDDEN;
extern void msi_free_action_script(MSIPACKAGE *package, UINT script) DECLSPEC_HIDDEN;
extern WCHAR *msi_build_icon_path(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN;
extern WCHAR *msi_build_directory_name(DWORD , ...) DECLSPEC_HIDDEN;
extern WCHAR * WINAPIV msi_build_directory_name(DWORD , ...) DECLSPEC_HIDDEN;
extern void msi_reduce_to_long_filename(WCHAR *) DECLSPEC_HIDDEN;
extern WCHAR *msi_create_component_advertise_string(MSIPACKAGE *, MSICOMPONENT *, const WCHAR *) DECLSPEC_HIDDEN;
extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, MSIFEATURE *feature) DECLSPEC_HIDDEN;
......
dlls/msvcrt/undname.c
View file @ 2a92c58e
......@@ -230,7 +230,7 @@ static char* str_array_get_ref(struct array* cref, unsigned idx)
* Helper for printf type of command (only %s and %c are implemented)
* while dynamically allocating the buffer
*/
static char* str_printf(struct parsed_symbol* sym, const char* format, ...)
static char* WINAPIV str_printf(struct parsed_symbol* sym, const char* format, ...)
{
va_list args;
unsigned int len = 1, i, sz;
......
dlls/rsaenh/mpi.c
View file @ 2a92c58e
......@@ -1029,7 +1029,7 @@ mp_clamp (mp_int * a)
}
}
void mp_clear_multi(mp_int *mp, ...)
void WINAPIV mp_clear_multi(mp_int *mp, ...)
{
mp_int* next_mp = mp;
va_list args;
......@@ -2351,7 +2351,7 @@ int mp_init_copy (mp_int * a, const mp_int * b)
return mp_copy (b, a);
}
int mp_init_multi(mp_int *mp, ...)
int WINAPIV mp_init_multi(mp_int *mp, ...)
{
mp_err res = MP_OKAY; /* Assume ok until proven otherwise */
int n = 0; /* Number of ok inits */
......
dlls/rsaenh/tomcrypt.h
View file @ 2a92c58e
......@@ -227,10 +227,10 @@ typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat);
char *mp_error_to_string(int code);
/* init a null terminated series of arguments */
int mp_init_multi(mp_int *mp, ...);
int WINAPIV mp_init_multi(mp_int *mp, ...);
/* clear a null terminated series of arguments */
void mp_clear_multi(mp_int *mp, ...);
void WINAPIV mp_clear_multi(mp_int *mp, ...);
/* shrink ram required for a bignum */
int mp_shrink(mp_int *a);
......
dlls/ucrtbase/printf.c
View file @ 2a92c58e
......@@ -25,9 +25,9 @@
#include <corecrt_stdio_config.h>
int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len,
const char *format, _locale_t locale, __ms_va_list valist);
const char *format, _locale_t locale, va_list valist);
int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args )
int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, va_list args )
{
return __stdio_common_vsprintf( _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
buf, size, fmt, NULL, args );
......
include/msvcrt/corecrt.h
View file @ 2a92c58e
......@@ -122,22 +122,16 @@
# endif
#endif
#ifndef __ms_va_list
# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__)
# define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list)
# define __ms_va_copy(dest,src) __builtin_ms_va_copy(dest,src)
# else
# define __ms_va_list va_list
# define __ms_va_start(list,arg) va_start(list,arg)
# define __ms_va_end(list) va_end(list)
# ifdef va_copy
# define __ms_va_copy(dest,src) va_copy(dest,src)
# else
# define __ms_va_copy(dest,src) ((dest) = (src))
# endif
# endif
#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__)
# include <stdarg.h>
# undef va_list
# undef va_start
# undef va_end
# undef va_copy
# define va_list __builtin_ms_va_list
# define va_start(list,arg) __builtin_ms_va_start(list,arg)
# define va_end(list) __builtin_ms_va_end(list)
# define va_copy(dest,src) __builtin_ms_va_copy(dest,src)
#endif
#ifndef WINAPIV
......
include/msvcrt/corecrt_wstdio.h
View file @ 2a92c58e
......@@ -82,21 +82,21 @@ _ACRTIMP wint_t __cdecl ungetwc(wint_t,FILE*);
#ifdef _UCRT
_ACRTIMP int __cdecl __stdio_common_vfwprintf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vfwprintf_s(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vswprintf_s(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vfwprintf(unsigned __int64,FILE*,const wchar_t*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vfwprintf_s(unsigned __int64,FILE*,const wchar_t*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vswprintf_s(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vfwscanf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vswscanf(unsigned __int64,const wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vfwscanf(unsigned __int64,FILE*,const wchar_t*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vswscanf(unsigned __int64,const wchar_t*,size_t,const wchar_t*,_locale_t,va_list);
#endif /* _UCRT */
#if defined(_UCRT) && !defined(_NO_CRT_STDIO_INLINE)
static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args)
static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, va_list args)
{
int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
return ret < 0 ? -1 : ret;
......@@ -105,15 +105,15 @@ static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_
static inline int WINAPIV _snwprintf(wchar_t *buffer, size_t size, const wchar_t* format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, __ms_va_list args)
static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, va_list args)
{
int ret = __stdio_common_vsnwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args);
return ret < 0 ? -1 : ret;
......@@ -122,15 +122,15 @@ static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t cou
static inline int WINAPIV _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vsnwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args)
static inline int __cdecl vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, va_list args)
{
int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
return ret < 0 ? -1 : ret;
......@@ -139,15 +139,15 @@ static inline int WINAPIV vswprintf(wchar_t *buffer, size_t size, const wchar_t
static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV _vswprintf(wchar_t *buffer, const wchar_t *format, __ms_va_list args)
static inline int __cdecl _vswprintf(wchar_t *buffer, const wchar_t *format, va_list args)
{
int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args);
return ret < 0 ? -1 : ret;
......@@ -156,15 +156,15 @@ static inline int WINAPIV _vswprintf(wchar_t *buffer, const wchar_t *format, __m
static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret < 0 ? -1 : ret;
}
static inline int WINAPIV vswprintf_s(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args)
static inline int __cdecl vswprintf_s(wchar_t *buffer, size_t size, const wchar_t *format, va_list args)
{
int ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
return ret < 0 ? -1 : ret;
......@@ -173,39 +173,39 @@ static inline int WINAPIV vswprintf_s(wchar_t *buffer, size_t size, const wchar_
static inline int WINAPIV swprintf_s(wchar_t *buffer, size_t size, const wchar_t* format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV _swprintf_l(wchar_t *buffer, size_t size, const wchar_t* format, _locale_t locale, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, locale);
va_start(args, locale);
ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args)
static inline int __cdecl _vscwprintf(const wchar_t *format, va_list args)
{
int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
NULL, 0, format, NULL, args);
return ret < 0 ? -1 : ret;
}
static inline int __cdecl _vswprintf_p_l(wchar_t *buffer, size_t size, const wchar_t *format, _locale_t locale, __ms_va_list args)
static inline int __cdecl _vswprintf_p_l(wchar_t *buffer, size_t size, const wchar_t *format, _locale_t locale, va_list args)
{
int ret = __stdio_common_vswprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args);
return ret < 0 ? -1 : ret;
}
static inline int __cdecl _vscwprintf_p_l(const wchar_t *format, _locale_t locale, __ms_va_list args)
static inline int __cdecl _vscwprintf_p_l(const wchar_t *format, _locale_t locale, va_list args)
{
int ret = __stdio_common_vswprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
NULL, 0, format, locale, args);
......@@ -215,16 +215,16 @@ static inline int __cdecl _vscwprintf_p_l(const wchar_t *format, _locale_t local
static inline int WINAPIV _scwprintf(const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
NULL, 0, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int __cdecl vfwprintf(FILE *file, const wchar_t *format, __ms_va_list args)
static inline int __cdecl vfwprintf(FILE *file, const wchar_t *format, va_list args)
{
return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
}
......@@ -232,15 +232,15 @@ static inline int __cdecl vfwprintf(FILE *file, const wchar_t *format, __ms_va_l
static inline int WINAPIV fwprintf(FILE *file, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int vfwprintf_s(FILE *file, const wchar_t *format, __ms_va_list args)
static inline int __cdecl vfwprintf_s(FILE *file, const wchar_t *format, va_list args)
{
return __stdio_common_vfwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
}
......@@ -248,15 +248,15 @@ static inline int vfwprintf_s(FILE *file, const wchar_t *format, __ms_va_list ar
static inline int WINAPIV fwprintf_s(FILE *file, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = vfwprintf_s(file, format, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int __cdecl vwprintf(const wchar_t *format, __ms_va_list args)
static inline int __cdecl vwprintf(const wchar_t *format, va_list args)
{
return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
}
......@@ -264,15 +264,15 @@ static inline int __cdecl vwprintf(const wchar_t *format, __ms_va_list args)
static inline int WINAPIV wprintf(const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int vwprintf_s(const wchar_t *format, __ms_va_list args)
static inline int __cdecl vwprintf_s(const wchar_t *format, va_list args)
{
return __stdio_common_vfwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
}
......@@ -280,77 +280,77 @@ static inline int vwprintf_s(const wchar_t *format, __ms_va_list args)
static inline int WINAPIV wprintf_s(const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = vfwprintf_s(stdout, format, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV swscanf(const wchar_t *buffer, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, -1, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV swscanf_s(const wchar_t *buffer, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, buffer, -1, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV fwscanf(FILE *file, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, file, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV fwscanf_s(FILE *file, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, file, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV wscanf(FILE *file, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV wscanf_s(FILE *file, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, stdin, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
......@@ -359,39 +359,39 @@ static inline int WINAPIV wscanf_s(FILE *file, const wchar_t *format, ...)
_ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...);
_ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...);
_ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...);
_ACRTIMP int __cdecl _vscwprintf(const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl _vscwprintf(const wchar_t*,va_list);
_ACRTIMP int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,va_list);
_ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list);
_ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,va_list);
_ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,va_list);
_ACRTIMP int WINAPIV fwprintf(FILE*,const wchar_t*,...);
_ACRTIMP int WINAPIV fwprintf_s(FILE*,const wchar_t*,...);
_ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...);
_ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl vwprintf(const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl vwprintf_s(const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,va_list);
_ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,va_list);
_ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,va_list);
_ACRTIMP int __cdecl vwprintf(const wchar_t*,va_list);
_ACRTIMP int __cdecl vwprintf_s(const wchar_t*,va_list);
_ACRTIMP int WINAPIV wprintf(const wchar_t*,...);
_ACRTIMP int WINAPIV wprintf_s(const wchar_t*,...);
#ifdef _CRT_NON_CONFORMING_SWPRINTFS
_ACRTIMP int WINAPIV swprintf(wchar_t*,const wchar_t*,...);
_ACRTIMP int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl vswprintf(wchar_t*,const wchar_t*,va_list);
#elif !defined(_NO_CRT_STDIO_INLINE)
static inline int vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { return _vsnwprintf(buffer,size,format,args); }
static inline int __cdecl vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, va_list args) { return _vsnwprintf(buffer,size,format,args); }
static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = _vsnwprintf(buffer, size, format, args);
__ms_va_end(args);
va_end(args);
return ret;
}
#else
_ACRTIMP int vswprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list);
_ACRTIMP int __cdecl vswprintf(wchar_t*,size_t,const wchar_t*,va_list);
_ACRTIMP int WINAPIV swprintf(wchar_t*,size_t,const wchar_t*,...);
#endif /* _CRT_NON_CONFORMING_SWPRINTFS */
......
include/msvcrt/stdio.h
View file @ 2a92c58e
......@@ -147,35 +147,35 @@ _ACRTIMP unsigned int __cdecl _set_output_format(unsigned int);
#ifdef _UCRT
_ACRTIMP int __cdecl __stdio_common_vfprintf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vfprintf_s(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vfprintf(unsigned __int64,FILE*,const char*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vfprintf_s(unsigned __int64,FILE*,const char*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,const char*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vfscanf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vsscanf(unsigned __int64,char const*,size_t,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl __stdio_common_vfscanf(unsigned __int64,FILE*,const char*,_locale_t,va_list);
_ACRTIMP int __cdecl __stdio_common_vsscanf(unsigned __int64,char const*,size_t,const char*,_locale_t,va_list);
#endif /* _UCRT */
#if defined(_UCRT) && !defined(_NO_CRT_STDIO_INLINE)
static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args)
static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, va_list args)
{
int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
buffer, size, format, NULL, args);
return ret < 0 ? -1 : ret;
}
static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args)
static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *format, va_list args)
{
int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION,
buffer, size, format, NULL, args);
return ret < 0 ? -1 : ret;
}
static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, const char *format, __ms_va_list args)
static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, const char *format, va_list args)
{
int ret = __stdio_common_vsnprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args);
return ret < 0 ? -1 : ret;
......@@ -184,15 +184,15 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count,
static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vsnprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int __cdecl _vscprintf(const char *format, __ms_va_list args)
static inline int __cdecl _vscprintf(const char *format, va_list args)
{
int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
NULL, 0, format, NULL, args);
......@@ -202,23 +202,23 @@ static inline int __cdecl _vscprintf(const char *format, __ms_va_list args)
static inline int WINAPIV _scprintf(const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
NULL, 0, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int __cdecl vsprintf(char *buffer, const char *format, __ms_va_list args)
static inline int __cdecl vsprintf(char *buffer, const char *format, va_list args)
{
int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION,
buffer, -1, format, NULL, args);
return ret < 0 ? -1 : ret;
}
static inline int __cdecl vsprintf_s(char *buffer, size_t size, const char *format, __ms_va_list args)
static inline int __cdecl vsprintf_s(char *buffer, size_t size, const char *format, va_list args)
{
int ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
return ret < 0 ? -1 : ret;
......@@ -227,21 +227,21 @@ static inline int __cdecl vsprintf_s(char *buffer, size_t size, const char *form
static inline int WINAPIV sprintf_s(char *buffer, size_t size, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *format, _locale_t locale, __ms_va_list args)
static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *format, _locale_t locale, va_list args)
{
int ret = __stdio_common_vsprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args);
return ret < 0 ? -1 : ret;
}
static inline int __cdecl vfprintf(FILE *file, const char *format, __ms_va_list args)
static inline int __cdecl vfprintf(FILE *file, const char *format, va_list args)
{
return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
}
......@@ -249,15 +249,15 @@ static inline int __cdecl vfprintf(FILE *file, const char *format, __ms_va_list
static inline int WINAPIV fprintf(FILE *file, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_list args)
static inline int __cdecl vfprintf_s(FILE *file, const char *format, va_list args)
{
return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
}
......@@ -265,15 +265,15 @@ static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_lis
static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int vprintf(const char *format, __ms_va_list args)
static inline int vprintf(const char *format, va_list args)
{
return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
}
......@@ -281,15 +281,15 @@ static inline int vprintf(const char *format, __ms_va_list args)
static inline int WINAPIV printf(const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int vprintf_s(const char *format, __ms_va_list args)
static inline int vprintf_s(const char *format, va_list args)
{
return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
}
......@@ -297,88 +297,88 @@ static inline int vprintf_s(const char *format, __ms_va_list args)
static inline int WINAPIV printf_s(const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV sscanf(const char *buffer, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, -1, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV sscanf_s(const char *buffer, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, buffer, -1, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV _snscanf_l(const char *buffer, size_t size, const char *format, _locale_t locale, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, locale);
va_start(args, locale);
ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, size, format, locale, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV fscanf(FILE *file, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, file, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV fscanf_s(FILE *file, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, file, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV scanf(const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV scanf_s(const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, stdin, format, NULL, args);
__ms_va_end(args);
va_end(args);
return ret;
}
......@@ -386,23 +386,23 @@ static inline int WINAPIV scanf_s(const char *format, ...)
_ACRTIMP int WINAPIV _scprintf(const char *,...);
_ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...);
_ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list);
_ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list);
_ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list);
_ACRTIMP int __cdecl _vscprintf(const char*,va_list);
_ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,va_list);
_ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,va_list);
_ACRTIMP int WINAPIV fprintf(FILE*,const char*,...);
_ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...);
_ACRTIMP int WINAPIV printf(const char*,...);
_ACRTIMP int WINAPIV printf_s(const char*,...);
_ACRTIMP int WINAPIV sprintf_s(char*,size_t,const char*,...);
_ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list);
_ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list);
_ACRTIMP int __cdecl vprintf(const char*,__ms_va_list);
_ACRTIMP int __cdecl vprintf_s(const char*,__ms_va_list);
_ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list);
_ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list);
_ACRTIMP int __cdecl vfprintf(FILE*,const char*,va_list);
_ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,va_list);
_ACRTIMP int __cdecl vprintf(const char*,va_list);
_ACRTIMP int __cdecl vprintf_s(const char*,va_list);
_ACRTIMP int __cdecl vsprintf(char*,const char*,va_list);
_ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,va_list);
_ACRTIMP int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list);
static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); }
_ACRTIMP int __cdecl _vsnprintf(char*,size_t,const char*,va_list);
static inline int vsnprintf(char *buffer, size_t size, const char *format, va_list args) { return _vsnprintf(buffer,size,format,args); }
_ACRTIMP int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...);
_ACRTIMP int WINAPIV fscanf(FILE*,const char*,...);
......@@ -438,33 +438,33 @@ static inline int unlink(const char* path) { return _unlink(path); }
static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = vsnprintf(buffer, size, format, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV _snprintf(char *buffer, size_t size, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = _vsnprintf(buffer, size, format, args);
__ms_va_end(args);
va_end(args);
return ret;
}
static inline int WINAPIV sprintf(char *buffer, const char *format, ...)
{
int ret;
__ms_va_list args;
va_list args;
__ms_va_start(args, format);
va_start(args, format);
ret = _vsnprintf(buffer, (size_t)_CRT_INT_MAX, format, args);
__ms_va_end(args);
va_end(args);
return ret;
}
......
programs/winedbg/dbg.y
View file @ 2a92c58e
......@@ -567,7 +567,7 @@ static int dbg_error(const char* s)
return 0;
}
HANDLE parser_generate_command_file(const char* pmt, ...)
HANDLE WINAPIV parser_generate_command_file(const char* pmt, ...)
{
HANDLE hFile;
char path[MAX_PATH], file[MAX_PATH];
......
programs/winedbg/debugger.h
View file @ 2a92c58e
......@@ -311,7 +311,7 @@ extern int msgbox_res_id(HWND hwnd, UINT textId, UINT captionId, UI
extern void parser_handle(HANDLE);
extern int input_read_line(const char* pfx, char* buffer, int size);
extern int input_fetch_entire_line(const char* pfx, char** line);
extern HANDLE parser_generate_command_file(const char*, ...);
extern HANDLE WINAPIV parser_generate_command_file(const char*, ...);
/* debug.l */
extern void lexeme_flush(void);
......@@ -335,7 +335,7 @@ extern struct expr* expr_alloc_binary_op(int oper, struct expr*, struct expr
extern struct expr* expr_alloc_unary_op(int oper, struct expr*);
extern struct expr* expr_alloc_pstruct(struct expr*, const char* element);
extern struct expr* expr_alloc_struct(struct expr*, const char* element);
extern struct expr* expr_alloc_func_call(const char*, int nargs, ...);
extern struct expr* WINAPIV expr_alloc_func_call(const char*, int nargs, ...);
extern struct expr* expr_alloc_typecast(struct type_expr_t*, struct expr*);
extern struct dbg_lvalue expr_eval(struct expr*);
extern struct expr* expr_clone(const struct expr* exp, BOOL *local_binding);
......
programs/winedbg/expr.c
View file @ 2a92c58e
......@@ -245,7 +245,7 @@ struct expr* expr_alloc_pstruct(struct expr* exp, const char* element)
return ex;
}
struct expr* expr_alloc_func_call(const char* funcname, int nargs, ...)
struct expr* WINAPIV expr_alloc_func_call(const char* funcname, int nargs, ...)
{
struct expr* ex;
va_list ap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment