Changeset 21625 for trunk/src/kernel32

Timestamp:

Apr 15, 2011, 9:35:39 PM (14 years ago)

Author:

dmik

Message:

kernel32: SEH: Fixed: Detecting the successful Win32 FS change was wrong and could cause the unwind at inappropriate times while not doing it at appropriate times.

File:

• trunk/src/kernel32/seh/sehutil.s (modified) (2 diffs)

trunk/src/kernel32/seh/sehutil.s

@@ -80 +80 @@
      * Win32 thread is about to exit and TIB has been already destroyed. */
     movl (%esp), %ecx   /* (%esp) is OS/2 FS pushed above */
-    andl $0x0000FFFF, %ecx
-    cmpl %ecx, %eax
+    movl %fs, %eax
+    cmpw %cx, %ax
     je ___seh_handler_Skip_Win32_Unwind
 
@@ -98 +98 @@
     movl %ecx, 0(%eax)  /* pPrev */
 
-    xor %eax, %eax  /* return code is irrelevant for XCPT_UNWIND */
+    xor %eax, %eax  /* return code is irrelevant for EH_UNWINDING */
     jmp ___seh_handler_Return