[tkreuzer] 54937: [XDK] - Add some missing NTAPI - move some types into appropriate headers - make sure $endif is followed by (...)
Author: tkreuzer Date: Fri Jan 13 17:45:26 2012 New Revision: 54937
URL: http://svn.reactos.org/svn/reactos?rev=54937&view=rev Log: [XDK] - Add some missing NTAPI - move some types into appropriate headers - make sure $endif is followed by (...)
Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/extypes.h trunk/reactos/include/xdk/iofuncs.h trunk/reactos/include/xdk/iotypes.h trunk/reactos/include/xdk/kdfuncs.h trunk/reactos/include/xdk/kdtypes.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/mmfuncs.h trunk/reactos/include/xdk/ntifs.template.h trunk/reactos/include/xdk/nttmapi.h trunk/reactos/include/xdk/obtypes.h trunk/reactos/include/xdk/psfuncs.h trunk/reactos/include/xdk/pstypes.h trunk/reactos/include/xdk/rtltypes.h trunk/reactos/include/xdk/sefuncs.h trunk/reactos/include/xdk/setypes.h trunk/reactos/include/xdk/zwfuncs.h
Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=549... ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -3769,6 +3769,7 @@
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
+ /****************************************************************************** * I/O Manager Functions * ******************************************************************************/
Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=549... ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -800,6 +800,26 @@ typedef NTSTATUS (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE)( IN PLUID LogonId); + +typedef struct _SECURITY_CLIENT_CONTEXT { + SECURITY_QUALITY_OF_SERVICE SecurityQos; + PACCESS_TOKEN ClientToken; + BOOLEAN DirectlyAccessClientToken; + BOOLEAN DirectAccessEffectiveOnly; + BOOLEAN ServerIsRemote; + TOKEN_CONTROL ClientTokenControl; +} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; + +/****************************************************************************** + * Object Manager Types * + ******************************************************************************/ + +typedef enum _OBJECT_INFORMATION_CLASS { + ObjectBasicInformation = 0, + ObjectTypeInformation = 2, +} OBJECT_INFORMATION_CLASS; + + /****************************************************************************** * Runtime Library Types * ******************************************************************************/ @@ -1886,16 +1906,6 @@
#define RtlOffsetToPointer(B,O) ((PCHAR)(((PCHAR)(B)) + ((ULONG_PTR)(O)))) #define RtlPointerToOffset(B,P) ((ULONG)(((PCHAR)(P)) - ((PCHAR)(B)))) - -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation = 0, - ObjectNameInformation = 1, /* FIXME, not in WDK */ - ObjectTypeInformation = 2, - ObjectTypesInformation = 3, /* FIXME, not in WDK */ - ObjectHandleFlagInformation = 4, /* FIXME, not in WDK */ - ObjectSessionInformation = 5, /* FIXME, not in WDK */ - MaxObjectInfoClass /* FIXME, not in WDK */ -} OBJECT_INFORMATION_CLASS;
NTSYSCALLAPI NTSTATUS @@ -4737,18 +4747,12 @@ ULONG Reserved [22]; } PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION;
-typedef struct _SECURITY_CLIENT_CONTEXT { - SECURITY_QUALITY_OF_SERVICE SecurityQos; - PACCESS_TOKEN ClientToken; - BOOLEAN DirectlyAccessClientToken; - BOOLEAN DirectAccessEffectiveOnly; - BOOLEAN ServerIsRemote; - TOKEN_CONTROL ClientTokenControl; -} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; - #define SYSTEM_PAGE_PRIORITY_BITS 3 #define SYSTEM_PAGE_PRIORITY_LEVELS (1 << SYSTEM_PAGE_PRIORITY_BITS)
+/****************************************************************************** + * Kernel Types * + ******************************************************************************/ typedef struct _KAPC_STATE { LIST_ENTRY ApcListHead[MaximumMode]; PKPROCESS Process; @@ -4769,6 +4773,7 @@ LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE;
+ /****************************************************************************** * Kernel Functions * ******************************************************************************/ @@ -4944,7 +4949,8 @@
NTKERNELAPI ULONG -KeRemoveQueueEx ( +NTAPI +KeRemoveQueueEx( IN OUT PKQUEUE Queue, IN KPROCESSOR_MODE WaitMode, IN BOOLEAN Alertable, @@ -10286,6 +10292,9 @@
#include "csq.h"
+extern PACL SePublicDefaultDacl; +extern PACL SeSystemDefaultDacl; + #define FS_LFN_APIS 0x00004000
#define FILE_STORAGE_TYPE_SPECIFIED 0x00000041 /* FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE */
Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=54937... ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -7561,6 +7561,7 @@ extern POBJECT_TYPE NTSYSAPI SeTokenObjectType; extern POBJECT_TYPE NTSYSAPI PsProcessType;
+ /****************************************************************************** * Process Manager Types * ******************************************************************************/ @@ -7896,6 +7897,7 @@ VOID KeMemoryBarrier(VOID) { + // FIXME: Do we really need lfence after the __faststorefence ? FastFence(); LFENCE_ACQUIRE(); } @@ -10351,12 +10353,14 @@ #if (NTDDI_VERSION >= NTDDI_WS08)
PVOID +NTAPI KeRegisterProcessorChangeCallback( IN PPROCESSOR_CALLBACK_FUNCTION CallbackFunction, IN PVOID CallbackContext OPTIONAL, IN ULONG Flags);
VOID +NTAPI KeDeregisterProcessorChangeCallback( IN PVOID CallbackHandle);
@@ -14757,6 +14761,7 @@
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
+ #ifndef _NTTMAPI_ #define _NTTMAPI_
Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -815,7 +815,7 @@
$if (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WINXP) -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_)
NTKERNELAPI @@ -872,7 +872,7 @@ $endif (_NTIFS_) $if (_WDMDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ -$endif +$endif (_WDMDDK_ || _NTIFS_)
$if (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_WINXPSP2)
Modified: trunk/reactos/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/extypes.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/extypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -2,7 +2,7 @@ /****************************************************************************** * Executive Types * ******************************************************************************/ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) #define EX_RUNDOWN_ACTIVE 0x1 #define EX_RUNDOWN_COUNT_SHIFT 0x1
Modified: trunk/reactos/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iofuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -2051,7 +2051,7 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_NTDDK_) NTKERNELAPI IO_PAGING_PRIORITY @@ -2084,10 +2084,10 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_NTDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WS03SP1) -$endif +$endif (_NTDDK_ || _NTIFS_)
$if (_NTDDK_) BOOLEAN @@ -2111,7 +2111,7 @@ $endif (_NTIFS_) $if (_NTDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WS03SP1) */ -$endif +$endif (_NTDDK_ || _NTIFS_)
#if (NTDDI_VERSION >= NTDDI_VISTA) $if (_WDMDDK_)
Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -2,7 +2,7 @@ /****************************************************************************** * I/O Manager Types * ******************************************************************************/ -$endif +$endif (_WDMDDK_ || _NTDDK_)
$if (_WDMDDK_)
@@ -214,7 +214,7 @@ #define DO_SYSTEM_CRITICAL_PARTITION 0x00400000 #define DO_DISALLOW_EXECUTE 0x00800000
-$endif +$endif (_NTDDK_) $if (_WDMDDK_) /* DEVICE_OBJECT.Flags */ #define DO_VERIFY_VOLUME 0x00000002 @@ -254,12 +254,12 @@ #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff
-$endif +$endif (_NTDDK_) $if (_WDMDDK_ || _DEVIOCTL_) /* DEVICE_OBJECT.DeviceType */ #define DEVICE_TYPE ULONG
-$endif +$endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) typedef struct _DEVICE_OBJECT { CSHORT Type;
Modified: trunk/reactos/include/xdk/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdfuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/kdfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kdfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -9,7 +9,7 @@ IN PCCH Prompt, OUT PCH Response, IN ULONG MaximumResponseLength); -$endif +$endif (_NTDDK_)
$if (_WDMDDK_) #ifndef _DBGNT_ @@ -189,4 +189,4 @@ OUT PVOID OutBuffer, OUT PULONG OutBufferNeeded OPTIONAL); #endif -$endif +$endif (_WDMDDK_)
Modified: trunk/reactos/include/xdk/kdtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdtypes.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/kdtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kdtypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -91,4 +91,4 @@ IN PVOID Buffer, IN ULONG Offset, IN ULONG Length); -$endif +$endif (_NTDDK_)
Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -103,7 +103,7 @@ $endif(_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #if defined(SINGLE_GROUP_LEGACY_API) -$endif +$endif (_WDMDDK_ || _NTDDK_)
$if (_WDMDDK_) NTKERNELAPI @@ -145,7 +145,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* defined(SINGLE_GROUP_LEGACY_API) */ -$endif +$endif (_WDMDDK_ || _NTDDK_)
$if (_WDMDDK_) #if !defined(_M_AMD64) @@ -605,7 +605,7 @@ KeAcquireSpinLockRaiseToSynch( IN OUT PKSPIN_LOCK SpinLock); #endif -$endif +$endif (_NTIFS_)
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
@@ -735,7 +735,7 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03) -$endif +$endif (_WDMDDK_ || _NTDDK_)
$if (_WDMDDK_) NTKERNELAPI @@ -794,10 +794,10 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03SP1) -$endif +$endif (_WDMDDK_ || _NTDDK_)
$if (_WDMDDK_) NTKERNELAPI @@ -878,7 +878,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03SP1) */ -$endif +$endif (_WDMDDK_ || _NTDDK_)
#if (NTDDI_VERSION >= NTDDI_VISTA) $if (_WDMDDK_) @@ -903,7 +903,7 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if defined(SINGLE_GROUP_LEGACY_API) -$endif +$endif (_WDMDDK_ || _NTDDK_)
$if (_WDMDDK_) NTKERNELAPI @@ -943,7 +943,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* SINGLE_GROUP_LEGACY_API */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_NTIFS_) NTKERNELAPI VOID @@ -953,7 +953,8 @@
NTKERNELAPI ULONG -KeRemoveQueueEx ( +NTAPI +KeRemoveQueueEx( IN OUT PKQUEUE Queue, IN KPROCESSOR_MODE WaitMode, IN BOOLEAN Alertable, @@ -968,12 +969,14 @@ #if (NTDDI_VERSION >= NTDDI_WS08)
PVOID +NTAPI KeRegisterProcessorChangeCallback( IN PPROCESSOR_CALLBACK_FUNCTION CallbackFunction, IN PVOID CallbackContext OPTIONAL, IN ULONG Flags);
VOID +NTAPI KeDeregisterProcessorChangeCallback( IN PVOID CallbackHandle);
@@ -981,7 +984,7 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WIN7) -$endif +$endif (_WDMDDK_ || _NTDDK_)
$if (_WDMDDK_) ULONG64 @@ -1207,7 +1210,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) #if !defined(_IA64_) NTHALAPI
Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -999,7 +999,7 @@ extern PCCHAR KeNumberProcessors; #endif
-$endif /* _WDMDDK_ */ +$endif (_WDMDDK_) $if (_NTDDK_)
#define NX_SUPPORT_POLICY_ALWAYSOFF 0 @@ -1182,5 +1182,27 @@ extern PCCHAR KeNumberProcessors; #endif
-$endif /* _NTDDK_ */ - +$endif (_NTDDK_) +$if (_NTIFS_) +typedef struct _KAPC_STATE { + LIST_ENTRY ApcListHead[MaximumMode]; + PKPROCESS Process; + BOOLEAN KernelApcInProgress; + BOOLEAN KernelApcPending; + BOOLEAN UserApcPending; +} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; + +#define KAPC_STATE_ACTUAL_LENGTH (FIELD_OFFSET(KAPC_STATE, UserApcPending) + sizeof(BOOLEAN)) + +#define ASSERT_QUEUE(Q) ASSERT(((Q)->Header.Type & KOBJECT_TYPE_MASK) == QueueObject); + +typedef struct _KQUEUE { + DISPATCHER_HEADER Header; + LIST_ENTRY EntryListHead; + volatile ULONG CurrentCount; + ULONG MaximumCount; + LIST_ENTRY ThreadListHead; +} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + +$endif (_NTIFS_) +
Modified: trunk/reactos/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmfuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -591,7 +591,7 @@
$if (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WINXP) -$endif +$endif (_WDMDDK_ || _NTIFS_)
$if (_WDMDDK_) NTKERNELAPI @@ -664,10 +664,10 @@
$if (_WDMDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) NTKERNELAPI LOGICAL @@ -685,7 +685,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_WS03SP1) NTKERNELAPI @@ -699,7 +699,7 @@ IN MEMORY_CACHING_TYPE CacheType, IN ULONG Flags); #endif -$endif +$endif (_WDMDDK_)
#if (NTDDI_VERSION >= NTDDI_VISTA) $if (_WDMDDK_)
Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template.... ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -62,18 +62,9 @@ typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
$include (setypes.h) +$include (obtypes.h) $include (rtltypes.h) $include (rtlfuncs.h) - -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation = 0, - ObjectNameInformation = 1, /* FIXME, not in WDK */ - ObjectTypeInformation = 2, - ObjectTypesInformation = 3, /* FIXME, not in WDK */ - ObjectHandleFlagInformation = 4, /* FIXME, not in WDK */ - ObjectSessionInformation = 5, /* FIXME, not in WDK */ - MaxObjectInfoClass /* FIXME, not in WDK */ -} OBJECT_INFORMATION_CLASS;
NTSYSCALLAPI NTSTATUS @@ -1031,38 +1022,10 @@ ULONG Reserved [22]; } PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION;
-typedef struct _SECURITY_CLIENT_CONTEXT { - SECURITY_QUALITY_OF_SERVICE SecurityQos; - PACCESS_TOKEN ClientToken; - BOOLEAN DirectlyAccessClientToken; - BOOLEAN DirectAccessEffectiveOnly; - BOOLEAN ServerIsRemote; - TOKEN_CONTROL ClientTokenControl; -} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; - #define SYSTEM_PAGE_PRIORITY_BITS 3 #define SYSTEM_PAGE_PRIORITY_LEVELS (1 << SYSTEM_PAGE_PRIORITY_BITS)
-typedef struct _KAPC_STATE { - LIST_ENTRY ApcListHead[MaximumMode]; - PKPROCESS Process; - BOOLEAN KernelApcInProgress; - BOOLEAN KernelApcPending; - BOOLEAN UserApcPending; -} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; - -#define KAPC_STATE_ACTUAL_LENGTH (FIELD_OFFSET(KAPC_STATE, UserApcPending) + sizeof(BOOLEAN)) - -#define ASSERT_QUEUE(Q) ASSERT(((Q)->Header.Type & KOBJECT_TYPE_MASK) == QueueObject); - -typedef struct _KQUEUE { - DISPATCHER_HEADER Header; - LIST_ENTRY EntryListHead; - volatile ULONG CurrentCount; - ULONG MaximumCount; - LIST_ENTRY ThreadListHead; -} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; - +$include (ketypes.h) $include (kefuncs.h) $include (extypes.h) $include (exfuncs.h) @@ -1268,6 +1231,9 @@ #endif
#include "csq.h" + +extern PACL SePublicDefaultDacl; +extern PACL SeSystemDefaultDacl;
#define FS_LFN_APIS 0x00004000
Modified: trunk/reactos/include/xdk/nttmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/nttmapi.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/nttmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/nttmapi.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -1,4 +1,3 @@ -$if (_WDMDDK_) #ifndef _NTTMAPI_ #define _NTTMAPI_
@@ -649,4 +648,3 @@ #endif /* NTDDI_VERSION >= NTDDI_VISTA */
#endif /* !_NTTMAPI_ */ -$endif
Modified: trunk/reactos/include/xdk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/obtypes.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/obtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/obtypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -2,6 +2,7 @@ * Object Manager Types * ******************************************************************************/
+$if (_WDMDDK_) #define MAXIMUM_FILENAME_LENGTH 256 #define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\')
@@ -132,3 +133,22 @@ extern POBJECT_TYPE NTSYSAPI SeTokenObjectType; extern POBJECT_TYPE NTSYSAPI PsProcessType;
+$endif (_WDMDDK_) +$if (_NTIFS_) +typedef enum _OBJECT_INFORMATION_CLASS { + ObjectBasicInformation = 0, + ObjectTypeInformation = 2, +$endif (_NTIFS_) +$if (_PRIVATE_) + /* Not for public use */ + ObjectNameInformation = 1, + ObjectTypesInformation = 3, + ObjectHandleFlagInformation = 4, + ObjectSessionInformation = 5, + MaxObjectInfoClass +$endif (_PRIVATE_) +$if (_NTIFS_) +} OBJECT_INFORMATION_CLASS; + +$endif (_NTIFS_) +
Modified: trunk/reactos/include/xdk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/psfuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/psfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -211,7 +211,7 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ $if (_NTDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WINXP) -$endif +$endif (_NTDDK_ || _NTIFS_)
$if (_NTDDK_) NTKERNELAPI @@ -274,7 +274,7 @@ $endif (_NTIFS_) $if (_NTDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ -$endif +$endif (_NTDDK_ || _NTIFS_)
$if (_NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03)
Modified: trunk/reactos/include/xdk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/pstypes.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/pstypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -38,7 +38,7 @@ #define HIGH_PRIORITY 31 #define MAXIMUM_PRIORITY 32
-$endif /* _WDMDDK_ */ +$endif (_WDMDDK_) $if (_NTDDK_)
#define QUOTA_LIMITS_HARDWS_MIN_ENABLE 0x00000001 @@ -447,5 +447,5 @@
extern NTKERNELAPI PEPROCESS PsInitialSystemProcess;
-$endif /* _NTDDK_ */ - +$endif (_NTDDK_) +
Modified: trunk/reactos/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtltypes.h?rev=... ============================================================================== --- trunk/reactos/include/xdk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtltypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -553,4 +553,4 @@ ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; #endif -$endif +$endif (_NTIFS_)
Modified: trunk/reactos/include/xdk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/sefuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/sefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/sefuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -378,7 +378,7 @@
$if (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_VISTA) -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_) NTKERNELAPI ULONG @@ -481,7 +481,7 @@ $endif (_NTIFS_) $if (_WDMDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_NTIFS_)
#if (NTDDI_VERSION >= NTDDI_VISTA || (NTDDI_VERSION >= NTDDI_WINXPSP2 && NTDDI_VERSION < NTDDI_WS03))
Modified: trunk/reactos/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/setypes.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/setypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/setypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -303,7 +303,7 @@
#endif /* !_NTLSA_AUDIT_ */ #endif /* !_NTLSA_IFS_ */ -$endif +$endif (_WDMDDK_) $if (_NTDDK_) #define SE_UNSOLICITED_INPUT_PRIVILEGE 6
@@ -392,7 +392,7 @@ WinConsoleLogonSid = 81, WinThisOrganizationCertificateSid = 82, } WELL_KNOWN_SID_TYPE; -$endif +$endif (_NTDDK_) $if (_NTIFS_) #ifndef SID_IDENTIFIER_AUTHORITY_DEFINED #define SID_IDENTIFIER_AUTHORITY_DEFINED @@ -1131,4 +1131,14 @@ typedef NTSTATUS (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE)( IN PLUID LogonId); + +typedef struct _SECURITY_CLIENT_CONTEXT { + SECURITY_QUALITY_OF_SERVICE SecurityQos; + PACCESS_TOKEN ClientToken; + BOOLEAN DirectlyAccessClientToken; + BOOLEAN DirectAccessEffectiveOnly; + BOOLEAN ServerIsRemote; + TOKEN_CONTROL ClientTokenControl; +} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; + $endif (_NTIFS_)
Modified: trunk/reactos/include/xdk/zwfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/zwfuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/xdk/zwfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/zwfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -642,7 +642,7 @@
$if (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_VISTA) -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_)
NTSYSAPI @@ -1025,7 +1025,7 @@ $endif (_NTIFS_) $if (_WDMDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ -$endif +$endif (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WIN7) $if (_WDMDDK_)
-
tkreuzer＠svn.reactos.org