- Wine-Commits - list.winehq.org

Brendan Shanks : mountmgr.sys: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 1, 2023

Sept. 1, 2023

Module: wine Branch: master Commit: 9139d8705d7b7af7b8e0b4ff21cc2e3a71fcd6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9139d8705d7b7af7b8e0b4ff21cc2e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Aug 31 14:51:08 2023 -0700 mountmgr.sys: Ensure unixlib function tables and enum stay in sync. --- dlls/mountmgr.sys/unixlib.c | 2 ++ dlls/mountmgr.sys/unixlib.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index 13f6fbecf09..b74b2336a34 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -586,3 +586,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = delete_credential, enumerate_credentials, }; + +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index efbce71b979..93e812a516f 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -172,6 +172,7 @@ enum mountmgr_funcs unix_write_credential, unix_delete_credential, unix_enumerate_credentials, + unix_funcs_count }; #define MOUNTMGR_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

1 0

Rémi Bernon : win32u: Init vsc2vk in NtUserGetKeyNameText only if necessary.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: 7c95eb676a13969a4e28b2368c8156d2eeb70375 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c95eb676a13969a4e28b2368c8156… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 1 10:33:53 2023 +0100 win32u: Init vsc2vk in NtUserGetKeyNameText only if necessary. --- dlls/win32u/input.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 1f9e48423fc..a8e41ff2741 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1115,17 +1115,16 @@ INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ) INT code = ((lparam >> 16) & 0x1ff), vkey, len; const KBDTABLES *kbd_tables = &kbdus_tables; VSC_LPWSTR *key_name; - BYTE vsc2vk[0x300]; TRACE_(keyboard)( "lparam %#x, buffer %p, size %d.\n", (int)lparam, buffer, size ); if (!buffer || !size) return 0; if ((len = user_driver->pGetKeyNameText( lparam, buffer, size )) >= 0) return len; - kbd_tables_init_vsc2vk( kbd_tables, vsc2vk ); - if (lparam & 0x2000000) { + BYTE vsc2vk[0x300]; + kbd_tables_init_vsc2vk( kbd_tables, vsc2vk ); switch ((vkey = vsc2vk[code])) { case VK_RSHIFT:

1 0

Rémi Bernon : win32u: Init vsc2char in NtUserMapVirtualKeyEx only if necessary.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: 42100f2de6b958f4b6ea9c99dbb9d7c766b6349d URL: https://gitlab.winehq.org/wine/wine/-/commit/42100f2de6b958f4b6ea9c99dbb9d7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 26 12:36:46 2023 +0200 win32u: Init vsc2char in NtUserMapVirtualKeyEx only if necessary. --- dlls/win32u/input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index ea516fdda9b..3e6e440de93 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1042,8 +1042,6 @@ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ) if ((ret = user_driver->pMapVirtualKeyEx( code, type, layout )) != -1) return ret; - kbd_tables_init_vk2char( kbd_tables, vk2char ); - switch (type) { case MAPVK_VK_TO_VSC_EX: @@ -1096,6 +1094,7 @@ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ) } break; case MAPVK_VK_TO_CHAR: + kbd_tables_init_vk2char( kbd_tables, vk2char ); if (code >= ARRAY_SIZE(vk2char)) ret = 0; else if (code >= 'A' && code <= 'Z') ret = code; else ret = vk2char[code];

1 0

Rémi Bernon : win32u: Init vsc2vk in NtUserMapVirtualKeyEx only if necessary.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: 9a3e6ca3814ac3db24e38acd0c47423e5d51519a URL: https://gitlab.winehq.org/wine/wine/-/commit/9a3e6ca3814ac3db24e38acd0c4742… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 26 12:36:03 2023 +0200 win32u: Init vsc2vk in NtUserMapVirtualKeyEx only if necessary. --- dlls/win32u/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index a8e41ff2741..ea516fdda9b 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1042,7 +1042,6 @@ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ) if ((ret = user_driver->pMapVirtualKeyEx( code, type, layout )) != -1) return ret; - kbd_tables_init_vsc2vk( kbd_tables, vsc2vk ); kbd_tables_init_vk2char( kbd_tables, vk2char ); switch (type) @@ -1067,6 +1066,7 @@ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ) case VK_DECIMAL: code = VK_DELETE; break; } + kbd_tables_init_vsc2vk( kbd_tables, vsc2vk ); for (ret = 0; ret < ARRAY_SIZE(vsc2vk); ++ret) if (vsc2vk[ret] == code) break; if (ret >= ARRAY_SIZE(vsc2vk)) ret = 0; @@ -1079,6 +1079,8 @@ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ) break; case MAPVK_VSC_TO_VK: case MAPVK_VSC_TO_VK_EX: + kbd_tables_init_vsc2vk( kbd_tables, vsc2vk ); + if (code & 0xe000) code -= 0xdf00; if (code >= ARRAY_SIZE(vsc2vk)) ret = 0; else ret = vsc2vk[code];

1 0

Rémi Bernon : dinput: Get rid of duplicated winetest helpers.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: 509483356d57962e8f55aea8ab7776fab4d7e83d URL: https://gitlab.winehq.org/wine/wine/-/commit/509483356d57962e8f55aea8ab7776… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 18:45:07 2023 +0200 dinput: Get rid of duplicated winetest helpers. --- dlls/dinput/tests/dinput_test.h | 2 - dlls/dinput/tests/driver_bus.c | 7 +- dlls/dinput/tests/driver_hid.c | 1 + dlls/dinput/tests/driver_hid.h | 345 ++++++------------------------------ dlls/dinput/tests/driver_hid_poll.c | 1 + 5 files changed, 64 insertions(+), 292 deletions(-)

1 0

Dmitry Timoshkov : ntdll: Implement NtCreateToken().
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: a52cf805d2e0c8a2357aa62ce825f166cbdf27c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a52cf805d2e0c8a2357aa62ce825f1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 21 16:39:15 2023 +0300 ntdll: Implement NtCreateToken(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/security.c | 107 +++++++++++++++++++++++++++++++++++++++++ dlls/wow64/security.c | 36 ++++++++++++++ dlls/wow64/struct32.h | 5 ++ dlls/wow64/syscall.h | 1 + dlls/wow64/wow64_private.h | 25 ++++++++++ include/wine/server_protocol.h | 32 +++++++++++- server/protocol.def | 20 ++++++++ server/request.h | 13 +++++ server/token.c | 106 ++++++++++++++++++++++++++++++++++++++-- server/trace.c | 20 ++++++++ 12 files changed, 362 insertions(+), 8 deletions(-)

1 0

Rémi Bernon : include: Pass a temporary buffer to winetest_elapsed.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: 9bab243d90c69bbaeb558929d627f3227e030aa4 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bab243d90c69bbaeb558929d627f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 22:01:24 2023 +0200 include: Pass a temporary buffer to winetest_elapsed. Using wine_dbg_sprintf pulls various things that are not available in the driver tests. --- include/wine/test.h | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index e47c795ac82..1ae759afcf6 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -88,7 +88,6 @@ struct winetest_thread_data extern struct winetest_thread_data *winetest_get_thread_data(void); extern void winetest_print_lock(void); extern void winetest_print_unlock(void); -extern const char *winetest_elapsed(void); extern int winetest_get_mainargs( char*** pargv ); extern void winetest_wait_child_process( HANDLE process ); @@ -168,13 +167,24 @@ static const char winetest_color_blue[] = "\x1b[34m"; static const char winetest_color_bright_red[] = "\x1b[1;91m"; static const char winetest_color_bright_purple[] = "\x1b[1;95m"; +static const char *winetest_elapsed( char *buffer ) +{ + DWORD now; + + if (!winetest_time) return ""; + winetest_last_time = now = GetTickCount(); + sprintf( buffer, "%.3f", (now - winetest_start_time) / 1000.0 ); + return buffer; +} + static void winetest_print_location( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void winetest_print_location( const char *msg, ... ) { struct winetest_thread_data *data = winetest_get_thread_data(); + char elapsed[64]; va_list valist; - printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed( elapsed ) ); va_start( valist, msg ); vprintf( msg, valist ); va_end( valist ); @@ -560,15 +570,6 @@ static void exit_process( int code ) ExitProcess( code ); } -const char *winetest_elapsed(void) -{ - DWORD now; - - if (!winetest_time) return ""; - winetest_last_time = now = GetTickCount(); - return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); -} - void winetest_print_lock(void) { UINT ret; @@ -678,13 +679,15 @@ static int run_test( const char *name ) if (winetest_debug) { + char elapsed[64]; + winetest_print_lock(); if (winetest_muted_todo_successes || winetest_muted_skipped || winetest_muted_traces) printf( "%04x:%s:%s Silenced %d todos, %d skips and %d traces.\n", - (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), + (UINT)GetCurrentProcessId(), test->name, winetest_elapsed( elapsed ), (UINT)winetest_muted_todo_successes, (UINT)winetest_muted_skipped, (UINT)winetest_muted_traces); printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d as flaky, %d %s), %d skipped.\n", - (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), + (UINT)GetCurrentProcessId(), test->name, winetest_elapsed( elapsed ), (UINT)(winetest_successes + winetest_failures + winetest_flaky_failures + winetest_todo_successes + winetest_todo_failures), (UINT)winetest_todo_successes, (UINT)winetest_flaky_failures, (UINT)(winetest_failures + winetest_todo_failures), (winetest_failures + winetest_todo_failures != 1) ? "failures" : "failure", @@ -710,6 +713,7 @@ static void usage( const char *argv0 ) static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) { struct winetest_thread_data *data = winetest_get_thread_data(); + char elapsed[64]; winetest_print_lock(); if (data->current_file) @@ -717,7 +721,7 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) data->current_file, data->current_line ); if (winetest_color) printf( winetest_color_bright_red ); printf( "%04x:%s:%s unhandled exception %08x at %p\n", - (UINT)GetCurrentProcessId(), current_test->name, winetest_elapsed(), + (UINT)GetCurrentProcessId(), current_test->name, winetest_elapsed( elapsed ), (UINT)ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); if (winetest_color) printf( winetest_color_reset ); fflush( stdout );

1 0

Rémi Bernon : include: Avoid using strcmp directly in wine/test.h.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: e3b2cfed9e3b005c58bb50f85c8ddd26161ae9d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3b2cfed9e3b005c58bb50f85c8ddd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 19:21:57 2023 +0200 include: Avoid using strcmp directly in wine/test.h. It's not available in kernel driver code. --- include/wine/test.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index ec6dcb0a02a..889923afacc 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -56,6 +56,7 @@ extern int winetest_mute_threshold; /* current platform */ extern const char *winetest_platform; +extern int winetest_platform_is_wine; /* use ANSI escape codes for output coloring */ extern int winetest_color; @@ -133,14 +134,14 @@ extern void winetest_wait_child_process( HANDLE process ); winetest_loop_flaky(); \ winetest_end_flaky()) #define flaky flaky_if(TRUE) -#define flaky_wine flaky_if(!strcmp(winetest_platform, "wine")) -#define flaky_wine_if(is_flaky) flaky_if((is_flaky) && !strcmp(winetest_platform, "wine")) +#define flaky_wine flaky_if(winetest_platform_is_wine) +#define flaky_wine_if(is_flaky) flaky_if((is_flaky) && winetest_platform_is_wine) #define todo_if(is_todo) for (winetest_start_todo(is_todo); \ winetest_loop_todo(); \ winetest_end_todo()) -#define todo_wine todo_if(!strcmp(winetest_platform, "wine")) -#define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) +#define todo_wine todo_if(winetest_platform_is_wine) +#define todo_wine_if(is_todo) todo_if((is_todo) && winetest_platform_is_wine) #ifndef ARRAY_SIZE @@ -231,7 +232,7 @@ static inline void winetest_ignore_exceptions( BOOL ignore ) static inline int broken( int condition ) { - return (strcmp(winetest_platform, "windows") == 0) && condition; + return !winetest_platform_is_wine && condition; } static LONG winetest_add_line( void ) @@ -413,7 +414,7 @@ static inline void winetest_win_skip( const char *msg, ... ) { va_list valist; va_start(valist, msg); - if (strcmp(winetest_platform, "windows") == 0) + if (!winetest_platform_is_wine) winetest_vskip(msg, valist); else winetest_vok(0, msg, valist); @@ -529,6 +530,7 @@ int winetest_interactive = 0; /* current platform */ const char *winetest_platform = "windows"; +int winetest_platform_is_wine = 0; /* report failed flaky tests as failures (BOOL) */ int winetest_report_flaky = 0; @@ -781,6 +783,7 @@ int main( int argc, char **argv ) winetest_platform = strdup(p); else if (running_under_wine()) winetest_platform = "wine"; + winetest_platform_is_wine = !strcmp( winetest_platform, "wine" ); if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) {

1 0

Rémi Bernon : include: Introduce winetest wrappers for vprintf and GetTickCount.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: add4d6ef8d58ca8992c7ec8f35ce346e1033f465 URL: https://gitlab.winehq.org/wine/wine/-/commit/add4d6ef8d58ca8992c7ec8f35ce34… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 22:01:53 2023 +0200 include: Introduce winetest wrappers for vprintf and GetTickCount. --- include/wine/test.h | 85 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 30 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 1ae759afcf6..ec6dcb0a02a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -40,7 +40,7 @@ extern int winetest_debug; /* trace timing information */ extern int winetest_time; -extern DWORD winetest_start_time, winetest_last_time; +extern int winetest_start_time, winetest_last_time; /* running in interactive mode? */ extern int winetest_interactive; @@ -88,6 +88,8 @@ struct winetest_thread_data extern struct winetest_thread_data *winetest_get_thread_data(void); extern void winetest_print_lock(void); extern void winetest_print_unlock(void); +extern int winetest_vprintf( const char *msg, va_list args ); +extern int winetest_get_time(void); extern int winetest_get_mainargs( char*** pargv ); extern void winetest_wait_child_process( HANDLE process ); @@ -167,12 +169,25 @@ static const char winetest_color_blue[] = "\x1b[34m"; static const char winetest_color_bright_red[] = "\x1b[1;91m"; static const char winetest_color_bright_purple[] = "\x1b[1;95m"; +static int winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static int winetest_printf( const char *msg, ... ) +{ + va_list valist; + int ret; + + va_start( valist, msg ); + ret = winetest_vprintf( msg, valist ); + va_end( valist ); + + return ret; +} + static const char *winetest_elapsed( char *buffer ) { - DWORD now; + int now; if (!winetest_time) return ""; - winetest_last_time = now = GetTickCount(); + winetest_last_time = now = winetest_get_time(); sprintf( buffer, "%.3f", (now - winetest_start_time) / 1000.0 ); return buffer; } @@ -184,9 +199,9 @@ static void winetest_print_location( const char *msg, ... ) char elapsed[64]; va_list valist; - printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed( elapsed ) ); + winetest_printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed( elapsed ) ); va_start( valist, msg ); - vprintf( msg, valist ); + winetest_vprintf( msg, valist ); va_end( valist ); } @@ -197,7 +212,7 @@ static void winetest_print_context( const char *msgtype ) winetest_print_location( "%s", msgtype ); for (i = 0; i < data->context_count; ++i) - printf( "%s: ", data->context[i] ); + winetest_printf( "%s: ", data->context[i] ); } static inline void winetest_subtest( const char *name ) @@ -264,19 +279,19 @@ static int winetest_vok( int condition, const char *msg, va_list args ) winetest_print_lock(); if (data->flaky_level) { - if (winetest_color) printf( winetest_color_dark_purple ); + if (winetest_color) winetest_printf( winetest_color_dark_purple ); winetest_print_context( "Test succeeded inside flaky todo block: " ); - vprintf(msg, args); + winetest_vprintf( msg, args ); InterlockedIncrement( &winetest_flaky_failures ); } else { - if (winetest_color) printf( winetest_color_dark_red ); + if (winetest_color) winetest_printf( winetest_color_dark_red ); winetest_print_context( "Test succeeded inside todo block: " ); - vprintf(msg, args); + winetest_vprintf( msg, args ); InterlockedIncrement( &winetest_todo_failures ); } - if (winetest_color) printf( winetest_color_reset ); + if (winetest_color) winetest_printf( winetest_color_reset ); winetest_print_unlock(); return 0; } @@ -288,10 +303,10 @@ static int winetest_vok( int condition, const char *msg, va_list args ) if (winetest_debug > 0) { winetest_print_lock(); - if (winetest_color) printf( winetest_color_yellow ); + if (winetest_color) winetest_printf( winetest_color_yellow ); winetest_print_context( "Test marked todo: " ); - vprintf(msg, args); - if (winetest_color) printf( winetest_color_reset ); + winetest_vprintf( msg, args ); + if (winetest_color) winetest_printf( winetest_color_reset ); winetest_print_unlock(); } InterlockedIncrement( &winetest_todo_successes ); @@ -307,31 +322,31 @@ static int winetest_vok( int condition, const char *msg, va_list args ) winetest_print_lock(); if (data->flaky_level) { - if (winetest_color) printf( winetest_color_bright_purple ); + if (winetest_color) winetest_printf( winetest_color_bright_purple ); winetest_print_context( "Test marked flaky: " ); - vprintf(msg, args); + winetest_vprintf( msg, args ); InterlockedIncrement( &winetest_flaky_failures ); } else { - if (winetest_color) printf( winetest_color_bright_red ); + if (winetest_color) winetest_printf( winetest_color_bright_red ); winetest_print_context( "Test failed: " ); - vprintf(msg, args); + winetest_vprintf( msg, args ); InterlockedIncrement( &winetest_failures ); } - if (winetest_color) printf( winetest_color_reset ); + if (winetest_color) winetest_printf( winetest_color_reset ); winetest_print_unlock(); return 0; } else { if (winetest_report_success || - (winetest_time && GetTickCount() >= winetest_last_time + 1000)) + (winetest_time && winetest_get_time() >= winetest_last_time + 1000)) { winetest_print_lock(); - if (winetest_color) printf( winetest_color_green ); + if (winetest_color) winetest_printf( winetest_color_green ); winetest_print_location("Test succeeded\n"); - if (winetest_color) printf( winetest_color_reset ); + if (winetest_color) winetest_printf( winetest_color_reset ); winetest_print_unlock(); } InterlockedIncrement( &winetest_successes ); @@ -362,7 +377,7 @@ static inline void winetest_trace( const char *msg, ... ) winetest_print_lock(); winetest_print_context( "" ); va_start(valist, msg); - vprintf( msg, valist ); + winetest_vprintf( msg, valist ); va_end(valist); winetest_print_unlock(); } @@ -374,10 +389,10 @@ static void winetest_vskip( const char *msg, va_list args ) if (winetest_add_line() < winetest_mute_threshold) { winetest_print_lock(); - if (winetest_color) printf( winetest_color_blue ); + if (winetest_color) winetest_printf( winetest_color_blue ); winetest_print_context( "Tests skipped: " ); - vprintf(msg, args); - if (winetest_color) printf( winetest_color_reset ); + winetest_vprintf( msg, args ); + if (winetest_color) winetest_printf( winetest_color_reset ); winetest_print_unlock(); InterlockedIncrement( &winetest_skipped ); } @@ -507,7 +522,7 @@ int winetest_debug = 1; /* trace timing information */ int winetest_time = 0; -DWORD winetest_start_time, winetest_last_time; +int winetest_start_time, winetest_last_time; /* interactive mode? */ int winetest_interactive = 0; @@ -588,6 +603,16 @@ void winetest_print_unlock(void) if (winetest_mutex) ReleaseMutex( winetest_mutex ); } +int winetest_vprintf( const char *msg, va_list args ) +{ + return vprintf( msg, args ); +} + +int winetest_get_time(void) +{ + return GetTickCount(); +} + int winetest_get_mainargs( char ***pargv ) { *pargv = winetest_argv; @@ -615,9 +640,9 @@ void winetest_wait_child_process( HANDLE process ) { DWORD pid = GetProcessId( process ); winetest_print_lock(); - if (winetest_color) printf( winetest_color_bright_red ); + if (winetest_color) winetest_printf( winetest_color_bright_red ); winetest_print_location( "unhandled exception %08x in child process %04x\n", (UINT)exit_code, (UINT)pid ); - if (winetest_color) printf( winetest_color_reset ); + if (winetest_color) winetest_printf( winetest_color_reset ); winetest_print_unlock(); InterlockedIncrement( &winetest_failures ); } @@ -777,7 +802,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_REPORT_FLAKY", p, sizeof(p) )) winetest_report_flaky = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); - winetest_last_time = winetest_start_time = GetTickCount(); + winetest_last_time = winetest_start_time = winetest_get_time(); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX );

1 0

Rémi Bernon : include: Rename winetest_printf to winetest_print_location.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: e199e02176f8754bb405d0f67733105c261c5fc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e199e02176f8754bb405d0f6773310… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 21:24:12 2023 +0200 include: Rename winetest_printf to winetest_print_location. --- include/wine/test.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index b5baece987c..e47c795ac82 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -168,8 +168,8 @@ static const char winetest_color_blue[] = "\x1b[34m"; static const char winetest_color_bright_red[] = "\x1b[1;91m"; static const char winetest_color_bright_purple[] = "\x1b[1;95m"; -static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); -static void winetest_printf( const char *msg, ... ) +static void winetest_print_location( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static void winetest_print_location( const char *msg, ... ) { struct winetest_thread_data *data = winetest_get_thread_data(); va_list valist; @@ -185,7 +185,7 @@ static void winetest_print_context( const char *msgtype ) struct winetest_thread_data *data = winetest_get_thread_data(); unsigned int i; - winetest_printf( "%s", msgtype ); + winetest_print_location( "%s", msgtype ); for (i = 0; i < data->context_count; ++i) printf( "%s: ", data->context[i] ); } @@ -193,14 +193,14 @@ static void winetest_print_context( const char *msgtype ) static inline void winetest_subtest( const char *name ) { winetest_print_lock(); - winetest_printf( "Subtest %s\n", name ); + winetest_print_location( "Subtest %s\n", name ); winetest_print_unlock(); } static inline void winetest_ignore_exceptions( BOOL ignore ) { winetest_print_lock(); - winetest_printf( "IgnoreExceptions=%d\n", ignore ? 1 : 0 ); + winetest_print_location( "IgnoreExceptions=%d\n", ignore ? 1 : 0 ); winetest_print_unlock(); } @@ -226,7 +226,7 @@ static LONG winetest_add_line( void ) if (count == winetest_mute_threshold) { winetest_print_lock(); - winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); + winetest_print_location( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); winetest_print_unlock(); } @@ -320,7 +320,7 @@ static int winetest_vok( int condition, const char *msg, va_list args ) { winetest_print_lock(); if (winetest_color) printf( winetest_color_green ); - winetest_printf("Test succeeded\n"); + winetest_print_location("Test succeeded\n"); if (winetest_color) printf( winetest_color_reset ); winetest_print_unlock(); } @@ -577,7 +577,7 @@ void winetest_print_lock(void) ret = WaitForSingleObject( winetest_mutex, 30000 ); if (ret != WAIT_OBJECT_0 && ret != WAIT_ABANDONED) { - winetest_printf( "could not get the print lock: %u\n", ret ); + winetest_print_location( "could not get the print lock: %u\n", ret ); winetest_mutex = 0; } } @@ -615,7 +615,7 @@ void winetest_wait_child_process( HANDLE process ) DWORD pid = GetProcessId( process ); winetest_print_lock(); if (winetest_color) printf( winetest_color_bright_red ); - winetest_printf( "unhandled exception %08x in child process %04x\n", (UINT)exit_code, (UINT)pid ); + winetest_print_location( "unhandled exception %08x in child process %04x\n", (UINT)exit_code, (UINT)pid ); if (winetest_color) printf( winetest_color_reset ); winetest_print_unlock(); InterlockedIncrement( &winetest_failures ); @@ -623,7 +623,7 @@ void winetest_wait_child_process( HANDLE process ) else if (exit_code) { winetest_print_lock(); - winetest_printf( "%u failures in child process\n", (UINT)exit_code ); + winetest_print_location( "%u failures in child process\n", (UINT)exit_code ); winetest_print_unlock(); while (exit_code-- > 0) InterlockedIncrement( &winetest_failures ); }

1 0