- Move more stuff to wdm.h

- Improve more Ob* definitions

svn path=/branches/header-work/; revision=45876

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index e62fb53..a2aebe1 100644 (file)
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -9389,6 +9389,75 @@ ExFreeToPagedLookasideList(
 
 #endif // !defined(MIDL_PASS)
 
+/******************************************************************************
+ *                          Object Manager Functions                          *
+ ******************************************************************************/
+
+/*
+ * VOID
+ * ObDereferenceObject(
+ *   IN PVOID  Object)
+ */
+#define ObDereferenceObject ObfDereferenceObject
+
+/*
+ * VOID
+ * ObReferenceObject(
+ *   IN PVOID  Object)
+ */
+#define ObReferenceObject ObfReferenceObject
+
+#if (NTDDI_VERSION >= NTDDI_WIN2K)
+
+NTKERNELAPI
+LONG_PTR
+FASTCALL
+ObfDereferenceObject(
+  IN PVOID  Object);
+
+NTKERNELAPI
+NTSTATUS
+NTAPI
+ObGetObjectSecurity(
+  IN PVOID  Object,
+  OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor,
+  OUT PBOOLEAN  MemoryAllocated);
+
+NTKERNELAPI
+LONG_PTR
+FASTCALL
+ObfReferenceObject(
+  IN PVOID  Object);
+
+NTKERNELAPI
+NTSTATUS
+NTAPI
+ObReferenceObjectByHandle(
+  IN HANDLE  Handle,
+  IN ACCESS_MASK  DesiredAccess,
+  IN POBJECT_TYPE  ObjectType  OPTIONAL,
+  IN KPROCESSOR_MODE  AccessMode,
+  OUT PVOID  *Object,
+  OUT POBJECT_HANDLE_INFORMATION  HandleInformation  OPTIONAL);
+
+NTKERNELAPI
+NTSTATUS
+NTAPI
+ObReferenceObjectByPointer(
+  IN PVOID  Object,
+  IN ACCESS_MASK  DesiredAccess,
+  IN POBJECT_TYPE  ObjectType OPTIONAL,
+  IN KPROCESSOR_MODE  AccessMode);
+
+NTKERNELAPI
+VOID
+NTAPI
+ObReleaseObjectSecurity(
+  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  IN BOOLEAN  MemoryAllocated);
+
+#endif
+
 
 /******************************************************************************
  *                          Unsorted                                          *

diff --git a/include/ddk/winddk.h b/include/ddk/winddk.h
index e92d42c..24fff79 100644 (file)
--- a/include/ddk/winddk.h
+++ b/include/ddk/winddk.h
@@ -3238,27 +3238,6 @@ ObDereferenceSecurityDescriptor(
   PSECURITY_DESCRIPTOR  SecurityDescriptor,
   ULONG  Count);
 
-NTKERNELAPI
-LONG_PTR
-FASTCALL
-ObfDereferenceObject(
-  IN PVOID  Object);
-
-/*
- * VOID
- * ObDereferenceObject(
- *   IN PVOID  Object)
- */
-#define ObDereferenceObject ObfDereferenceObject
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObGetObjectSecurity(
-  IN PVOID  Object,
-  OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor,
-  OUT PBOOLEAN  MemoryAllocated);
-
 NTKERNELAPI
 NTSTATUS
 NTAPI
@@ -3270,12 +3249,6 @@ ObInsertObject(
   OUT PVOID*  ReferencedObject  OPTIONAL,
   OUT PHANDLE  Handle);
 
-NTKERNELAPI
-LONG_PTR
-FASTCALL
-ObfReferenceObject(
-  IN PVOID  Object);
-
 NTKERNELAPI
 NTSTATUS
 NTAPI
@@ -3283,12 +3256,6 @@ ObLogSecurityDescriptor(
   IN PSECURITY_DESCRIPTOR  InputSecurityDescriptor,
   OUT PSECURITY_DESCRIPTOR  *OutputSecurityDescriptor,
   IN ULONG RefBias);
-/*
- * VOID
- * ObReferenceObject(
- *   IN PVOID  Object)
- */
-#define ObReferenceObject ObfReferenceObject
 
 NTKERNELAPI
 VOID
@@ -3327,17 +3294,6 @@ ObQueryObjectAuditingByHandle(
   IN HANDLE  Handle,
   OUT PBOOLEAN  GenerateOnClose);
 
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObReferenceObjectByHandle(
-  IN HANDLE  Handle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_TYPE  ObjectType  OPTIONAL,
-  IN KPROCESSOR_MODE  AccessMode,
-  OUT PVOID  *Object,
-  OUT POBJECT_HANDLE_INFORMATION  HandleInformation  OPTIONAL);
-
 NTKERNELAPI
 NTSTATUS
 NTAPI
@@ -3351,15 +3307,6 @@ ObReferenceObjectByName(
   IN OUT PVOID  ParseContext  OPTIONAL,
   OUT PVOID  *Object);
 
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObReferenceObjectByPointer(
-  IN PVOID  Object,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_TYPE  ObjectType,
-  IN KPROCESSOR_MODE  AccessMode);
-
 NTKERNELAPI
 VOID
 NTAPI
@@ -3367,15 +3314,6 @@ ObReferenceSecurityDescriptor(
   IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
   IN ULONG  Count);
 
-NTKERNELAPI
-VOID
-NTAPI
-ObReleaseObjectSecurity(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN BOOLEAN  MemoryAllocated);
-
-
-
 /** Process manager routines **/
 
 NTKERNELAPI