niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

ntdll/tests: Fix a test failure when exception information is missing.

Browse source
This commit is contained in:
Alexandre Julliard 2024-02-23 17:00:28 +01:00
parent af64a8bb5c
commit 2e6651cb36
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/ntdll/tests/unwind.c
View file

@ -1583,6 +1583,9 @@ static void call_virtual_unwind_arm64( void *code_mem, int testnum, const struct
for (i = 0; i < test->nb_results; i++)
{
#ifdef __x86_64__
if (test->results[i].handler == -2) continue; /* skip invalid leaf function test */
#endif
winetest_push_context( "%u/%u", testnum, i );
memset( &ctx_ptr, 0x55, sizeof(ctx_ptr) );
memset( &context, 0x55, sizeof(context) );
@ -1602,11 +1605,7 @@ static void call_virtual_unwind_arm64( void *code_mem, int testnum, const struct
data = (void *)0xdeadbeef;
frame = 0xdeadbeef;
#ifdef __x86_64__
if (test->results[i].handler == -2) continue; /* skip invalid leaf function test */
#else
if (test->results[i].handler == -2) orig_pc = context.Lr;
#endif
handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_pc,
test->unwind_info ? (RUNTIME_FUNCTION *)&runtime_func : NULL,
(CONTEXT *)&context, &data, &frame, &ctx_ptr );
@ -3226,12 +3225,13 @@ static void test_dynamic_unwind(void)
ok( base == 0xdeadbeef, "RtlLookupFunctionTable wrong base, got: %Ix\n", base );
base = 0xdeadbeef;
len = 0xdeadbeef;
func = pRtlLookupFunctionTable( (ULONG_PTR)pRtlLookupFunctionEntry, &base, &len );
ok( base == (ULONG_PTR)GetModuleHandleA("ntdll.dll"),
"RtlLookupFunctionTable wrong base, got: %Ix / %p\n", base, GetModuleHandleA("ntdll.dll") );
ptr = RtlImageDirectoryEntryToData( (void *)base, TRUE, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &len2 );
ok( func == ptr, "RtlLookupFunctionTable wrong table, got: %p / %p\n", func, ptr );
ok( len == len2, "RtlLookupFunctionTable wrong len, got: %lu / %lu\n", len, len2 );
ok( len == len2 || !ptr, "RtlLookupFunctionTable wrong len, got: %lu / %lu\n", len, len2 );
pRtlDeleteGrowableFunctionTable( growable_table );