October 2021 - Wine-commits

Alexandre Julliard : net: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 3291ead14df517375a6a62e4d5e6d137a9924288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3291ead14df517375a6a62e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:16 2021 +0200 net: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/net.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index dbc4bf2bfc6..a8073956019 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -54,7 +54,7 @@ static int output_write(const WCHAR* str, int len) return count; } -static int output_vprintf(const WCHAR* fmt, __ms_va_list va_args) +static int output_vprintf(const WCHAR* fmt, va_list va_args) { WCHAR str[8192]; int len; @@ -69,23 +69,23 @@ static int output_vprintf(const WCHAR* fmt, __ms_va_list va_args) static int WINAPIV output_printf(const WCHAR* fmt, ...) { - __ms_va_list arguments; + va_list arguments; - __ms_va_start(arguments, fmt); + va_start(arguments, fmt); output_vprintf(fmt, arguments); - __ms_va_end(arguments); + va_end(arguments); return 0; } static int WINAPIV output_string(int msg, ...) { WCHAR fmt[8192]; - __ms_va_list arguments; + va_list arguments; LoadStringW(GetModuleHandleW(NULL), msg, fmt, ARRAY_SIZE(fmt)); - __ms_va_start(arguments, msg); + va_start(arguments, msg); output_vprintf(fmt, arguments); - __ms_va_end(arguments); + va_end(arguments); return 0; }

1 0

Alexandre Julliard : netstat: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 3b6b24ea424c5f499c58f7de06e83a8c035b6ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6b24ea424c5f499c58f7de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:22 2021 +0200 netstat: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/netstat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 563896629c9..243fca56055 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -78,7 +78,7 @@ static int WINAPIV NETSTAT_wprintf(const WCHAR *format, ...) static BOOL traceOutput = FALSE; #define MAX_WRITECONSOLE_SIZE 65535 - __ms_va_list parms; + va_list parms; DWORD nOut; int len; DWORD res = 0; @@ -96,9 +96,9 @@ static int WINAPIV NETSTAT_wprintf(const WCHAR *format, ...) return 0; } - __ms_va_start(parms, format); + va_start(parms, format); len = wvsprintfW(output_bufW, format, parms); - __ms_va_end(parms); + va_end(parms); /* Try to write as unicode all the time we think it's a console */ if (toConsole) {

1 0

Alexandre Julliard : reg: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 942f9f71575d4a53ae032360e03f1297be1319f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=942f9f71575d4a53ae032360… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:29 2021 +0200 reg: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 617ec9df56f..1af63498b05 100644 --- a/programs/reg/reg.c +++ b/programs/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 */

1 0

Alexandre Julliard : regedit: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 8667b8d124f66b7c172a94e6b87e725fe647e114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8667b8d124f66b7c172a94e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:38 2021 +0200 regedit: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 */ }

1 0

Alexandre Julliard : regsvr32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: f8ffea3a8747587355569b761c58e89d39727d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ffea3a8747587355569b76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:45 2021 +0200 regsvr32: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index fb307d797a1..c56479015d8 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -39,7 +39,7 @@ static BOOL Silent = FALSE; static void WINAPIV output_write(UINT id, ...) { WCHAR fmt[1024]; - __ms_va_list va_args; + va_list va_args; WCHAR *str; DWORD len, nOut, ret; @@ -51,10 +51,10 @@ static void WINAPIV output_write(UINT id, ...) return; } - __ms_va_start(va_args, id); + va_start(va_args, id); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (LPWSTR)&str, 0, &va_args); - __ms_va_end(va_args); + va_end(va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt));

1 0

Alexandre Julliard : services/tests: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 7f83b8fdd1be6ccfd10b256ef845b0d03564befa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f83b8fdd1be6ccfd10b256e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:56 2021 +0200 services/tests: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 93eff0e36f0..7495232b7b1 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -65,12 +65,12 @@ static inline void service_event(const char *event) static void WINAPIV service_ok(int cnd, const char *msg, ...) __WINE_PRINTF_ATTR(2,3); static void WINAPIV service_ok(int cnd, const char *msg, ...) { - __ms_va_list valist; + va_list valist; char buf[512]; - __ms_va_start(valist, msg); + va_start(valist, msg); vsprintf(buf, msg, valist); - __ms_va_end(valist); + va_end(valist); send_msg(cnd ? "OK" : "FAIL", buf); }

1 0

Alexandre Julliard : taskkill: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 2c2e75503bea973a3091ea48d431782da656ef8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c2e75503bea973a3091ea48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:04 2021 +0200 taskkill: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/taskkill.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 193ed058297..6704b121aa9 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -39,7 +39,7 @@ struct pid_close_info BOOL found; }; -static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) +static int taskkill_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; DWORD count, ret; @@ -75,27 +75,27 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) static int WINAPIV taskkill_printfW(const WCHAR *msg, ...) { - __ms_va_list va_args; + va_list va_args; int len; - __ms_va_start(va_args, msg); + va_start(va_args, msg); len = taskkill_vprintfW(msg, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; } static int WINAPIV taskkill_message_printfW(int msg, ...) { - __ms_va_list va_args; + va_list va_args; WCHAR msg_buffer[8192]; int len; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - __ms_va_start(va_args, msg); + va_start(va_args, msg); len = taskkill_vprintfW(msg_buffer, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; }

1 0

Alexandre Julliard : uninstaller: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 9183aec7c7dee9acdd5a7eec783ac20859a30330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9183aec7c7dee9acdd5a7eec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:12 2021 +0200 uninstaller: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 8941d3a47ad..d8203b6763b 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -70,7 +70,7 @@ static void output_writeconsole(const WCHAR *str, DWORD len) } } -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; @@ -89,25 +89,25 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) static void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1024]; - __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); } static void WINAPIV output_array(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); } /**

1 0

Alexandre Julliard : winedbg: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 43e3e1e409225336dccc820983ade69010e35beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e3e1e409225336dccc8209… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:19 2021 +0200 winedbg: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 0a629e880fa..57c2eb82972 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -147,12 +147,12 @@ void dbg_outputW(const WCHAR* buffer, int len) int WINAPIV dbg_printf(const char* format, ...) { static char buf[4*1024]; - __ms_va_list valist; + va_list valist; int len; - __ms_va_start(valist, format); + va_start(valist, format); len = vsnprintf(buf, sizeof(buf), format, valist); - __ms_va_end(valist); + va_end(valist); if (len <= -1 || len >= sizeof(buf)) {

1 0

Alexandre Julliard : winemenubuilder: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 63bff91a7f0a9f3ece0ce3945861d923bf9d3d4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=63bff91a7f0a9f3ece0ce394… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:26 2021 +0200 winemenubuilder: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 522e6192b24..16dc32a8859 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -246,7 +246,7 @@ static void heap_free( void *ptr ) static WCHAR * WINAPIV heap_wprintf(const WCHAR *format, ...) { - __ms_va_list args; + va_list args; int size = 4096; WCHAR *buffer; int n; @@ -254,9 +254,9 @@ static WCHAR * WINAPIV heap_wprintf(const WCHAR *format, ...) while (1) { buffer = xmalloc(size * sizeof(WCHAR)); - __ms_va_start(args, format); + va_start(args, format); n = _vsnwprintf(buffer, size, format, args); - __ms_va_end(args); + va_end(args); if (n == -1) size *= 2; else if (n >= size)

1 0