Rob Shearman : include: Move Wine-specific EH_* defines from winnt. h to include/wine/exception.h.

[Alexandre Julliard]

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

Author: Rob Shearman <rob(a)codeweavers.com>
Date:   Fri Nov 30 18:04:08 2007 +0000

include: Move Wine-specific EH_* defines from winnt.h to include/wine/exception.h.

---

 dlls/winecrt0/stub.c     |    2 +-
 include/wine/exception.h |    8 ++++++++
 include/winnt.h          |   13 +------------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c
index ebeb908..c6ddb91 100644
--- a/dlls/winecrt0/stub.c
+++ b/dlls/winecrt0/stub.c
@@ -32,5 +32,5 @@ void DECLSPEC_HIDDEN __wine_spec_unimplemented_stub( const char *module, const c
 
     args[0] = (ULONG_PTR)module;
     args[1] = (ULONG_PTR)function;
-    RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );
+    RaiseException( EXCEPTION_WINE_STUB, EXCEPTION_NONCONTINUABLE, 2, args );
 }
diff --git a/include/wine/exception.h b/include/wine/exception.h
index eebfdfb..ceb4c12 100644
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@@ -187,6 +187,14 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTR
 #endif
 }
 
+/* Exception handling flags - from OS/2 2.0 exception handling */
+
+/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */
+#define EH_NONCONTINUABLE   0x01
+#define EH_UNWINDING        0x02
+#define EH_EXIT_UNWIND      0x04
+#define EH_STACK_INVALID    0x08
+#define EH_NESTED_CALL      0x10
 
 /* Wine-specific exceptions codes */
 
diff --git a/include/winnt.h b/include/winnt.h
index 78fa1f7..f103c0d 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -1906,19 +1906,8 @@ typedef CONTEXT *PCONTEXT;
 #define WT_EXECUTEDELETEWAIT           0x08
 
 
-/*
- * From OS/2 2.0 exception handling
- * Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD
- */
-
-#define EH_NONCONTINUABLE   0x01
-#define EH_UNWINDING        0x02
-#define EH_EXIT_UNWIND      0x04
-#define EH_STACK_INVALID    0x08
-#define EH_NESTED_CALL      0x10
-
 #define EXCEPTION_CONTINUABLE        0
-#define EXCEPTION_NONCONTINUABLE     EH_NONCONTINUABLE
+#define EXCEPTION_NONCONTINUABLE     0x01
 
 /*
  * The exception record used by Win32 to give additional information