From e78ab7139d96ec77046d1dca6bd7ce0526607cf4 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 17 Mar 2010 11:07:59 +0000
Subject: [PATCH] [XDK] - Improve PEPROCESS and PETHREAD definitions - Remove
 PDEVICE_HANDLER_OBJECT [WDM] - Update wdm.h to reflect the changes to XDK
 [NTDDK] - Remove some duplicates and group some related definitions

svn path=/branches/header-work/; revision=46245
---
 include/ddk/ntddk.h        | 30 ++++++------------------------
 include/ddk/wdm.h          |  9 ++++++++-
 include/xdk/wdm.template.h |  9 ++++++++-
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h
index 43e104a7b4d..59cd28769e4 100644
--- a/include/ddk/ntddk.h
+++ b/include/ddk/ntddk.h
@@ -57,23 +57,10 @@ extern "C" {
 #endif
 
 typedef struct _BUS_HANDLER *PBUS_HANDLER;
-typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT;
 typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT;
 #if defined(_NTHAL_INCLUDED_)
-typedef struct _KPROCESS *PEPROCESS;
-typedef struct _ETHREAD *PETHREAD;
 typedef struct _KAFFINITY_EX *PKAFFINITY_EX;
-#elif defined(_NTIFS_INCLUDED_)
-typedef struct _KPROCESS *PEPROCESS;
-typedef struct _KTHREAD *PETHREAD;
-#else
-typedef struct _EPROCESS *PEPROCESS;
-typedef struct _ETHREAD *PETHREAD;
 #endif
-typedef struct _IO_TIMER *PIO_TIMER;
-typedef struct _KINTERRUPT *PKINTERRUPT;
-typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD;
-typedef struct _OBJECT_TYPE *POBJECT_TYPE;
 typedef struct _PEB *PPEB;
 typedef struct _IMAGE_NT_HEADERS *PIMAGE_NT_HEADERS32;
 typedef struct _IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64;
@@ -507,6 +494,12 @@ typedef VOID
   IN struct _RTL_GENERIC_TABLE *Table,
   IN PVOID Buffer);
 
+typedef struct _RTL_SPLAY_LINKS {
+  struct _RTL_SPLAY_LINKS *Parent;
+  struct _RTL_SPLAY_LINKS *LeftChild;
+  struct _RTL_SPLAY_LINKS *RightChild;
+} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS;
+
 typedef struct _RTL_GENERIC_TABLE {
   PRTL_SPLAY_LINKS TableRoot;
   LIST_ENTRY InsertOrderList;
@@ -645,12 +638,6 @@ RtlIsGenericTableEmpty(
 
 #endif /* RTL_USE_AVL_TABLES */
 
-typedef struct _RTL_SPLAY_LINKS {
-  struct _RTL_SPLAY_LINKS *Parent;
-  struct _RTL_SPLAY_LINKS *LeftChild;
-  struct _RTL_SPLAY_LINKS *RightChild;
-} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS;
-
 typedef struct _RTL_DYNAMIC_HASH_TABLE_ENTRY {
   LIST_ENTRY Linkage;
   ULONG_PTR Signature;
@@ -790,11 +777,6 @@ typedef LPOSVERSIONINFOA LPOSVERSIONINFO;
         _SplayChild->Parent = _SplayParent;             \
     }
 
-#define RtlEqualLuid(L1, L2) (((L1)->LowPart == (L2)->LowPart) && \
-                              ((L1)->HighPart  == (L2)->HighPart))
-
-#define RtlIsZeroLuid(L1) ((BOOLEAN) (((L1)->LowPart | (L1)->HighPart) == 0))
-
 #if !defined(MIDL_PASS)
 
 FORCEINLINE
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 5816d3afa7b..8bceb36df84 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -123,11 +123,18 @@ struct _IO_RESOURCE_DESCRIPTOR;
 typedef struct _OBJECT_TYPE *POBJECT_TYPE;
 typedef struct _HAL_DISPATCH_TABLE *PHAL_DISPATCH_TABLE;
 typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE;
-typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT;
 typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; 
 typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT;
+#if defined(_NTHAL_INCLUDED_)
+typedef struct _KPROCESS *PEPROCESS;
 typedef struct _ETHREAD *PETHREAD;
+#elif defined(_NTIFS_INCLUDED_)
+typedef struct _KPROCESS *PEPROCESS;
+typedef struct _KTHREAD *PETHREAD;
+#else
 typedef struct _EPROCESS *PEPROCESS;
+typedef struct _ETHREAD *PETHREAD;
+#endif
 typedef struct _IO_TIMER *PIO_TIMER;
 typedef struct _KINTERRUPT *PKINTERRUPT;
 typedef struct _KPROCESS *PKPROCESS;
diff --git a/include/xdk/wdm.template.h b/include/xdk/wdm.template.h
index 8430b4bf97d..80b6d598efe 100644
--- a/include/xdk/wdm.template.h
+++ b/include/xdk/wdm.template.h
@@ -123,11 +123,18 @@ struct _IO_RESOURCE_DESCRIPTOR;
 typedef struct _OBJECT_TYPE *POBJECT_TYPE;
 typedef struct _HAL_DISPATCH_TABLE *PHAL_DISPATCH_TABLE;
 typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE;
-typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT;
 typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; 
 typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT;
+#if defined(_NTHAL_INCLUDED_)
+typedef struct _KPROCESS *PEPROCESS;
 typedef struct _ETHREAD *PETHREAD;
+#elif defined(_NTIFS_INCLUDED_)
+typedef struct _KPROCESS *PEPROCESS;
+typedef struct _KTHREAD *PETHREAD;
+#else
 typedef struct _EPROCESS *PEPROCESS;
+typedef struct _ETHREAD *PETHREAD;
+#endif
 typedef struct _IO_TIMER *PIO_TIMER;
 typedef struct _KINTERRUPT *PKINTERRUPT;
 typedef struct _KPROCESS *PKPROCESS;
-- 
2.17.1