Alexandre Julliard : ntdll/tests: Don't mark Wow64 behavior as broken.
Alexandre Julliard
julliard at winehq.org
Wed Aug 18 16:22:10 CDT 2021
Module: wine
Branch: master
Commit: 0883dafe6a9c3a49fcc5c4b65904503172e6aa5e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0883dafe6a9c3a49fcc5c4b65904503172e6aa5e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Aug 18 20:03:31 2021 +0200
ntdll/tests: Don't mark Wow64 behavior as broken.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/tests/exception.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index f79a302d4aa..2a56641ca3c 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -470,7 +470,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce
if(rec->ExceptionCode == EXCEPTION_BREAKPOINT)
{
ok(context->Eip == (DWORD)code_mem + 0xa ||
- broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ ||
+ (is_wow64 && context->Eip == (DWORD)code_mem + 0xb) ||
broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */,
"Eip at %x instead of %x or %x\n", context->Eip,
(DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb);
@@ -507,7 +507,7 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR
if(rec->ExceptionCode == EXCEPTION_BREAKPOINT)
{
ok(context->Eip == (DWORD)code_mem + 0xa ||
- broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ ||
+ (is_wow64 && context->Eip == (DWORD)code_mem + 0xb) ||
broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */,
"Eip at %x instead of %x or %x\n", context->Eip,
(DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb);
@@ -1177,7 +1177,7 @@ static void test_debugger(DWORD cont_status)
if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT)
{
ok((char *)ctx.Eip == (char *)code_mem_address + 0xa ||
- broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) ||
+ (is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) ||
broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */,
"Eip at 0x%x instead of %p\n",
ctx.Eip, (char *)code_mem_address + 0xa);
More information about the wine-cvs
mailing list