From ae955c39ede301bda77584ee177039e6664b2276 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Mon, 20 Jun 2005 19:14:08 +0000
Subject: [PATCH] Build epsapi with NDK

svn path=/trunk/; revision=16164
---
 reactos/include/epsapi.h            |  4 ++--
 reactos/include/ndk/zwtypes.h       |  9 ++++++---
 reactos/lib/epsapi/enum/drivers.c   |  8 ++++----
 reactos/lib/epsapi/enum/modules.c   |  4 ++--
 reactos/lib/epsapi/enum/processes.c | 17 ++++++++++-------
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/reactos/include/epsapi.h b/reactos/include/epsapi.h
index 6e7cecfaa94..2a3e62d7d45 100644
--- a/reactos/include/epsapi.h
+++ b/reactos/include/epsapi.h
@@ -26,8 +26,8 @@
 #define __EPSAPI_H_INCLUDED__
 
 /* INCLUDES */
-#define NTOS_MODE_USER
-#include <ntos.h>
+#include <ntdll/rtl.h>
+#include <ntdll/ldr.h> /* FIXME: USE LDR_DATA_TABLE_ENTRY */
 
 /* OBJECTS */
 
diff --git a/reactos/include/ndk/zwtypes.h b/reactos/include/ndk/zwtypes.h
index 68386daad10..637ece5f491 100644
--- a/reactos/include/ndk/zwtypes.h
+++ b/reactos/include/ndk/zwtypes.h
@@ -464,7 +464,8 @@ typedef struct _SYSTEM_BASIC_INFORMATION
 } SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION;
 
 /* Class 1 */
-typedef struct _SYSTEM_PROCESSOR_INFORMATION {
+typedef struct _SYSTEM_PROCESSOR_INFORMATION
+{
     USHORT ProcessorArchitecture;
     USHORT ProcessorLevel;
     USHORT ProcessorRevision;
@@ -552,7 +553,8 @@ typedef struct _SYSTEM_PERFORMANCE_INFORMATION
 } SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION;
 
 /* Class 3 */
-typedef struct _SYSTEM_TIMEOFDAY_INFORMATION {
+typedef struct _SYSTEM_TIMEOFDAY_INFORMATION
+{
     LARGE_INTEGER BootTime;
     LARGE_INTEGER CurrentTime;
     LARGE_INTEGER TimeZoneBias;
@@ -633,7 +635,8 @@ typedef struct _SYSTEM_CALL_COUNT_INFORMATION
 } SYSTEM_CALL_COUNT_INFORMATION, *PSYSTEM_CALL_COUNT_INFORMATION; 
 
 /* Class 7 */
-typedef struct _SYSTEM_DEVICE_INFORMATION {
+typedef struct _SYSTEM_DEVICE_INFORMATION
+{
     ULONG NumberOfDisks;
     ULONG NumberOfFloppies;
     ULONG NumberOfCdRoms;
diff --git a/reactos/lib/epsapi/enum/drivers.c b/reactos/lib/epsapi/enum/drivers.c
index 5142efdce58..1185f13e275 100644
--- a/reactos/lib/epsapi/enum/drivers.c
+++ b/reactos/lib/epsapi/enum/drivers.c
@@ -14,9 +14,9 @@
  *                          and improve reusability
  */
 
-#include <stddef.h>
+#include <windows.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
+#include <ndk/ntndk.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -188,8 +188,8 @@ PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL
 PsaWalkNextSystemModule(IN PSYSTEM_MODULE_INFORMATION CurrentSystemModule)
 {
   return (PSYSTEM_MODULE_INFORMATION_ENTRY)((ULONG_PTR)CurrentSystemModule +
-                                            (offsetof(SYSTEM_MODULE_INFORMATION, Module[1]) -
-                                             offsetof(SYSTEM_MODULE_INFORMATION, Module[0])));
+                                            (FIELD_OFFSET(SYSTEM_MODULE_INFORMATION, Module[1]) -
+                                             FIELD_OFFSET(SYSTEM_MODULE_INFORMATION, Module[0])));
 }
 
 /* EOF */
diff --git a/reactos/lib/epsapi/enum/modules.c b/reactos/lib/epsapi/enum/modules.c
index 7a2300ae566..3b0d201f787 100644
--- a/reactos/lib/epsapi/enum/modules.c
+++ b/reactos/lib/epsapi/enum/modules.c
@@ -18,9 +18,9 @@
  *                          isolated in its own library to clear the confusion
  *                          and improve reusability
  */
-
+#include <windows.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
+#include <ndk/ntndk.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/epsapi/enum/processes.c b/reactos/lib/epsapi/enum/processes.c
index 75fb255bf86..d3f68fa637f 100644
--- a/reactos/lib/epsapi/enum/processes.c
+++ b/reactos/lib/epsapi/enum/processes.c
@@ -31,12 +31,15 @@
  *                          and improve reusability
  */
 
-#include <ddk/ntddk.h>
-#include <debug.h>
-#include <stddef.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
 #include <epsapi.h>
 
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS NTAPI
 PsaCaptureProcessesAndThreads(OUT PSYSTEM_PROCESS_INFORMATION *ProcessesAndThreads)
 {
@@ -74,7 +77,7 @@ PsaCaptureProcessesAndThreads(OUT PSYSTEM_PROCESS_INFORMATION *ProcessesAndThrea
     pInfoBuffer = pTmp;
   
     /* query the information */
-    Status = NtQuerySystemInformation(SystemProcessesAndThreadsInformation,
+    Status = NtQuerySystemInformation(SystemProcessInformation,
                                       pInfoBuffer,
                                       nSize,
                                       NULL);
@@ -262,7 +265,7 @@ PsaWalkFirstThread(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess)
   static SIZE_T nOffsetOfThreads = 0;
 
   /* get the offset of the Threads field */
-  nOffsetOfThreads = offsetof(SYSTEM_PROCESS_INFORMATION, TH);
+  nOffsetOfThreads = FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH);
 
   return (PSYSTEM_THREAD_INFORMATION)((ULONG_PTR)CurrentProcess + nOffsetOfThreads);
 }
@@ -271,8 +274,8 @@ PSYSTEM_THREAD_INFORMATION FASTCALL
 PsaWalkNextThread(IN PSYSTEM_THREAD_INFORMATION CurrentThread)
 {
   return (PSYSTEM_THREAD_INFORMATION)((ULONG_PTR)CurrentThread +
-                           (offsetof(SYSTEM_PROCESS_INFORMATION, TH[1]) -
-                            offsetof(SYSTEM_PROCESS_INFORMATION, TH[0])));
+                           (FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH[1]) -
+                            FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH[0])));
 }
 
 /* EOF */