From 8667b8d124f66b7c172a94e6b87e725fe647e114 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 25 Oct 2021 11:01:38 +0200 Subject: [PATCH] regedit: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard --- programs/regedit/edit.c | 14 +++++++------- programs/regedit/regedit.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 813c1a1c84c..13f2256b2cb 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -44,7 +44,7 @@ struct edit_params DWORD size; }; -static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_list va_args) +static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, va_list va_args) { WCHAR title[256]; WCHAR fmt[1024]; @@ -64,23 +64,23 @@ static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_l int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...) { - __ms_va_list ap; + va_list ap; INT result; - __ms_va_start(ap, resId); + va_start(ap, resId); result = vmessagebox(hwnd, buttons, titleId, resId, ap); - __ms_va_end(ap); + va_end(ap); return result; } static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) { - __ms_va_list ap; + va_list ap; - __ms_va_start(ap, msg_id); + va_start(ap, msg_id); vmessagebox(hwnd, MB_OK|MB_ICONERROR, IDS_ERROR, msg_id, ap); - __ms_va_end(ap); + va_end(ap); } static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index e25de19b527..c60d1ddb9b6 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -50,7 +50,7 @@ static 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; @@ -69,31 +69,31 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1536]; - __ms_va_list va_args; + va_list va_args; if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); return; } - __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); } void WINAPIV error_exit(unsigned int id, ...) { WCHAR fmt[1536]; - __ms_va_list va_args; + va_list va_args; if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %u\n", GetLastError()); return; } - __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); exit(0); /* regedit.exe always terminates with error code zero */ }