commit ae8342df48b9332dcfd71f0b34e8c51abfb2c705
author Ulrich Weigand <weigand@informatik.uni-erlangen.de> Wed Nov 10 19:42:13 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Nov 10 19:42:13 1999 +0000
tree 152fa4b17b89a8fb079335d6a13cdc236c5332a0
parent 0a70783c1165ffc943e8ab4c2be502d35e82df7b

Bugfix: Exception handlers are *not* WINAPI.

dlls/ntdll/exception.c

diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index eb81dab..07e161a 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -66,8 +66,8 @@
  *
  * Handler for exceptions happening inside a handler.
  */
-static DWORD CALLBACK EXC_RaiseHandler( EXCEPTION_RECORD *rec, EXCEPTION_FRAME *frame,
-                                        CONTEXT *context, EXCEPTION_FRAME **dispatcher )
+static DWORD EXC_RaiseHandler( EXCEPTION_RECORD *rec, EXCEPTION_FRAME *frame,
+                               CONTEXT *context, EXCEPTION_FRAME **dispatcher )
 {
     if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))
         return ExceptionContinueSearch;
@@ -82,8 +82,8 @@
  *
  * Handler for exceptions happening inside an unwind handler.
  */
-static DWORD CALLBACK EXC_UnwindHandler( EXCEPTION_RECORD *rec, EXCEPTION_FRAME *frame,
-                                         CONTEXT *context, EXCEPTION_FRAME **dispatcher )
+static DWORD EXC_UnwindHandler( EXCEPTION_RECORD *rec, EXCEPTION_FRAME *frame,
+                                CONTEXT *context, EXCEPTION_FRAME **dispatcher )
 {
     if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))
         return ExceptionContinueSearch;

include/wine/exception.h

diff --git a/include/wine/exception.h b/include/wine/exception.h
index 79c437a..c4bcd4c 100644
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@@ -128,10 +128,10 @@
     const struct __tagWINE_FRAME *ExceptionRecord;
 } __WINE_FRAME;
 
-extern DWORD WINAPI WINE_exception_handler( PEXCEPTION_RECORD record, EXCEPTION_FRAME *frame,
-                                            CONTEXT *context, LPVOID pdispatcher );
-extern DWORD WINAPI WINE_finally_handler( PEXCEPTION_RECORD record, EXCEPTION_FRAME *frame,
-                                          CONTEXT *context, LPVOID pdispatcher );
+extern DWORD WINE_exception_handler( PEXCEPTION_RECORD record, EXCEPTION_FRAME *frame,
+                                     CONTEXT *context, LPVOID pdispatcher );
+extern DWORD WINE_finally_handler( PEXCEPTION_RECORD record, EXCEPTION_FRAME *frame,
+                                   CONTEXT *context, LPVOID pdispatcher );
 
 #endif /* USE_COMPILER_EXCEPTIONS */
 

include/winnt.h

diff --git a/include/winnt.h b/include/winnt.h
index db0e2bd..fd62044 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -708,8 +708,8 @@
 
 struct __EXCEPTION_FRAME;
 
-typedef DWORD (CALLBACK *PEXCEPTION_HANDLER)(PEXCEPTION_RECORD,struct __EXCEPTION_FRAME*,
-                                             PCONTEXT,struct __EXCEPTION_FRAME **);
+typedef DWORD (*PEXCEPTION_HANDLER)(PEXCEPTION_RECORD,struct __EXCEPTION_FRAME*,
+                                    PCONTEXT,struct __EXCEPTION_FRAME **);
 
 typedef struct __EXCEPTION_FRAME
 {

win32/except.c

diff --git a/win32/except.c b/win32/except.c
index 9413c77..be6ee2b 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -110,8 +110,8 @@
  *
  * Exception handler for exception blocks declared in Wine code.
  */
-DWORD WINAPI WINE_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *frame,
-                                     CONTEXT *context, LPVOID pdispatcher )
+DWORD WINE_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *frame,
+                              CONTEXT *context, LPVOID pdispatcher )
 {
     __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame;
 
@@ -150,8 +150,8 @@
  *
  * Exception handler for try/finally blocks declared in Wine code.
  */
-DWORD WINAPI WINE_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *frame,
-                                   CONTEXT *context, LPVOID pdispatcher )
+DWORD WINE_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *frame,
+                            CONTEXT *context, LPVOID pdispatcher )
 {
     __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame;