October 2021 - Wine-Commits

Alexandre Julliard : ntdll: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 747b97539b5c0ae60046cdd037fc2c5577e5881a URL: https://source.winehq.org/git/wine.git/?a=commit;h=747b97539b5c0ae60046cdd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:17 2021 +0200 ntdll: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 8 +++--- dlls/ntdll/ntdll_misc.h | 4 +-- dlls/ntdll/printf.c | 64 +++++++++++++++++++++++------------------------ dlls/ntdll/printf.h | 2 +- dlls/ntdll/rtl.c | 16 ++++++------ dlls/ntdll/rtlstr.c | 6 ++--- dlls/ntdll/string.c | 8 +++--- dlls/ntdll/tests/rtl.c | 12 ++++----- dlls/ntdll/tests/rtlstr.c | 26 +++++++++---------- 9 files changed, 73 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=747b97539b5c0ae60046…

1 0

Alexandre Julliard : ntoskrnl/tests: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: a1cbf24468127fbc3bbf45ec06028d069165e81f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1cbf24468127fbc3bbf45ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:23 2021 +0200 ntoskrnl/tests: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/utils.h | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 98fe3f97864..fc675e17dd0 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -110,7 +110,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; @@ -121,23 +121,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) @@ -244,7 +244,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(); @@ -296,13 +296,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) { @@ -317,37 +317,37 @@ 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); @@ -378,13 +378,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 : advpack/tests: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

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 : dinput8/tests: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

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 : kernelbase: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

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 : vcomp: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 8839ec313039c543e492abe0b7304505f3c67496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8839ec313039c543e492abe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:13:01 2021 +0200 vcomp: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 30bc2c63501..bd97e444d81 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -94,7 +94,7 @@ struct vcomp_team_data /* callback arguments */ int nargs; void *wrapper; - __ms_va_list valist; + va_list valist; /* barrier */ unsigned int barrier; @@ -120,12 +120,12 @@ struct vcomp_task_data unsigned int dynamic_chunksize; }; -static void **ptr_from_va_list(__ms_va_list valist) +static void **ptr_from_va_list(va_list valist) { return *(void ***)&valist; } -static void copy_va_list_data(void **args, __ms_va_list valist, int args_count) +static void copy_va_list_data(void **args, va_list valist, int args_count) { unsigned int i; @@ -1474,7 +1474,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) team_data.finished_threads = 0; team_data.nargs = nargs; team_data.wrapper = wrapper; - __ms_va_start(team_data.valist, wrapper); + va_start(team_data.valist, wrapper); team_data.barrier = 0; team_data.barrier_count = 0; @@ -1572,7 +1572,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) assert(list_empty(&thread_data.entry)); } - __ms_va_end(team_data.valist); + va_end(team_data.valist); } static CRITICAL_SECTION *alloc_critsect(void) @@ -1687,7 +1687,7 @@ static unsigned int get_step_count(int start, int end, int range_offset, int ste } static void CDECL c2vectparallel_wrapper(int start, int end, int step, int end_included, BOOL dynamic_distribution, - int volatile *dynamic_start, void *function, int nargs, __ms_va_list valist) + int volatile *dynamic_start, void *function, int nargs, va_list valist) { void *wrapper_args[MAX_VECT_PARALLEL_CALLBACK_ARGS]; unsigned int step_count, steps_per_call, remainder; @@ -1779,7 +1779,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int struct vcomp_thread_data *thread_data; int volatile dynamic_start; int prev_thread_count; - __ms_va_list valist; + va_list valist; TRACE("start %d, end %d, step %d, end_included %d, thread_count %d, dynamic_distribution %#x," " function %p, nargs %d.\n", start, end, step, end_included, thread_count, @@ -1793,7 +1793,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int return; } - __ms_va_start(valist, nargs); + va_start(valist, nargs); /* This expression can result in integer overflow. According to the tests, * native vcomp runs the function as a single thread both for empty range @@ -1807,7 +1807,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int wrapper_args[1] = (void *)(ULONG_PTR)end; copy_va_list_data(&wrapper_args[2], valist, nargs - 2); _vcomp_fork_call_wrapper(function, nargs, wrapper_args); - __ms_va_end(valist); + va_end(valist); return; } @@ -1821,7 +1821,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int &dynamic_start, function, nargs, valist); thread_data->fork_threads = prev_thread_count; - __ms_va_end(valist); + va_end(valist); } BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)

1 0

Alexandre Julliard : user32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 54796d65fc59ea4de58bb2fadf5cf1e0c91306c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54796d65fc59ea4de58bb2fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:57 2021 +0200 user32: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/wsprintf.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index 4c1c44365aa..1b396f0269c 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -336,7 +336,7 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, /*********************************************************************** * wvsnprintfA (internal) */ -static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list args ) +static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -456,7 +456,7 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list arg /*********************************************************************** * wvsnprintfW (internal) */ -static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list args ) +static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer; @@ -574,7 +574,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a /*********************************************************************** * wvsprintfA (USER32.@) */ -INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, __ms_va_list args ) +INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) { INT res = wvsnprintfA( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -584,7 +584,7 @@ INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, __ms_va_list args ) /*********************************************************************** * wvsprintfW (USER32.@) */ -INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, __ms_va_list args ) +INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args ) { INT res = wvsnprintfW( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -596,12 +596,12 @@ INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, __ms_va_list args ) */ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) { - __ms_va_list valist; + va_list valist; INT res; - __ms_va_start( valist, spec ); + va_start( valist, spec ); res = wvsnprintfA( buffer, 1024, spec, valist ); - __ms_va_end( valist ); + va_end( valist ); return ( res == -1 ) ? 1024 : res; } @@ -611,11 +611,11 @@ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) */ INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... ) { - __ms_va_list valist; + va_list valist; INT res; - __ms_va_start( valist, spec ); + va_start( valist, spec ); res = wvsnprintfW( buffer, 1024, spec, valist ); - __ms_va_end( valist ); + va_end( valist ); return ( res == -1 ) ? 1024 : res; }

1 0

Alexandre Julliard : msvcrt: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: d8ed47ec21b255976131c82e4c14653846765adb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ed47ec21b255976131c82e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:09 2021 +0200 msvcrt: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 8 +- dlls/msvcr90/tests/msvcr90.c | 24 ++-- dlls/msvcrt/concurrency.c | 6 +- dlls/msvcrt/console.c | 20 ++-- dlls/msvcrt/file.c | 126 ++++++++++----------- dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 14 +-- dlls/msvcrt/printf.h | 6 +- dlls/msvcrt/process.c | 132 ++++++++++----------- dlls/msvcrt/scanf.c | 252 ++++++++++++++++++++--------------------- dlls/msvcrt/scanf.h | 32 +++--- dlls/msvcrt/tests/printf.c | 86 +++++++------- dlls/msvcrt/wcs.c | 242 +++++++++++++++++++-------------------- dlls/ucrtbase/tests/printf.c | 36 +++--- dlls/ucrtbase/tests/scanf.c | 6 +- 15 files changed, 497 insertions(+), 497 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8ed47ec21b255976131…

1 0

Rémi Bernon : dinput: Cleanup keyboard device enumeration and creation.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: e85a5302770167bdd9c11be2939e80730a64b92f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e85a5302770167bdd9c11be2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 22 09:33:53 2021 +0200 dinput: Cleanup keyboard device enumeration and creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 120 ++++++++++++++++++------------------------------- 1 file changed, 44 insertions(+), 76 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index fd8e9e8fd12..804ce8b7808 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -145,102 +145,70 @@ static DWORD get_keyboard_subtype(void) return dev_subtype; } -static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, DWORD subtype) { - DWORD dwSize; - DIDEVICEINSTANCEW ddi; - - dwSize = lpddi->dwSize; - - TRACE("%d %p\n", dwSize, lpddi); - - memset(lpddi, 0, dwSize); - memset(&ddi, 0, sizeof(ddi)); - - ddi.dwSize = dwSize; - ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = GUID_SysKeyboard; - if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); - else - ddi.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); - MultiByteToWideChar(CP_ACP, 0, "Keyboard", -1, ddi.tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, "Wine Keyboard", -1, ddi.tszProductName, MAX_PATH); - - memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); -} - -static HRESULT keyboarddev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ) { - if (id != 0) - return E_FAIL; - - if (dwFlags & DIEDFL_FORCEFEEDBACK) - return S_FALSE; - - if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || - (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { - TRACE("Enumerating the Keyboard device\n"); - - fill_keyboard_dideviceinstanceW(lpddi, version, get_keyboard_subtype()); - - return S_OK; - } + BYTE subtype = get_keyboard_subtype(); + DWORD size; + + TRACE( "type %#x, flags %#x, instance %p, version %#04x, index %d\n", type, flags, instance, version, index ); + + if (index != 0) return DIERR_GENERIC; + if (flags & DIEDFL_FORCEFEEDBACK) return DI_NOEFFECT; + if (version < 0x0800 && type != 0 && type != DIDEVTYPE_KEYBOARD) return DI_NOEFFECT; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_KEYBOARD && type != DI8DEVTYPE_KEYBOARD) + return DI_NOEFFECT; + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW) && + instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) + return DIERR_INVALIDPARAM; + + size = instance->dwSize; + memset( instance, 0, size ); + instance->dwSize = size; + instance->guidInstance = GUID_SysKeyboard; + instance->guidProduct = GUID_SysKeyboard; + if (version >= 0x0800) instance->dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); + else instance->dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); + MultiByteToWideChar( CP_ACP, 0, "Keyboard", -1, instance->tszInstanceName, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "Wine Keyboard", -1, instance->tszProductName, MAX_PATH ); - return S_FALSE; + return DI_OK; } -static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboardImpl **out ) +static HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { - BYTE subtype = get_keyboard_subtype(); - SysKeyboardImpl* newDevice; + SysKeyboardImpl *impl; HRESULT hr; + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + if (!IsEqualGUID( &GUID_SysKeyboard, guid )) return DIERR_DEVICENOTREG; + if (FAILED(hr = direct_input_device_alloc( sizeof(SysKeyboardImpl), &SysKeyboardWvt, &keyboard_internal_vtbl, - rguid, dinput, (void **)&newDevice ))) + guid, dinput, (void **)&impl ))) return hr; - newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); - fill_keyboard_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion, subtype ); - newDevice->base.caps.dwDevType = newDevice->base.instance.dwDevType; - newDevice->base.caps.dwFirmwareRevision = 100; - newDevice->base.caps.dwHardwareRevision = 100; + keyboard_enum_device( 0, 0, &impl->base.instance, dinput->dwVersion, 0 ); + impl->base.caps.dwDevType = impl->base.instance.dwDevType; + impl->base.caps.dwFirmwareRevision = 100; + impl->base.caps.dwHardwareRevision = 100; - if (FAILED(hr = direct_input_device_init( &newDevice->base.IDirectInputDevice8W_iface ))) + if (FAILED(hr = direct_input_device_init( &impl->base.IDirectInputDevice8W_iface ))) { - IDirectInputDevice_Release( &newDevice->base.IDirectInputDevice8W_iface ); + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); return hr; } - *out = newDevice; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; } -static HRESULT keyboarddev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) -{ - TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); - *out = NULL; - - if (IsEqualGUID(&GUID_SysKeyboard, rguid)) /* Wine Keyboard */ - { - SysKeyboardImpl *This; - HRESULT hr; - - if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; - - TRACE( "Created a Keyboard device (%p)\n", This ); - - *out = &This->base.IDirectInputDevice8W_iface; - return DI_OK; - } - - return DIERR_DEVICENOTREG; -} - const struct dinput_device keyboard_device = { "Wine keyboard driver", - keyboarddev_enum_device, - keyboarddev_create_device + keyboard_enum_device, + keyboard_create_device }; static HRESULT keyboard_internal_poll( IDirectInputDevice8W *iface )

1 0

Rémi Bernon : dinput: Cleanup mouse device enumeration and creation.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 3dcb888a59aab67df6a6d6ebbd80f6be2200a620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcb888a59aab67df6a6d6eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 22 09:33:52 2021 +0200 dinput: Cleanup mouse device enumeration and creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 134 ++++++++++++++++++++-------------------------------- 1 file changed, 51 insertions(+), 83 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1b91fa12189..4e353dba200 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -76,120 +76,88 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base); } -static void fill_mouse_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version) { - DWORD dwSize; - DIDEVICEINSTANCEW ddi; - - dwSize = lpddi->dwSize; - - TRACE("%d %p\n", dwSize, lpddi); - - memset(lpddi, 0, dwSize); - memset(&ddi, 0, sizeof(ddi)); - - ddi.dwSize = dwSize; - ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = GUID_SysMouse; - if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); - else - ddi.dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); - MultiByteToWideChar(CP_ACP, 0, "Mouse", -1, ddi.tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, "Wine Mouse", -1, ddi.tszProductName, MAX_PATH); - - memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); -} - -static HRESULT mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ) { - if (id != 0) - return E_FAIL; - - if (dwFlags & DIEDFL_FORCEFEEDBACK) - return S_FALSE; - - if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || - (((dwDevType == DI8DEVCLASS_POINTER) || (dwDevType == DI8DEVTYPE_MOUSE)) && (version >= 0x0800))) { - TRACE("Enumerating the mouse device\n"); - - fill_mouse_dideviceinstanceW(lpddi, version); - - return S_OK; - } - - return S_FALSE; + DWORD size; + + TRACE( "type %#x, flags %#x, instance %p, version %#04x, index %d\n", type, flags, instance, version, index ); + + if (index != 0) return DIERR_GENERIC; + if (flags & DIEDFL_FORCEFEEDBACK) return DI_NOEFFECT; + if (version < 0x0800 && type != 0 && type != DIDEVTYPE_MOUSE) return DI_NOEFFECT; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_POINTER && type != DI8DEVTYPE_MOUSE) + return DI_NOEFFECT; + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW) && + instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) + return DIERR_INVALIDPARAM; + + size = instance->dwSize; + memset( instance, 0, size ); + instance->dwSize = size; + instance->guidInstance = GUID_SysMouse; + instance->guidProduct = GUID_SysMouse; + if (version >= 0x0800) instance->dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); + else instance->dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); + MultiByteToWideChar( CP_ACP, 0, "Mouse", -1, instance->tszInstanceName, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "Wine Mouse", -1, instance->tszProductName, MAX_PATH ); + + return DI_OK; } -static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) +static HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { - SysMouseImpl* newDevice; - WCHAR buffer[20]; + SysMouseImpl *impl; HKEY hkey, appkey; + WCHAR buffer[20]; HRESULT hr; + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + if (!IsEqualGUID( &GUID_SysMouse, guid )) return DIERR_DEVICENOTREG; + if (FAILED(hr = direct_input_device_alloc( sizeof(SysMouseImpl), &SysMouseWvt, &mouse_internal_vtbl, - rguid, dinput, (void **)&newDevice ))) + guid, dinput, (void **)&impl ))) return hr; - newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); - fill_mouse_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion ); - newDevice->base.caps.dwDevType = newDevice->base.instance.dwDevType; - newDevice->base.caps.dwFirmwareRevision = 100; - newDevice->base.caps.dwHardwareRevision = 100; - newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + mouse_enum_device( 0, 0, &impl->base.instance, dinput->dwVersion, 0 ); + impl->base.caps.dwDevType = impl->base.instance.dwDevType; + impl->base.caps.dwFirmwareRevision = 100; + impl->base.caps.dwHardwareRevision = 100; + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) { - if (!wcsnicmp( buffer, L"disable", -1 )) newDevice->warp_override = WARP_DISABLE; - else if (!wcsnicmp( buffer, L"force", -1 )) newDevice->warp_override = WARP_FORCE_ON; + if (!wcsnicmp( buffer, L"disable", -1 )) impl->warp_override = WARP_DISABLE; + else if (!wcsnicmp( buffer, L"force", -1 )) impl->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - if (FAILED(hr = direct_input_device_init( &newDevice->base.IDirectInputDevice8W_iface ))) + if (FAILED(hr = direct_input_device_init( &impl->base.IDirectInputDevice8W_iface ))) { - IDirectInputDevice_Release( &newDevice->base.IDirectInputDevice8W_iface ); + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); return hr; } if (dinput->dwVersion >= 0x0800) { - newDevice->base.use_raw_input = TRUE; - newDevice->base.raw_device.usUsagePage = 1; /* HID generic device page */ - newDevice->base.raw_device.usUsage = 2; /* HID generic mouse */ + impl->base.use_raw_input = TRUE; + impl->base.raw_device.usUsagePage = 1; /* HID generic device page */ + impl->base.raw_device.usUsage = 2; /* HID generic mouse */ } - *out = newDevice; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; } -static HRESULT mousedev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) -{ - TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); - *out = NULL; - - if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ - { - SysMouseImpl *This; - HRESULT hr; - - if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; - - TRACE( "Created a Mouse device (%p)\n", This ); - - *out = &This->base.IDirectInputDevice8W_iface; - return DI_OK; - } - - return DIERR_DEVICENOTREG; -} - const struct dinput_device mouse_device = { "Wine mouse driver", - mousedev_enum_device, - mousedev_create_device + mouse_enum_device, + mouse_create_device }; /******************************************************************************

1 0