ntdll: Move some exception definitions to winternl.h.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-07 12:06:54 +02:00 · 2021-10-07 12:06:54 +02:00 · 97479d3d32
parent dc3a240a2d
commit 97479d3d32
29 changed files with 33 additions and 63 deletions
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@ -33,7 +33,6 @@
 #include "winuser.h"
 #include "wincrypt.h"
 #include "wine/debug.h"
-#include "wine/exception.h"
 #include "crypt32_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
--- a/dlls/dbghelp/coff.c
+++ b/dlls/dbghelp/coff.c
@ -41,7 +41,6 @@
 #include "winbase.h"
 #include "winternl.h"

-#include "wine/exception.h"
 #include "wine/debug.h"
 #include "dbghelp_private.h"
 #include "wine/mscvpdb.h"
--- a/dlls/ddraw/tests/dsurface.c
+++ b/dlls/ddraw/tests/dsurface.c
@ -24,7 +24,6 @@
 #define COBJMACROS

 #include "wine/test.h"
-#include "wine/exception.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "unknwn.h"
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@ -38,9 +38,7 @@
 #include "winerror.h"
 #include "wincon.h"
 #include "wine/condrv.h"
-#include "wine/exception.h"
 #include "wine/debug.h"
-#include "excpt.h"
 #include "kernel_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(console);
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@ -39,7 +39,6 @@
 #include "fileapi.h"
 #include "shlwapi.h"

-#include "wine/exception.h"
 #include "wine/debug.h"

 WINE_DEFAULT_DEBUG_CHANNEL(file);
--- a/dlls/kernel32/module.c
+++ b/dlls/kernel32/module.c
@ -34,7 +34,6 @@
 #include "kernel_private.h"
 #include "psapi.h"

-#include "wine/exception.h"
 #include "wine/list.h"
 #include "wine/asm.h"
 #include "wine/debug.h"
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@ -35,7 +35,6 @@
 #include "kernel_private.h"
 #include "psapi.h"
 #include "ddk/wdm.h"
-#include "wine/exception.h"
 #include "wine/asm.h"
 #include "wine/debug.h"

--- a/dlls/krnl386.exe16/instr.c
+++ b/dlls/krnl386.exe16/instr.c
@ -30,7 +30,6 @@
 #include "wine/debug.h"
 #include "kernel16_private.h"
 #include "dosexe.h"
-#include "wine/exception.h"

 WINE_DEFAULT_DEBUG_CHANNEL(int);
 WINE_DECLARE_DEBUG_CHANNEL(io);
--- a/dlls/krnl386.exe16/int21.c
+++ b/dlls/krnl386.exe16/int21.c
@ -38,7 +38,6 @@
 #include "winerror.h"
 #include "winuser.h"
 #include "wine/debug.h"
-#include "wine/exception.h"

 /*
 * Note:
--- a/dlls/krnl386.exe16/int31.c
+++ b/dlls/krnl386.exe16/int31.c
@ -30,7 +30,6 @@

 #include "excpt.h"
 #include "wine/debug.h"
-#include "wine/exception.h"

 WINE_DEFAULT_DEBUG_CHANNEL(int31);

--- a/dlls/msvcp140_1/tests/msvcp140_1.c
+++ b/dlls/msvcp140_1/tests/msvcp140_1.c
@ -24,8 +24,6 @@
 #include "winnls.h"

 #include "wine/test.h"
-#include "wine/exception.h"
-#include "winbase.h"

 typedef unsigned char MSVCP_bool;

--- a/dlls/msvcp90/misc.c
+++ b/dlls/msvcp90/misc.c
@ -26,7 +26,7 @@
 #include "winbase.h"
 #include "winternl.h"
 #include "wine/debug.h"
-#include "wine/exception.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(msvcp);

 #if _MSVCP_VER >= 110
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@ -31,7 +31,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"
-#include "wine/exception.h"
 #include "msvcrt.h"
 #include "excpt.h"
 #include "wincon.h"
--- a/dlls/ntdll/unix/process.c
+++ b/dlls/ntdll/unix/process.c
@ -61,7 +61,6 @@
 #include "winioctl.h"
 #include "unix_private.h"
 #include "wine/condrv.h"
-#include "wine/exception.h"
 #include "wine/server.h"
 #include "wine/debug.h"

--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@ -69,7 +69,6 @@
 #include "winternl.h"
 #include "ddk/wdm.h"
 #include "wine/server.h"
-#include "wine/exception.h"
 #include "wine/debug.h"
 #include "unix_private.h"

--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@ -67,7 +67,6 @@
 #include "ddk/wdm.h"
 #include "wine/server.h"
 #include "wine/debug.h"
-#include "wine/exception.h"
 #include "unix_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(thread);
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@ -31,7 +31,6 @@
 #include "ddk/wdm.h"
 #include "excpt.h"
 #include "wine/debug.h"
-#include "wine/exception.h"

 #define KSHARED_USER_DATA_PAGE_SIZE 0x1000

--- a/dlls/user32/lstr.c
+++ b/dlls/user32/lstr.c
@ -32,8 +32,6 @@
 #include "winuser.h"
 #include "winerror.h"

-#include "wine/exception.h"
-

 /***********************************************************************
 *           CharNextExW   (USER32.@)
--- a/dlls/user32/png.c
+++ b/dlls/user32/png.c
@ -42,7 +42,6 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "winternl.h"
-#include "wine/exception.h"
 #include "wine/server.h"
 #include "controls.h"
 #include "win.h"
--- a/dlls/win32u/main.c
+++ b/dlls/win32u/main.c
@ -26,7 +26,6 @@
 #include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
-#include "wine/exception.h"
 #include "wine/unixlib.h"

 extern void *__wine_syscall_dispatcher DECLSPEC_HIDDEN;
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@ -52,8 +52,6 @@
 #include "iphlpapi.h"
 #include "dhcpcsdk.h"

-#include "wine/exception.h"
-
 #include "internet.h"
 #include "resource.h"

--- a/dlls/wow64cpu/cpu.c
+++ b/dlls/wow64cpu/cpu.c
@ -26,7 +26,6 @@
 #include "winnt.h"
 #include "winternl.h"
 #include "wine/asm.h"
-#include "wine/exception.h"
 #include "wine/debug.h"

 WINE_DEFAULT_DEBUG_CHANNEL(wow);
--- a/dlls/ws2_32/ws2_32_private.h
+++ b/dlls/ws2_32/ws2_32_private.h
@ -50,7 +50,6 @@
 #include "ip2string.h"
 #include "wine/afd.h"
 #include "wine/debug.h"
-#include "wine/exception.h"
 #include "wine/unixlib.h"

 #define DECLARE_CRITICAL_SECTION(cs) \
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@ -22,6 +22,7 @@
 #define __WINE_WINE_EXCEPTION_H

 #include <windef.h>
+#include <winternl.h>
 #include <excpt.h>

 #ifdef __cplusplus
@ -286,37 +287,6 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void)
 #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
-#define EH_TARGET_UNWIND    0x20
-#define EH_COLLIDED_UNWIND  0x40
-
-/* Wine-specific exceptions codes */
-
-#define EXCEPTION_WINE_STUB       0x80000100  /* stub entry point called */
-#define EXCEPTION_WINE_ASSERTION  0x80000101  /* assertion failed */
-
-/* Wine extension; Windows doesn't have a name for this code.  This is an
-   undocumented exception understood by MS VC debugger, allowing the program
-   to name a particular thread.  Search google.com or deja.com for "0x406d1388"
-   for more info. */
-#define EXCEPTION_WINE_NAME_THREAD     0x406D1388
-
-/* used for C++ exceptions in msvcrt
- * parameters:
- * [0] CXX_FRAME_MAGIC
- * [1] pointer to exception object
- * [2] pointer to type
- */
-#define EXCEPTION_WINE_CXX_EXCEPTION   0xe06d7363
-#define EXCEPTION_WINE_CXX_FRAME_MAGIC 0x19930520
-
 #ifdef __cplusplus
 }
 #endif
--- a/include/winternl.h
+++ b/include/winternl.h
@ -3438,6 +3438,37 @@ typedef struct _RTL_PROCESS_MODULE_INFORMATION_EX
 #define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET  0x00000020
 #define THREAD_CREATE_FLAGS_INITIAL_THREAD          0x00000080

+#define EH_NONCONTINUABLE   0x01
+#define EH_UNWINDING        0x02
+#define EH_EXIT_UNWIND      0x04
+#define EH_STACK_INVALID    0x08
+#define EH_NESTED_CALL      0x10
+#define EH_TARGET_UNWIND    0x20
+#define EH_COLLIDED_UNWIND  0x40
+
+#ifdef __WINESRC__
+
+/* Wine-specific exceptions codes */
+
+#define EXCEPTION_WINE_STUB       0x80000100  /* stub entry point called */
+#define EXCEPTION_WINE_ASSERTION  0x80000101  /* assertion failed */
+
+/* Wine extension; Windows doesn't have a name for this code.  This is an
+   undocumented exception understood by MS VC debugger, allowing the program
+   to name a particular thread. */
+#define EXCEPTION_WINE_NAME_THREAD     0x406D1388
+
+/* used for C++ exceptions in msvcrt
+ * parameters:
+ * [0] CXX_FRAME_MAGIC
+ * [1] pointer to exception object
+ * [2] pointer to type
+ */
+#define EXCEPTION_WINE_CXX_EXCEPTION   0xe06d7363
+#define EXCEPTION_WINE_CXX_FRAME_MAGIC 0x19930520
+
+#endif
+
 typedef LONG (CALLBACK *PRTL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS);

 typedef void (CALLBACK *PTP_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,void*,void*,IO_STATUS_BLOCK*,PTP_IO);
--- a/programs/winedbg/gdbproxy.c
+++ b/programs/winedbg/gdbproxy.c
@ -39,7 +39,6 @@
 #include "winbase.h"
 #include "winsock2.h"
 #include "tlhelp32.h"
-#include "wine/exception.h"
 #include "wine/debug.h"

 WINE_DEFAULT_DEBUG_CHANNEL(winedbg);
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@ -29,7 +29,6 @@
 #include "winuser.h"
 #include "tlhelp32.h"
 #include "wine/debug.h"
-#include "wine/exception.h"

 WINE_DEFAULT_DEBUG_CHANNEL(winedbg);

--- a/programs/winedbg/tgt_active.c
+++ b/programs/winedbg/tgt_active.c
@ -28,7 +28,6 @@
 #include "resource.h"
 #include "winternl.h"
 #include "wine/debug.h"
-#include "wine/exception.h"

 WINE_DEFAULT_DEBUG_CHANNEL(winedbg);

--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@ -23,8 +23,6 @@
 #include "debugger.h"

 #include "winternl.h"
-#include "wine/exception.h"
-
 #include "wine/debug.h"

 /* TODO list: