- NDK 0.98, now with versionned headers. Too many changes to list, see the TinyKRNL...

[reactos.git] / reactos / lib / epsapi / enum / modules.c

diff --git a/reactos/lib/epsapi/enum/modules.c b/reactos/lib/epsapi/enum/modules.c
index 7a2300a..55915ee 100644 (file)
--- a/reactos/lib/epsapi/enum/modules.c
+++ b/reactos/lib/epsapi/enum/modules.c
@@ -18,14 +18,15 @@
  *                          isolated in its own library to clear the confusion
  *                          and improve reusability
  */
-
+#define WIN32_NO_STATUS
+#include <windows.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
+#include <ndk/ntndk.h>
 
 #define NDEBUG
 #include <debug.h>
 
-#include <epsapi.h>
+#include <epsapi/epsapi.h>
 
 NTSTATUS NTAPI
 PsaEnumerateProcessModules(IN HANDLE ProcessHandle,
@@ -49,7 +50,7 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle,
  
       while(Current != ListHead)
       {
-        PLDR_MODULE LoaderModule = CONTAINING_RECORD(Current, LDR_MODULE, InLoadOrderModuleList);
+        PLDR_DATA_TABLE_ENTRY LoaderModule = CONTAINING_RECORD(Current, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks);
    
         /* return the current module to the callback */
         Status = Callback(ProcessHandle, LoaderModule, CallbackContext);
@@ -59,7 +60,7 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle,
           goto Failure;
         }
     
-        Current = LoaderModule->InLoadOrderModuleList.Flink;
+        Current = LoaderModule->InLoadOrderLinks.Flink;
       }
 #if 0
     }
@@ -73,7 +74,7 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle,
   {
     PROCESS_BASIC_INFORMATION BasicInformation;
     PPEB_LDR_DATA LoaderData;
-    LDR_MODULE LoaderModule;
+    LDR_DATA_TABLE_ENTRY LoaderModule;
     PLIST_ENTRY ListHead, Current;
  
     /* query the process basic information (includes the PEB address) */
@@ -116,7 +117,7 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle,
     {
       /* read the current module */
       Status = NtReadVirtualMemory(ProcessHandle,
-                                   CONTAINING_RECORD(Current, LDR_MODULE, InLoadOrderModuleList),
+                                   CONTAINING_RECORD(Current, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks),
                                    &LoaderModule,
                                    sizeof(LoaderModule),
                                    NULL);
@@ -136,7 +137,7 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle,
       }
     
       /* address of the next module in the list */
-      Current = LoaderModule.InLoadOrderModuleList.Flink;
+      Current = LoaderModule.InLoadOrderLinks.Flink;
     }
   }