Module: wine Branch: master Commit: 7eaa5119b7f2a4f316689922be0a74dd1c7bd70f URL: https://gitlab.winehq.org/wine/wine/-/commit/7eaa5119b7f2a4f316689922be0a74d...
Author: Paul Gofman pgofman@codeweavers.com Date: Mon Sep 4 13:33:44 2023 -0600
ntdll/tests: Adjust test_nested_exception() for Win11 results.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55238
---
dlls/ntdll/tests/exception.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4b31ded98b7..c50dfde753b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4947,7 +4947,8 @@ static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRAT return ExceptionContinueExecution; }
- if (rec->ExceptionCode == 0xdeadbeef && rec->ExceptionFlags == EH_NESTED_CALL) + if (rec->ExceptionCode == 0xdeadbeef && (rec->ExceptionFlags == EH_NESTED_CALL + || rec->ExceptionFlags == (EH_NESTED_CALL | EXCEPTION_SOFTWARE_ORIGINATE))) { ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); got_nested_exception = TRUE; @@ -4955,7 +4956,7 @@ static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRAT return ExceptionContinueSearch; }
- ok(rec->ExceptionCode == 0xdeadbeef && !rec->ExceptionFlags, + ok(rec->ExceptionCode == 0xdeadbeef && (!rec->ExceptionFlags || rec->ExceptionFlags == EXCEPTION_SOFTWARE_ORIGINATE), "Got unexpected exception code %#lx, flags %#lx.\n", rec->ExceptionCode, rec->ExceptionFlags); ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); ok(frame == (void *)((BYTE *)nested_exception_initial_frame + 8),