https://git.reactos.org/?p=reactos.git;a=commitdiff;h=958d4a884a51f2de046181...
commit 958d4a884a51f2de046181a29ce430cb01ccd241 Author: winesync ros-dev@reactos.org AuthorDate: Mon Jan 17 18:47:46 2022 +0100 Commit: Thomas Csovcsity thc.fr13nd@gmail.com CommitDate: Sun Jun 19 13:06:39 2022 +0200
[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 --- base/applications/cmdutils/reg/reg.c | 14 +++++++------- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/base/applications/cmdutils/reg/reg.c b/base/applications/cmdutils/reg/reg.c index 0c8eb47863c..5963d7b08fe 100644 --- a/base/applications/cmdutils/reg/reg.c +++ b/base/applications/cmdutils/reg/reg.c @@ -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; DWORD len; @@ -92,7 +92,7 @@ void WINAPIV output_message(unsigned int id, ...) { WCHAR *fmt = NULL; int len; - __ms_va_list va_args; + va_list va_args;
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);
- __ms_va_start(va_args, id); + va_start(va_args, id); output_formatstring(fmt, va_args); - __ms_va_end(va_args); + va_end(va_args);
free(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); - __ms_va_end(va_args); + va_end(va_args); }
/* ask_confirm() adapted from programs/cmd/builtins.c */ diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index c833eff4f8d..3d4ba702200 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: 04d52eb83fa5c37cfe1100f435e36c2f78918338 + wine: 942f9f71575d4a53ae032360e03f1297be1319f7