wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Alexandre Julliard : krnl386: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: b14447b137c526a8e337b21bab1ae1e5fc11039f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b14447b137c526a8e337b21b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:58 2021 +0200 krnl386: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/thunk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index c8a247299b4..3ae61e1fe96 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -2381,9 +2381,9 @@ INT WINAPI k32LoadStringA(HINSTANCE instance, UINT resource_id, /*********************************************************************** * k32wvsprintfA (KERNEL32.16) */ -INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, __ms_va_list args) +INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, va_list args) { - static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, __ms_va_list); + static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, va_list); if(!pwvsprintfA) pwvsprintfA = user32_proc_address("wvsprintfA"); return (*pwvsprintfA)(buffer, spec, args); @@ -2394,12 +2394,12 @@ INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, __ms_va_list args) */ INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...) { - __ms_va_list args; + va_list args; INT res; - __ms_va_start(args, spec); + va_start(args, spec); res = k32wvsprintfA(buffer, spec, args); - __ms_va_end(args); + va_end(args); return res; }

1 0

Alexandre Julliard : kernelbase: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 2b86341847776f6502f3b878aa0e0d358e076cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b86341847776f6502f3b878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:53 2021 +0200 kernelbase: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 1c2f4dda221..259b9d0d18e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3728,7 +3728,7 @@ static const WCHAR *get_message( DWORD flags, const void *src, UINT id, UINT lan * FormatMessageA (kernelbase.@) */ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageA( DWORD flags, const void *source, DWORD msgid, DWORD langid, - char *buffer, DWORD size, __ms_va_list *args ) + char *buffer, DWORD size, va_list *args ) { DWORD ret = 0; ULONG len, retsize = 0; @@ -3811,7 +3811,7 @@ done: * FormatMessageW (kernelbase.@) */ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, DWORD msgid, DWORD langid, - WCHAR *buffer, DWORD size, __ms_va_list *args ) + WCHAR *buffer, DWORD size, va_list *args ) { ULONG retsize = 0; ULONG width = (flags & FORMAT_MESSAGE_MAX_WIDTH_MASK);

1 0

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

22 Oct '21

Module: wine Branch: master Commit: b1d5649b5c12ce8f9cacf74880122674a95f1d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1d5649b5c12ce8f9cacf748… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:48 2021 +0200 kernel32/tests: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 6 +++--- dlls/kernel32/tests/format_msg.c | 20 ++++++++++---------- dlls/kernel32/tests/process.c | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 1a258ad69a6..0955025a650 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -60,11 +60,11 @@ static HMODULE ntdll; static void WINAPIV __WINE_PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) { - __ms_va_list valist; + va_list valist; - __ms_va_start(valist, msg); + va_start(valist, msg); winetest_vok(condition, msg, valist); - __ms_va_end(valist); + va_end(valist); if (!condition) ++child_failures; } diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 794069e341d..0e09ba904d0 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -29,26 +29,26 @@ static DWORD WINAPIV doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { - __ms_va_list list; + va_list list; DWORD r; - __ms_va_start(list, outsize); + va_start(list, outsize); r = FormatMessageA(flags, src, msg_id, lang_id, out, outsize, &list); - __ms_va_end(list); + va_end(list); return r; } static DWORD WINAPIV doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPWSTR out, DWORD outsize, ... ) { - __ms_va_list list; + va_list list; DWORD r; - __ms_va_start(list, outsize); + va_start(list, outsize); r = FormatMessageW(flags, src, msg_id, lang_id, out, outsize, &list); - __ms_va_end(list); + va_end(list); return r; } @@ -297,11 +297,11 @@ static void test_message_from_string_wide(void) { ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, L"%1!*.*u!,%1!*.*u!", - 0, 0, out, ARRAY_SIZE(out), (__ms_va_list *)args ); + 0, 0, out, ARRAY_SIZE(out), (va_list *)args ); ok(!lstrcmpW(L" 0002, 00003", out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==13,"failed: r=%d\n",r); r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, L"%1!*.*u!,%4!*.*u!", - 0, 0, out, ARRAY_SIZE(out), (__ms_va_list *)args ); + 0, 0, out, ARRAY_SIZE(out), (va_list *)args ); ok(!lstrcmpW(L" 0002, 001", out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==12,"failed: r=%d\n",r); } @@ -593,11 +593,11 @@ static void test_message_from_string(void) { ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, - "%1!*.*u!,%1!*.*u!", 0, 0, out, sizeof(out), (__ms_va_list *)args ); + "%1!*.*u!,%1!*.*u!", 0, 0, out, sizeof(out), (va_list *)args ); ok(!strcmp(" 0002, 00003", out),"failed out=[%s]\n",out); ok(r==13,"failed: r=%d\n",r); r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, - "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (__ms_va_list *)args ); + "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (va_list *)args ); ok(!strcmp(" 0002, 001", out),"failed out=[%s]\n",out); ok(r==12,"failed: r=%d\n",r); } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 87873d4a90d..0d1a2f1a31d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -307,13 +307,13 @@ static void get_file_name(char* buf) */ static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { - __ms_va_list valist; + va_list valist; char buffer[1024+4*MAX_LISTED_ENV_VAR]; DWORD w; - __ms_va_start(valist, fmt); + va_start(valist, fmt); vsprintf(buffer, fmt, valist); - __ms_va_end(valist); + va_end(valist); WriteFile(h, buffer, strlen(buffer), &w, NULL); }

1 0

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

22 Oct '21

Module: wine Branch: master Commit: 4233b5d600da7029d5ebd0fdea853db9fe3dede1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4233b5d600da7029d5ebd0fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:39 2021 +0200 dinput8/tests: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.h | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index f41de44b87a..4fec0e99e47 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -143,7 +143,7 @@ static inline void winetest_set_location( const char *file, int line ) data->current_line = line; } -static inline void kvprintf( const char *format, __ms_va_list ap ) +static inline void kvprintf( const char *format, va_list ap ) { struct tls_data *data = get_tls_data(); IO_STATUS_BLOCK io; @@ -154,23 +154,23 @@ static inline void kvprintf( const char *format, __ms_va_list ap ) static inline void WINAPIV kprintf( const char *format, ... ) __WINE_PRINTF_ATTR( 1, 2 ); static inline void WINAPIV kprintf( const char *format, ... ) { - __ms_va_list valist; + va_list valist; - __ms_va_start( valist, format ); + va_start( valist, format ); kvprintf( format, valist ); - __ms_va_end( valist ); + va_end( valist ); } static inline void WINAPIV winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR( 1, 2 ); static inline void WINAPIV winetest_printf( const char *msg, ... ) { struct tls_data *data = get_tls_data(); - __ms_va_list valist; + va_list valist; kprintf( "%s:%d: ", data->current_file, data->current_line ); - __ms_va_start( valist, msg ); + va_start( valist, msg ); kvprintf( msg, valist ); - __ms_va_end( valist ); + va_end( valist ); } static inline NTSTATUS winetest_init(void) @@ -283,7 +283,7 @@ static inline LONG winetest_add_line(void) return count; } -static inline int winetest_vok( int condition, const char *msg, __ms_va_list args ) +static inline int winetest_vok( int condition, const char *msg, va_list args ) { struct tls_data *data = get_tls_data(); @@ -332,13 +332,13 @@ static inline int winetest_vok( int condition, const char *msg, __ms_va_list arg static inline void WINAPIV winetest_ok( int condition, const char *msg, ... ) __WINE_PRINTF_ATTR( 2, 3 ); static inline void WINAPIV winetest_ok( int condition, const char *msg, ... ) { - __ms_va_list args; - __ms_va_start( args, msg ); + va_list args; + va_start( args, msg ); winetest_vok( condition, msg, args ); - __ms_va_end( args ); + va_end( args ); } -static inline void winetest_vskip( const char *msg, __ms_va_list args ) +static inline void winetest_vskip( const char *msg, va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { @@ -352,34 +352,34 @@ static inline void winetest_vskip( const char *msg, __ms_va_list args ) static inline void WINAPIV winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR( 1, 2 ); static inline void WINAPIV winetest_skip( const char *msg, ... ) { - __ms_va_list args; - __ms_va_start( args, msg ); + va_list args; + va_start( args, msg ); winetest_vskip( msg, args ); - __ms_va_end( args ); + va_end( args ); } static inline void WINAPIV winetest_win_skip( const char *msg, ... ) __WINE_PRINTF_ATTR( 1, 2 ); static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { - __ms_va_list args; - __ms_va_start( args, msg ); + va_list args; + va_start( args, msg ); if (!running_under_wine) winetest_vskip( msg, args ); else winetest_vok( 0, msg, args ); - __ms_va_end( args ); + va_end( args ); } static inline void WINAPIV winetest_trace( const char *msg, ... ) __WINE_PRINTF_ATTR( 1, 2 ); static inline void WINAPIV winetest_trace( const char *msg, ... ) { - __ms_va_list args; + va_list args; if (!winetest_debug) return; if (winetest_add_line() < winetest_mute_threshold) { winetest_print_context( "" ); - __ms_va_start( args, msg ); + va_start( args, msg ); kvprintf( msg, args ); - __ms_va_end( args ); + va_end( args ); } else InterlockedIncrement( &muted_traces ); } @@ -409,13 +409,13 @@ static inline void WINAPIV winetest_push_context( const char *fmt, ... ) __WINE_ static inline void WINAPIV winetest_push_context( const char *fmt, ... ) { struct tls_data *data = get_tls_data(); - __ms_va_list valist; + va_list valist; if (data->context_count < ARRAY_SIZE(data->context)) { - __ms_va_start( valist, fmt ); + va_start( valist, fmt ); vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); - __ms_va_end( valist ); + va_end( valist ); data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; } ++data->context_count;

1 0

Alexandre Julliard : dbgeng: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 922f9c85cf711a01eadd5e47bc66a45129035447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=922f9c85cf711a01eadd5e47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:34 2021 +0200 dbgeng: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index c857456b51c..014f723981b 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -2782,7 +2782,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_Output(IDebugControl2 *iface, ULO } static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVaList(IDebugControl2 *iface, ULONG mask, const char *format, - __ms_va_list args) + va_list args) { FIXME("%p, %#x, %s stub.\n", iface, mask, debugstr_a(format)); @@ -2798,7 +2798,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_ControlledOutput(IDebugControl2 * } static HRESULT STDMETHODCALLTYPE debugcontrol_ControlledOutputVaList(IDebugControl2 *iface, ULONG output_control, - ULONG mask, const char *format, __ms_va_list args) + ULONG mask, const char *format, va_list args) { FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, mask, debugstr_a(format)); @@ -2814,7 +2814,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_OutputPrompt(IDebugControl2 *ifac } static HRESULT STDMETHODCALLTYPE debugcontrol_OutputPromptVaList(IDebugControl2 *iface, ULONG output_control, - const char *format, __ms_va_list args) + const char *format, va_list args) { FIXME("%p, %u, %s stub.\n", iface, output_control, debugstr_a(format));

1 0

Alexandre Julliard : d3dcompiler: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: bb2d48627d98301fe24ed74bd6897d1146e8dc1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb2d48627d98301fe24ed74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:28 2021 +0200 d3dcompiler: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/asmshader.y | 6 +++--- dlls/d3dcompiler_43/compiler.c | 20 ++++++++++---------- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/ppl.l | 10 +++++----- dlls/d3dcompiler_43/preproc.c | 6 +++--- dlls/d3dcompiler_43/utils.c | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 9e0fec618cd..f33be2259d9 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -30,11 +30,11 @@ struct asm_parser asm_ctx; void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { - __ms_va_list args; + va_list args; - __ms_va_start(args, fmt); + va_start(args, fmt); compilation_message(&ctx->messages, fmt, args); - __ms_va_end(args); + va_end(args); } static void asmshader_error(char const *s) { diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index b75a1d0a6a5..112e82d6d44 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -83,7 +83,7 @@ static CRITICAL_SECTION_DEBUG wpp_mutex_debug = static CRITICAL_SECTION wpp_mutex = { &wpp_mutex_debug, -1, 0, 0, 0, 0 }; /* Preprocessor error reporting functions */ -static void wpp_write_message(const char *fmt, __ms_va_list args) +static void wpp_write_message(const char *fmt, va_list args) { char* newbuffer; int rc, newsize; @@ -125,37 +125,37 @@ static void wpp_write_message(const char *fmt, __ms_va_list args) static void WINAPIV PRINTF_ATTR(1,2) wpp_write_message_var(const char *fmt, ...) { - __ms_va_list args; + va_list args; - __ms_va_start(args, fmt); + va_start(args, fmt); wpp_write_message(fmt, args); - __ms_va_end(args); + va_end(args); } int WINAPIV ppy_error(const char *msg, ...) { - __ms_va_list ap; - __ms_va_start(ap, msg); + va_list ap; + va_start(ap, msg); wpp_write_message_var("%s:%d:%d: %s: ", pp_status.input ? pp_status.input : "'main file'", pp_status.line_number, pp_status.char_number, "Error"); wpp_write_message(msg, ap); wpp_write_message_var("\n"); - __ms_va_end(ap); + va_end(ap); pp_status.state = 1; return 1; } int WINAPIV ppy_warning(const char *msg, ...) { - __ms_va_list ap; - __ms_va_start(ap, msg); + va_list ap; + va_start(ap, msg); wpp_write_message_var("%s:%d:%d: %s: ", pp_status.input ? pp_status.input : "'main file'", pp_status.line_number, pp_status.char_number, "Warning"); wpp_write_message(msg, ap); wpp_write_message_var("\n"); - __ms_va_end(ap); + va_end(ap); return 0; } diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 49027d11851..713c900cee6 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -269,7 +269,7 @@ struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; #define PRINTF_ATTR(fmt,args) #endif -void compilation_message(struct compilation_messages *msg, const char *fmt, __ms_va_list args) DECLSPEC_HIDDEN; +void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args) DECLSPEC_HIDDEN; void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; static inline void set_parse_status(enum parse_status *current, enum parse_status update) { diff --git a/dlls/d3dcompiler_43/ppl.l b/dlls/d3dcompiler_43/ppl.l index 568ccb4e8df..1797b98eebf 100644 --- a/dlls/d3dcompiler_43/ppl.l +++ b/dlls/d3dcompiler_43/ppl.l @@ -287,7 +287,7 @@ includelogicentry_t *pp_includelogiclist = NULL; void WINAPIV pp_writestring(const char *format, ...) { - __ms_va_list valist; + va_list valist; int len; static char *buffer; static int buffercapacity; @@ -301,10 +301,10 @@ void WINAPIV pp_writestring(const char *format, ...) buffercapacity = BUFFERINITIALCAPACITY; } - __ms_va_start(valist, format); + va_start(valist, format); len = vsnprintf(buffer, buffercapacity, format, valist); - __ms_va_end(valist); + va_end(valist); /* If the string is longer than buffersize, vsnprintf returns * the string length with glibc >= 2.1, -1 with glibc < 2.1 */ while(len > buffercapacity || len < 0) @@ -318,10 +318,10 @@ void WINAPIV pp_writestring(const char *format, ...) if(new_buffer == NULL) return; buffer = new_buffer; - __ms_va_start(valist, format); + va_start(valist, format); len = vsnprintf(buffer, buffercapacity, format, valist); - __ms_va_end(valist); + va_end(valist); } wpp_write(buffer, len); diff --git a/dlls/d3dcompiler_43/preproc.c b/dlls/d3dcompiler_43/preproc.c index be98e6f4194..3ea05a00a26 100644 --- a/dlls/d3dcompiler_43/preproc.c +++ b/dlls/d3dcompiler_43/preproc.c @@ -437,11 +437,11 @@ int pp_get_if_depth(void) void WINAPIV pp_internal_error(const char *file, int line, const char *s, ...) { - __ms_va_list ap; - __ms_va_start(ap, s); + va_list ap; + va_start(ap, s); fprintf(stderr, "Internal error (please report) %s %d: ", file, line); vfprintf(stderr, s, ap); fprintf(stderr, "\n"); - __ms_va_end(ap); + va_end(ap); exit(3); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0d20a85458e..2c5c903106e 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -716,7 +716,7 @@ HRESULT dxbc_write_blob(struct dxbc *dxbc, ID3DBlob **blob) return S_OK; } -void compilation_message(struct compilation_messages *msg, const char *fmt, __ms_va_list args) +void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args) { char* buffer; int rc, size;

1 0

Alexandre Julliard : avifil32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 1303364fcba50b16f6531846d3df74fe4de914eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1303364fcba50b16f6531846… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:23 2021 +0200 avifil32: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 0494bfc59e4..e4fb64ff3ee 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2233,7 +2233,7 @@ HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile) HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - __ms_va_list vl; + va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2255,13 +2255,13 @@ HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK l streams[0] = pavi; options[0] = lpOptions; - __ms_va_start(vl, lpOptions); + va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { streams[i] = va_arg(vl, PAVISTREAM); options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } - __ms_va_end(vl); + va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); @@ -2276,7 +2276,7 @@ error: HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - __ms_va_list vl; + va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2298,13 +2298,13 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK streams[0] = pavi; options[0] = lpOptions; - __ms_va_start(vl, lpOptions); + va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { streams[i] = va_arg(vl, PAVISTREAM); options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } - __ms_va_end(vl); + va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]);

1 0

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

22 Oct '21

Module: wine Branch: master Commit: e855536a01ae06beeac9588647c9a8e1751cd566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e855536a01ae06beeac95886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:17 2021 +0200 advpack/tests: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/tests/advpack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 5bd39f76fdb..d787590eea0 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -191,12 +191,12 @@ static void delnode_test(void) static void WINAPIV append_str(char **str, const char *data, ...) { - __ms_va_list valist; + va_list valist; - __ms_va_start(valist, data); + va_start(valist, data); vsprintf(*str, data, valist); *str += strlen(*str); - __ms_va_end(valist); + va_end(valist); } static void create_inf_file(void)

1 0

Alexandre Julliard : aclui: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 13e707b4074cbdf3c1b1ca75af8bb7a758bbdf8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e707b4074cbdf3c1b1ca75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:11 2021 +0200 aclui: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/aclui_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 8fd3db4d58c..ace58127674 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -65,14 +65,14 @@ static HINSTANCE aclui_instance; static WCHAR *WINAPIV load_formatstr(UINT resource, ...) { - __ms_va_list valist; + va_list valist; WCHAR *str; DWORD ret; - __ms_va_start(valist, resource); + va_start(valist, resource); ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, aclui_instance, resource, 0, (WCHAR*)&str, 0, &valist); - __ms_va_end(valist); + va_end(valist); return ret ? str : NULL; }

1 0

Rémi Bernon : dinput: Factor all IDirectInputDevice8W vtables together.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: b242273482616a3f98fb2cf0ce7a648bf4caf16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b242273482616a3f98fb2cf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 22 09:33:54 2021 +0200 dinput: Factor all IDirectInputDevice8W vtables together. And remove "internal" suffix from internal functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 189 +++++++++++++++++++++++++------------------ dlls/dinput/device_private.h | 80 +----------------- dlls/dinput/joystick_hid.c | 108 ++++++++----------------- dlls/dinput/keyboard.c | 73 +++++------------ dlls/dinput/mouse.c | 73 +++++------------ 5 files changed, 181 insertions(+), 342 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b242273482616a3f98fb…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021