Alexandre Julliard : kernel32: Don't save the signal mask in sigsetjmp.

Alexandre Julliard julliard at winehq.org
Tue Feb 12 16:46:14 CST 2008


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Feb 12 22:39:54 2008 +0100

kernel32: Don't save the signal mask in sigsetjmp.
    
This shouldn't be needed anymore now that exceptions are not handled
on the signal stack, and signal mask handling is broken on Mac OS.

---

 dlls/kernel32/fiber.c    |    2 +-
 include/wine/exception.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c
index f8647ef..24ea351 100644
--- a/dlls/kernel32/fiber.c
+++ b/dlls/kernel32/fiber.c
@@ -188,7 +188,7 @@ void WINAPI SwitchToFiber( LPVOID fiber )
     /* stack_allocation and stack_base never change */
 
     /* FIXME: should save floating point context if requested in fiber->flags */
-    if (!sigsetjmp( current_fiber->jmpbuf, 1 ))
+    if (!sigsetjmp( current_fiber->jmpbuf, 0 ))
     {
         NtCurrentTeb()->Tib.u.FiberData   = new_fiber;
         NtCurrentTeb()->Tib.ExceptionList = new_fiber->except;
diff --git a/include/wine/exception.h b/include/wine/exception.h
index ceb4c12..adf8926 100644
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@@ -94,7 +94,7 @@
              __f.frame.Handler = __wine_exception_handler; \
              __f.u.filter = (func); \
              __wine_push_frame( &__f.frame ); \
-             if (sigsetjmp( __f.jmp, 1 )) { \
+             if (sigsetjmp( __f.jmp, 0 )) { \
                  const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \
                  do {
 




More information about the wine-cvs mailing list