From 33bce1ad24ef9d5e1a23d19ea097932245d11beb Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Fri, 23 Sep 2005 07:19:47 +0000 Subject: [PATCH] Forgot these changes, sorry svn path=/trunk/; revision=18003 --- reactos/include/ndk/kdtypes.h | 17 +++++++- reactos/include/ndk/ldrtypes.h | 4 +- reactos/include/ndk/rtlfuncs.h | 7 ++++ reactos/include/ndk/umfuncs.h | 14 +++---- reactos/include/ndk/umtypes.h | 11 +++++ reactos/include/ndk/zwfuncs.h | 75 ++++++++++++++++++++++++++++++++++ 6 files changed, 117 insertions(+), 11 deletions(-) diff --git a/reactos/include/ndk/kdtypes.h b/reactos/include/ndk/kdtypes.h index 0aa3ad5d0d0..fd219b531f0 100644 --- a/reactos/include/ndk/kdtypes.h +++ b/reactos/include/ndk/kdtypes.h @@ -14,7 +14,22 @@ /* EXPORTED DATA *************************************************************/ /* CONSTANTS *****************************************************************/ - +#define DPFLTR_ERROR_LEVEL 0 +#define DPFLTR_WARNING_LEVEL 1 +#define DPFLTR_TRACE_LEVEL 2 +#define DPFLTR_INFO_LEVEL 3 +#define DPFLTR_MASK 0x80000000 + +#define DBG_STATUS_CONTROL_C 1 +#define DBG_STATUS_SYSRQ 2 +#define DBG_STATUS_BUGCHECK_FIRST 3 +#define DBG_STATUS_BUGCHECK_SECOND 4 +#define DBG_STATUS_FATAL 5 +#define DBG_STATUS_DEBUG_CONTROL 6 +#define DBG_STATUS_WORKER 7 + +#define BREAKPOINT_PRINT 1 +#define BREAKPOINT_PROMPT 2 /* ENUMERATIONS **************************************************************/ typedef enum _DEBUG_CONTROL_CODE diff --git a/reactos/include/ndk/ldrtypes.h b/reactos/include/ndk/ldrtypes.h index f84929dd29a..07112bcd6fb 100644 --- a/reactos/include/ndk/ldrtypes.h +++ b/reactos/include/ndk/ldrtypes.h @@ -32,7 +32,9 @@ #define LDRP_PROCESS_ATTACH_CALLED 0x00080000 #define LDRP_DEBUG_SYMBOLS_LOADED 0x00100000 #define LDRP_IMAGE_NOT_AT_BASE 0x00200000 -#define LDRP_WX86_IGNORE_MACHINETYPE 0x00400000 +#define LDRP_COR_IMAGE 0x00400000 +#define LDR_COR_OWNS_UNMAP 0x00800000 +#define LDRP_REDIRECTED 0x10000000 /* ENUMERATIONS **************************************************************/ diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index 48e6a94caf5..991c395ae85 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -945,6 +945,13 @@ RtlOemToUnicodeN( /* * Ansi->Unicode String Functions */ +NTSYSAPI +ULONG +NTAPI +RtlxAnsiStringToUnicodeSize( + PCANSI_STRING AnsiString +); + NTSYSAPI NTSTATUS NTAPI diff --git a/reactos/include/ndk/umfuncs.h b/reactos/include/ndk/umfuncs.h index 1ff23c84008..4b706c4d78a 100644 --- a/reactos/include/ndk/umfuncs.h +++ b/reactos/include/ndk/umfuncs.h @@ -108,14 +108,10 @@ VOID NTAPI DbgBreakPoint(VOID); -NTSTATUS +NTSYSAPI +VOID NTAPI -DbgSsInitialize( - HANDLE ReplyPort, - PVOID Callback, - ULONG Unknown2, - ULONG Unknown3 -); +DbgBreakPointWithStatus(IN ULONG Status); NTSTATUS NTAPI @@ -131,8 +127,8 @@ DbgUiContinue( NTSTATUS NTAPI DbgUiWaitStateChange( - ULONG Unknown1, - ULONG Unknown2 + PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange, + PLARGE_INTEGER TimeOut ); VOID diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h index 59f8de1b311..6c082740a99 100644 --- a/reactos/include/ndk/umtypes.h +++ b/reactos/include/ndk/umtypes.h @@ -90,6 +90,17 @@ #define NT_WARNING(x) ((ULONG)(x)>>30==2) #define NT_ERROR(x) ((ULONG)(x)>>30==3) +/* Limits */ +#define MINCHAR 0x80 +#define MAXCHAR 0x7f +#define MINSHORT 0x8000 +#define MAXSHORT 0x7fff +#define MINLONG 0x80000000 +#define MAXLONG 0x7fffffff +#define MAXUCHAR 0xff +#define MAXUSHORT 0xffff +#define MAXULONG 0xffffffff + /* TYPES *********************************************************************/ /* Basic Types that aren't defined in User-Mode Headers */ diff --git a/reactos/include/ndk/zwfuncs.h b/reactos/include/ndk/zwfuncs.h index 1ca7343390b..4a10c8431eb 100644 --- a/reactos/include/ndk/zwfuncs.h +++ b/reactos/include/ndk/zwfuncs.h @@ -315,6 +315,26 @@ ZwClearEvent( IN HANDLE EventHandle ); +NTSYSCALLAPI +NTSTATUS +NTAPI +NtCreateDebugObject( + OUT PHANDLE DebugHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN BOOLEAN KillProcessOnExit +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwCreateDebugObject( + OUT PHANDLE DebugHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN BOOLEAN KillProcessOnExit +); + NTSTATUS NTAPI NtCreateJobObject( @@ -906,6 +926,32 @@ ZwCreateWaitablePort( ULONG NPMessageQueueSize OPTIONAL ); +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueryDebugFilterState( + ULONG ComponentId, + ULONG Level +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtDebugContinue( + IN HANDLE DebugObject, + IN PCLIENT_ID AppClientId, + IN NTSTATUS ContinueStatus +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwDebugContinue( + IN HANDLE DebugObject, + IN PCLIENT_ID AppClientId, + IN NTSTATUS ContinueStatus +); + NTSTATUS NTAPI NtDelayExecution( @@ -3410,6 +3456,15 @@ ZwSetContextThread( IN PCONTEXT Context ); +NTSYSAPI +NTSTATUS +NTAPI +NtSetDebugFilterState( + ULONG ComponentId, + ULONG Level, + BOOLEAN State +); + NTSTATUS NTAPI NtSetDefaultLocale( @@ -4182,6 +4237,26 @@ NtW32Call( OUT PULONG ResultLength OPTIONAL ); +NTSYSCALLAPI +NTSTATUS +NTAPI +NtWaitForDebugEvent( + IN HANDLE DebugObject, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PDBGUI_WAIT_STATE_CHANGE StateChange +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwWaitForDebugEvent( + IN HANDLE DebugObject, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PDBGUI_WAIT_STATE_CHANGE StateChange +); + NTSTATUS NTAPI NtWaitForMultipleObjects( -- 2.17.1