[akhaldi] 45876: - Move more stuff to wdm.h - Improve more Ob* definitions

Author: akhaldi
Date: Fri Mar  5 19:06:58 2010
New Revision: 45876
URL: http://svn.reactos.org/svn/reactos?rev=45876&view=rev
Log:
- Move more stuff to wdm.h
- Improve more Ob* definitions
Modified:
    branches/header-work/include/ddk/wdm.h
    branches/header-work/include/ddk/winddk.h
Modified: branches/header-work/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r…
==============================================================================
--- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Fri Mar  5 19:06:58 2010
@@ -9389,6 +9389,75 @@
 #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                                          *
Modified: branches/header-work/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.…
==============================================================================
--- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Fri Mar  5 19:06:58 2010
@@ -3239,27 +3239,6 @@
   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
 ObInsertObject(
@@ -3271,24 +3250,12 @@
   OUT PHANDLE  Handle);
 NTKERNELAPI
-LONG_PTR
-FASTCALL
-ObfReferenceObject(
-  IN PVOID  Object);
-
-NTKERNELAPI
 NTSTATUS
 NTAPI
 ObLogSecurityDescriptor(
   IN PSECURITY_DESCRIPTOR  InputSecurityDescriptor,
   OUT PSECURITY_DESCRIPTOR  *OutputSecurityDescriptor,
   IN ULONG RefBias);
-/*
- * VOID
- * ObReferenceObject(
- *   IN PVOID  Object)
- */
-#define ObReferenceObject ObfReferenceObject
 NTKERNELAPI
 VOID
@@ -3326,17 +3293,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
@@ -3352,29 +3308,11 @@
   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
 ObReferenceSecurityDescriptor(
   IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
   IN ULONG  Count);
-
-NTKERNELAPI
-VOID
-NTAPI
-ObReleaseObjectSecurity(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN BOOLEAN  MemoryAllocated);
-
-
 /** Process manager routines **/