James Hawkins : ntdll: Fix a test that fails in win2k3.

Alexandre Julliard julliard at winehq.org
Wed May 14 15:08:24 CDT 2008


Module: wine
Branch: master
Commit: 2470b0b31605133ec046330dd79fdccaa7ba33fe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2470b0b31605133ec046330dd79fdccaa7ba33fe

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Wed May 14 14:55:00 2008 -0500

ntdll: Fix a test that fails in win2k3.

---

 dlls/ntdll/tests/exception.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 80a8fbd..0aa880a 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -215,8 +215,10 @@ LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionIn
      */
     if(rec->ExceptionCode == EXCEPTION_BREAKPOINT)
     {
-        ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n",
-           context->Eip, (DWORD)code_mem + 0xa);
+        ok(context->Eip == (DWORD)code_mem + 0xa ||
+           context->Eip == (DWORD)code_mem + 0xb, /* win2k3 */
+           "Eip at %x instead of %x or %x\n", context->Eip,
+           (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb);
     }
     else
     {
@@ -245,8 +247,10 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR
      */
     if(rec->ExceptionCode == EXCEPTION_BREAKPOINT)
     {
-        ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n",
-           context->Eip, (DWORD)code_mem + 0xa);
+        ok(context->Eip == (DWORD)code_mem + 0xa ||
+           context->Eip == (DWORD)code_mem + 0xb, /* win2k3 */
+           "Eip at %x instead of %x or %x\n", context->Eip,
+           (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb);
     }
     else
     {




More information about the wine-cvs mailing list