- Wine-Devel - list.winehq.org

[PATCH 1/6] ntoskrnl.exe/tests: Sync test utils with wine/test.h.
by Rémi Bernon July 2, 2021

July 2, 2021

Adding support for thread local test data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/Makefile.in | 10 +- dlls/ntoskrnl.exe/tests/driver.c | 32 +-- dlls/ntoskrnl.exe/tests/driver.h | 4 +- dlls/ntoskrnl.exe/tests/driver_netio.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 + dlls/ntoskrnl.exe/tests/utils.h | 349 +++++++++++++++++++------ 6 files changed, 294 insertions(+), 106 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 863fad30f63..85a6925138a 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,15 +1,15 @@ TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid -driver_IMPORTS = winecrt0 ntoskrnl +driver_IMPORTS = winecrt0 ntoskrnl hal driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver2_IMPORTS = winecrt0 ntoskrnl +driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver3_IMPORTS = winecrt0 ntoskrnl +driver3_IMPORTS = winecrt0 ntoskrnl hal driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_hid_IMPORTS = winecrt0 ntoskrnl hidclass +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..1fe3ec2e558 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -999,41 +999,41 @@ static void test_call_driver(DEVICE_OBJECT *device) irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); - ok(iosb.Information == 123, "got information %#x\n", iosb.Information); + ok(iosb.Information == 123, "got information %#I64x\n", (UINT64)iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &event, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), @@ -1041,8 +1041,8 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); @@ -1118,7 +1118,7 @@ static void test_cancel_irp(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 1, "CurrentLocation = %u\n", irp->CurrentLocation); irpsp = IoGetCurrentIrpStackLocation(irp); - ok(irpsp->DeviceObject == device, "DeviceObject = %u\n", irpsp->DeviceObject); + ok(irpsp->DeviceObject == device, "DeviceObject = %p\n", irpsp->DeviceObject); IoSetCancelRoutine(irp, cancel_irp); cancel_cnt = 0; @@ -1432,16 +1432,16 @@ static void check_resource_(int line, ERESOURCE *resource, ULONG exclusive_waite ULONG count; count = ExGetExclusiveWaiterCount(resource); - ok_(__FILE__, line, count == exclusive_waiters, + ok_(__FILE__, line)(count == exclusive_waiters, "expected %u exclusive waiters, got %u\n", exclusive_waiters, count); count = ExGetSharedWaiterCount(resource); - ok_(__FILE__, line, count == shared_waiters, + ok_(__FILE__, line)(count == shared_waiters, "expected %u shared waiters, got %u\n", shared_waiters, count); ret = ExIsResourceAcquiredExclusiveLite(resource); - ok_(__FILE__, line, ret == exclusive, + ok_(__FILE__, line)(ret == exclusive, "expected exclusive %u, got %u\n", exclusive, ret); count = ExIsResourceAcquiredSharedLite(resource); - ok_(__FILE__, line, count == shared_count, + ok_(__FILE__, line)(count == shared_count, "expected shared %u, got %u\n", shared_count, count); } #define check_resource(a,b,c,d,e) check_resource_(__LINE__,a,b,c,d,e) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 455695ad36b..b0c7cab0252 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -51,10 +51,12 @@ static const char teststr[] = "Wine is not an emulator"; struct test_data { + char winetest_platform[256]; int running_under_wine; int winetest_report_success; int winetest_debug; - int successes, failures, skipped, todo_successes, todo_failures; + int failures; + int todo_failures; }; struct main_test_input diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ea9cfd1a4c5..4ebacc7cf14 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -141,7 +141,7 @@ static void test_wsk_get_address_info(void) { struct sockaddr_in *addr = (struct sockaddr_in *)addr_info->ai_addr; - ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %u.\n", addr_info->ai_addrlen); + ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %I64u.\n", (UINT64)addr_info->ai_addrlen); ok(addr->sin_family == AF_INET, "Got unexpected sin_family %u.\n", addr->sin_family); ok(ntohs(addr->sin_port) == 12345, "Got unexpected sin_port %u.\n", ntohs(addr->sin_port)); ok(ntohl(addr->sin_addr.s_addr) == 0x7f000001, "Got unexpected sin_addr %#x.\n", diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 71dbfe1a5e9..57c1bdd17fd 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -386,6 +386,7 @@ static void cat_okfile(void) SetEndOfFile(okfile); winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + winetest_add_failures(InterlockedExchange(&test_data->todo_failures, 0)); } static ULONG64 modified_value; @@ -2598,6 +2599,8 @@ START_TEST(ntoskrnl) 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); ok(!!mapping, "got error %u\n", GetLastError()); test_data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); + ok(strlen(winetest_platform) < 256, "winetest_platform expectedly large!\n"); + strcpy(test_data->winetest_platform, winetest_platform); test_data->running_under_wine = !strcmp(winetest_platform, "wine"); test_data->winetest_report_success = winetest_report_success; test_data->winetest_debug = winetest_debug; diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 6a0e00428a5..6c6a8f20aeb 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -22,18 +22,115 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -static HANDLE okfile; -static LONG successes; -static LONG failures; -static LONG skipped; -static LONG todo_successes; -static LONG todo_failures; -static int todo_level, todo_do_loop; +#include <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winternl.h> + +#include <ddk/wdm.h> +#include <wine/test.h> + +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +# define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __winetest_va_end(list) __builtin_ms_va_end(list) +#else +# define __winetest_va_start(list,arg) va_start(list,arg) +# define __winetest_va_end(list) va_end(list) +#endif + static int running_under_wine; -static int winetest_debug; -static int winetest_report_success; -static inline void kvprintf(const char *format, __ms_va_list ap) +/* debug level */ +int winetest_debug = 1; + +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + +/* interactive mode? */ +int winetest_interactive = 0; + +/* current platform */ +static char winetest_platform_buf[256] = "windows"; +const char *winetest_platform = winetest_platform_buf; + +/* report successful tests (BOOL) */ +int winetest_report_success = 0; + +/* silence todos and skips above this threshold */ +int winetest_mute_threshold = 42; + +static LONG successes; /* number of successful tests */ +static LONG failures; /* number of failures */ +static LONG skipped; /* number of skipped test chunks */ +static LONG todo_successes; /* number of successful tests inside todo block */ +static LONG todo_failures; /* number of failures inside todo block */ +static LONG muted_traces; /* number of silenced traces */ +static LONG muted_skipped; /* same as skipped but silent */ +static LONG muted_todo_successes; /* same as todo_successes but silent */ + +/* counts how many times a given line printed a message */ +static LONG line_counters[16384]; + +/* output file for driver tests */ +HANDLE okfile; + +/* The following data must be kept track of on a per-thread basis */ +struct tls_data +{ + HANDLE thread; + const char* current_file; /* file of current check */ + int current_line; /* line of current check */ + unsigned int todo_level; /* current todo nesting level */ + int todo_do_loop; + char *str_pos; /* position in debug buffer */ + char strings[2000]; /* buffer for debug strings */ + char context[8][128]; /* data to print before messages */ + unsigned int context_count; /* number of context prefixes */ +}; + +static KSPIN_LOCK tls_data_lock; +static struct tls_data tls_data_pool[128]; +static DWORD tls_data_count; + +static struct tls_data *get_tls_data(void) +{ + static struct tls_data tls_overflow; + struct tls_data *data; + HANDLE thread = PsGetCurrentThreadId(); + KIRQL irql; + + KeAcquireSpinLock(&tls_data_lock, &irql); + for (data = tls_data_pool; data != tls_data_pool + tls_data_count; ++data) + if (data->thread == thread) break; + if (data == tls_data_pool + ARRAY_SIZE(tls_data_pool)) + data = &tls_overflow; + else if (data == tls_data_pool + tls_data_count) + { + data->thread = thread; + data->str_pos = data->strings; + tls_data_count++; + } + KeReleaseSpinLock(&tls_data_lock, irql); + + return data; +} + +void winetest_set_location( const char* file, int line ) +{ + struct tls_data *data = get_tls_data(); + data->current_file=strrchr(file,'/'); + if (data->current_file==NULL) + data->current_file=strrchr(file,'\\'); + if (data->current_file==NULL) + data->current_file=file; + else + data->current_file++; + data->current_line=line; +} + +static inline void kvprintf(const char *format, __winetest_va_list ap) { static char buffer[512]; IO_STATUS_BLOCK io; @@ -43,11 +140,11 @@ static inline void kvprintf(const char *format, __ms_va_list ap) static inline void WINAPIV kprintf(const char *format, ...) { - __ms_va_list valist; + __winetest_va_list valist; - __ms_va_start(valist, format); + __winetest_va_start(valist, format); kvprintf(format, valist); - __ms_va_end(valist); + __winetest_va_end(valist); } static inline NTSTATUS winetest_init(void) @@ -61,6 +158,8 @@ static inline NTSTATUS winetest_init(void) HANDLE section; NTSTATUS ret; + KeInitializeSpinLock(&tls_data_lock); + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); @@ -77,6 +176,7 @@ static inline NTSTATUS winetest_init(void) running_under_wine = data->running_under_wine; winetest_debug = data->winetest_debug; winetest_report_success = data->winetest_report_success; + strcpy(winetest_platform_buf, data->winetest_platform); ZwUnmapViewOfSection(NtCurrentProcess(), addr); ZwClose(section); @@ -114,10 +214,7 @@ static inline void winetest_cleanup(void) { data = addr; - InterlockedExchangeAdd(&data->successes, successes); InterlockedExchangeAdd(&data->failures, failures); - InterlockedExchangeAdd(&data->skipped, skipped); - InterlockedExchangeAdd(&data->todo_successes, todo_successes); InterlockedExchangeAdd(&data->todo_failures, todo_failures); ZwUnmapViewOfSection(NtCurrentProcess(), addr); @@ -128,130 +225,216 @@ static inline void winetest_cleanup(void) ZwClose(okfile); } -static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) +static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static void __winetest_cdecl winetest_printf( const char *msg, ... ) { - const char *current_file; + struct tls_data *data = get_tls_data(); + __winetest_va_list valist; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; + kprintf( "%s:%d: ", data->current_file, data->current_line ); + __winetest_va_start( valist, msg ); + kvprintf( msg, valist ); + __winetest_va_end( valist ); +} +static void __winetest_cdecl winetest_print_context( const char *msgtype ) +{ + struct tls_data *data = get_tls_data(); + unsigned int i; + + winetest_printf( "%s", msgtype ); + for (i = 0; i < data->context_count; ++i) + kprintf( "%s: ", data->context[i] ); +} - if (todo_level) +int broken( int condition ) +{ + return (strcmp(winetest_platform, "windows") == 0) && condition; +} + +static LONG winetest_add_line( void ) +{ + struct tls_data *data; + int index, count; + + if (winetest_debug > 1) + return 0; + + data = get_tls_data(); + index = data->current_line % ARRAY_SIZE(line_counters); + count = InterlockedIncrement(line_counters + index) - 1; + if (count == winetest_mute_threshold) + winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); + + return count; +} + +/* + * Checks condition. + * Parameters: + * - condition - condition to check; + * - msg test description; + * - file - test application source code file name of the check + * - line - test application source code file line number of the check + * Return: + * 0 if condition does not have the expected value, 1 otherwise + */ +int winetest_vok( int condition, const char *msg, __winetest_va_list args ) +{ + struct tls_data *data = get_tls_data(); + + if (data->todo_level) { if (condition) { - kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); + winetest_print_context( "Test succeeded inside todo block: " ); kvprintf(msg, args); InterlockedIncrement(&todo_failures); + return 0; } else { - if (winetest_debug > 0) + if (!winetest_debug || + winetest_add_line() < winetest_mute_threshold) { - kprintf("%s:%d: Test marked todo: ", current_file, line); - kvprintf(msg, args); + if (winetest_debug > 0) + { + winetest_print_context( "Test marked todo: " ); + kvprintf(msg, args); + } + InterlockedIncrement(&todo_successes); } - InterlockedIncrement(&todo_successes); + else + InterlockedIncrement(&muted_todo_successes); + return 1; } } else { if (!condition) { - kprintf("%s:%d: Test failed: ", current_file, line); + winetest_print_context( "Test failed: " ); kvprintf(msg, args); InterlockedIncrement(&failures); + return 0; } else { if (winetest_report_success) - kprintf("%s:%d: Test succeeded\n", current_file, line); + winetest_printf("Test succeeded\n"); InterlockedIncrement(&successes); + return 1; } } } -static inline void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) { - __ms_va_list args; - __ms_va_start(args, msg); - vok_(file, line, condition, msg, args); - __ms_va_end(args); + __winetest_va_list valist; + + __winetest_va_start(valist, msg); + winetest_vok(condition, msg, valist); + __winetest_va_end(valist); } -static inline void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +void __winetest_cdecl winetest_trace( const char *msg, ... ) { - const char *current_file; + __winetest_va_list valist; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; + if (!winetest_debug) + return; + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "" ); + __winetest_va_start(valist, msg); + kvprintf( msg, valist ); + __winetest_va_end(valist); + } else - current_file++; - - kprintf("%s:%d: Tests skipped: ", current_file, line); - kvprintf(msg, args); - skipped++; + InterlockedIncrement(&muted_traces); } -static inline void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +void winetest_vskip( const char *msg, __winetest_va_list args ) { - __ms_va_list args; - __ms_va_start(args, msg); - if (running_under_wine) - vok_(file, line, 0, msg, args); + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "Tests skipped: " ); + kvprintf(msg, args); + InterlockedIncrement(&skipped); + } else - vskip_(file, line, msg, args); - __ms_va_end(args); + InterlockedIncrement(&muted_skipped); } -static inline void WINAPIV trace_(const char *file, int line, const char *msg, ...) +void __winetest_cdecl winetest_skip( const char *msg, ... ) { - const char *current_file; - __ms_va_list args; + __winetest_va_list valist; + __winetest_va_start(valist, msg); + winetest_vskip(msg, valist); + __winetest_va_end(valist); +} - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; +void __winetest_cdecl winetest_win_skip( const char *msg, ... ) +{ + __winetest_va_list valist; + __winetest_va_start(valist, msg); + if (strcmp(winetest_platform, "windows") == 0) + winetest_vskip(msg, valist); else - current_file++; - - __ms_va_start(args, msg); - kprintf("%s:%d: ", current_file, line); - kvprintf(msg, args); - __ms_va_end(args); + winetest_vok(0, msg, valist); + __winetest_va_end(valist); } -static inline void winetest_start_todo( int is_todo ) +void winetest_start_todo( int is_todo ) { - todo_level = (todo_level << 1) | (is_todo != 0); - todo_do_loop=1; + struct tls_data *data = get_tls_data(); + data->todo_level = (data->todo_level << 1) | (is_todo != 0); + data->todo_do_loop=1; } -static inline int winetest_loop_todo(void) +int winetest_loop_todo(void) { - int do_loop=todo_do_loop; - todo_do_loop=0; + struct tls_data *data = get_tls_data(); + int do_loop=data->todo_do_loop; + data->todo_do_loop=0; return do_loop; } -static inline void winetest_end_todo(void) +void winetest_end_todo(void) { - todo_level >>= 1; + struct tls_data *data = get_tls_data(); + data->todo_level >>= 1; } -static inline int broken(int condition) +void __winetest_cdecl winetest_push_context( const char *fmt, ... ) { - return !running_under_wine && condition; + struct tls_data *data = get_tls_data(); + __winetest_va_list valist; + + if (data->context_count < ARRAY_SIZE(data->context)) + { + __winetest_va_start(valist, fmt); + vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); + __winetest_va_end(valist); + data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; + } + ++data->context_count; } -#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ - winetest_loop_todo(); \ - winetest_end_todo()) -#define todo_wine todo_if(running_under_wine) -#define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) -#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_(__FILE__, __LINE__, __VA_ARGS__) +void winetest_pop_context(void) +{ + struct tls_data *data = get_tls_data(); + + if (data->context_count) + --data->context_count; +} + +LONG winetest_get_failures(void) +{ + return failures; +} + +void winetest_add_failures( LONG new_failures ) +{ + while (new_failures-- > 0) + InterlockedIncrement( &failures ); +} -- 2.32.0

2 6

[PATCH] dbghelp/tests: try to fix failure in current dbghelp tests
by Eric Pouech July 2, 2021

July 2, 2021

Testbot failures in previous SymGetTypeFromName patch have nothing to do with that former patch. Trying to address errouneous test. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 7be58c55b91..7fd1f6fb883 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -108,7 +108,7 @@ static void test_stack_walk(void) addr = (void *)(DWORD_PTR)frame.AddrPC.Offset; - if (addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) + if (!found_our_frame && addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) { found_our_frame = TRUE;

1 0

[PATCH 5/5] iphlpapi: Rewrite ConvertInterfaceLuidToNameA/NameToLuidA() to call their unicode equivalents.
by Huw Davies July 2, 2021

July 2, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 38 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8540b594e53..b6b96165027 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3244,21 +3244,20 @@ DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID *luid, NET_IFINDEX *inde */ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_T len) { - DWORD ret; - MIB_IFROW row; + DWORD err; + WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - TRACE("(%p %p %u)\n", luid, name, (DWORD)len); + TRACE( "(%p %p %u)\n", luid, name, (DWORD)len ); if (!luid) return ERROR_INVALID_PARAMETER; + if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - if (!name || len < WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, NULL, 0, NULL, NULL )) - return ERROR_NOT_ENOUGH_MEMORY; + err = ConvertInterfaceLuidToNameW( luid, nameW, ARRAY_SIZE(nameW) ); + if (err) return err; - WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, name, len, NULL, NULL ); - return NO_ERROR; + if (!WideCharToMultiByte( CP_UNIXCP, 0, nameW, -1, name, len, NULL, NULL )) + err = GetLastError(); + return err; } /****************************************************************** @@ -3286,22 +3285,15 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE */ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) { - DWORD ret; - IF_INDEX index; - MIB_IFROW row; - - TRACE("(%s %p)\n", debugstr_a(name), luid); + WCHAR nameW[IF_MAX_STRING_SIZE]; - if ((ret = getInterfaceIndexByName( name, &index ))) return ERROR_INVALID_NAME; - if (!luid) return ERROR_INVALID_PARAMETER; + TRACE( "(%s %p)\n", debugstr_a(name), luid ); - row.dwIndex = index; - if ((ret = GetIfEntry( &row ))) return ret; + if (!name) return ERROR_INVALID_NAME; + if (!MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) + return GetLastError(); - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + return ConvertInterfaceNameToLuidW( nameW, luid ); } /****************************************************************** -- 2.23.0

1 0

[PATCH 4/5] iphlpapi: Implement if_indextoname() using the ConvertInterface* functions.
by Huw Davies July 2, 2021

July 2, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index aaa6a80c19e..8540b594e53 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3374,11 +3374,19 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) /****************************************************************** * if_indextoname (IPHLPAPI.@) */ -PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name ) { - TRACE("(%u, %p)\n", index, name); + NET_LUID luid; + DWORD err; + + TRACE( "(%u, %p)\n", index, name ); + + err = ConvertInterfaceIndexToLuid( index, &luid ); + if (err) return NULL; - return getInterfaceNameByIndex(index, name); + err = ConvertInterfaceLuidToNameA( &luid, name, IF_MAX_STRING_SIZE ); + if (err) return NULL; + return name; } /****************************************************************** -- 2.23.0

1 0

[PATCH 3/5] iphlpapi: Implement if_nametoindex() using the ConvertInterface* functions.
by Huw Davies July 2, 2021

July 2, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a774e60c3d9..aaa6a80c19e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3357,13 +3357,18 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) { - IF_INDEX idx; + IF_INDEX index; + NET_LUID luid; + DWORD err; - TRACE("(%s)\n", name); - if (getInterfaceIndexByName(name, &idx) == NO_ERROR) - return idx; + TRACE( "(%s)\n", name ); - return 0; + err = ConvertInterfaceNameToLuidA( name, &luid ); + if (err) return 0; + + err = ConvertInterfaceLuidToIndex( &luid, &index ); + if (err) index = 0; + return index; } /****************************************************************** -- 2.23.0

1 0

[PATCH 2/5] iphlpapi: Use ConvertInterfaceIndexToLuid() where possible.
by Huw Davies July 2, 2021

July 2, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7b104330ba7..a774e60c3d9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1052,8 +1052,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); aa->ConnectionType = connectionTypeFromMibType(type); - aa->Luid.Info.NetLuidIndex = index; - aa->Luid.Info.IfType = aa->IfType; + ConvertInterfaceIndexToLuid( index, &aa->Luid ); if (output_gateways && num_v4_gateways) { @@ -1796,10 +1795,8 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) if ((ret = getInterfaceStatsByName( name, &row ))) return ret; memset( row2, 0, sizeof(*row2) ); - row2->InterfaceLuid.Info.Reserved = 0; - row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; - row2->InterfaceLuid.Info.IfType = row.dwType; row2->InterfaceIndex = row.dwIndex; + ConvertInterfaceIndexToLuid( row2->InterfaceIndex, &row2->InterfaceLuid ); ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu; -- 2.23.0

1 0

[PATCH 1/5] nsiproxy: Implement NDIS index to luid get_parameter.
by Huw Davies July 2, 2021

July 2, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/ndis.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index d7f6ac9c739..cefd42983d4 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -382,9 +382,39 @@ static void test_ndis_ifinfo( void ) NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } +static void test_ndis_index_luid( void ) +{ + DWORD err, count, i; + NET_LUID *luids, luid; + DWORD index; + + /* index -> luid map. NsiAllocateAndGetTable and NsiGetAllParameters fail */ + + /* first get the luids */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luids, sizeof(*luids), + NULL, 0, NULL, 0, NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + + for (i = 0; i < count; i++) + { + ConvertInterfaceLuidToIndex( luids + i, &index ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, &luid, sizeof(luid), 0 ); + ok( !err, "got %d\n", err ); + ok( luid.Value == luids[i].Value, "%d: luid mismatch\n", i ); + } + NsiFreeTable( luids, NULL, NULL, NULL ); + + index = ~0u; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, &luid, sizeof(luid), 0 ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); +} + START_TEST( nsi ) { test_nsi_api(); test_ndis_ifinfo(); + test_ndis_index_luid(); } diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 647fd650cd3..38e6802e3bd 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -584,6 +584,31 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par return status; } +static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); + + if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_index( *(DWORD *)key ); + if (entry) + { + *(NET_LUID *)data = entry->if_luid; + status = STATUS_SUCCESS; + } + LeaveCriticalSection( &if_list_cs ); + return status; +} + static const struct module_table tables[] = { { @@ -596,6 +621,16 @@ static const struct module_table tables[] = ifinfo_get_all_parameters, ifinfo_get_parameter }, + { + NSI_NDIS_INDEX_LUID_TABLE, + { + sizeof(DWORD), 0, + 0, sizeof(NET_LUID) + }, + NULL, + NULL, + index_luid_get_parameter + }, { ~0u } }; -- 2.23.0

1 0

[PATCH] dbghelp: fix SymGetTypeFromName
by Eric Pouech July 2, 2021

July 2, 2021

Correctly initialize the module_pair structure Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index c322157d57d..be7c8378e8c 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -924,12 +924,12 @@ BOOL WINAPI SymGetTypeInfo(HANDLE hProcess, DWORD64 ModBase, BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Name, PSYMBOL_INFO Symbol) { - struct process* pcs = process_find_by_handle(hProcess); struct module_pair pair; struct symt* type; - if (!pcs) return FALSE; - pair.requested = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); if (!module_get_debug(&pair)) return FALSE; type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE;

1 0

[PATCH] winedbg: gdb proxy's exec-file:read command
by Eric Pouech July 2, 2021

July 2, 2021

Added support for qXfer:exec-file:read command in gdb proxy. This removes lots of garbage spitted by gdb. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b8a8a1da2f8..04f1dabd312 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1850,6 +1850,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_add(gdbctx, "qXfer:libraries:read+;"); packet_reply_add(gdbctx, "qXfer:threads:read+;"); packet_reply_add(gdbctx, "qXfer:features:read+;"); + packet_reply_add(gdbctx, "qXfer:exec-file:read+;"); packet_reply_close(gdbctx); return packet_done; } @@ -1910,6 +1911,25 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_close_xfer(gdbctx, off, len); return packet_done; } + + if (sscanf(gdbctx->in_packet, "Xfer:exec-file:read::%x,%x", &off, &len) == 2) + { + BOOL is_wow64; + char* unix_path; + char* tmp; + + if (!gdbctx->process || !gdbctx->process->imageName) return packet_error; + if (!(unix_path = wine_get_unix_file_name(gdbctx->process->imageName))) return packet_error; + + if (IsWow64Process(gdbctx->process->handle, &is_wow64) && + is_wow64 && (tmp = strstr(unix_path, "system32"))) + memcpy(tmp, "syswow64", 8); + packet_reply_open_xfer(gdbctx); + packet_reply_add(gdbctx, unix_path); + packet_reply_close_xfer(gdbctx, off, len); + HeapFree(GetProcessHeap(), 0, unix_path); + return packet_done; + } break; } ERR("Unhandled query %s\n", debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len));

1 0

[PATCH] winedbg: Added helper in gdbproxy mode to get proper address width information
by Eric Pouech July 2, 2021

July 2, 2021

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 19fa86d44da..89dcc14dcf6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -702,6 +702,13 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, * =============================================== * */ +static int addr_width(struct gdb_context* gdbctx) +{ + int sz = (gdbctx && gdbctx->process && gdbctx->process->be_cpu) ? + gdbctx->process->be_cpu->pointer_size : (int)sizeof(void*); + return sz * 2; +} + enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; @@ -1343,7 +1350,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); @@ -1468,8 +1475,8 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } packet_reply_open(gdbctx); snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n", - (unsigned)sizeof(void*), (DWORD_PTR)addr, - (unsigned)sizeof(void*), mbi.RegionSize, state, type, prot); + addr_width(gdbctx), (DWORD_PTR)addr, + addr_width(gdbctx), mbi.RegionSize, state, type, prot); packet_reply_add(gdbctx, "O"); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx);

1 0