mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 21:53:06 +00:00
[WINESYNC] reg: Use the standard va_list instead of __ms_va_list.
Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 942f9f71575d4a53ae032360e03f1297be1319f7 by Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
29992c17f1
commit
958d4a884a
2 changed files with 8 additions and 8 deletions
|
@ -72,7 +72,7 @@ void output_writeconsole(const WCHAR *str, DWORD wlen)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args)
|
static void output_formatstring(const WCHAR *fmt, va_list va_args)
|
||||||
{
|
{
|
||||||
WCHAR *str;
|
WCHAR *str;
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
@ -92,7 +92,7 @@ void WINAPIV output_message(unsigned int id, ...)
|
||||||
{
|
{
|
||||||
WCHAR *fmt = NULL;
|
WCHAR *fmt = NULL;
|
||||||
int len;
|
int len;
|
||||||
__ms_va_list va_args;
|
va_list va_args;
|
||||||
|
|
||||||
if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0)))
|
if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0)))
|
||||||
{
|
{
|
||||||
|
@ -106,20 +106,20 @@ void WINAPIV output_message(unsigned int id, ...)
|
||||||
|
|
||||||
LoadStringW(GetModuleHandleW(NULL), id, fmt, len);
|
LoadStringW(GetModuleHandleW(NULL), id, fmt, len);
|
||||||
|
|
||||||
__ms_va_start(va_args, id);
|
va_start(va_args, id);
|
||||||
output_formatstring(fmt, va_args);
|
output_formatstring(fmt, va_args);
|
||||||
__ms_va_end(va_args);
|
va_end(va_args);
|
||||||
|
|
||||||
free(fmt);
|
free(fmt);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WINAPIV output_string(const WCHAR *fmt, ...)
|
void WINAPIV output_string(const WCHAR *fmt, ...)
|
||||||
{
|
{
|
||||||
__ms_va_list va_args;
|
va_list va_args;
|
||||||
|
|
||||||
__ms_va_start(va_args, fmt);
|
va_start(va_args, fmt);
|
||||||
output_formatstring(fmt, va_args);
|
output_formatstring(fmt, va_args);
|
||||||
__ms_va_end(va_args);
|
va_end(va_args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ask_confirm() adapted from programs/cmd/builtins.c */
|
/* ask_confirm() adapted from programs/cmd/builtins.c */
|
||||||
|
|
|
@ -4,4 +4,4 @@ directories:
|
||||||
files:
|
files:
|
||||||
programs/reg/resource.h: base/applications/cmdutils/reg/resource.h
|
programs/reg/resource.h: base/applications/cmdutils/reg/resource.h
|
||||||
tags:
|
tags:
|
||||||
wine: 04d52eb83fa5c37cfe1100f435e36c2f78918338
|
wine: 942f9f71575d4a53ae032360e03f1297be1319f7
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue