New file msvcrt/excpt.h. Move some stuff out of winnt.h into it.
diff --git a/debugger/dbg.y b/debugger/dbg.y
index 86af2a8..9f10618 100644
--- a/debugger/dbg.y
+++ b/debugger/dbg.y
@@ -18,6 +18,7 @@
#include "wine/exception.h"
#include "debugger.h"
#include "expr.h"
+#include "msvcrt/excpt.h"
extern FILE * yyin;
diff --git a/debugger/winedbg.c b/debugger/winedbg.c
index 020ee86..42a463d 100644
--- a/debugger/winedbg.c
+++ b/debugger/winedbg.c
@@ -16,6 +16,7 @@
#include "wincon.h"
#include "wingdi.h"
#include "winuser.h"
+#include "msvcrt/excpt.h"
#include "winreg.h"
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index a190486..b4757d4 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -16,6 +16,7 @@
#include "msvcrt.h"
#include "msvcrt/setjmp.h"
+#include "msvcrt/excpt.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c
index 5e59e16..2df6659 100644
--- a/dlls/ntdll/debugtools.c
+++ b/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);
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 96e7c52..68596db 100644
--- a/dlls/ntdll/exception.c
+++ b/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);
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 13376ae..f8c0df8 100644
--- a/dlls/ntdll/sec.c
+++ b/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);
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index d027a82..81e18bd 100644
--- a/dlls/opengl32/wgl.c
+++ b/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"
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index aedec91..152a274 100644
--- a/dlls/user/lstr.c
+++ b/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);
diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c
index 962b718..b4636e6 100644
--- a/dlls/winedos/dosvm.c
+++ b/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);
diff --git a/files/dos_fs.c b/files/dos_fs.c
index f3f3aae..ff756fc 100644
--- a/files/dos_fs.c
+++ b/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"
diff --git a/include/Makefile.in b/include/Makefile.in
index 9a9b680..7211eee 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -58,6 +58,7 @@
msvcrt/direct.h \
msvcrt/dos.h \
msvcrt/eh.h \
+ msvcrt/excpt.h \
msvcrt/fcntl.h \
msvcrt/io.h \
msvcrt/locale.h \
diff --git a/include/msvcrt/excpt.h b/include/msvcrt/excpt.h
new file mode 100644
index 0000000..e57f90a
--- /dev/null
+++ b/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 */
diff --git a/include/windows.h b/include/windows.h
index a041926..575dec7 100644
--- a/include/windows.h
+++ b/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"
diff --git a/include/winnt.h b/include/winnt.h
index bad90ad..78f9488 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -2220,23 +2220,6 @@
/*
- * 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
*/
diff --git a/loader/resource.c b/loader/resource.c
index 6aee478..4967843 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -23,6 +23,7 @@
#include "debugtools.h"
#include "winerror.h"
#include "winnls.h"
+#include "msvcrt/excpt.h"
DEFAULT_DEBUG_CHANNEL(resource);
diff --git a/memory/global.c b/memory/global.c
index 1b4df49..90dc2c7 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -25,6 +25,7 @@
#include "module.h"
#include "debugtools.h"
#include "winerror.h"
+#include "msvcrt/excpt.h"
DEFAULT_DEBUG_CHANNEL(global);
diff --git a/memory/string.c b/memory/string.c
index caa994a..b2ac9e1 100644
--- a/memory/string.c
+++ b/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);
diff --git a/memory/virtual.c b/memory/virtual.c
index 7c9eda7..e83c526 100644
--- a/memory/virtual.c
+++ b/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);
diff --git a/relay32/snoop.c b/relay32/snoop.c
index 585378b..ebe1c0f 100644
--- a/relay32/snoop.c
+++ b/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);
diff --git a/win32/console.c b/win32/console.c
index a5b8f12..f3e03f5 100644
--- a/win32/console.c
+++ b/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);
diff --git a/win32/except.c b/win32/except.c
index d107835..02d3b00 100644
--- a/win32/except.c
+++ b/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);
diff --git a/win32/init.c b/win32/init.c
index b65b1fe..df23b7f 100644
--- a/win32/init.c
+++ b/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);
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index a0737b0..d31cdb3 100644
--- a/windows/cursoricon.c
+++ b/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);
