ported the __EXCEPT_PAGE_FAULT macro for upcoming synchronizations of imported wine code

Modified: trunk/reactos/include/wine/exception.h

--- trunk/reactos/include/wine/exception.h	2005-12-17 15:45:59 UTC (rev 20224)
+++ trunk/reactos/include/wine/exception.h	2005-12-17 16:06:45 UTC (rev 20225)
@@ -78,6 +78,7 @@

 #define __EXCEPT(func) __except((func)(GetExceptionInformation()))
 #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); }
 #define __ENDTRY /*nothing*/

+#define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)

 
 #else  /* USE_COMPILER_EXCEPTIONS */
 
@@ -129,6 +130,9 @@

 typedef DWORD (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS);
 typedef void (CALLBACK *__WINE_FINALLY)(BOOL);
 

+/* convenience handler for page fault exceptions */
+#define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 )
+

 #define WINE_EXCEPTION_FILTER(func) DWORD CALLBACK func( PEXCEPTION_POINTERS __eptr )
 #define WINE_FINALLY_FUNC(func) void CALLBACK func( BOOL __normal )
 
@@ -156,7 +160,7 @@

 
 #endif /* USE_COMPILER_EXCEPTIONS */
 

-static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame )

+static __inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame )

 {
 #if defined(__GNUC__) && defined(__i386__)
     EXCEPTION_REGISTRATION_RECORD *prev;
@@ -173,7 +177,7 @@

 #endif
 }
 

-static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame )

+static __inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame )

 {
 #if defined(__GNUC__) && defined(__i386__)
     __asm__ __volatile__(".byte 0x64\n\tmovl %0,(0)"
@@ -199,8 +203,14 @@

 
     if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))
         return ExceptionContinueSearch;

-    if (wine_frame->u.filter)

+
+    if (wine_frame->u.filter == (void *)1)  /* special hack for page faults */

     {

+        if (record->ExceptionCode != EXCEPTION_ACCESS_VIOLATION)
+            return ExceptionContinueSearch;
+    }
+    else if (wine_frame->u.filter)
+    {

         EXCEPTION_POINTERS ptrs;
         ptrs.ExceptionRecord = record;
         ptrs.ContextRecord = context;
@@ -253,4 +263,11 @@

 
 extern void __wine_enter_vm86( CONTEXT *context );
 

+static __inline WINE_EXCEPTION_FILTER(__wine_pagefault_filter)
+{
+    if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)
+        return EXCEPTION_CONTINUE_SEARCH;
+    return EXCEPTION_EXECUTE_HANDLER;
+}
+

 #endif  /* __WINE_WINE_EXCEPTION_H */