- Update NDK with proper (when possible) RTL structure names that were previously...

[reactos.git] / reactos / lib / kernel32 / misc / toolhelp.c

diff --git a/reactos/lib/kernel32/misc/toolhelp.c b/reactos/lib/kernel32/misc/toolhelp.c
index e818a53..520fc4c 100644 (file)
--- a/reactos/lib/kernel32/misc/toolhelp.c
+++ b/reactos/lib/kernel32/misc/toolhelp.c
@@ -38,6 +38,8 @@
 
 #include <k32.h>
 
+#include <tlhelp32.h>
+
 #define NDEBUG
 #include "../include/debug.h"
 
@@ -90,8 +92,8 @@ typedef struct _TH32SNAPSHOT
 /* INTERNAL FUNCTIONS *********************************************************/
 
 static VOID
-TH32FreeAllocatedResources(PDEBUG_BUFFER HeapDebug,
-                           PDEBUG_BUFFER ModuleDebug,
+TH32FreeAllocatedResources(PRTL_DEBUG_BUFFER HeapDebug,
+                           PRTL_DEBUG_BUFFER ModuleDebug,
                            PVOID ProcThrdInfo,
                            ULONG ProcThrdInfoSize)
 {
@@ -116,8 +118,8 @@ TH32FreeAllocatedResources(PDEBUG_BUFFER HeapDebug,
 static NTSTATUS
 TH32CreateSnapshot(DWORD dwFlags,
                    DWORD th32ProcessID,
-                   PDEBUG_BUFFER *HeapDebug,
-                   PDEBUG_BUFFER *ModuleDebug,
+                   PRTL_DEBUG_BUFFER *HeapDebug,
+                   PRTL_DEBUG_BUFFER *ModuleDebug,
                    PVOID *ProcThrdInfo,
                    ULONG *ProcThrdInfoSize)
 {
@@ -137,7 +139,7 @@ TH32CreateSnapshot(DWORD dwFlags,
     if(*HeapDebug != NULL)
     {
       Status = RtlQueryProcessDebugInformation(th32ProcessID,
-                                               PDI_HEAPS,
+                                               RTL_DEBUG_QUERY_HEAPS,
                                                *HeapDebug);
     }
     else
@@ -154,7 +156,7 @@ TH32CreateSnapshot(DWORD dwFlags,
     if(*ModuleDebug != NULL)
     {
       Status = RtlQueryProcessDebugInformation(th32ProcessID,
-                                               PDI_MODULES,
+                                               RTL_DEBUG_QUERY_MODULES,
                                                *ModuleDebug);
     }
     else
@@ -219,8 +221,8 @@ TH32CreateSnapshot(DWORD dwFlags,
 static NTSTATUS
 TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
                                     DWORD th32ProcessID,
-                                    PDEBUG_BUFFER HeapDebug,
-                                    PDEBUG_BUFFER ModuleDebug,
+                                    PRTL_DEBUG_BUFFER HeapDebug,
+                                    PRTL_DEBUG_BUFFER ModuleDebug,
                                     PVOID ProcThrdInfo,
                                     HANDLE *SectionHandle)
 {
@@ -237,8 +239,8 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
   ULONG ViewSize, i;
   ULONG nProcesses = 0, nThreads = 0, nHeaps = 0, nModules = 0;
   ULONG RequiredSnapshotSize = sizeof(TH32SNAPSHOT);
-  PHEAP_INFORMATION hi = NULL;
-  PMODULE_INFORMATION mi = NULL;
+  PRTL_PROCESS_HEAPS hi = NULL;
+  PRTL_PROCESS_MODULES mi = NULL;
   NTSTATUS Status = STATUS_SUCCESS;
 
   /*
@@ -246,7 +248,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
    */
   if(dwFlags & TH32CS_SNAPHEAPLIST)
   {
-    hi = (PHEAP_INFORMATION)HeapDebug->HeapInformation;
+    hi = (PRTL_PROCESS_HEAPS)HeapDebug->HeapInformation;
     nHeaps = hi->HeapCount;
     RequiredSnapshotSize += nHeaps * sizeof(HEAPLIST32);
   }
@@ -256,7 +258,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
    */
   if(dwFlags & TH32CS_SNAPMODULE)
   {
-    mi = (PMODULE_INFORMATION)ModuleDebug->ModuleInformation;
+    mi = (PRTL_PROCESS_MODULES)ModuleDebug->ModuleInformation;
     nModules = mi->ModuleCount;
     RequiredSnapshotSize += nModules * sizeof(MODULEENTRY32W);
   }
@@ -267,7 +269,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
   if(dwFlags & (TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD))
   {
     ULONG ProcOffset = 0;
-    
+
     ProcessInfo = (PSYSTEM_PROCESS_INFORMATION)ProcThrdInfo;
     do
     {
@@ -373,14 +375,14 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
       ModuleListEntry->modBaseAddr = (BYTE*)mi->ModuleEntry[i].Base;
       ModuleListEntry->modBaseSize = mi->ModuleEntry[i].Size;
       ModuleListEntry->hModule = (HMODULE)mi->ModuleEntry[i].Base;
-      
+
       MultiByteToWideChar(CP_ACP,
                           0,
                           &mi->ModuleEntry[i].ImageName[mi->ModuleEntry[i].ModuleNameOffset],
                           -1,
                           ModuleListEntry->szModule,
                           sizeof(ModuleListEntry->szModule) / sizeof(ModuleListEntry->szModule[0]));
-      
+
       MultiByteToWideChar(CP_ACP,
                           0,
                           mi->ModuleEntry[i].ImageName,
@@ -398,7 +400,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
   if(dwFlags & TH32CS_SNAPPROCESS)
   {
     ULONG ProcOffset = 0;
-    
+
     Snapshot->ProcessListCount = nProcesses;
     Snapshot->ProcessListOffset = DataOffset;
     ProcessListEntry = (LPPROCESSENTRY32W)OffsetToPtr(Snapshot, DataOffset);
@@ -406,7 +408,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
     do
     {
       ProcessInfo = (PSYSTEM_PROCESS_INFORMATION)((ULONG_PTR)ProcessInfo + ProcOffset);
-      
+
       ProcessListEntry->dwSize = sizeof(PROCESSENTRY32W);
       ProcessListEntry->cntUsage = 0; /* no longer used */
       ProcessListEntry->th32ProcessID = (ULONG)ProcessInfo->UniqueProcessId;
@@ -426,7 +428,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
       {
         lstrcpyW(ProcessListEntry->szExeFile, L"[System Process]");
       }
-      
+
       ProcessListEntry++;
 
       ProcOffset = ProcessInfo->NextEntryOffset;
@@ -439,7 +441,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
   if(dwFlags & TH32CS_SNAPTHREAD)
   {
     ULONG ProcOffset = 0;
-    
+
     Snapshot->ThreadListCount = nThreads;
     Snapshot->ThreadListOffset = DataOffset;
     ThreadListEntry = (LPTHREADENTRY32)OffsetToPtr(Snapshot, DataOffset);
@@ -448,7 +450,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
     {
       PSYSTEM_THREAD_INFORMATION ThreadInfo;
       ULONG n;
-      
+
       ProcessInfo = (PSYSTEM_PROCESS_INFORMATION)((ULONG_PTR)ProcessInfo + ProcOffset);
       ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(ProcessInfo + 1);
 
@@ -1111,7 +1113,7 @@ HANDLE
 STDCALL
 CreateToolhelp32Snapshot(DWORD dwFlags, DWORD th32ProcessID)
 {
-  PDEBUG_BUFFER HeapDebug, ModuleDebug;
+  PRTL_DEBUG_BUFFER HeapDebug, ModuleDebug;
   PVOID ProcThrdInfo;
   ULONG ProcThrdInfoSize;
   NTSTATUS Status;