From 73ab649ced480fc9f865712fb1c531ca964fc878 Mon Sep 17 00:00:00 2001
From: Peter Hunnisett <peter@transgaming.com>
Date: Mon, 25 Feb 2002 20:10:35 +0000
Subject: [PATCH] New file msvcrt/excpt.h. Move some stuff out of winnt.h into
 it.

---
 debugger/dbg.y          |  1 +
 debugger/winedbg.c      |  1 +
 dlls/msvcrt/except.c    |  1 +
 dlls/ntdll/debugtools.c |  1 +
 dlls/ntdll/exception.c  |  1 +
 dlls/ntdll/sec.c        |  1 +
 dlls/opengl32/wgl.c     |  1 +
 dlls/user/lstr.c        |  2 ++
 dlls/winedos/dosvm.c    |  1 +
 files/dos_fs.c          |  1 +
 include/Makefile.in     |  1 +
 include/msvcrt/excpt.h  | 24 ++++++++++++++++++++++++
 include/windows.h       |  2 +-
 include/winnt.h         | 17 -----------------
 loader/resource.c       |  1 +
 memory/global.c         |  1 +
 memory/string.c         |  1 +
 memory/virtual.c        |  1 +
 relay32/snoop.c         |  1 +
 win32/console.c         |  1 +
 win32/except.c          |  1 +
 win32/init.c            |  1 +
 windows/cursoricon.c    |  1 +
 23 files changed, 46 insertions(+), 18 deletions(-)
 create mode 100644 include/msvcrt/excpt.h

diff --git a/debugger/dbg.y b/debugger/dbg.y
index 86af2a82499..9f10618a423 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 020ee867c72..42a463dbc08 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 a1904868da3..b4757d46766 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 5e59e16a832..2df66593d50 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 96e7c52099b..68596db031b 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 13376ae28af..f8c0df8c7d7 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 d027a822c45..81e18bd3484 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 aedec91d76b..152a274d6d6 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 962b718050d..b4636e6123b 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 f3f3aae0d8a..ff756fce34e 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 9a9b680c31a..7211eeedf48 100644
--- a/include/Makefile.in
+++ b/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 \
diff --git a/include/msvcrt/excpt.h b/include/msvcrt/excpt.h
new file mode 100644
index 00000000000..e57f90ab925
--- /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 a04192670df..575dec75934 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 bad90adcf6a..78f9488e8ee 100644
--- a/include/winnt.h
+++ b/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
diff --git a/loader/resource.c b/loader/resource.c
index 6aee4788d27..4967843fdfc 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 1b4df499d04..90dc2c7e768 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 caa994a9852..b2ac9e15773 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 7c9eda7d63b..e83c5266073 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 585378b4d50..ebe1c0f9eb0 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 a5b8f122d3d..f3e03f52e5e 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 d10783523d0..02d3b002147 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 b65b1fe8c19..df23b7fd965 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 a0737b0f73a..d31cdb311b9 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);