[PSDK][KERNEL32]

- Fix some DWORD vs SIZE_T confusion for memory functions

svn path=/trunk/; revision=54295

diff --git a/reactos/dll/win32/kernel32/client/heapmem.c b/reactos/dll/win32/kernel32/client/heapmem.c
index 49ebc54..6ea3774 100644 (file)
--- a/reactos/dll/win32/kernel32/client/heapmem.c
+++ b/reactos/dll/win32/kernel32/client/heapmem.c
@@ -43,8 +43,8 @@ BaseDllInitializeMemoryManager(VOID)
 HANDLE
 WINAPI
 HeapCreate(DWORD flOptions,
-           DWORD dwInitialSize,
-           DWORD dwMaximumSize)
+           SIZE_T dwInitialSize,
+           SIZE_T dwMaximumSize)
 {
     HANDLE hRet;
     ULONG Flags;
@@ -366,7 +366,7 @@ HeapSetInformation(HANDLE HeapHandle,
 HGLOBAL
 NTAPI
 GlobalAlloc(UINT uFlags,
-            DWORD dwBytes)
+            SIZE_T dwBytes)
 {
     ULONG Flags = 0;
     PVOID Ptr = NULL;
@@ -823,7 +823,7 @@ GlobalLock(HGLOBAL hMem)
 HGLOBAL
 NTAPI
 GlobalReAlloc(HGLOBAL hMem,
-              DWORD dwBytes,
+              SIZE_T dwBytes,
               UINT uFlags)
 {
     PBASE_HEAP_HANDLE_ENTRY HandleEntry;
@@ -1085,7 +1085,7 @@ GlobalReAlloc(HGLOBAL hMem,
 /*
  * @implemented
  */
-DWORD
+SIZE_T
 NTAPI
 GlobalSize(HGLOBAL hMem)
 {

diff --git a/reactos/dll/win32/kernel32/client/virtmem.c b/reactos/dll/win32/kernel32/client/virtmem.c
index 73ce275..acf2e13 100644 (file)
--- a/reactos/dll/win32/kernel32/client/virtmem.c
+++ b/reactos/dll/win32/kernel32/client/virtmem.c
@@ -27,7 +27,7 @@ VirtualAllocEx(IN HANDLE hProcess,
                IN DWORD flProtect)
 {
     NTSTATUS Status;
-    
+
     /* Make sure the address is within the granularity of the system (64K) */
     if ((lpAddress) &&
         (lpAddress < (PVOID)BaseStaticServerData->SysInfo.AllocationGranularity))
@@ -36,7 +36,7 @@ VirtualAllocEx(IN HANDLE hProcess,
         SetLastError(ERROR_INVALID_PARAMETER);
         return NULL;
     }
-    
+
     /* Handle any possible exceptions */
     _SEH2_TRY
     {
@@ -53,7 +53,7 @@ VirtualAllocEx(IN HANDLE hProcess,
         Status = _SEH2_GetExceptionCode();
     }
     _SEH2_END;
-    
+
     /* Check for status */
     if (!NT_SUCCESS(Status))
     {
@@ -193,7 +193,7 @@ VirtualLock(IN LPVOID lpAddress,
             IN SIZE_T dwSize)
 {
     NTSTATUS Status;
-    ULONG RegionSize = dwSize;
+    SIZE_T RegionSize = dwSize;
     PVOID BaseAddress = lpAddress;
 
     /* Lock the memory */
@@ -215,7 +215,7 @@ VirtualLock(IN LPVOID lpAddress,
 /*
  * @implemented
  */
-DWORD
+SIZE_T
 NTAPI
 VirtualQuery(IN LPCVOID lpAddress,
              OUT PMEMORY_BASIC_INFORMATION lpBuffer,
@@ -231,7 +231,7 @@ VirtualQuery(IN LPCVOID lpAddress,
 /*
  * @implemented
  */
-DWORD
+SIZE_T
 NTAPI
 VirtualQueryEx(IN HANDLE hProcess,
                IN LPCVOID lpAddress,
@@ -239,7 +239,7 @@ VirtualQueryEx(IN HANDLE hProcess,
                IN SIZE_T dwLength)
 {
     NTSTATUS Status;
-    ULONG ResultLength;
+    SIZE_T ResultLength;
 
     /* Query basic information */
     Status = NtQueryVirtualMemory(hProcess,
@@ -268,9 +268,9 @@ VirtualUnlock(IN LPVOID lpAddress,
               IN SIZE_T dwSize)
 {
     NTSTATUS Status;
-    ULONG RegionSize = dwSize;
+    SIZE_T RegionSize = dwSize;
     PVOID BaseAddress = lpAddress;
-    
+
     /* Lock the memory */
     Status = NtUnlockVirtualMemory(NtCurrentProcess(),
                                    &BaseAddress,

diff --git a/reactos/include/psdk/winbase.h b/reactos/include/psdk/winbase.h
index 1250944..f3302d5 100644 (file)
--- a/reactos/include/psdk/winbase.h
+++ b/reactos/include/psdk/winbase.h
@@ -998,12 +998,12 @@ typedef struct _TIME_ZONE_INFORMATION {
 typedef struct _MEMORYSTATUS {
        DWORD dwLength;
        DWORD dwMemoryLoad;
-       DWORD dwTotalPhys;
-       DWORD dwAvailPhys;
-       DWORD dwTotalPageFile;
-       DWORD dwAvailPageFile;
-       DWORD dwTotalVirtual;
-       DWORD dwAvailVirtual;
+       SIZE_T dwTotalPhys;
+       SIZE_T dwAvailPhys;
+       SIZE_T dwTotalPageFile;
+       SIZE_T dwAvailPageFile;
+       SIZE_T dwTotalVirtual;
+       SIZE_T dwAvailVirtual;
 } MEMORYSTATUS,*LPMEMORYSTATUS;
 
 #if (_WIN32_WINNT >= 0x0500)
@@ -1755,7 +1755,7 @@ DWORD WINAPI GetWindowThreadProcessId(HWND,PDWORD);
 UINT WINAPI GetWriteWatch(DWORD,PVOID,SIZE_T,PVOID*,PULONG_PTR,PULONG);
 ATOM WINAPI GlobalAddAtomA(LPCSTR);
 ATOM WINAPI GlobalAddAtomW( LPCWSTR);
-HGLOBAL WINAPI GlobalAlloc(UINT,DWORD);
+HGLOBAL WINAPI GlobalAlloc(UINT,SIZE_T);
 SIZE_T WINAPI GlobalCompact(DWORD); /* Obsolete: Has no effect. */
 ATOM WINAPI GlobalDeleteAtom(ATOM);
 #define GlobalDiscard(m) GlobalReAlloc((m),0,GMEM_MOVEABLE)
@@ -1772,8 +1772,8 @@ VOID WINAPI GlobalMemoryStatus(LPMEMORYSTATUS);
 #if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX);
 #endif
-HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT);
-DWORD WINAPI GlobalSize(HGLOBAL);
+HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,SIZE_T,UINT);
+SIZE_T WINAPI GlobalSize(HGLOBAL);
 VOID WINAPI GlobalUnfix(HGLOBAL); /* Obsolete: Has no effect. */
 BOOL WINAPI GlobalUnlock(HGLOBAL);
 BOOL WINAPI GlobalUnWire(HGLOBAL); /* Obsolete: Has no effect. */
@@ -1781,14 +1781,14 @@ PVOID WINAPI GlobalWire(HGLOBAL); /* Obsolete: Has no effect. */
 #define HasOverlappedIoCompleted(lpOverlapped)  ((lpOverlapped)->Internal != STATUS_PENDING)
 PVOID WINAPI HeapAlloc(HANDLE,DWORD,SIZE_T);
 SIZE_T WINAPI HeapCompact(HANDLE,DWORD);
-HANDLE WINAPI HeapCreate(DWORD,DWORD,DWORD);
+HANDLE WINAPI HeapCreate(DWORD,SIZE_T,SIZE_T);
 BOOL WINAPI HeapDestroy(HANDLE);
 BOOL WINAPI HeapFree(HANDLE,DWORD,PVOID);
 BOOL WINAPI HeapLock(HANDLE);
 #if (_WIN32_WINNT >= 0x0501)
 BOOL WINAPI HeapQueryInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T);
 #endif
-PVOID WINAPI HeapReAlloc(HANDLE,DWORD,PVOID,DWORD);
+PVOID WINAPI HeapReAlloc(HANDLE,DWORD,PVOID,SIZE_T);
 #if (_WIN32_WINNT >= 0x0501)
 BOOL WINAPI HeapSetInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T);
 #endif
@@ -2288,8 +2288,8 @@ BOOL WINAPI VirtualFreeEx(HANDLE,PVOID,SIZE_T,DWORD);
 BOOL WINAPI VirtualLock(PVOID,SIZE_T);
 BOOL WINAPI VirtualProtect(PVOID,SIZE_T,DWORD,PDWORD);
 BOOL WINAPI VirtualProtectEx(HANDLE,PVOID,SIZE_T,DWORD,PDWORD);
-DWORD WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T);
-DWORD WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T);
+SIZE_T WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T);
+SIZE_T WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T);
 BOOL WINAPI VirtualUnlock(PVOID,SIZE_T);
 BOOL WINAPI WaitCommEvent(HANDLE,PDWORD,LPOVERLAPPED);
 BOOL WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD);