[PATCH 0/1] MR7894: Draft: ntdll/tests: Allow an offset of 1 in the STATUS_BREAKPOINT test.

[Bernhard Übelacker]

In the [Test pattern page](https://gitlab.winehq.org/bernhardu/wine/-/merge_requests/new?merge_request%...) are some windows tests shown, that fail with `exception.c:881: Test failed: 42: Unexpected eip 0xf0000/0xf0001`.

Unfortunately too late I realized these machines are all driven by @rbernon , so I cannot directly test this patch.

@rbernon : Are these VMs probably running with AMD while testbot runs on Intel? What do you think about the patch? Is it worth the effort?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7894

[PATCH 1/1] ntdll/tests: Allow an offset of 1 in the STATUS_BREAKPOINT test.

[Bernhard Übelacker]

From: Bernhard Übelacker <bernhardu(a)mailbox.org>

---
 dlls/ntdll/tests/exception.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 514ad218274..8ac86b98797 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -878,7 +878,8 @@ static DWORD prot_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R
     ok( rec->ExceptionCode == except->status ||
         (except->alt_status != 0 && rec->ExceptionCode == except->alt_status),
         "%u: Wrong exception code %lx/%lx\n", entry, rec->ExceptionCode, except->status );
-    ok( context->Eip == (DWORD)code_mem + except->offset,
+    ok( context->Eip == (DWORD)code_mem + except->offset ||
+        (rec->ExceptionCode == STATUS_BREAKPOINT && context->Eip == (DWORD)code_mem + except->offset + 1),
         "%u: Unexpected eip %#lx/%#lx\n", entry,
         context->Eip, (DWORD)code_mem + except->offset );
     ok( rec->ExceptionAddress == (char*)context->Eip ||
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7894