Changeset 21624 for trunk/include/excpt.h

Timestamp:

Apr 15, 2011, 9:32:09 PM (14 years ago)

Author:

dmik

Message:

kernel32: SEH: Make sure Win32 FS is active when unregistering the try handler: the code within it (e.g. an OS/2 longjmp) can occasionally reset it to OS/2 FS.

File:

• trunk/include/excpt.h (modified) (2 diffs)

trunk/include/excpt.h

@@ -134 +134 @@
         else if (__seh_frame.state == 3)                                       \
             /* remove exception handler */                                     \
-            __asm__ ("movl %%fs:0, %%ecx; "                                    \
+            __asm__ ("push $1; "                                               \
+                     "call _SetWin32TIB@4; "                                   \
+                     ""                                                        \
+                     "movl %%fs:0, %%ecx; "                                    \
                      "movl 60(%%ecx), %%eax; "                                 \
                      "movl %%eax, %%fs:0; "                                    \
@@ -162 +165 @@
         else if (__seh_frame.state == 3)                                       \
             /* remove exception handler */                                     \
-            __asm__ ("movl %%fs:0, %%ecx; "                                    \
+            __asm__ ("push $1; "                                               \
+                     "call _SetWin32TIB@4; "                                   \
+                     ""                                                        \
+                     "movl %%fs:0, %%ecx; "                                    \
                      "movl 60(%%ecx), %%eax; "                                 \
                      "movl %%eax, %%fs:0; "                                    \