Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
d8ed47ec
Commit
d8ed47ec
authored
Oct 22, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Use the standard va_list instead of __ms_va_list.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
52355351
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
497 additions
and
497 deletions
+497
-497
msvcr120.c
dlls/msvcr120/tests/msvcr120.c
+4
-4
msvcr90.c
dlls/msvcr90/tests/msvcr90.c
+12
-12
concurrency.c
dlls/msvcrt/concurrency.c
+3
-3
console.c
dlls/msvcrt/console.c
+10
-10
file.c
dlls/msvcrt/file.c
+63
-63
misc.c
dlls/msvcrt/misc.c
+2
-2
msvcrt.h
dlls/msvcrt/msvcrt.h
+7
-7
printf.h
dlls/msvcrt/printf.h
+3
-3
process.c
dlls/msvcrt/process.c
+66
-66
scanf.c
dlls/msvcrt/scanf.c
+126
-126
scanf.h
dlls/msvcrt/scanf.h
+16
-16
printf.c
dlls/msvcrt/tests/printf.c
+43
-43
wcs.c
dlls/msvcrt/wcs.c
+121
-121
printf.c
dlls/ucrtbase/tests/printf.c
+18
-18
scanf.c
dlls/ucrtbase/tests/scanf.c
+3
-3
No files found.
dlls/msvcr120/tests/msvcr120.c
View file @
d8ed47ec
...
...
@@ -191,7 +191,7 @@ static int (CDECL *p__clearfp)(void);
static
_locale_t
(
__cdecl
*
p_wcreate_locale
)(
int
,
const
wchar_t
*
);
static
void
(
__cdecl
*
p_free_locale
)(
_locale_t
);
static
unsigned
short
(
__cdecl
*
p_wctype
)(
const
char
*
);
static
int
(
__cdecl
*
p_vsscanf
)(
const
char
*
,
const
char
*
,
__ms_
va_list
valist
);
static
int
(
__cdecl
*
p_vsscanf
)(
const
char
*
,
const
char
*
,
va_list
valist
);
static
_Dcomplex
*
(
__cdecl
*
p__Cbuild
)(
_Dcomplex
*
,
double
,
double
);
static
double
(
__cdecl
*
p_creal
)(
_Dcomplex
);
static
double
(
__cdecl
*
p_nexttoward
)(
double
,
double
);
...
...
@@ -1114,10 +1114,10 @@ static void test_wctype(void)
static
int
WINAPIV
_vsscanf_wrapper
(
const
char
*
buffer
,
const
char
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p_vsscanf
(
buffer
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
dlls/msvcr90/tests/msvcr90.c
View file @
d8ed47ec
...
...
@@ -110,8 +110,8 @@ static int* (__cdecl *p_fpecode)(void);
static
int
(
__cdecl
*
p_configthreadlocale
)(
int
);
static
void
*
(
__cdecl
*
p_get_terminate
)(
void
);
static
void
*
(
__cdecl
*
p_get_unexpected
)(
void
);
static
int
(
__cdecl
*
p__vswprintf_l
)(
wchar_t
*
,
const
wchar_t
*
,
_locale_t
,
__ms_
va_list
);
static
int
(
__cdecl
*
p_vswprintf_l
)(
wchar_t
*
,
const
wchar_t
*
,
_locale_t
,
__ms_
va_list
);
static
int
(
__cdecl
*
p__vswprintf_l
)(
wchar_t
*
,
const
wchar_t
*
,
_locale_t
,
va_list
);
static
int
(
__cdecl
*
p_vswprintf_l
)(
wchar_t
*
,
const
wchar_t
*
,
_locale_t
,
va_list
);
static
FILE
*
(
__cdecl
*
p_fopen
)(
const
char
*
,
const
char
*
);
static
int
(
__cdecl
*
p_fclose
)(
FILE
*
);
static
int
(
__cdecl
*
p_unlink
)(
const
char
*
);
...
...
@@ -134,7 +134,7 @@ static int (__cdecl *p__setmbcp)(int);
static
int
(
__cdecl
*
p__fpieee_flt
)(
ULONG
,
EXCEPTION_POINTERS
*
,
int
(
__cdecl
*
handler
)(
_FPIEEE_RECORD
*
));
static
int
(
__cdecl
*
p__memicmp
)(
const
char
*
,
const
char
*
,
size_t
);
static
int
(
__cdecl
*
p__memicmp_l
)(
const
char
*
,
const
char
*
,
size_t
,
_locale_t
);
static
int
(
__cdecl
*
p__vsnwprintf
)(
wchar_t
*
buffer
,
size_t
count
,
const
wchar_t
*
format
,
__ms_
va_list
valist
);
static
int
(
__cdecl
*
p__vsnwprintf
)(
wchar_t
*
buffer
,
size_t
count
,
const
wchar_t
*
format
,
va_list
valist
);
static
size_t
(
__cdecl
*
p___strncnt
)(
const
char
*
str
,
size_t
count
);
static
int
(
WINAPIV
*
p_swscanf
)(
const
wchar_t
*
str
,
const
wchar_t
*
format
,
...);
static
int
(
__cdecl
*
p____mb_cur_max_l_func
)(
_locale_t
locale
);
...
...
@@ -1220,10 +1220,10 @@ static int WINAPIV __vswprintf_l_wrapper(wchar_t *buf,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
ret
=
p__vswprintf_l
(
buf
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -1231,10 +1231,10 @@ static int WINAPIV _vswprintf_l_wrapper(wchar_t *buf,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
ret
=
p_vswprintf_l
(
buf
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -1898,10 +1898,10 @@ static void test__memicmp_l(void)
static
int
WINAPIV
_vsnwprintf_wrapper
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p__vsnwprintf
(
str
,
len
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
dlls/msvcrt/concurrency.c
View file @
d8ed47ec
...
...
@@ -1026,7 +1026,7 @@ SchedulerPolicy* WINAPIV SchedulerPolicy_ctor_policies(
SchedulerPolicy
*
this
,
size_t
n
,
...)
{
unsigned
int
min_concurrency
,
max_concurrency
;
__ms_
va_list
valist
;
va_list
valist
;
size_t
i
;
TRACE
(
"(%p %Iu)
\n
"
,
this
,
n
);
...
...
@@ -1035,7 +1035,7 @@ SchedulerPolicy* WINAPIV SchedulerPolicy_ctor_policies(
min_concurrency
=
this
->
policy_container
->
policies
[
MinConcurrency
];
max_concurrency
=
this
->
policy_container
->
policies
[
MaxConcurrency
];
__ms_
va_start
(
valist
,
n
);
va_start
(
valist
,
n
);
for
(
i
=
0
;
i
<
n
;
i
++
)
{
PolicyElementKey
policy
=
va_arg
(
valist
,
PolicyElementKey
);
unsigned
int
val
=
va_arg
(
valist
,
unsigned
int
);
...
...
@@ -1047,7 +1047,7 @@ SchedulerPolicy* WINAPIV SchedulerPolicy_ctor_policies(
else
SchedulerPolicy_SetPolicyValue
(
this
,
policy
,
val
);
}
__ms_
va_end
(
valist
);
va_end
(
valist
);
SchedulerPolicy_SetConcurrencyLimits
(
this
,
min_concurrency
,
max_concurrency
);
return
this
;
...
...
dlls/msvcrt/console.c
View file @
d8ed47ec
...
...
@@ -525,7 +525,7 @@ static int puts_clbk_console_w(void *ctx, int len, const wchar_t *str)
/*********************************************************************
* _vcprintf (MSVCRT.@)
*/
int
CDECL
_vcprintf
(
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
_vcprintf
(
const
char
*
format
,
va_list
valist
)
{
return
pf_printf_a
(
puts_clbk_console_a
,
NULL
,
format
,
NULL
,
0
,
arg_clbk_valist
,
NULL
,
&
valist
);
}
...
...
@@ -536,11 +536,11 @@ int CDECL _vcprintf(const char* format, __ms_va_list valist)
int
WINAPIV
_cprintf
(
const
char
*
format
,
...)
{
int
retval
;
__ms_
va_list
valist
;
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
retval
=
_vcprintf
(
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -549,7 +549,7 @@ int WINAPIV _cprintf(const char* format, ...)
/*********************************************************************
* _vcwprintf (MSVCRT.@)
*/
int
CDECL
_vcwprintf
(
const
wchar_t
*
format
,
__ms_
va_list
valist
)
int
CDECL
_vcwprintf
(
const
wchar_t
*
format
,
va_list
valist
)
{
return
pf_printf_w
(
puts_clbk_console_w
,
NULL
,
format
,
NULL
,
0
,
arg_clbk_valist
,
NULL
,
&
valist
);
}
...
...
@@ -560,11 +560,11 @@ int CDECL _vcwprintf(const wchar_t* format, __ms_va_list valist)
int
WINAPIV
_cwprintf
(
const
wchar_t
*
format
,
...)
{
int
retval
;
__ms_
va_list
valist
;
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
retval
=
_vcwprintf
(
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -575,7 +575,7 @@ int WINAPIV _cwprintf(const wchar_t* format, ...)
* __conio_common_vcprintf (UCRTBASE.@)
*/
int
CDECL
__conio_common_vcprintf
(
unsigned
__int64
options
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -587,7 +587,7 @@ int CDECL __conio_common_vcprintf(unsigned __int64 options, const char* format,
* __conio_common_vcwprintf (UCRTBASE.@)
*/
int
CDECL
__conio_common_vcwprintf
(
unsigned
__int64
options
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
dlls/msvcrt/file.c
View file @
d8ed47ec
...
...
@@ -2396,11 +2396,11 @@ int WINAPIV _wsopen( const wchar_t *path, int oflags, int shflags, ... )
if
(
oflags
&
_O_CREAT
)
{
__ms_
va_list
ap
;
va_list
ap
;
__ms_
va_start
(
ap
,
shflags
);
va_start
(
ap
,
shflags
);
pmode
=
va_arg
(
ap
,
int
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
}
else
pmode
=
0
;
...
...
@@ -2447,11 +2447,11 @@ int WINAPIV _sopen( const char *path, int oflags, int shflags, ... )
if
(
oflags
&
_O_CREAT
)
{
__ms_
va_list
ap
;
va_list
ap
;
__ms_
va_start
(
ap
,
shflags
);
va_start
(
ap
,
shflags
);
pmode
=
va_arg
(
ap
,
int
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
}
else
pmode
=
0
;
...
...
@@ -2464,14 +2464,14 @@ int WINAPIV _sopen( const char *path, int oflags, int shflags, ... )
*/
int
WINAPIV
_open
(
const
char
*
path
,
int
flags
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
if
(
flags
&
_O_CREAT
)
{
int
pmode
;
__ms_
va_start
(
ap
,
flags
);
va_start
(
ap
,
flags
);
pmode
=
va_arg
(
ap
,
int
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
_sopen
(
path
,
flags
,
_SH_DENYNO
,
pmode
);
}
else
...
...
@@ -2483,14 +2483,14 @@ int WINAPIV _open( const char *path, int flags, ... )
*/
int
WINAPIV
_wopen
(
const
wchar_t
*
path
,
int
flags
,...)
{
__ms_
va_list
ap
;
va_list
ap
;
if
(
flags
&
_O_CREAT
)
{
int
pmode
;
__ms_
va_start
(
ap
,
flags
);
va_start
(
ap
,
flags
);
pmode
=
va_arg
(
ap
,
int
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
_wsopen
(
path
,
flags
,
_SH_DENYNO
,
pmode
);
}
else
...
...
@@ -5150,7 +5150,7 @@ static int puts_clbk_file_w(void *file, int len, const wchar_t *str)
}
static
int
vfprintf_helper
(
DWORD
options
,
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
printf_arg
args_ctx
[
_ARGMAX
+
1
];
BOOL
tmp_buf
;
...
...
@@ -5182,7 +5182,7 @@ static int vfprintf_helper(DWORD options, FILE* file, const char *format,
}
static
int
vfwprintf_helper
(
DWORD
options
,
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
printf_arg
args_ctx
[
_ARGMAX
+
1
];
BOOL
tmp_buf
;
...
...
@@ -5217,7 +5217,7 @@ static int vfwprintf_helper(DWORD options, FILE* file, const wchar_t *format,
* _vfprintf_s_l (MSVCRT.@)
*/
int
CDECL
_vfprintf_s_l
(
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vfprintf_helper
(
MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER
,
file
,
format
,
locale
,
valist
);
}
...
...
@@ -5226,7 +5226,7 @@ int CDECL _vfprintf_s_l(FILE* file, const char *format,
* _vfwprintf_s_l (MSVCRT.@)
*/
int
CDECL
_vfwprintf_s_l
(
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vfwprintf_helper
(
MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER
,
file
,
format
,
locale
,
valist
);
}
...
...
@@ -5234,7 +5234,7 @@ int CDECL _vfwprintf_s_l(FILE* file, const wchar_t *format,
/*********************************************************************
* vfprintf (MSVCRT.@)
*/
int
CDECL
vfprintf
(
FILE
*
file
,
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
vfprintf
(
FILE
*
file
,
const
char
*
format
,
va_list
valist
)
{
return
vfprintf_helper
(
0
,
file
,
format
,
NULL
,
valist
);
}
...
...
@@ -5242,7 +5242,7 @@ int CDECL vfprintf(FILE* file, const char *format, __ms_va_list valist)
/*********************************************************************
* vfprintf_s (MSVCRT.@)
*/
int
CDECL
vfprintf_s
(
FILE
*
file
,
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
vfprintf_s
(
FILE
*
file
,
const
char
*
format
,
va_list
valist
)
{
return
_vfprintf_s_l
(
file
,
format
,
NULL
,
valist
);
}
...
...
@@ -5250,7 +5250,7 @@ int CDECL vfprintf_s(FILE* file, const char *format, __ms_va_list valist)
/*********************************************************************
* vfwprintf (MSVCRT.@)
*/
int
CDECL
vfwprintf
(
FILE
*
file
,
const
wchar_t
*
format
,
__ms_
va_list
valist
)
int
CDECL
vfwprintf
(
FILE
*
file
,
const
wchar_t
*
format
,
va_list
valist
)
{
return
vfwprintf_helper
(
0
,
file
,
format
,
NULL
,
valist
);
}
...
...
@@ -5258,7 +5258,7 @@ int CDECL vfwprintf(FILE* file, const wchar_t *format, __ms_va_list valist)
/*********************************************************************
* vfwprintf_s (MSVCRT.@)
*/
int
CDECL
vfwprintf_s
(
FILE
*
file
,
const
wchar_t
*
format
,
__ms_
va_list
valist
)
int
CDECL
vfwprintf_s
(
FILE
*
file
,
const
wchar_t
*
format
,
va_list
valist
)
{
return
_vfwprintf_s_l
(
file
,
format
,
NULL
,
valist
);
}
...
...
@@ -5269,7 +5269,7 @@ int CDECL vfwprintf_s(FILE* file, const wchar_t *format, __ms_va_list valist)
* __stdio_common_vfprintf (UCRTBASE.@)
*/
int
CDECL
_stdio_common_vfprintf
(
unsigned
__int64
options
,
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -5281,7 +5281,7 @@ int CDECL _stdio_common_vfprintf(unsigned __int64 options, FILE *file, const cha
* __stdio_common_vfprintf_p (UCRTBASE.@)
*/
int
CDECL
__stdio_common_vfprintf_p
(
unsigned
__int64
options
,
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -5295,7 +5295,7 @@ int CDECL __stdio_common_vfprintf_p(unsigned __int64 options, FILE *file, const
* __stdio_common_vfprintf_s (UCRTBASE.@)
*/
int
CDECL
__stdio_common_vfprintf_s
(
unsigned
__int64
options
,
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -5308,7 +5308,7 @@ int CDECL __stdio_common_vfprintf_s(unsigned __int64 options, FILE *file, const
* __stdio_common_vfwprintf (UCRTBASE.@)
*/
int
CDECL
__stdio_common_vfwprintf
(
unsigned
__int64
options
,
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -5320,7 +5320,7 @@ int CDECL __stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const w
* __stdio_common_vfwprintf_p (UCRTBASE.@)
*/
int
CDECL
__stdio_common_vfwprintf_p
(
unsigned
__int64
options
,
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -5334,7 +5334,7 @@ int CDECL __stdio_common_vfwprintf_p(unsigned __int64 options, FILE *file, const
* __stdio_common_vfwprintf_s (UCRTBASE.@)
*/
int
CDECL
__stdio_common_vfwprintf_s
(
unsigned
__int64
options
,
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -5349,7 +5349,7 @@ int CDECL __stdio_common_vfwprintf_s(unsigned __int64 options, FILE *file, const
* _vfprintf_l (MSVCRT.@)
*/
int
CDECL
_vfprintf_l
(
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vfprintf_helper
(
0
,
file
,
format
,
locale
,
valist
);
}
...
...
@@ -5358,7 +5358,7 @@ int CDECL _vfprintf_l(FILE* file, const char *format,
* _vfwprintf_l (MSVCRT.@)
*/
int
CDECL
_vfwprintf_l
(
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vfwprintf_helper
(
0
,
file
,
format
,
locale
,
valist
);
}
...
...
@@ -5367,7 +5367,7 @@ int CDECL _vfwprintf_l(FILE* file, const wchar_t *format,
* _vfprintf_p_l (MSVCRT.@)
*/
int
CDECL
_vfprintf_p_l
(
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vfprintf_helper
(
MSVCRT_PRINTF_POSITIONAL_PARAMS
|
MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER
,
file
,
format
,
locale
,
valist
);
...
...
@@ -5376,7 +5376,7 @@ int CDECL _vfprintf_p_l(FILE* file, const char *format,
/*********************************************************************
* _vfprintf_p (MSVCRT.@)
*/
int
CDECL
_vfprintf_p
(
FILE
*
file
,
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
_vfprintf_p
(
FILE
*
file
,
const
char
*
format
,
va_list
valist
)
{
return
_vfprintf_p_l
(
file
,
format
,
NULL
,
valist
);
}
...
...
@@ -5385,7 +5385,7 @@ int CDECL _vfprintf_p(FILE* file, const char *format, __ms_va_list valist)
* _vfwprintf_p_l (MSVCRT.@)
*/
int
CDECL
_vfwprintf_p_l
(
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vfwprintf_helper
(
MSVCRT_PRINTF_POSITIONAL_PARAMS
|
MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER
,
file
,
format
,
locale
,
valist
);
...
...
@@ -5394,7 +5394,7 @@ int CDECL _vfwprintf_p_l(FILE* file, const wchar_t *format,
/*********************************************************************
* _vfwprintf_p (MSVCRT.@)
*/
int
CDECL
_vfwprintf_p
(
FILE
*
file
,
const
wchar_t
*
format
,
__ms_
va_list
valist
)
int
CDECL
_vfwprintf_p
(
FILE
*
file
,
const
wchar_t
*
format
,
va_list
valist
)
{
return
_vfwprintf_p_l
(
file
,
format
,
NULL
,
valist
);
}
...
...
@@ -5402,7 +5402,7 @@ int CDECL _vfwprintf_p(FILE* file, const wchar_t *format, __ms_va_list valist)
/*********************************************************************
* vprintf (MSVCRT.@)
*/
int
CDECL
vprintf
(
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
vprintf
(
const
char
*
format
,
va_list
valist
)
{
return
vfprintf
(
MSVCRT_stdout
,
format
,
valist
);
}
...
...
@@ -5410,7 +5410,7 @@ int CDECL vprintf(const char *format, __ms_va_list valist)
/*********************************************************************
* vprintf_s (MSVCRT.@)
*/
int
CDECL
vprintf_s
(
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
vprintf_s
(
const
char
*
format
,
va_list
valist
)
{
return
vfprintf_s
(
MSVCRT_stdout
,
format
,
valist
);
}
...
...
@@ -5418,7 +5418,7 @@ int CDECL vprintf_s(const char *format, __ms_va_list valist)
/*********************************************************************
* vwprintf (MSVCRT.@)
*/
int
CDECL
vwprintf
(
const
wchar_t
*
format
,
__ms_
va_list
valist
)
int
CDECL
vwprintf
(
const
wchar_t
*
format
,
va_list
valist
)
{
return
vfwprintf
(
MSVCRT_stdout
,
format
,
valist
);
}
...
...
@@ -5426,7 +5426,7 @@ int CDECL vwprintf(const wchar_t *format, __ms_va_list valist)
/*********************************************************************
* vwprintf_s (MSVCRT.@)
*/
int
CDECL
vwprintf_s
(
const
wchar_t
*
format
,
__ms_
va_list
valist
)
int
CDECL
vwprintf_s
(
const
wchar_t
*
format
,
va_list
valist
)
{
return
vfwprintf_s
(
MSVCRT_stdout
,
format
,
valist
);
}
...
...
@@ -5436,11 +5436,11 @@ int CDECL vwprintf_s(const wchar_t *format, __ms_va_list valist)
*/
int
WINAPIV
fprintf
(
FILE
*
file
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfprintf
(
file
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -5449,11 +5449,11 @@ int WINAPIV fprintf(FILE* file, const char *format, ...)
*/
int
WINAPIV
fprintf_s
(
FILE
*
file
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfprintf_s
(
file
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -5462,11 +5462,11 @@ int WINAPIV fprintf_s(FILE* file, const char *format, ...)
*/
int
WINAPIV
fwprintf
(
FILE
*
file
,
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfwprintf
(
file
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -5475,11 +5475,11 @@ int WINAPIV fwprintf(FILE* file, const wchar_t *format, ...)
*/
int
WINAPIV
fwprintf_s
(
FILE
*
file
,
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfwprintf_s
(
file
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -5488,11 +5488,11 @@ int WINAPIV fwprintf_s(FILE* file, const wchar_t *format, ...)
*/
int
WINAPIV
_fwprintf_l
(
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
_vfwprintf_l
(
file
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -5501,11 +5501,11 @@ int WINAPIV _fwprintf_l(FILE* file, const wchar_t *format, _locale_t locale, ...
*/
int
WINAPIV
printf
(
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfprintf
(
MSVCRT_stdout
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -5514,11 +5514,11 @@ int WINAPIV printf(const char *format, ...)
*/
int
WINAPIV
printf_s
(
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vprintf_s
(
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -5631,11 +5631,11 @@ wint_t CDECL _ungetwc_nolock(wint_t wc, FILE * file)
*/
int
WINAPIV
wprintf
(
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vwprintf
(
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -5644,11 +5644,11 @@ int WINAPIV wprintf(const wchar_t *format, ...)
*/
int
WINAPIV
wprintf_s
(
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vwprintf_s
(
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
dlls/msvcrt/misc.c
View file @
d8ed47ec
...
...
@@ -536,9 +536,9 @@ BOOL CDECL __crtInitializeCriticalSectionEx(
/*********************************************************************
* _vacopy (MSVCR120.@)
*/
void
CDECL
_vacopy
(
__ms_va_list
*
dest
,
__ms_
va_list
src
)
void
CDECL
_vacopy
(
va_list
*
dest
,
va_list
src
)
{
__ms_
va_copy
(
*
dest
,
src
);
va_copy
(
*
dest
,
src
);
}
#endif
...
...
dlls/msvcrt/msvcrt.h
View file @
d8ed47ec
...
...
@@ -337,15 +337,15 @@ typedef union _printf_arg
LONGLONG
get_longlong
;
double
get_double
;
}
printf_arg
;
typedef
printf_arg
(
*
args_clbk
)(
void
*
,
int
,
int
,
__ms_
va_list
*
);
typedef
printf_arg
(
*
args_clbk
)(
void
*
,
int
,
int
,
va_list
*
);
int
pf_printf_a
(
puts_clbk_a
,
void
*
,
const
char
*
,
_locale_t
,
DWORD
,
args_clbk
,
void
*
,
__ms_
va_list
*
)
DECLSPEC_HIDDEN
;
DWORD
,
args_clbk
,
void
*
,
va_list
*
)
DECLSPEC_HIDDEN
;
int
pf_printf_w
(
puts_clbk_w
,
void
*
,
const
wchar_t
*
,
_locale_t
,
DWORD
,
args_clbk
,
void
*
,
__ms_
va_list
*
)
DECLSPEC_HIDDEN
;
int
create_positional_ctx_a
(
void
*
,
const
char
*
,
__ms_
va_list
)
DECLSPEC_HIDDEN
;
int
create_positional_ctx_w
(
void
*
,
const
wchar_t
*
,
__ms_
va_list
)
DECLSPEC_HIDDEN
;
printf_arg
arg_clbk_valist
(
void
*
,
int
,
int
,
__ms_
va_list
*
)
DECLSPEC_HIDDEN
;
printf_arg
arg_clbk_positional
(
void
*
,
int
,
int
,
__ms_
va_list
*
)
DECLSPEC_HIDDEN
;
DWORD
,
args_clbk
,
void
*
,
va_list
*
)
DECLSPEC_HIDDEN
;
int
create_positional_ctx_a
(
void
*
,
const
char
*
,
va_list
)
DECLSPEC_HIDDEN
;
int
create_positional_ctx_w
(
void
*
,
const
wchar_t
*
,
va_list
)
DECLSPEC_HIDDEN
;
printf_arg
arg_clbk_valist
(
void
*
,
int
,
int
,
va_list
*
)
DECLSPEC_HIDDEN
;
printf_arg
arg_clbk_positional
(
void
*
,
int
,
int
,
va_list
*
)
DECLSPEC_HIDDEN
;
extern
char
*
__cdecl
__unDName
(
char
*
,
const
char
*
,
int
,
malloc_func_t
,
free_func_t
,
unsigned
short
int
);
...
...
dlls/msvcrt/printf.h
View file @
d8ed47ec
...
...
@@ -965,7 +965,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu
int
FUNC_NAME
(
pf_printf
)(
FUNC_NAME
(
puts_clbk
)
pf_puts
,
void
*
puts_ctx
,
const
APICHAR
*
fmt
,
_locale_t
locale
,
DWORD
options
,
args_clbk
pf_args
,
void
*
args_ctx
,
__ms_
va_list
*
valist
)
args_clbk
pf_args
,
void
*
args_ctx
,
va_list
*
valist
)
{
const
APICHAR
*
q
,
*
p
=
fmt
;
APICHAR
buf
[
32
];
...
...
@@ -1228,7 +1228,7 @@ enum types_clbk_flags {
};
/* This functions stores types of arguments. It uses args[0] internally */
static
printf_arg
arg_clbk_type
(
void
*
ctx
,
int
pos
,
int
type
,
__ms_
va_list
*
valist
)
static
printf_arg
arg_clbk_type
(
void
*
ctx
,
int
pos
,
int
type
,
va_list
*
valist
)
{
static
const
printf_arg
ret
;
printf_arg
*
args
=
ctx
;
...
...
@@ -1250,7 +1250,7 @@ static printf_arg arg_clbk_type(void *ctx, int pos, int type, __ms_va_list *vali
}
#endif
int
FUNC_NAME
(
create_positional_ctx
)(
void
*
args_ctx
,
const
APICHAR
*
format
,
__ms_
va_list
valist
)
int
FUNC_NAME
(
create_positional_ctx
)(
void
*
args_ctx
,
const
APICHAR
*
format
,
va_list
valist
)
{
struct
FUNC_NAME
(
_str_ctx
)
puts_ctx
=
{
INT_MAX
,
NULL
};
printf_arg
*
args
=
args_ctx
;
...
...
dlls/msvcrt/process.c
View file @
d8ed47ec
...
...
@@ -273,7 +273,7 @@ static wchar_t *msvcrt_argvtos_aw(const char * const *arg, wchar_t delim)
/* INTERNAL: Convert wide va_list to a single 'delim'-separated wide string, with an
* extra '\0' to terminate it.
*/
static
wchar_t
*
msvcrt_valisttos
(
const
wchar_t
*
arg0
,
__ms_
va_list
alist
,
wchar_t
delim
)
static
wchar_t
*
msvcrt_valisttos
(
const
wchar_t
*
arg0
,
va_list
alist
,
wchar_t
delim
)
{
unsigned
int
size
=
0
,
pos
=
0
;
const
wchar_t
*
arg
;
...
...
@@ -308,7 +308,7 @@ static wchar_t *msvcrt_valisttos(const wchar_t *arg0, __ms_va_list alist, wchar_
/* INTERNAL: Convert ansi va_list to a single 'delim'-separated wide string, with an
* extra '\0' to terminate it.
*/
static
wchar_t
*
msvcrt_valisttos_aw
(
const
char
*
arg0
,
__ms_
va_list
alist
,
wchar_t
delim
)
static
wchar_t
*
msvcrt_valisttos_aw
(
const
char
*
arg0
,
va_list
alist
,
wchar_t
delim
)
{
unsigned
int
size
=
0
,
pos
=
0
;
const
char
*
arg
;
...
...
@@ -391,13 +391,13 @@ intptr_t CDECL _cwait(int *status, intptr_t pid, int action)
*/
intptr_t
WINAPIV
_wexecl
(
const
wchar_t
*
name
,
const
wchar_t
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
args
;
intptr_t
ret
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
_P_OVERLAY
,
name
,
args
,
NULL
,
0
);
...
...
@@ -413,15 +413,15 @@ intptr_t WINAPIV _wexecl(const wchar_t* name, const wchar_t* arg0, ...)
*/
intptr_t
WINAPIV
_execl
(
const
char
*
name
,
const
char
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
nameW
,
*
args
;
intptr_t
ret
;
if
(
!
(
nameW
=
msvcrt_wstrdupa
(
name
)))
return
-
1
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos_aw
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
_P_OVERLAY
,
nameW
,
args
,
NULL
,
0
);
...
...
@@ -437,20 +437,20 @@ intptr_t WINAPIV _execl(const char* name, const char* arg0, ...)
*/
intptr_t
WINAPIV
_wexecle
(
const
wchar_t
*
name
,
const
wchar_t
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
args
,
*
envs
=
NULL
;
const
wchar_t
*
const
*
envp
;
intptr_t
ret
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
while
(
va_arg
(
ap
,
wchar_t
*
)
!=
NULL
)
/*nothing*/
;
envp
=
va_arg
(
ap
,
const
wchar_t
*
const
*
);
if
(
envp
)
envs
=
msvcrt_argvtos
(
envp
,
0
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
_P_OVERLAY
,
name
,
args
,
envs
,
0
);
...
...
@@ -464,22 +464,22 @@ intptr_t WINAPIV _wexecle(const wchar_t* name, const wchar_t* arg0, ...)
*/
intptr_t
WINAPIV
_execle
(
const
char
*
name
,
const
char
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
nameW
,
*
args
,
*
envs
=
NULL
;
const
char
*
const
*
envp
;
intptr_t
ret
;
if
(
!
(
nameW
=
msvcrt_wstrdupa
(
name
)))
return
-
1
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos_aw
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
while
(
va_arg
(
ap
,
char
*
)
!=
NULL
)
/*nothing*/
;
envp
=
va_arg
(
ap
,
const
char
*
const
*
);
if
(
envp
)
envs
=
msvcrt_argvtos_aw
(
envp
,
0
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
_P_OVERLAY
,
nameW
,
args
,
envs
,
0
);
...
...
@@ -496,13 +496,13 @@ intptr_t WINAPIV _execle(const char* name, const char* arg0, ...)
*/
intptr_t
WINAPIV
_wexeclp
(
const
wchar_t
*
name
,
const
wchar_t
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
args
;
intptr_t
ret
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
_P_OVERLAY
,
name
,
args
,
NULL
,
1
);
...
...
@@ -518,15 +518,15 @@ intptr_t WINAPIV _wexeclp(const wchar_t* name, const wchar_t* arg0, ...)
*/
intptr_t
WINAPIV
_execlp
(
const
char
*
name
,
const
char
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
nameW
,
*
args
;
intptr_t
ret
;
if
(
!
(
nameW
=
msvcrt_wstrdupa
(
name
)))
return
-
1
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos_aw
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
_P_OVERLAY
,
nameW
,
args
,
NULL
,
1
);
...
...
@@ -542,20 +542,20 @@ intptr_t WINAPIV _execlp(const char* name, const char* arg0, ...)
*/
intptr_t
WINAPIV
_wexeclpe
(
const
wchar_t
*
name
,
const
wchar_t
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
args
,
*
envs
=
NULL
;
const
wchar_t
*
const
*
envp
;
intptr_t
ret
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
while
(
va_arg
(
ap
,
wchar_t
*
)
!=
NULL
)
/*nothing*/
;
envp
=
va_arg
(
ap
,
const
wchar_t
*
const
*
);
if
(
envp
)
envs
=
msvcrt_argvtos
(
envp
,
0
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
_P_OVERLAY
,
name
,
args
,
envs
,
1
);
...
...
@@ -569,22 +569,22 @@ intptr_t WINAPIV _wexeclpe(const wchar_t* name, const wchar_t* arg0, ...)
*/
intptr_t
WINAPIV
_execlpe
(
const
char
*
name
,
const
char
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
nameW
,
*
args
,
*
envs
=
NULL
;
const
char
*
const
*
envp
;
intptr_t
ret
;
if
(
!
(
nameW
=
msvcrt_wstrdupa
(
name
)))
return
-
1
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos_aw
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
while
(
va_arg
(
ap
,
char
*
)
!=
NULL
)
/*nothing*/
;
envp
=
va_arg
(
ap
,
const
char
*
const
*
);
if
(
envp
)
envs
=
msvcrt_argvtos_aw
(
envp
,
0
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
_P_OVERLAY
,
nameW
,
args
,
envs
,
1
);
...
...
@@ -685,13 +685,13 @@ intptr_t CDECL _execvp(const char* name, const char* const* argv)
*/
intptr_t
WINAPIV
_wspawnl
(
int
flags
,
const
wchar_t
*
name
,
const
wchar_t
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
args
;
intptr_t
ret
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
flags
,
name
,
args
,
NULL
,
0
);
...
...
@@ -707,15 +707,15 @@ intptr_t WINAPIV _wspawnl(int flags, const wchar_t* name, const wchar_t* arg0, .
*/
intptr_t
WINAPIV
_spawnl
(
int
flags
,
const
char
*
name
,
const
char
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
nameW
,
*
args
;
intptr_t
ret
;
if
(
!
(
nameW
=
msvcrt_wstrdupa
(
name
)))
return
-
1
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos_aw
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
flags
,
nameW
,
args
,
NULL
,
0
);
...
...
@@ -731,20 +731,20 @@ intptr_t WINAPIV _spawnl(int flags, const char* name, const char* arg0, ...)
*/
intptr_t
WINAPIV
_wspawnle
(
int
flags
,
const
wchar_t
*
name
,
const
wchar_t
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
args
,
*
envs
=
NULL
;
const
wchar_t
*
const
*
envp
;
intptr_t
ret
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
while
(
va_arg
(
ap
,
wchar_t
*
)
!=
NULL
)
/*nothing*/
;
envp
=
va_arg
(
ap
,
const
wchar_t
*
const
*
);
if
(
envp
)
envs
=
msvcrt_argvtos
(
envp
,
0
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
flags
,
name
,
args
,
envs
,
0
);
...
...
@@ -758,22 +758,22 @@ intptr_t WINAPIV _wspawnle(int flags, const wchar_t* name, const wchar_t* arg0,
*/
intptr_t
WINAPIV
_spawnle
(
int
flags
,
const
char
*
name
,
const
char
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
nameW
,
*
args
,
*
envs
=
NULL
;
const
char
*
const
*
envp
;
intptr_t
ret
;
if
(
!
(
nameW
=
msvcrt_wstrdupa
(
name
)))
return
-
1
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos_aw
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
while
(
va_arg
(
ap
,
char
*
)
!=
NULL
)
/*nothing*/
;
envp
=
va_arg
(
ap
,
const
char
*
const
*
);
if
(
envp
)
envs
=
msvcrt_argvtos_aw
(
envp
,
0
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
flags
,
nameW
,
args
,
envs
,
0
);
...
...
@@ -790,13 +790,13 @@ intptr_t WINAPIV _spawnle(int flags, const char* name, const char* arg0, ...)
*/
intptr_t
WINAPIV
_wspawnlp
(
int
flags
,
const
wchar_t
*
name
,
const
wchar_t
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
args
;
intptr_t
ret
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
flags
,
name
,
args
,
NULL
,
1
);
...
...
@@ -812,15 +812,15 @@ intptr_t WINAPIV _wspawnlp(int flags, const wchar_t* name, const wchar_t* arg0,
*/
intptr_t
WINAPIV
_spawnlp
(
int
flags
,
const
char
*
name
,
const
char
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
nameW
,
*
args
;
intptr_t
ret
;
if
(
!
(
nameW
=
msvcrt_wstrdupa
(
name
)))
return
-
1
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos_aw
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
flags
,
nameW
,
args
,
NULL
,
1
);
...
...
@@ -836,20 +836,20 @@ intptr_t WINAPIV _spawnlp(int flags, const char* name, const char* arg0, ...)
*/
intptr_t
WINAPIV
_wspawnlpe
(
int
flags
,
const
wchar_t
*
name
,
const
wchar_t
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
args
,
*
envs
=
NULL
;
const
wchar_t
*
const
*
envp
;
intptr_t
ret
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
while
(
va_arg
(
ap
,
wchar_t
*
)
!=
NULL
)
/*nothing*/
;
envp
=
va_arg
(
ap
,
const
wchar_t
*
const
*
);
if
(
envp
)
envs
=
msvcrt_argvtos
(
envp
,
0
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
flags
,
name
,
args
,
envs
,
1
);
...
...
@@ -863,22 +863,22 @@ intptr_t WINAPIV _wspawnlpe(int flags, const wchar_t* name, const wchar_t* arg0,
*/
intptr_t
WINAPIV
_spawnlpe
(
int
flags
,
const
char
*
name
,
const
char
*
arg0
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
wchar_t
*
nameW
,
*
args
,
*
envs
=
NULL
;
const
char
*
const
*
envp
;
intptr_t
ret
;
if
(
!
(
nameW
=
msvcrt_wstrdupa
(
name
)))
return
-
1
;
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
args
=
msvcrt_valisttos_aw
(
arg0
,
ap
,
' '
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
__ms_
va_start
(
ap
,
arg0
);
va_start
(
ap
,
arg0
);
while
(
va_arg
(
ap
,
char
*
)
!=
NULL
)
/*nothing*/
;
envp
=
va_arg
(
ap
,
const
char
*
const
*
);
if
(
envp
)
envs
=
msvcrt_argvtos_aw
(
envp
,
0
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
ret
=
msvcrt_spawn
(
flags
,
nameW
,
args
,
envs
,
1
);
...
...
dlls/msvcrt/scanf.c
View file @
d8ed47ec
...
...
@@ -149,12 +149,12 @@ static int wchar2digit(wchar_t c, int base) {
*/
int
WINAPIV
fscanf
(
FILE
*
file
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfscanf_l
(
file
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -164,12 +164,12 @@ int WINAPIV fscanf(FILE *file, const char *format, ...)
int
WINAPIV
_fscanf_l
(
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vfscanf_l
(
file
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -178,12 +178,12 @@ int WINAPIV _fscanf_l(FILE *file, const char *format,
*/
int
WINAPIV
fscanf_s
(
FILE
*
file
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfscanf_s_l
(
file
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -193,12 +193,12 @@ int WINAPIV fscanf_s(FILE *file, const char *format, ...)
int
WINAPIV
_fscanf_s_l
(
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vfscanf_s_l
(
file
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -207,12 +207,12 @@ int WINAPIV _fscanf_s_l(FILE *file, const char *format,
*/
int
WINAPIV
scanf
(
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfscanf_l
(
MSVCRT_stdin
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -221,12 +221,12 @@ int WINAPIV scanf(const char *format, ...)
*/
int
WINAPIV
_scanf_l
(
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vfscanf_l
(
MSVCRT_stdin
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -235,12 +235,12 @@ int WINAPIV _scanf_l(const char *format, _locale_t locale, ...)
*/
int
WINAPIV
scanf_s
(
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfscanf_s_l
(
MSVCRT_stdin
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -249,12 +249,12 @@ int WINAPIV scanf_s(const char *format, ...)
*/
int
WINAPIV
_scanf_s_l
(
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vfscanf_s_l
(
MSVCRT_stdin
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -263,12 +263,12 @@ int WINAPIV _scanf_s_l(const char *format, _locale_t locale, ...)
*/
int
WINAPIV
fwscanf
(
FILE
*
file
,
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfwscanf_l
(
file
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -278,12 +278,12 @@ int WINAPIV fwscanf(FILE *file, const wchar_t *format, ...)
int
WINAPIV
_fwscanf_l
(
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vfwscanf_l
(
file
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -292,12 +292,12 @@ int WINAPIV _fwscanf_l(FILE *file, const wchar_t *format,
*/
int
WINAPIV
fwscanf_s
(
FILE
*
file
,
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfwscanf_s_l
(
file
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -307,12 +307,12 @@ int WINAPIV fwscanf_s(FILE *file, const wchar_t *format, ...)
int
WINAPIV
_fwscanf_s_l
(
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vfwscanf_s_l
(
file
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -321,12 +321,12 @@ int WINAPIV _fwscanf_s_l(FILE *file, const wchar_t *format,
*/
int
WINAPIV
wscanf
(
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfwscanf_l
(
MSVCRT_stdin
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -336,12 +336,12 @@ int WINAPIV wscanf(const wchar_t *format, ...)
int
WINAPIV
_wscanf_l
(
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vfwscanf_l
(
MSVCRT_stdin
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -350,12 +350,12 @@ int WINAPIV _wscanf_l(const wchar_t *format,
*/
int
WINAPIV
wscanf_s
(
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vfwscanf_s_l
(
MSVCRT_stdin
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -365,12 +365,12 @@ int WINAPIV wscanf_s(const wchar_t *format, ...)
int
WINAPIV
_wscanf_s_l
(
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vfwscanf_s_l
(
MSVCRT_stdin
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -379,12 +379,12 @@ int WINAPIV _wscanf_s_l(const wchar_t *format,
*/
int
WINAPIV
sscanf
(
const
char
*
str
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vsscanf_l
(
str
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -394,12 +394,12 @@ int WINAPIV sscanf(const char *str, const char *format, ...)
int
WINAPIV
_sscanf_l
(
const
char
*
str
,
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vsscanf_l
(
str
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -408,12 +408,12 @@ int WINAPIV _sscanf_l(const char *str, const char *format,
*/
int
WINAPIV
sscanf_s
(
const
char
*
str
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vsscanf_s_l
(
str
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -423,12 +423,12 @@ int WINAPIV sscanf_s(const char *str, const char *format, ...)
int
WINAPIV
_sscanf_s_l
(
const
char
*
str
,
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vsscanf_s_l
(
str
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -437,12 +437,12 @@ int WINAPIV _sscanf_s_l(const char *str, const char *format,
*/
int
WINAPIV
swscanf
(
const
wchar_t
*
str
,
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vswscanf_l
(
str
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -452,12 +452,12 @@ int WINAPIV swscanf(const wchar_t *str, const wchar_t *format, ...)
int
WINAPIV
_swscanf_l
(
const
wchar_t
*
str
,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vswscanf_l
(
str
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -466,12 +466,12 @@ int WINAPIV _swscanf_l(const wchar_t *str, const wchar_t *format,
*/
int
WINAPIV
swscanf_s
(
const
wchar_t
*
str
,
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vswscanf_s_l
(
str
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -481,12 +481,12 @@ int WINAPIV swscanf_s(const wchar_t *str, const wchar_t *format, ...)
int
WINAPIV
_swscanf_s_l
(
const
wchar_t
*
str
,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vswscanf_s_l
(
str
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -495,12 +495,12 @@ int WINAPIV _swscanf_s_l(const wchar_t *str, const wchar_t *format,
*/
int
WINAPIV
_cscanf
(
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vcscanf_l
(
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -509,12 +509,12 @@ int WINAPIV _cscanf(const char *format, ...)
*/
int
WINAPIV
_cscanf_l
(
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vcscanf_l
(
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -523,12 +523,12 @@ int WINAPIV _cscanf_l(const char *format, _locale_t locale, ...)
*/
int
WINAPIV
_cscanf_s
(
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vcscanf_s_l
(
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -537,12 +537,12 @@ int WINAPIV _cscanf_s(const char *format, ...)
*/
int
WINAPIV
_cscanf_s_l
(
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vcscanf_s_l
(
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -551,12 +551,12 @@ int WINAPIV _cscanf_s_l(const char *format, _locale_t locale, ...)
*/
int
WINAPIV
_cwscanf
(
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vcwscanf_l
(
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -565,12 +565,12 @@ int WINAPIV _cwscanf(const wchar_t *format, ...)
*/
int
WINAPIV
_cwscanf_l
(
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vcwscanf_l
(
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -579,12 +579,12 @@ int WINAPIV _cwscanf_l(const wchar_t *format, _locale_t locale, ...)
*/
int
WINAPIV
_cwscanf_s
(
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vcwscanf_s_l
(
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -593,12 +593,12 @@ int WINAPIV _cwscanf_s(const wchar_t *format, ...)
*/
int
WINAPIV
_cwscanf_s_l
(
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vcwscanf_s_l
(
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -607,12 +607,12 @@ int WINAPIV _cwscanf_s_l(const wchar_t *format, _locale_t locale, ...)
*/
int
WINAPIV
_snscanf
(
const
char
*
input
,
size_t
length
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vsnscanf_l
(
input
,
length
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -622,12 +622,12 @@ int WINAPIV _snscanf(const char *input, size_t length, const char *format, ...)
int
WINAPIV
_snscanf_l
(
const
char
*
input
,
size_t
length
,
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vsnscanf_l
(
input
,
length
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -636,12 +636,12 @@ int WINAPIV _snscanf_l(const char *input, size_t length,
*/
int
WINAPIV
_snscanf_s
(
const
char
*
input
,
size_t
length
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vsnscanf_s_l
(
input
,
length
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -651,12 +651,12 @@ int WINAPIV _snscanf_s(const char *input, size_t length, const char *format, ...
int
WINAPIV
_snscanf_s_l
(
const
char
*
input
,
size_t
length
,
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vsnscanf_s_l
(
input
,
length
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -668,7 +668,7 @@ int CDECL __stdio_common_vsscanf(unsigned __int64 options,
const
char
*
input
,
size_t
length
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
va_list
valist
)
{
/* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide
* scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf,
...
...
@@ -688,7 +688,7 @@ int CDECL __stdio_common_vswscanf(unsigned __int64 options,
const
wchar_t
*
input
,
size_t
length
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
va_list
valist
)
{
/* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide
* scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf,
...
...
@@ -708,7 +708,7 @@ int CDECL __stdio_common_vfscanf(unsigned __int64 options,
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
va_list
valist
)
{
if
(
options
&
~
_CRT_INTERNAL_SCANF_SECURECRT
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -725,7 +725,7 @@ int CDECL __stdio_common_vfwscanf(unsigned __int64 options,
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
va_list
valist
)
{
if
(
options
&
~
_CRT_INTERNAL_SCANF_SECURECRT
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -741,12 +741,12 @@ int CDECL __stdio_common_vfwscanf(unsigned __int64 options,
int
WINAPIV
_snwscanf
(
wchar_t
*
input
,
size_t
length
,
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vsnwscanf_l
(
input
,
length
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -756,12 +756,12 @@ int WINAPIV _snwscanf(wchar_t *input, size_t length,
int
WINAPIV
_snwscanf_l
(
wchar_t
*
input
,
size_t
length
,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vsnwscanf_l
(
input
,
length
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -771,12 +771,12 @@ int WINAPIV _snwscanf_l(wchar_t *input, size_t length,
int
WINAPIV
_snwscanf_s
(
wchar_t
*
input
,
size_t
length
,
const
wchar_t
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
res
=
vsnwscanf_s_l
(
input
,
length
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -786,12 +786,12 @@ int WINAPIV _snwscanf_s(wchar_t *input, size_t length,
int
WINAPIV
_snwscanf_s_l
(
wchar_t
*
input
,
size_t
length
,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
res
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
res
=
vsnwscanf_s_l
(
input
,
length
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -800,7 +800,7 @@ int WINAPIV _snwscanf_s_l(wchar_t *input, size_t length,
/*********************************************************************
* vsscanf (MSVCRT120.@)
*/
int
CDECL
MSVCRT_vsscanf
(
const
char
*
buffer
,
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
MSVCRT_vsscanf
(
const
char
*
buffer
,
const
char
*
format
,
va_list
valist
)
{
if
(
!
MSVCRT_CHECK_PMT
(
buffer
!=
NULL
&&
format
!=
NULL
))
return
-
1
;
...
...
@@ -810,7 +810,7 @@ int CDECL MSVCRT_vsscanf(const char *buffer, const char *format, __ms_va_list va
/*********************************************************************
* vswscanf (MSVCRT120.@)
*/
int
CDECL
vswscanf
(
const
wchar_t
*
buffer
,
const
wchar_t
*
format
,
__ms_
va_list
valist
)
int
CDECL
vswscanf
(
const
wchar_t
*
buffer
,
const
wchar_t
*
format
,
va_list
valist
)
{
if
(
!
MSVCRT_CHECK_PMT
(
buffer
!=
NULL
&&
format
!=
NULL
))
return
-
1
;
...
...
dlls/msvcrt/scanf.h
View file @
d8ed47ec
...
...
@@ -52,15 +52,15 @@
#define _UNLOCK_FILE_(file) _unlock_file(MSVCRT_stdin)
#ifdef WIDE_SCANF
#ifdef SECURE
#define _FUNCTION_ static int vcwscanf_s_l(const wchar_t *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vcwscanf_s_l(const wchar_t *format, _locale_t locale, va_list ap)
#else
/* SECURE */
#define _FUNCTION_ static int vcwscanf_l(const wchar_t *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vcwscanf_l(const wchar_t *format, _locale_t locale, va_list ap)
#endif
/* SECURE */
#else
/* WIDE_SCANF */
#ifdef SECURE
#define _FUNCTION_ static int vcscanf_s_l(const char *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vcscanf_s_l(const char *format, _locale_t locale, va_list ap)
#else
/* SECURE */
#define _FUNCTION_ static int vcscanf_l(const char *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vcscanf_l(const char *format, _locale_t locale, va_list ap)
#endif
/* SECURE */
#endif
/* WIDE_SCANF */
#else
...
...
@@ -84,15 +84,15 @@
#define _UNLOCK_FILE_(file) do {} while(0)
#ifdef WIDE_SCANF
#ifdef SECURE
#define _FUNCTION_ static int vsnwscanf_s_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vsnwscanf_s_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, va_list ap)
#else
/* SECURE */
#define _FUNCTION_ static int vsnwscanf_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vsnwscanf_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, va_list ap)
#endif
/* SECURE */
#else
/* WIDE_SCANF */
#ifdef SECURE
#define _FUNCTION_ static int vsnscanf_s_l(const char *file, size_t length, const char *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vsnscanf_s_l(const char *file, size_t length, const char *format, _locale_t locale, va_list ap)
#else
/* SECURE */
#define _FUNCTION_ static int vsnscanf_l(const char *file, size_t length, const char *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vsnscanf_l(const char *file, size_t length, const char *format, _locale_t locale, va_list ap)
#endif
/* SECURE */
#endif
/* WIDE_SCANF */
#else
/* STRING_LEN */
...
...
@@ -106,15 +106,15 @@
#define _UNLOCK_FILE_(file) do {} while(0)
#ifdef WIDE_SCANF
#ifdef SECURE
#define _FUNCTION_ static int vswscanf_s_l(const wchar_t *file, const wchar_t *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vswscanf_s_l(const wchar_t *file, const wchar_t *format, _locale_t locale, va_list ap)
#else
/* SECURE */
#define _FUNCTION_ static int vswscanf_l(const wchar_t *file, const wchar_t *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vswscanf_l(const wchar_t *file, const wchar_t *format, _locale_t locale, va_list ap)
#endif
/* SECURE */
#else
/* WIDE_SCANF */
#ifdef SECURE
#define _FUNCTION_ static int vsscanf_s_l(const char *file, const char *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vsscanf_s_l(const char *file, const char *format, _locale_t locale, va_list ap)
#else
/* SECURE */
#define _FUNCTION_ static int vsscanf_l(const char *file, const char *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vsscanf_l(const char *file, const char *format, _locale_t locale, va_list ap)
#endif
/* SECURE */
#endif
/* WIDE_SCANF */
#endif
/* STRING_LEN */
...
...
@@ -127,9 +127,9 @@
#define _LOCK_FILE_(file) _lock_file(file)
#define _UNLOCK_FILE_(file) _unlock_file(file)
#ifdef SECURE
#define _FUNCTION_ static int vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale, va_list ap)
#else
/* SECURE */
#define _FUNCTION_ static int vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale, va_list ap)
#endif
/* SECURE */
#else
/* WIDE_SCANF */
#define _GETC_FUNC_(file) fgetc(file)
...
...
@@ -139,9 +139,9 @@
#define _LOCK_FILE_(file) _lock_file(file)
#define _UNLOCK_FILE_(file) _unlock_file(file)
#ifdef SECURE
#define _FUNCTION_ static int vfscanf_s_l(FILE* file, const char *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vfscanf_s_l(FILE* file, const char *format, _locale_t locale, va_list ap)
#else
/* SECURE */
#define _FUNCTION_ static int vfscanf_l(FILE* file, const char *format, _locale_t locale,
__ms_
va_list ap)
#define _FUNCTION_ static int vfscanf_l(FILE* file, const char *format, _locale_t locale, va_list ap)
#endif
/* SECURE */
#endif
/* WIDE_SCANF */
#endif
/* STRING */
...
...
dlls/msvcrt/tests/printf.c
View file @
d8ed47ec
...
...
@@ -43,11 +43,11 @@ static inline float __port_ind(void)
}
#define IND __port_ind()
static
int
(
__cdecl
*
p__vscprintf
)(
const
char
*
format
,
__ms_
va_list
valist
);
static
int
(
__cdecl
*
p__vscwprintf
)(
const
wchar_t
*
format
,
__ms_
va_list
valist
);
static
int
(
__cdecl
*
p__vscprintf
)(
const
char
*
format
,
va_list
valist
);
static
int
(
__cdecl
*
p__vscwprintf
)(
const
wchar_t
*
format
,
va_list
valist
);
static
int
(
__cdecl
*
p__vsnwprintf_s
)(
wchar_t
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
wchar_t
*
format
,
__ms_
va_list
valist
);
va_list
valist
);
static
int
(
__cdecl
*
p__ecvt_s
)(
char
*
buffer
,
size_t
length
,
double
number
,
int
ndigits
,
int
*
decpt
,
int
*
sign
);
static
int
(
__cdecl
*
p__fcvt_s
)(
char
*
buffer
,
size_t
length
,
double
number
,
...
...
@@ -55,17 +55,17 @@ static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number,
static
unsigned
int
(
__cdecl
*
p__get_output_format
)(
void
);
static
unsigned
int
(
__cdecl
*
p__set_output_format
)(
unsigned
int
);
static
int
(
WINAPIV
*
p_sprintf
)(
char
*
,
...);
static
int
(
__cdecl
*
p__vsprintf_p
)(
char
*
,
size_t
,
const
char
*
,
__ms_
va_list
);
static
int
(
__cdecl
*
p_vswprintf
)(
wchar_t
*
str
,
const
wchar_t
*
format
,
__ms_
va_list
valist
);
static
int
(
__cdecl
*
p__vswprintf
)(
wchar_t
*
str
,
const
wchar_t
*
format
,
__ms_
va_list
valist
);
static
int
(
__cdecl
*
p__vsprintf_p
)(
char
*
,
size_t
,
const
char
*
,
va_list
);
static
int
(
__cdecl
*
p_vswprintf
)(
wchar_t
*
str
,
const
wchar_t
*
format
,
va_list
valist
);
static
int
(
__cdecl
*
p__vswprintf
)(
wchar_t
*
str
,
const
wchar_t
*
format
,
va_list
valist
);
static
int
(
__cdecl
*
p__vswprintf_l
)(
wchar_t
*
str
,
const
wchar_t
*
format
,
void
*
locale
,
__ms_
va_list
valist
);
void
*
locale
,
va_list
valist
);
static
int
(
__cdecl
*
p__vswprintf_c
)(
wchar_t
*
str
,
size_t
size
,
const
wchar_t
*
format
,
__ms_
va_list
valist
);
va_list
valist
);
static
int
(
__cdecl
*
p__vswprintf_c_l
)(
wchar_t
*
str
,
size_t
size
,
const
wchar_t
*
format
,
void
*
locale
,
__ms_
va_list
valist
);
void
*
locale
,
va_list
valist
);
static
int
(
__cdecl
*
p__vswprintf_p_l
)(
wchar_t
*
str
,
size_t
size
,
const
wchar_t
*
format
,
void
*
locale
,
__ms_
va_list
valist
);
void
*
locale
,
va_list
valist
);
static
void
init
(
void
)
{
...
...
@@ -783,10 +783,10 @@ static void test_xcvt(void)
static
int
WINAPIV
_vsnwprintf_wrapper
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
_vsnwprintf
(
str
,
len
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -811,60 +811,60 @@ static void test_vsnwprintf(void)
static
int
WINAPIV
vswprintf_wrapper
(
wchar_t
*
str
,
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p_vswprintf
(
str
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
static
int
WINAPIV
_vswprintf_wrapper
(
wchar_t
*
str
,
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p__vswprintf
(
str
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
static
int
WINAPIV
_vswprintf_l_wrapper
(
wchar_t
*
str
,
const
wchar_t
*
format
,
void
*
locale
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
ret
=
p__vswprintf_l
(
str
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
static
int
WINAPIV
_vswprintf_c_wrapper
(
wchar_t
*
str
,
size_t
size
,
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p__vswprintf_c
(
str
,
size
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
static
int
WINAPIV
_vswprintf_c_l_wrapper
(
wchar_t
*
str
,
size_t
size
,
const
wchar_t
*
format
,
void
*
locale
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
ret
=
p__vswprintf_c_l
(
str
,
size
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
static
int
WINAPIV
_vswprintf_p_l_wrapper
(
wchar_t
*
str
,
size_t
size
,
const
wchar_t
*
format
,
void
*
locale
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
ret
=
p__vswprintf_p_l
(
str
,
size
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -918,10 +918,10 @@ static void test_vswprintf(void)
static
int
WINAPIV
_vscprintf_wrapper
(
const
char
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p__vscprintf
(
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -942,10 +942,10 @@ static void test_vscprintf(void)
static
int
WINAPIV
_vscwprintf_wrapper
(
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p__vscwprintf
(
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -967,10 +967,10 @@ static int WINAPIV _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer,
size_t
count
,
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p__vsnwprintf_s
(
str
,
sizeOfBuffer
,
count
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -1016,10 +1016,10 @@ static int WINAPIV _vsprintf_p_wrapper(char *str, size_t sizeOfBuffer,
const
char
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
p__vsprintf_p
(
str
,
sizeOfBuffer
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
dlls/msvcrt/wcs.c
View file @
d8ed47ec
...
...
@@ -820,7 +820,7 @@ float CDECL wcstof( const wchar_t *str, wchar_t **end )
/*********************************************************************
* arg_clbk_valist (INTERNAL)
*/
printf_arg
arg_clbk_valist
(
void
*
ctx
,
int
arg_pos
,
int
type
,
__ms_
va_list
*
valist
)
printf_arg
arg_clbk_valist
(
void
*
ctx
,
int
arg_pos
,
int
type
,
va_list
*
valist
)
{
printf_arg
ret
;
...
...
@@ -843,7 +843,7 @@ printf_arg arg_clbk_valist(void *ctx, int arg_pos, int type, __ms_va_list *valis
/*********************************************************************
* arg_clbk_positional (INTERNAL)
*/
printf_arg
arg_clbk_positional
(
void
*
ctx
,
int
pos
,
int
type
,
__ms_
va_list
*
valist
)
printf_arg
arg_clbk_positional
(
void
*
ctx
,
int
pos
,
int
type
,
va_list
*
valist
)
{
printf_arg
*
args
=
ctx
;
return
args
[
pos
];
...
...
@@ -854,7 +854,7 @@ printf_arg arg_clbk_positional(void *ctx, int pos, int type, __ms_va_list *valis
/*********************************************************************
* _vsnprintf (MSVCRT.@)
*/
int
CDECL
_vsnprintf
(
char
*
str
,
size_t
len
,
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
_vsnprintf
(
char
*
str
,
size_t
len
,
const
char
*
format
,
va_list
valist
)
{
static
const
char
nullbyte
=
'\0'
;
struct
_str_ctx_a
ctx
=
{
len
,
str
};
...
...
@@ -892,7 +892,7 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str)
* __stdio_common_vsprintf (UCRTBASE.@)
*/
int
CDECL
__stdio_common_vsprintf
(
unsigned
__int64
options
,
char
*
str
,
size_t
len
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
static
const
char
nullbyte
=
'\0'
;
struct
_str_ctx_a
ctx
=
{
len
,
str
};
...
...
@@ -923,7 +923,7 @@ int CDECL __stdio_common_vsprintf( unsigned __int64 options, char *str, size_t l
* _vsnprintf_l (MSVCRT.@)
*/
int
CDECL
_vsnprintf_l
(
char
*
str
,
size_t
len
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
static
const
char
nullbyte
=
'\0'
;
struct
_str_ctx_a
ctx
=
{
len
,
str
};
...
...
@@ -939,7 +939,7 @@ int CDECL _vsnprintf_l( char *str, size_t len, const char *format,
* _vsprintf_l (MSVCRT.@)
*/
int
CDECL
_vsprintf_l
(
char
*
str
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
_vsnprintf_l
(
str
,
INT_MAX
,
format
,
locale
,
valist
);
}
...
...
@@ -951,16 +951,16 @@ int WINAPIV _sprintf_l(char *str, const char *format,
_locale_t
locale
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
retval
=
_vsnprintf_l
(
str
,
INT_MAX
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
static
int
CDECL
vsnprintf_s_l_opt
(
char
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
char
*
format
,
DWORD
options
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
static
const
char
nullbyte
=
'\0'
;
struct
_str_ctx_a
ctx
;
...
...
@@ -992,7 +992,7 @@ static int CDECL vsnprintf_s_l_opt( char *str, size_t sizeOfBuffer,
static
int
vsnwprintf_s_l_opt
(
wchar_t
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
wchar_t
*
format
,
DWORD
options
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
struct
_str_ctx_w
ctx
;
int
len
,
ret
;
...
...
@@ -1025,7 +1025,7 @@ static int vsnwprintf_s_l_opt( wchar_t *str, size_t sizeOfBuffer,
*/
int
CDECL
_vsnprintf_s_l
(
char
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vsnprintf_s_l_opt
(
str
,
sizeOfBuffer
,
count
,
format
,
0
,
locale
,
valist
);
}
...
...
@@ -1034,7 +1034,7 @@ int CDECL _vsnprintf_s_l( char *str, size_t sizeOfBuffer,
* _vsprintf_s_l (MSVCRT.@)
*/
int
CDECL
_vsprintf_s_l
(
char
*
str
,
size_t
count
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
_vsnprintf_s_l
(
str
,
INT_MAX
,
count
,
format
,
locale
,
valist
);
}
...
...
@@ -1046,10 +1046,10 @@ int WINAPIV _sprintf_s_l( char *str, size_t count, const char *format,
_locale_t
locale
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
retval
=
_vsnprintf_s_l
(
str
,
INT_MAX
,
count
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1057,7 +1057,7 @@ int WINAPIV _sprintf_s_l( char *str, size_t count, const char *format,
* _vsnprintf_s (MSVCRT.@)
*/
int
CDECL
_vsnprintf_s
(
char
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
char
*
format
,
__ms_
va_list
valist
)
size_t
count
,
const
char
*
format
,
va_list
valist
)
{
return
_vsnprintf_s_l
(
str
,
sizeOfBuffer
,
count
,
format
,
NULL
,
valist
);
}
...
...
@@ -1066,7 +1066,7 @@ int CDECL _vsnprintf_s( char *str, size_t sizeOfBuffer,
* _vsnprintf_c_l (MSVCRT.@)
*/
int
CDECL
_vsnprintf_c_l
(
char
*
str
,
size_t
len
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vsnprintf_s_l_opt
(
str
,
len
,
len
,
format
,
0
,
locale
,
valist
);
}
...
...
@@ -1075,7 +1075,7 @@ int CDECL _vsnprintf_c_l(char *str, size_t len, const char *format,
* _vsnprintf_c (MSVCRT.@)
*/
int
CDECL
_vsnprintf_c
(
char
*
str
,
size_t
len
,
const
char
*
format
,
__ms_
va_list
valist
)
const
char
*
format
,
va_list
valist
)
{
return
_vsnprintf_c_l
(
str
,
len
,
format
,
NULL
,
valist
);
}
...
...
@@ -1087,7 +1087,7 @@ int CDECL _vsnprintf_c(char *str, size_t len,
*/
int
CDECL
__stdio_common_vsnprintf_s
(
unsigned
__int64
options
,
char
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
const
char
*
format
,
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -1099,7 +1099,7 @@ int CDECL __stdio_common_vsnprintf_s( unsigned __int64 options,
*/
int
CDECL
__stdio_common_vsnwprintf_s
(
unsigned
__int64
options
,
wchar_t
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
const
wchar_t
*
format
,
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -1111,7 +1111,7 @@ int CDECL __stdio_common_vsnwprintf_s( unsigned __int64 options,
*/
int
CDECL
__stdio_common_vswprintf_s
(
unsigned
__int64
options
,
wchar_t
*
str
,
size_t
count
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
__stdio_common_vsnwprintf_s
(
options
,
str
,
INT_MAX
,
count
,
format
,
locale
,
valist
);
}
...
...
@@ -1121,7 +1121,7 @@ int CDECL __stdio_common_vswprintf_s( unsigned __int64 options,
*/
int
CDECL
__stdio_common_vsprintf_s
(
unsigned
__int64
options
,
char
*
str
,
size_t
count
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -1133,7 +1133,7 @@ int CDECL __stdio_common_vsprintf_s( unsigned __int64 options,
/*********************************************************************
* vsprintf (MSVCRT.@)
*/
int
CDECL
vsprintf
(
char
*
str
,
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
vsprintf
(
char
*
str
,
const
char
*
format
,
va_list
valist
)
{
return
vsnprintf
(
str
,
INT_MAX
,
format
,
valist
);
}
...
...
@@ -1141,7 +1141,7 @@ int CDECL vsprintf( char *str, const char *format, __ms_va_list valist)
/*********************************************************************
* vsprintf_s (MSVCRT.@)
*/
int
CDECL
vsprintf_s
(
char
*
str
,
size_t
num
,
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
vsprintf_s
(
char
*
str
,
size_t
num
,
const
char
*
format
,
va_list
valist
)
{
return
vsnprintf
(
str
,
num
,
format
,
valist
);
}
...
...
@@ -1149,7 +1149,7 @@ int CDECL vsprintf_s( char *str, size_t num, const char *format, __ms_va_list va
/*********************************************************************
* _vscprintf (MSVCRT.@)
*/
int
CDECL
_vscprintf
(
const
char
*
format
,
__ms_
va_list
valist
)
int
CDECL
_vscprintf
(
const
char
*
format
,
va_list
valist
)
{
return
_vsnprintf_l
(
NULL
,
INT_MAX
,
format
,
NULL
,
valist
);
}
...
...
@@ -1158,7 +1158,7 @@ int CDECL _vscprintf( const char *format, __ms_va_list valist )
* _vscprintf_l (MSVCRT.@)
*/
int
CDECL
_vscprintf_l
(
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
_vsnprintf_l
(
NULL
,
INT_MAX
,
format
,
locale
,
valist
);
}
...
...
@@ -1167,7 +1167,7 @@ int CDECL _vscprintf_l(const char *format,
* _vscprintf_p_l (MSVCRT.@)
*/
int
CDECL
_vscprintf_p_l
(
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
args
)
_locale_t
locale
,
va_list
args
)
{
printf_arg
args_ctx
[
_ARGMAX
+
1
];
struct
_str_ctx_a
puts_ctx
=
{
INT_MAX
,
NULL
};
...
...
@@ -1196,7 +1196,7 @@ int CDECL _vscprintf_p_l(const char *format,
/*********************************************************************
* _vscprintf_p (MSVCR80.@)
*/
int
CDECL
_vscprintf_p
(
const
char
*
format
,
__ms_
va_list
argptr
)
int
CDECL
_vscprintf_p
(
const
char
*
format
,
va_list
argptr
)
{
return
_vscprintf_p_l
(
format
,
NULL
,
argptr
);
}
...
...
@@ -1207,10 +1207,10 @@ int CDECL _vscprintf_p(const char *format, __ms_va_list argptr)
int
WINAPIV
_snprintf
(
char
*
str
,
size_t
len
,
const
char
*
format
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
retval
=
vsnprintf
(
str
,
len
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1221,10 +1221,10 @@ int WINAPIV _snprintf_l(char *str, size_t count, const char *format,
_locale_t
locale
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
retval
=
_vsnprintf_l
(
str
,
count
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1235,10 +1235,10 @@ int WINAPIV _snprintf_c_l(char *str, size_t count, const char *format,
_locale_t
locale
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
retval
=
_vsnprintf_c_l
(
str
,
count
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1248,10 +1248,10 @@ int WINAPIV _snprintf_c_l(char *str, size_t count, const char *format,
int
WINAPIV
_snprintf_c
(
char
*
str
,
size_t
count
,
const
char
*
format
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
retval
=
_vsnprintf_c
(
str
,
count
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1262,10 +1262,10 @@ int WINAPIV _snprintf_s_l(char *str, size_t len, size_t count,
const
char
*
format
,
_locale_t
locale
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
retval
=
_vsnprintf_s_l
(
str
,
len
,
count
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1276,10 +1276,10 @@ int WINAPIV _snprintf_s(char *str, size_t len, size_t count,
const
char
*
format
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
retval
=
_vsnprintf_s_l
(
str
,
len
,
count
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1289,10 +1289,10 @@ int WINAPIV _snprintf_s(char *str, size_t len, size_t count,
int
WINAPIV
_scprintf
(
const
char
*
format
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
retval
=
_vscprintf
(
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1300,7 +1300,7 @@ int WINAPIV _scprintf(const char *format, ...)
* _vsnwprintf (MSVCRT.@)
*/
int
CDECL
_vsnwprintf
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
__ms_
va_list
valist
)
const
wchar_t
*
format
,
va_list
valist
)
{
struct
_str_ctx_w
ctx
=
{
len
,
str
};
int
ret
;
...
...
@@ -1315,7 +1315,7 @@ int CDECL _vsnwprintf(wchar_t *str, size_t len,
* _vsnwprintf_l (MSVCRT.@)
*/
int
CDECL
_vsnwprintf_l
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
struct
_str_ctx_w
ctx
=
{
len
,
str
};
int
ret
;
...
...
@@ -1330,7 +1330,7 @@ int CDECL _vsnwprintf_l(wchar_t *str, size_t len, const wchar_t *format,
* _vswprintf_c_l (MSVCRT.@)
*/
int
CDECL
_vswprintf_c_l
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vsnwprintf_s_l_opt
(
str
,
len
,
len
,
format
,
0
,
locale
,
valist
);
}
...
...
@@ -1339,13 +1339,13 @@ int CDECL _vswprintf_c_l(wchar_t *str, size_t len, const wchar_t *format,
* _vswprintf_c (MSVCRT.@)
*/
int
CDECL
_vswprintf_c
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
__ms_
va_list
valist
)
const
wchar_t
*
format
,
va_list
valist
)
{
return
_vswprintf_c_l
(
str
,
len
,
format
,
NULL
,
valist
);
}
static
int
vswprintf_p_l_opt
(
wchar_t
*
buffer
,
size_t
length
,
const
wchar_t
*
format
,
DWORD
options
,
_locale_t
locale
,
__ms_
va_list
args
)
const
wchar_t
*
format
,
DWORD
options
,
_locale_t
locale
,
va_list
args
)
{
printf_arg
args_ctx
[
_ARGMAX
+
1
];
struct
_str_ctx_w
puts_ctx
=
{
length
,
buffer
};
...
...
@@ -1374,7 +1374,7 @@ static int vswprintf_p_l_opt(wchar_t *buffer, size_t length,
* _vswprintf_p_l (MSVCRT.@)
*/
int
CDECL
_vswprintf_p_l
(
wchar_t
*
buffer
,
size_t
length
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
args
)
const
wchar_t
*
format
,
_locale_t
locale
,
va_list
args
)
{
return
vswprintf_p_l_opt
(
buffer
,
length
,
format
,
0
,
locale
,
args
);
}
...
...
@@ -1384,7 +1384,7 @@ int CDECL _vswprintf_p_l(wchar_t *buffer, size_t length,
* _vswprintf_p (MSVCR80.@)
*/
int
CDECL
_vswprintf_p
(
wchar_t
*
buffer
,
size_t
length
,
const
wchar_t
*
format
,
__ms_
va_list
args
)
const
wchar_t
*
format
,
va_list
args
)
{
return
vswprintf_p_l_opt
(
buffer
,
length
,
format
,
0
,
NULL
,
args
);
}
...
...
@@ -1396,7 +1396,7 @@ int CDECL _vswprintf_p(wchar_t *buffer, size_t length,
*/
int
CDECL
__stdio_common_vswprintf_p
(
unsigned
__int64
options
,
wchar_t
*
str
,
size_t
count
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -1409,7 +1409,7 @@ int CDECL __stdio_common_vswprintf_p( unsigned __int64 options,
*/
int
CDECL
_vsnwprintf_s_l
(
wchar_t
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
return
vsnwprintf_s_l_opt
(
str
,
sizeOfBuffer
,
count
,
format
,
0
,
locale
,
valist
);
}
...
...
@@ -1418,7 +1418,7 @@ int CDECL _vsnwprintf_s_l( wchar_t *str, size_t sizeOfBuffer,
* _vsnwprintf_s (MSVCRT.@)
*/
int
CDECL
_vsnwprintf_s
(
wchar_t
*
str
,
size_t
sizeOfBuffer
,
size_t
count
,
const
wchar_t
*
format
,
__ms_
va_list
valist
)
size_t
count
,
const
wchar_t
*
format
,
va_list
valist
)
{
return
_vsnwprintf_s_l
(
str
,
sizeOfBuffer
,
count
,
format
,
NULL
,
valist
);
...
...
@@ -1430,10 +1430,10 @@ int CDECL _vsnwprintf_s(wchar_t *str, size_t sizeOfBuffer,
int
WINAPIV
_snwprintf
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
retval
=
_vsnwprintf
(
str
,
len
,
format
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1444,10 +1444,10 @@ int WINAPIV _snwprintf_l( wchar_t *str, size_t len, const wchar_t *format,
_locale_t
locale
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
retval
=
_vsnwprintf_l
(
str
,
len
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1458,10 +1458,10 @@ int WINAPIV _snwprintf_s( wchar_t *str, size_t len, size_t count,
const
wchar_t
*
format
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
retval
=
_vsnwprintf_s_l
(
str
,
len
,
count
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1472,10 +1472,10 @@ int WINAPIV _snwprintf_s_l( wchar_t *str, size_t len, size_t count,
const
wchar_t
*
format
,
_locale_t
locale
,
...
)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
retval
=
_vsnwprintf_s_l
(
str
,
len
,
count
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1506,7 +1506,7 @@ static int puts_clbk_str_c99_w(void *ctx, int len, const wchar_t *str)
*/
int
CDECL
__stdio_common_vswprintf
(
unsigned
__int64
options
,
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
valist
)
_locale_t
locale
,
va_list
valist
)
{
struct
_str_ctx_w
ctx
=
{
len
,
str
};
int
ret
;
...
...
@@ -1537,12 +1537,12 @@ int CDECL __stdio_common_vswprintf( unsigned __int64 options,
*/
int
WINAPIV
sprintf
(
char
*
str
,
const
char
*
format
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
int
r
;
__ms_
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
r
=
vsnprintf
(
str
,
INT_MAX
,
format
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
r
;
}
...
...
@@ -1551,12 +1551,12 @@ int WINAPIV sprintf( char *str, const char *format, ... )
*/
int
WINAPIV
sprintf_s
(
char
*
str
,
size_t
num
,
const
char
*
format
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
int
r
;
__ms_
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
r
=
vsnprintf
(
str
,
num
,
format
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
r
;
}
...
...
@@ -1565,12 +1565,12 @@ int WINAPIV sprintf_s( char *str, size_t num, const char *format, ... )
*/
int
WINAPIV
_scwprintf
(
const
wchar_t
*
format
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
int
r
;
__ms_
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
r
=
_vsnwprintf
(
NULL
,
INT_MAX
,
format
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
r
;
}
...
...
@@ -1579,12 +1579,12 @@ int WINAPIV _scwprintf( const wchar_t *format, ... )
*/
int
WINAPIV
_swprintf
(
wchar_t
*
str
,
const
wchar_t
*
format
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
int
r
;
__ms_
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
r
=
_vsnwprintf
(
str
,
INT_MAX
,
format
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
r
;
}
...
...
@@ -1594,12 +1594,12 @@ int WINAPIV _swprintf( wchar_t *str, const wchar_t *format, ... )
int
WINAPIV
swprintf_s
(
wchar_t
*
str
,
size_t
numberOfElements
,
const
wchar_t
*
format
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
int
r
;
__ms_
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
r
=
_vsnwprintf_s
(
str
,
numberOfElements
,
INT_MAX
,
format
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
r
;
}
...
...
@@ -1610,12 +1610,12 @@ int WINAPIV swprintf_s(wchar_t *str, size_t numberOfElements,
int
WINAPIV
_swprintf_s_l
(
wchar_t
*
str
,
size_t
numberOfElements
,
const
wchar_t
*
format
,
_locale_t
locale
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
int
r
;
__ms_
va_start
(
ap
,
locale
);
va_start
(
ap
,
locale
);
r
=
_vsnwprintf_s_l
(
str
,
numberOfElements
,
INT_MAX
,
format
,
locale
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
r
;
}
...
...
@@ -1626,12 +1626,12 @@ int WINAPIV _swprintf_s_l(wchar_t *str, size_t numberOfElements,
int
WINAPIV
_swprintf_c_l
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
_locale_t
locale
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
int
r
;
__ms_
va_start
(
ap
,
locale
);
va_start
(
ap
,
locale
);
r
=
_vswprintf_c_l
(
str
,
len
,
format
,
locale
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
r
;
}
...
...
@@ -1642,12 +1642,12 @@ int WINAPIV _swprintf_c_l(wchar_t *str, size_t len,
int
WINAPIV
_swprintf_c
(
wchar_t
*
str
,
size_t
len
,
const
wchar_t
*
format
,
...
)
{
__ms_
va_list
ap
;
va_list
ap
;
int
r
;
__ms_
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
r
=
_vswprintf_c
(
str
,
len
,
format
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
r
;
}
...
...
@@ -1655,7 +1655,7 @@ int WINAPIV _swprintf_c(wchar_t *str, size_t len,
/*********************************************************************
* _vswprintf (MSVCRT.@)
*/
int
CDECL
_vswprintf
(
wchar_t
*
str
,
const
wchar_t
*
format
,
__ms_
va_list
args
)
int
CDECL
_vswprintf
(
wchar_t
*
str
,
const
wchar_t
*
format
,
va_list
args
)
{
return
_vsnwprintf
(
str
,
INT_MAX
,
format
,
args
);
}
...
...
@@ -1664,7 +1664,7 @@ int CDECL _vswprintf( wchar_t* str, const wchar_t* format, __ms_va_list args )
* _vswprintf (MSVCRT.@)
*/
int
CDECL
_vswprintf_l
(
wchar_t
*
str
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
args
)
_locale_t
locale
,
va_list
args
)
{
return
_vsnwprintf_l
(
str
,
INT_MAX
,
format
,
locale
,
args
);
}
...
...
@@ -1672,7 +1672,7 @@ int CDECL _vswprintf_l( wchar_t* str, const wchar_t* format,
/*********************************************************************
* _vscwprintf (MSVCRT.@)
*/
int
CDECL
_vscwprintf
(
const
wchar_t
*
format
,
__ms_
va_list
args
)
int
CDECL
_vscwprintf
(
const
wchar_t
*
format
,
va_list
args
)
{
return
_vsnwprintf
(
NULL
,
INT_MAX
,
format
,
args
);
}
...
...
@@ -1680,7 +1680,7 @@ int CDECL _vscwprintf( const wchar_t *format, __ms_va_list args )
/*********************************************************************
* _vscwprintf_l (MSVCRT.@)
*/
int
CDECL
_vscwprintf_l
(
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
args
)
int
CDECL
_vscwprintf_l
(
const
wchar_t
*
format
,
_locale_t
locale
,
va_list
args
)
{
return
_vsnwprintf_l
(
NULL
,
INT_MAX
,
format
,
locale
,
args
);
}
...
...
@@ -1688,7 +1688,7 @@ int CDECL _vscwprintf_l( const wchar_t *format, _locale_t locale, __ms_va_list a
/*********************************************************************
* _vscwprintf_p_l (MSVCRT.@)
*/
int
CDECL
_vscwprintf_p_l
(
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
args
)
int
CDECL
_vscwprintf_p_l
(
const
wchar_t
*
format
,
_locale_t
locale
,
va_list
args
)
{
return
vswprintf_p_l_opt
(
NULL
,
INT_MAX
,
format
,
0
,
locale
,
args
);
}
...
...
@@ -1697,7 +1697,7 @@ int CDECL _vscwprintf_p_l( const wchar_t *format, _locale_t locale, __ms_va_list
/*********************************************************************
* _vscwprintf_p (MSVCR80.@)
*/
int
CDECL
_vscwprintf_p
(
const
wchar_t
*
format
,
__ms_
va_list
args
)
int
CDECL
_vscwprintf_p
(
const
wchar_t
*
format
,
va_list
args
)
{
return
vswprintf_p_l_opt
(
NULL
,
INT_MAX
,
format
,
0
,
NULL
,
args
);
}
...
...
@@ -1707,7 +1707,7 @@ int CDECL _vscwprintf_p(const wchar_t *format, __ms_va_list args)
* vswprintf_s (MSVCRT.@)
*/
int
CDECL
vswprintf_s
(
wchar_t
*
str
,
size_t
numberOfElements
,
const
wchar_t
*
format
,
__ms_
va_list
args
)
const
wchar_t
*
format
,
va_list
args
)
{
return
_vsnwprintf_s
(
str
,
numberOfElements
,
INT_MAX
,
format
,
args
);
}
...
...
@@ -1716,14 +1716,14 @@ int CDECL vswprintf_s(wchar_t* str, size_t numberOfElements,
* _vswprintf_s_l (MSVCRT.@)
*/
int
CDECL
_vswprintf_s_l
(
wchar_t
*
str
,
size_t
numberOfElements
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_
va_list
args
)
const
wchar_t
*
format
,
_locale_t
locale
,
va_list
args
)
{
return
_vsnwprintf_s_l
(
str
,
numberOfElements
,
INT_MAX
,
format
,
locale
,
args
);
}
static
int
vsprintf_p_l_opt
(
char
*
buffer
,
size_t
length
,
const
char
*
format
,
DWORD
options
,
_locale_t
locale
,
__ms_
va_list
args
)
DWORD
options
,
_locale_t
locale
,
va_list
args
)
{
static
const
char
nullbyte
=
'\0'
;
printf_arg
args_ctx
[
_ARGMAX
+
1
];
...
...
@@ -1753,7 +1753,7 @@ static int vsprintf_p_l_opt(char *buffer, size_t length, const char *format,
* _vsprintf_p_l (MSVCRT.@)
*/
int
CDECL
_vsprintf_p_l
(
char
*
buffer
,
size_t
length
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
args
)
_locale_t
locale
,
va_list
args
)
{
return
vsprintf_p_l_opt
(
buffer
,
length
,
format
,
0
,
locale
,
args
);
}
...
...
@@ -1762,7 +1762,7 @@ int CDECL _vsprintf_p_l(char *buffer, size_t length, const char *format,
* _vsprintf_p (MSVCRT.@)
*/
int
CDECL
_vsprintf_p
(
char
*
buffer
,
size_t
length
,
const
char
*
format
,
__ms_
va_list
args
)
const
char
*
format
,
va_list
args
)
{
return
_vsprintf_p_l
(
buffer
,
length
,
format
,
NULL
,
args
);
}
...
...
@@ -1772,7 +1772,7 @@ int CDECL _vsprintf_p(char *buffer, size_t length,
* __stdio_common_vsprintf_p (UCRTBASE.@)
*/
int
CDECL
__stdio_common_vsprintf_p
(
unsigned
__int64
options
,
char
*
buffer
,
size_t
length
,
const
char
*
format
,
_locale_t
locale
,
__ms_
va_list
args
)
const
char
*
format
,
_locale_t
locale
,
va_list
args
)
{
if
(
options
&
~
UCRTBASE_PRINTF_MASK
)
FIXME
(
"options %s not handled
\n
"
,
wine_dbgstr_longlong
(
options
));
...
...
@@ -1786,12 +1786,12 @@ int CDECL __stdio_common_vsprintf_p(unsigned __int64 options, char *buffer, size
int
WINAPIV
_sprintf_p_l
(
char
*
buffer
,
size_t
length
,
const
char
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
r
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
r
=
_vsprintf_p_l
(
buffer
,
length
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
r
;
}
...
...
@@ -1803,10 +1803,10 @@ int WINAPIV __swprintf_l( wchar_t *str, const wchar_t *format,
_locale_t
locale
,
...)
{
int
retval
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
locale
);
va_list
valist
;
va_start
(
valist
,
locale
);
retval
=
_vswprintf_l
(
str
,
format
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
retval
;
}
...
...
@@ -1816,12 +1816,12 @@ int WINAPIV __swprintf_l( wchar_t *str, const wchar_t *format,
*/
int
WINAPIV
_sprintf_p
(
char
*
buffer
,
size_t
length
,
const
char
*
format
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
r
;
__ms_
va_start
(
valist
,
format
);
va_start
(
valist
,
format
);
r
=
_vsprintf_p_l
(
buffer
,
length
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
r
;
}
...
...
@@ -1833,12 +1833,12 @@ int WINAPIV _sprintf_p(char *buffer, size_t length, const char *format, ...)
int
WINAPIV
_swprintf_p_l
(
wchar_t
*
buffer
,
size_t
length
,
const
wchar_t
*
format
,
_locale_t
locale
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
int
r
;
__ms_
va_start
(
valist
,
locale
);
va_start
(
valist
,
locale
);
r
=
vswprintf_p_l_opt
(
buffer
,
length
,
format
,
0
,
locale
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
r
;
}
...
...
dlls/ucrtbase/tests/printf.c
View file @
d8ed47ec
...
...
@@ -81,10 +81,10 @@ static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str,
size_t
len
,
const
char
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
__stdio_common_vsprintf
(
options
,
str
,
len
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -165,10 +165,10 @@ static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str,
size_t
len
,
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
__stdio_common_vswprintf
(
options
,
str
,
len
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -259,10 +259,10 @@ static int WINAPIV vfprintf_wrapper(FILE *file,
const
char
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
__stdio_common_vfprintf
(
0
,
file
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -332,10 +332,10 @@ static int WINAPIV vfwprintf_wrapper(FILE *file,
const
wchar_t
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
__stdio_common_vfwprintf
(
0
,
file
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -429,10 +429,10 @@ static int WINAPIV _vsnprintf_s_wrapper(char *str, size_t sizeOfBuffer,
size_t
count
,
const
char
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
__stdio_common_vsnprintf_s
(
0
,
str
,
sizeOfBuffer
,
count
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
@@ -481,10 +481,10 @@ static int WINAPIV _vsnwprintf_s_wrapper(WCHAR *str, size_t sizeOfBuffer,
size_t
count
,
const
WCHAR
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
__stdio_common_vsnwprintf_s
(
0
,
str
,
sizeOfBuffer
,
count
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
dlls/ucrtbase/tests/scanf.c
View file @
d8ed47ec
...
...
@@ -30,10 +30,10 @@
static
int
WINAPIV
vsscanf_wrapper
(
unsigned
__int64
options
,
const
char
*
str
,
size_t
len
,
const
char
*
format
,
...)
{
int
ret
;
__ms_
va_list
valist
;
__ms_
va_start
(
valist
,
format
);
va_list
valist
;
va_start
(
valist
,
format
);
ret
=
__stdio_common_vsscanf
(
options
,
str
,
len
,
format
,
NULL
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
ret
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment