[akhaldi] 45897: - Move MMFLUSH_TYPE enum from winddk.h to ntifs.h - Remove redundant definitions from winddk.h : ObInsertObject, ObMakeTemporaryObject, ObOpenObjectByPointer, ObQueryObjectAuditingByHandle, ZwDeviceIoControlFile and ZwWaitForSingleObject - ObInsertObject : AdditionalReferences -> ObjectPointerBias and ReferencedObject -> NewObject Happy birthday Andy ! :)
Author: akhaldi Date: Fri Mar 5 22:51:34 2010 New Revision: 45897
URL: http://svn.reactos.org/svn/reactos?rev=45897&view=rev Log: - Move MMFLUSH_TYPE enum from winddk.h to ntifs.h - Remove redundant definitions from winddk.h : ObInsertObject, ObMakeTemporaryObject, ObOpenObjectByPointer, ObQueryObjectAuditingByHandle, ZwDeviceIoControlFile and ZwWaitForSingleObject - ObInsertObject : AdditionalReferences -> ObjectPointerBias and ReferencedObject -> NewObject
Happy birthday Andy ! :)
Modified: branches/header-work/include/ddk/ntifs.h branches/header-work/include/ddk/winddk.h
Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h?... ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Fri Mar 5 22:51:34 2010 @@ -1650,6 +1650,11 @@ BITMAP_RANGE BitmapRange3; } MBCB, *PMBCB;
+typedef enum _MMFLUSH_TYPE { + MmFlushForDelete, + MmFlushForWrite +} MMFLUSH_TYPE; + typedef struct _MOVEFILE_DESCRIPTOR { HANDLE FileHandle; ULONG Reserved; @@ -1698,7 +1703,6 @@ ULONG NumberOfObjectTypes; OBJECT_TYPE_INFO ObjectsTypeInfo[1]; } OBJECT_ALL_TYPES_INFO, *POBJECT_ALL_TYPES_INFO; -
typedef struct _PATHNAME_BUFFER { ULONG PathNameLength; @@ -4547,37 +4551,45 @@ IN PVOID Object );
+#if (NTDDI_VERSION >= NTDDI_WIN2K) + NTKERNELAPI NTSTATUS NTAPI ObInsertObject ( - IN PVOID Object, - IN PACCESS_STATE PassedAccessState OPTIONAL, - IN ACCESS_MASK DesiredAccess, - IN ULONG AdditionalReferences, - OUT PVOID *ReferencedObject OPTIONAL, - OUT PHANDLE Handle -); + IN PVOID Object, + IN PACCESS_STATE PassedAccessState OPTIONAL, + IN ACCESS_MASK DesiredAccess OPTIONAL, + IN ULONG ObjectPointerBias, + OUT PVOID *NewObject OPTIONAL, + OUT PHANDLE Handle OPTIONAL); + +NTKERNELAPI +NTSTATUS +NTAPI +ObOpenObjectByPointer ( + IN PVOID Object, + IN ULONG HandleAttributes, + IN PACCESS_STATE PassedAccessState OPTIONAL, + IN ACCESS_MASK DesiredAccess OPTIONAL, + IN POBJECT_TYPE ObjectType OPTIONAL, + IN KPROCESSOR_MODE AccessMode, + OUT PHANDLE Handle);
NTKERNELAPI VOID NTAPI ObMakeTemporaryObject ( - IN PVOID Object -); - -NTKERNELAPI -NTSTATUS -NTAPI -ObOpenObjectByPointer ( - IN PVOID Object, - IN ULONG HandleAttributes, - IN PACCESS_STATE PassedAccessState OPTIONAL, - IN ACCESS_MASK DesiredAccess OPTIONAL, - IN POBJECT_TYPE ObjectType OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - OUT PHANDLE Handle -); + IN PVOID Object); + +NTKERNELAPI +NTSTATUS +NTAPI +ObQueryObjectAuditingByHandle ( + IN HANDLE Handle, + OUT PBOOLEAN GenerateOnClose); + +#endif
NTKERNELAPI NTSTATUS @@ -4587,14 +4599,6 @@ OUT POBJECT_NAME_INFORMATION ObjectNameInfo, IN ULONG Length, OUT PULONG ReturnLength -); - -NTKERNELAPI -NTSTATUS -NTAPI -ObQueryObjectAuditingByHandle ( - IN HANDLE Handle, - OUT PBOOLEAN GenerateOnClose );
NTKERNELAPI @@ -5809,21 +5813,23 @@ IN PUNICODE_STRING Name );
+ +#if (NTDDI_VERSION >= NTDDI_WIN2K) NTSYSAPI NTSTATUS NTAPI ZwDeviceIoControlFile ( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength -); + IN HANDLE FileHandle, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG IoControlCode, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer OPTIONAL, + IN ULONG OutputBufferLength); +#endif
NTSYSAPI NTSTATUS @@ -6296,14 +6302,15 @@ IN POBJECT_ATTRIBUTES KeyObjectAttributes );
+#if (NTDDI_VERSION >= NTDDI_WIN2K) NTSYSAPI NTSTATUS NTAPI ZwWaitForSingleObject ( - IN HANDLE Handle, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL -); + IN HANDLE Handle, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL); +#endif
NTSYSAPI NTSTATUS
Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.h... ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Fri Mar 5 22:51:34 2010 @@ -3041,11 +3041,6 @@ MmAllocateNonCachedMemory( IN ULONG NumberOfBytes);
-typedef enum _MMFLUSH_TYPE { - MmFlushForDelete, - MmFlushForWrite -} MMFLUSH_TYPE; - NTKERNELAPI BOOLEAN NTAPI @@ -3241,27 +3236,10 @@ NTKERNELAPI NTSTATUS NTAPI -ObInsertObject( - IN PVOID Object, - IN PACCESS_STATE PassedAccessState OPTIONAL, - IN ACCESS_MASK DesiredAccess, - IN ULONG AdditionalReferences, - OUT PVOID* ReferencedObject OPTIONAL, - OUT PHANDLE Handle); - -NTKERNELAPI -NTSTATUS -NTAPI ObLogSecurityDescriptor( IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, IN ULONG RefBias); - -NTKERNELAPI -VOID -NTAPI -ObMakeTemporaryObject( - IN PVOID Object);
NTKERNELAPI NTSTATUS @@ -3274,25 +3252,6 @@ IN ACCESS_MASK DesiredAccess, IN OUT PVOID ParseContext OPTIONAL, OUT PHANDLE Handle); - -NTKERNELAPI -NTSTATUS -NTAPI -ObOpenObjectByPointer( - IN PVOID Object, - IN ULONG HandleAttributes, - IN PACCESS_STATE PassedAccessState OPTIONAL, - IN ACCESS_MASK DesiredAccess OPTIONAL, - IN POBJECT_TYPE ObjectType OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - OUT PHANDLE Handle); - -NTKERNELAPI -NTSTATUS -NTAPI -ObQueryObjectAuditingByHandle( - IN HANDLE Handle, - OUT PBOOLEAN GenerateOnClose);
NTKERNELAPI NTSTATUS @@ -3470,21 +3429,6 @@ OUT PVOID OutputBuffer, IN ULONG OutputBufferSize);
-NTSYSAPI -NTSTATUS -NTAPI -ZwDeviceIoControlFile( - IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - OUT PVOID OutputBuffer, - IN ULONG OutputBufferSize); - NTSYSCALLAPI NTSTATUS NTAPI @@ -3597,14 +3541,6 @@ NTSTATUS NTAPI NtWaitForSingleObject( - IN HANDLE ObjectHandle, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER TimeOut OPTIONAL); - -NTSYSAPI -NTSTATUS -NTAPI -ZwWaitForSingleObject( IN HANDLE ObjectHandle, IN BOOLEAN Alertable, IN PLARGE_INTEGER TimeOut OPTIONAL);
-
akhaldi＠svn.reactos.org