[PATCH] kernel32: Check only the low word of CS when printing exceptions.

Zebediah Figura z.figura12 at gmail.com
Tue May 15 15:02:23 CDT 2018


Fixes messages along the lines of
wine: Unhandled page fault at address 0xf7bd0023:0x7b43d14c (thread 006c), starting debugger...

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/kernel32/except.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c
index e00572f..bff8ce2 100644
--- a/dlls/kernel32/except.c
+++ b/dlls/kernel32/except.c
@@ -150,9 +150,9 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in
     if ((len<0) || (len>=size))
         return -1;
 #ifdef __i386__
-    if (ptr->ContextRecord->SegCs != wine_get_cs())
+    if (LOWORD(ptr->ContextRecord->SegCs) != wine_get_cs())
         len2 = snprintf(buffer+len, size-len, " at address 0x%04x:0x%08x",
-                        ptr->ContextRecord->SegCs,
+                        LOWORD(ptr->ContextRecord->SegCs),
                         (DWORD)ptr->ExceptionRecord->ExceptionAddress);
     else
 #endif
-- 
2.7.4




More information about the wine-devel mailing list