[KERNEL32]

[reactos.git] / reactos / dll / win32 / kernel32 / misc / toolhelp.c

diff --git a/reactos/dll/win32/kernel32/misc/toolhelp.c b/reactos/dll/win32/kernel32/misc/toolhelp.c
index 1cac914..aafd9e8 100644 (file)
--- a/reactos/dll/win32/kernel32/misc/toolhelp.c
+++ b/reactos/dll/win32/kernel32/misc/toolhelp.c
@@ -98,7 +98,7 @@ TH32FreeAllocatedResources(PRTL_DEBUG_INFORMATION HeapDebug,
   if(ProcThrdInfo != NULL)
   {
     NtFreeVirtualMemory(NtCurrentProcess(),
-                        ProcThrdInfo,
+                        &ProcThrdInfo,
                         &ProcThrdInfoSize,
                         MEM_RELEASE);
   }
@@ -225,8 +225,8 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
   HANDLE hSection;
   PTH32SNAPSHOT Snapshot;
   ULONG_PTR DataOffset;
-  ULONG ViewSize, i;
-  ULONG nProcesses = 0, nThreads = 0, nHeaps = 0, nModules = 0;
+  SIZE_T ViewSize;
+  ULONG i, nProcesses = 0, nThreads = 0, nHeaps = 0, nModules = 0;
   ULONG RequiredSnapshotSize = sizeof(TH32SNAPSHOT);
   PRTL_PROCESS_HEAPS hi = NULL;
   PRTL_PROCESS_MODULES mi = NULL;
@@ -400,11 +400,11 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
 
       ProcessListEntry->dwSize = sizeof(PROCESSENTRY32W);
       ProcessListEntry->cntUsage = 0; /* no longer used */
-      ProcessListEntry->th32ProcessID = (ULONG)ProcessInfo->UniqueProcessId;
+      ProcessListEntry->th32ProcessID = (ULONG_PTR)ProcessInfo->UniqueProcessId;
       ProcessListEntry->th32DefaultHeapID = 0; /* no longer used */
       ProcessListEntry->th32ModuleID = 0; /* no longer used */
       ProcessListEntry->cntThreads = ProcessInfo->NumberOfThreads;
-      ProcessListEntry->th32ParentProcessID = (ULONG)ProcessInfo->InheritedFromUniqueProcessId;
+      ProcessListEntry->th32ParentProcessID = (ULONG_PTR)ProcessInfo->InheritedFromUniqueProcessId;
       ProcessListEntry->pcPriClassBase = ProcessInfo->BasePriority;
       ProcessListEntry->dwFlags = 0; /* no longer used */
       if(ProcessInfo->ImageName.Buffer != NULL)
@@ -447,8 +447,8 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
       {
         ThreadListEntry->dwSize = sizeof(THREADENTRY32);
         ThreadListEntry->cntUsage = 0; /* no longer used */
-        ThreadListEntry->th32ThreadID = (ULONG)ThreadInfo->ClientId.UniqueThread;
-        ThreadListEntry->th32OwnerProcessID = (ULONG)ThreadInfo->ClientId.UniqueProcess;
+        ThreadListEntry->th32ThreadID = (ULONG_PTR)ThreadInfo->ClientId.UniqueThread;
+        ThreadListEntry->th32OwnerProcessID = (ULONG_PTR)ThreadInfo->ClientId.UniqueProcess;
         ThreadListEntry->tpBasePri = ThreadInfo->BasePriority;
         ThreadListEntry->tpDeltaPri = 0; /* no longer used */
         ThreadListEntry->dwFlags = 0; /* no longer used */
@@ -485,7 +485,7 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Heap32First(LPHEAPENTRY32 lphe, DWORD th32ProcessID, DWORD th32HeapID)
 {
   PRTL_DEBUG_INFORMATION DebugInfo;
@@ -574,7 +574,7 @@ Heap32First(LPHEAPENTRY32 lphe, DWORD th32ProcessID, DWORD th32HeapID)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Heap32Next(LPHEAPENTRY32 lphe)
 {
   PRTL_DEBUG_INFORMATION DebugInfo;
@@ -665,12 +665,12 @@ Heap32Next(LPHEAPENTRY32 lphe)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Heap32ListFirst(HANDLE hSnapshot, LPHEAPLIST32 lphl)
 {
   PTH32SNAPSHOT Snapshot;
   LARGE_INTEGER SOffset;
-  ULONG ViewSize;
+  SIZE_T ViewSize;
   NTSTATUS Status;
 
   CHECK_PARAM_SIZE(lphl, sizeof(HEAPLIST32));
@@ -719,12 +719,12 @@ Heap32ListFirst(HANDLE hSnapshot, LPHEAPLIST32 lphl)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Heap32ListNext(HANDLE hSnapshot, LPHEAPLIST32 lphl)
 {
   PTH32SNAPSHOT Snapshot;
   LARGE_INTEGER SOffset;
-  ULONG ViewSize;
+  SIZE_T ViewSize;
   NTSTATUS Status;
 
   CHECK_PARAM_SIZE(lphl, sizeof(HEAPLIST32));
@@ -773,7 +773,7 @@ Heap32ListNext(HANDLE hSnapshot, LPHEAPLIST32 lphl)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Module32First(HANDLE hSnapshot, LPMODULEENTRY32 lpme)
 {
   MODULEENTRY32W me;
@@ -806,12 +806,12 @@ Module32First(HANDLE hSnapshot, LPMODULEENTRY32 lpme)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Module32FirstW(HANDLE hSnapshot, LPMODULEENTRY32W lpme)
 {
   PTH32SNAPSHOT Snapshot;
   LARGE_INTEGER SOffset;
-  ULONG ViewSize;
+  SIZE_T ViewSize;
   NTSTATUS Status;
 
   CHECK_PARAM_SIZE(lpme, sizeof(MODULEENTRY32W));
@@ -860,7 +860,7 @@ Module32FirstW(HANDLE hSnapshot, LPMODULEENTRY32W lpme)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Module32Next(HANDLE hSnapshot, LPMODULEENTRY32 lpme)
 {
   MODULEENTRY32W me;
@@ -893,12 +893,12 @@ Module32Next(HANDLE hSnapshot, LPMODULEENTRY32 lpme)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Module32NextW(HANDLE hSnapshot, LPMODULEENTRY32W lpme)
 {
   PTH32SNAPSHOT Snapshot;
   LARGE_INTEGER SOffset;
-  ULONG ViewSize;
+  SIZE_T ViewSize;
   NTSTATUS Status;
 
   CHECK_PARAM_SIZE(lpme, sizeof(MODULEENTRY32W));
@@ -947,7 +947,7 @@ Module32NextW(HANDLE hSnapshot, LPMODULEENTRY32W lpme)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Process32First(HANDLE hSnapshot, LPPROCESSENTRY32 lppe)
 {
   PROCESSENTRY32W pe;
@@ -980,12 +980,12 @@ Process32First(HANDLE hSnapshot, LPPROCESSENTRY32 lppe)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Process32FirstW(HANDLE hSnapshot, LPPROCESSENTRY32W lppe)
 {
   PTH32SNAPSHOT Snapshot;
   LARGE_INTEGER SOffset;
-  ULONG ViewSize;
+  SIZE_T ViewSize;
   NTSTATUS Status;
 
   CHECK_PARAM_SIZE(lppe, sizeof(PROCESSENTRY32W));
@@ -1036,7 +1036,7 @@ Process32FirstW(HANDLE hSnapshot, LPPROCESSENTRY32W lppe)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Process32Next(HANDLE hSnapshot, LPPROCESSENTRY32 lppe)
 {
   PROCESSENTRY32W pe;
@@ -1069,12 +1069,12 @@ Process32Next(HANDLE hSnapshot, LPPROCESSENTRY32 lppe)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Process32NextW(HANDLE hSnapshot, LPPROCESSENTRY32W lppe)
 {
   PTH32SNAPSHOT Snapshot;
   LARGE_INTEGER SOffset;
-  ULONG ViewSize;
+  SIZE_T ViewSize;
   NTSTATUS Status;
 
   CHECK_PARAM_SIZE(lppe, sizeof(PROCESSENTRY32W));
@@ -1123,12 +1123,12 @@ Process32NextW(HANDLE hSnapshot, LPPROCESSENTRY32W lppe)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Thread32First(HANDLE hSnapshot, LPTHREADENTRY32 lpte)
 {
   PTH32SNAPSHOT Snapshot;
   LARGE_INTEGER SOffset;
-  ULONG ViewSize;
+  SIZE_T ViewSize;
   NTSTATUS Status;
 
   CHECK_PARAM_SIZE(lpte, sizeof(THREADENTRY32));
@@ -1177,12 +1177,12 @@ Thread32First(HANDLE hSnapshot, LPTHREADENTRY32 lpte)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Thread32Next(HANDLE hSnapshot, LPTHREADENTRY32 lpte)
 {
   PTH32SNAPSHOT Snapshot;
   LARGE_INTEGER SOffset;
-  ULONG ViewSize;
+  SIZE_T ViewSize;
   NTSTATUS Status;
 
   CHECK_PARAM_SIZE(lpte, sizeof(THREADENTRY32));
@@ -1231,9 +1231,9 @@ Thread32Next(HANDLE hSnapshot, LPTHREADENTRY32 lpte)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 Toolhelp32ReadProcessMemory(DWORD th32ProcessID,  LPCVOID lpBaseAddress,
-                            LPVOID lpBuffer, DWORD cbRead, LPDWORD lpNumberOfBytesRead)
+                            LPVOID lpBuffer, SIZE_T cbRead, SIZE_T* lpNumberOfBytesRead)
 {
   HANDLE hProcess = OpenProcess(PROCESS_VM_READ, FALSE, th32ProcessID);
   if(hProcess != NULL)
@@ -1251,7 +1251,7 @@ Toolhelp32ReadProcessMemory(DWORD th32ProcessID,  LPCVOID lpBaseAddress,
  * @implemented
  */
 HANDLE
-STDCALL
+WINAPI
 CreateToolhelp32Snapshot(DWORD dwFlags, DWORD th32ProcessID)
 {
   PRTL_DEBUG_INFORMATION HeapDebug, ModuleDebug;