ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regedit: Use the standard va_list instead of __ms_va_list. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-10-25 11:01:38 +02:00
parent 942f9f7157
commit 8667b8d124
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
programs/regedit/edit.c
View File

@ -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)

14
programs/regedit/regedit.c
View File

@ -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 */
}