From ad71bcda91311e575f30bb7f7515d0da11cb7525 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Thu, 23 Jun 2005 04:42:49 +0000 Subject: [PATCH] Fix more ddk/ndk missing defintions svn path=/trunk/; revision=16236 --- reactos/include/ndk/kefuncs.h | 4 +++ reactos/include/ndk/pstypes.h | 2 ++ reactos/include/ndk/sefuncs.h | 18 ++++++++++ reactos/include/ndk/umtypes.h | 6 ---- reactos/w32api/include/ddk/win2k.h | 4 +-- reactos/w32api/include/ddk/winddk.h | 55 +++++++++++++++++++++++++++++ 6 files changed, 81 insertions(+), 8 deletions(-) diff --git a/reactos/include/ndk/kefuncs.h b/reactos/include/ndk/kefuncs.h index 5848418a867..186f58dd820 100644 --- a/reactos/include/ndk/kefuncs.h +++ b/reactos/include/ndk/kefuncs.h @@ -110,6 +110,10 @@ KeTerminateThread( IN KPRIORITY Increment ); +BOOLEAN +STDCALL +KeIsAttachedProcess(VOID); + BOOLEAN STDCALL KeIsExecutingDpc( diff --git a/reactos/include/ndk/pstypes.h b/reactos/include/ndk/pstypes.h index aa37197fd75..b47d513516e 100644 --- a/reactos/include/ndk/pstypes.h +++ b/reactos/include/ndk/pstypes.h @@ -95,6 +95,8 @@ typedef NTSTATUS /* TYPES *********************************************************************/ struct _ETHREAD; +typedef struct _W32PROCESS *PW32PROCESS; +typedef struct _W32THREAD *PW32THREAD; typedef struct _CURDIR { diff --git a/reactos/include/ndk/sefuncs.h b/reactos/include/ndk/sefuncs.h index 1fa3bc9ee59..5cac399f5c2 100644 --- a/reactos/include/ndk/sefuncs.h +++ b/reactos/include/ndk/sefuncs.h @@ -15,6 +15,24 @@ /* PROTOTYPES ****************************************************************/ +NTSTATUS +STDCALL +SeCaptureSecurityDescriptor( + IN PSECURITY_DESCRIPTOR OriginalSecurityDescriptor, + IN KPROCESSOR_MODE CurrentMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + OUT PSECURITY_DESCRIPTOR *CapturedSecurityDescriptor +); + +NTSTATUS +STDCALL +SeReleaseSecurityDescriptor( + IN PSECURITY_DESCRIPTOR CapturedSecurityDescriptor, + IN KPROCESSOR_MODE CurrentMode, + IN BOOLEAN CaptureIfKernelMode +); + SECURITY_IMPERSONATION_LEVEL STDCALL SeTokenImpersonationLevel( diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h index ba0c16a25ff..4938d30951c 100644 --- a/reactos/include/ndk/umtypes.h +++ b/reactos/include/ndk/umtypes.h @@ -104,12 +104,6 @@ #define FSCTL_PIPE_INTERNAL_READ_OVFLOW \ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA) -/* Macros for getting the current Process or Thread */ -#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) -#define ZwCurrentProcess() NtCurrentProcess() -#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) -#define ZwCurrentThread() NtCurrentThread() - /* Kernel Shared Data Constants */ #define PROCESSOR_FEATURE_MAX 64 #define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA) diff --git a/reactos/w32api/include/ddk/win2k.h b/reactos/w32api/include/ddk/win2k.h index ca3add0b8c9..3884597f9f4 100644 --- a/reactos/w32api/include/ddk/win2k.h +++ b/reactos/w32api/include/ddk/win2k.h @@ -64,7 +64,7 @@ IoReadPartitionTable( IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN BOOLEAN ReturnRecognizedPartitions, - OUT struct _DRIVE_LAYOUT_INFORMATION **PartitionBuffer); + OUT PVOID PartitionBuffer); NTOSAPI NTSTATUS @@ -83,7 +83,7 @@ IoWritePartitionTable( IN ULONG SectorSize, IN ULONG SectorsPerTrack, IN ULONG NumberOfHeads, - IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer); + IN PVOID PartitionBuffer); /* * PVOID MmGetSystemAddressForMdl( diff --git a/reactos/w32api/include/ddk/winddk.h b/reactos/w32api/include/ddk/winddk.h index 1c4388ed78b..98d6ac89752 100644 --- a/reactos/w32api/include/ddk/winddk.h +++ b/reactos/w32api/include/ddk/winddk.h @@ -190,6 +190,11 @@ typedef struct _PEB *PPEB; typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; /* Constants */ +#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) +#define ZwCurrentProcess() NtCurrentProcess() +#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) +#define ZwCurrentThread() NtCurrentThread() + #define MAXIMUM_PROCESSORS 32 #define MAXIMUM_WAIT_OBJECTS 64 @@ -1537,6 +1542,50 @@ typedef struct _CM_SERIAL_DEVICE_DATA { ULONG BaudClock; } CM_SERIAL_DEVICE_DATA, *PCM_SERIAL_DEVICE_DATA; +typedef struct _VM_COUNTERS +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; +} VM_COUNTERS, *PVM_COUNTERS; + +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX, *PVM_COUNTERS_EX; + +typedef struct _POOLED_USAGE_AND_LIMITS +{ + SIZE_T PeakPagedPoolUsage; + SIZE_T PagedPoolUsage; + SIZE_T PagedPoolLimit; + SIZE_T PeakNonPagedPoolUsage; + SIZE_T NonPagedPoolUsage; + SIZE_T NonPagedPoolLimit; + SIZE_T PeakPagefileUsage; + SIZE_T PagefileUsage; + SIZE_T PagefileLimit; +} POOLED_USAGE_AND_LIMITS, *PPOOLED_USAGE_AND_LIMITS; + /* IO_RESOURCE_DESCRIPTOR.Option */ #define IO_RESOURCE_PREFERRED 0x01 @@ -4278,6 +4327,12 @@ typedef enum _THREADINFOCLASS { MaxThreadInfoClass } THREADINFOCLASS; +typedef struct _PROCESS_WS_WATCH_INFORMATION +{ + PVOID FaultingPc; + PVOID FaultingVa; +} PROCESS_WS_WATCH_INFORMATION, *PPROCESS_WS_WATCH_INFORMATION; + #define ES_SYSTEM_REQUIRED 0x00000001 #define ES_DISPLAY_REQUIRED 0x00000002 #define ES_USER_PRESENT 0x00000004