New file msvcrt/excpt.h. Move some stuff out of winnt.h into it.

debugger/dbg.y

@@ -18,6 +18,7 @@
 #include "wine/exception.h"
 #include "debugger.h"
 #include "expr.h"
+#include "msvcrt/excpt.h"
 
 extern FILE * yyin;
 

debugger/winedbg.c

@@ -16,6 +16,7 @@
 #include "wincon.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "msvcrt/excpt.h"
 
 #include "winreg.h"
 

dlls/msvcrt/except.c

@@ -16,6 +16,7 @@
 #include "msvcrt.h"
 
 #include "msvcrt/setjmp.h"
+#include "msvcrt/excpt.h"
 
 
 #include "wine/debug.h"

dlls/ntdll/debugtools.c

@@ -16,6 +16,7 @@
 #include "winnt.h"
 #include "ntddk.h"
 #include "wtypes.h"
+#include "msvcrt/excpt.h"
 
 DECLARE_DEBUG_CHANNEL(tid);
 

dlls/ntdll/exception.c

@@ -18,6 +18,7 @@
 #include "miscemu.h"
 #include "wine/server.h"
 #include "debugtools.h"
+#include "msvcrt/excpt.h"
 
 DEFAULT_DEBUG_CHANNEL(seh);
 

dlls/ntdll/sec.c

@@ -21,6 +21,7 @@
 #include "ntddk.h"
 #include "winreg.h"
 #include "ntdll_misc.h"
+#include "msvcrt/excpt.h"
 
 DEFAULT_DEBUG_CHANNEL(ntdll);
 

dlls/opengl32/wgl.c

@@ -17,6 +17,7 @@
 #include "wine_gl.h"
 #include "x11drv.h"
 #include "x11font.h"
+#include "msvcrt/excpt.h"
 
 #include "wgl.h"
 #include "opengl_ext.h"

dlls/user/lstr.c

@@ -22,6 +22,8 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 
+#include "msvcrt/excpt.h"
+
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(resource);

dlls/winedos/dosvm.c

@@ -34,6 +34,7 @@
 #include "dosvm.h"
 #include "stackframe.h"
 #include "debugtools.h"
+#include "msvcrt/excpt.h"
 
 DEFAULT_DEBUG_CHANNEL(int);
 DECLARE_DEBUG_CHANNEL(module);

files/dos_fs.c

@@ -35,6 +35,7 @@
 #include "ntddk.h"
 #include "options.h"
 #include "wine/server.h"
+#include "msvcrt/excpt.h"
 
 #include "debugtools.h"
 

include/Makefile.in

@@ -58,6 +58,7 @@ INSTALLED_INCLUDES = \
 	msvcrt/direct.h \
 	msvcrt/dos.h \
 	msvcrt/eh.h \
+	msvcrt/excpt.h \
 	msvcrt/fcntl.h \
 	msvcrt/io.h \
 	msvcrt/locale.h \

include/msvcrt/excpt.h

@@ -0,0 +1,24 @@
+#ifndef __WINE_EXCPT_H
+#define __WINE_EXCPT_H
+
+/*
+ * Return values from the actual exception handlers
+ */
+typedef enum _EXCEPTION_DISPOSITION
+{
+  ExceptionContinueExecution,
+  ExceptionContinueSearch,
+  ExceptionNestedException,
+  ExceptionCollidedUnwind
+} EXCEPTION_DISPOSITION;
+
+/*
+ * Return values from filters in except() and from UnhandledExceptionFilter
+ */
+#define EXCEPTION_EXECUTE_HANDLER        1
+#define EXCEPTION_CONTINUE_SEARCH        0
+#define EXCEPTION_CONTINUE_EXECUTION    -1
+
+
+
+#endif /* __WINE_EXCPT_H */

include/windows.h

@@ -10,7 +10,7 @@
 #else /* RC_INVOKED && !NOWINRES */
 
 /* All the basic includes */
-/* #include "excpt.h" */
+#include "msvcrt/excpt.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

include/winnt.h

@@ -2219,23 +2219,6 @@ __DEFINE_SET_SEG(gs)
 #define MAXIMUM_SUSPEND_COUNT 127
 
 
-/*
- * Return values from the actual exception handlers
- */
-
-#define ExceptionContinueExecution 0
-#define ExceptionContinueSearch    1
-#define ExceptionNestedException   2
-#define ExceptionCollidedUnwind    3
- 
-/*
- * Return values from filters in except() and from UnhandledExceptionFilter
- */
- 
-#define EXCEPTION_EXECUTE_HANDLER        1
-#define EXCEPTION_CONTINUE_SEARCH        0
-#define EXCEPTION_CONTINUE_EXECUTION    -1
-
 /*
  * From OS/2 2.0 exception handling
  * Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD

loader/resource.c

@@ -23,6 +23,7 @@
 #include "debugtools.h"
 #include "winerror.h"
 #include "winnls.h"
+#include "msvcrt/excpt.h"
 
 DEFAULT_DEBUG_CHANNEL(resource);
 

memory/global.c

@@ -25,6 +25,7 @@
 #include "module.h"
 #include "debugtools.h"
 #include "winerror.h"
+#include "msvcrt/excpt.h"
 
 DEFAULT_DEBUG_CHANNEL(global);
 

memory/string.c

@@ -15,6 +15,7 @@
 #include "wine/unicode.h"
 #include "winerror.h"
 #include "winnls.h"
+#include "msvcrt/excpt.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(string);

memory/virtual.c

@@ -30,6 +30,7 @@
 #include "file.h"
 #include "global.h"
 #include "wine/server.h"
+#include "msvcrt/excpt.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(virtual);

relay32/snoop.c

@@ -15,6 +15,7 @@
 #include "stackframe.h"
 #include "debugtools.h"
 #include "wine/exception.h"
+#include "msvcrt/excpt.h"
 
 DEFAULT_DEBUG_CHANNEL(snoop);
 

win32/console.c

@@ -29,6 +29,7 @@
 #include "wine/exception.h"
 #include "debugtools.h"
 #include "options.h"
+#include "msvcrt/excpt.h"
 
 DEFAULT_DEBUG_CHANNEL(console);
 

win32/except.c

@@ -33,6 +33,7 @@
 #include "stackframe.h"
 #include "wine/server.h"
 #include "debugtools.h"
+#include "msvcrt/excpt.h"
 
 DEFAULT_DEBUG_CHANNEL(seh);
 

win32/init.c

@@ -14,6 +14,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/exception.h"
+#include "msvcrt/excpt.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(win32);

windows/cursoricon.c

@@ -46,6 +46,7 @@
 #include "input.h"
 #include "message.h"
 #include "winerror.h"
+#include "msvcrt/excpt.h"
 
 DECLARE_DEBUG_CHANNEL(cursor);
 DECLARE_DEBUG_CHANNEL(icon);