From 21927423a2cf615c9a6b9fd36a9ec39e1903877c Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Fri, 26 Aug 2005 18:39:20 +0000 Subject: [PATCH] Add constants for DBG_CONTROL_C and DBG_CONTROL_BREAK to ntstatus.h, Work around conflict including ntstatus.h with the NDK svn path=/trunk/; revision=17560 --- reactos/include/ndk/umtypes.h | 48 ++++++++++++++++++++++++++++++- reactos/w32api/include/ntstatus.h | 5 ++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h index 72105633cf5..c08d42454f1 100644 --- a/reactos/include/ndk/umtypes.h +++ b/reactos/include/ndk/umtypes.h @@ -13,8 +13,54 @@ /* DEPENDENCIES **************************************************************/ #include -#include #include + +/* Undef the following to avoid conflects including ntstatus.h with winnt.h */ +#undef STATUS_WAIT_0 +#undef STATUS_ABANDONED_WAIT_0 +#undef STATUS_USER_APC +#undef STATUS_TIMEOUT +#undef STATUS_PENDING +#undef DBG_EXCEPTION_HANDLED +#undef DBG_CONTINUE +#undef STATUS_SEGMENT_NOTIFICATION +#undef DBG_TERMINATE_THREAD +#undef DBG_TERMINATE_PROCESS +#undef DBG_CONTROL_C +#undef DBG_CONTROL_BREAK +#undef DBG_COMMAND_EXCEPTION +#undef STATUS_GUARD_PAGE_VIOLATION +#undef STATUS_DATATYPE_MISALIGNMENT +#undef STATUS_BREAKPOINT +#undef STATUS_SINGLE_STEP +#undef DBG_EXCEPTION_NOT_HANDLED +#undef STATUS_ACCESS_VIOLATION +#undef STATUS_IN_PAGE_ERROR +#undef STATUS_INVALID_HANDLE +#undef STATUS_NO_MEMORY +#undef STATUS_ILLEGAL_INSTRUCTION +#undef STATUS_NONCONTINUABLE_EXCEPTION +#undef STATUS_INVALID_DISPOSITION +#undef STATUS_ARRAY_BOUNDS_EXCEEDED +#undef STATUS_FLOAT_DENORMAL_OPERAND +#undef STATUS_FLOAT_DIVIDE_BY_ZERO +#undef STATUS_FLOAT_INEXACT_RESULT +#undef STATUS_FLOAT_INVALID_OPERATION +#undef STATUS_FLOAT_OVERFLOW +#undef STATUS_FLOAT_STACK_CHECK +#undef STATUS_FLOAT_UNDERFLOW +#undef STATUS_INTEGER_DIVIDE_BY_ZERO +#undef STATUS_INTEGER_OVERFLOW +#undef STATUS_PRIVILEGED_INSTRUCTION +#undef STATUS_STACK_OVERFLOW +#undef STATUS_CONTROL_C_EXIT +#undef STATUS_FLOAT_MULTIPLE_FAULTS +#undef STATUS_FLOAT_MULTIPLE_TRAPS +#undef STATUS_REG_NAT_CONSUMPTION +#undef STATUS_SXS_EARLY_DEACTIVATION +#undef STATUS_SXS_INVALID_DEACTIVATION + +#include #define STATIC static /* CONSTANTS *****************************************************************/ diff --git a/reactos/w32api/include/ntstatus.h b/reactos/w32api/include/ntstatus.h index c2f427d30a0..3d5b01a6d5f 100644 --- a/reactos/w32api/include/ntstatus.h +++ b/reactos/w32api/include/ntstatus.h @@ -22,6 +22,11 @@ #define __WINE_NTSTATUS_H #ifndef WIN32_NO_STATUS +/* + * Debug codes + */ +#define DBG_CONTROL_C ((NTSTATUS)0x40010005L) +#define DBG_CONTROL_BREAK ((NTSTATUS)0x40010008L) /* * Exception codes -- 2.17.1