From be7afb4f81049f9e810c65a6d1b1073c00f75e50 Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Thu, 23 Oct 2008 18:19:20 +0000
Subject: [PATCH] - Fix Nt/ZwMapViewOfSection parameters (ULONG -> ULONG_PTR
 and SIZE_T) and the few callers which sent incorrect types - Also fix
 MapViewOfFile/Ex parameters

svn path=/trunk/; revision=36915
---
 reactos/dll/win32/kernel32/mem/section.c | 6 +++---
 reactos/include/ddk/winddk.h             | 8 ++++----
 reactos/include/psdk/winbase.h           | 4 ++--
 reactos/lib/rtl/thread.c                 | 3 ++-
 reactos/ntoskrnl/config/i386/cmhardwr.c  | 3 ++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/reactos/dll/win32/kernel32/mem/section.c b/reactos/dll/win32/kernel32/mem/section.c
index 7829ba153e5..92e74a40348 100644
--- a/reactos/dll/win32/kernel32/mem/section.c
+++ b/reactos/dll/win32/kernel32/mem/section.c
@@ -158,12 +158,12 @@ MapViewOfFileEx(HANDLE hFileMappingObject,
                 DWORD dwDesiredAccess,
                 DWORD dwFileOffsetHigh,
                 DWORD dwFileOffsetLow,
-                DWORD dwNumberOfBytesToMap,
+                SIZE_T dwNumberOfBytesToMap,
                 LPVOID lpBaseAddress)
 {
     NTSTATUS Status;
     LARGE_INTEGER SectionOffset;
-    ULONG ViewSize;
+    SIZE_T ViewSize;
     ULONG Protect;
     LPVOID ViewBase;
 
@@ -224,7 +224,7 @@ MapViewOfFile(HANDLE hFileMappingObject,
               DWORD dwDesiredAccess,
               DWORD dwFileOffsetHigh,
               DWORD dwFileOffsetLow,
-              DWORD dwNumberOfBytesToMap)
+              SIZE_T dwNumberOfBytesToMap)
 {
     /* Call the extended API */
     return MapViewOfFileEx(hFileMappingObject,
diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h
index d102cf6d060..5ec2b440c9d 100644
--- a/reactos/include/ddk/winddk.h
+++ b/reactos/include/ddk/winddk.h
@@ -11105,8 +11105,8 @@ NtMapViewOfSection(
   IN HANDLE  SectionHandle,
   IN HANDLE  ProcessHandle,
   IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN ULONG  CommitSize,
+  IN ULONG_PTR  ZeroBits,
+  IN SIZE_T  CommitSize,
   IN OUT PLARGE_INTEGER  SectionOffset  OPTIONAL,
   IN OUT PSIZE_T  ViewSize,
   IN SECTION_INHERIT  InheritDisposition,
@@ -11120,8 +11120,8 @@ ZwMapViewOfSection(
   IN HANDLE  SectionHandle,
   IN HANDLE  ProcessHandle,
   IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN ULONG  CommitSize,
+  IN ULONG_PTR  ZeroBits,
+  IN SIZE_T  CommitSize,
   IN OUT PLARGE_INTEGER  SectionOffset  OPTIONAL,
   IN OUT PSIZE_T  ViewSize,
   IN SECTION_INHERIT  InheritDisposition,
diff --git a/reactos/include/psdk/winbase.h b/reactos/include/psdk/winbase.h
index 40876857c36..21363ee54b3 100644
--- a/reactos/include/psdk/winbase.h
+++ b/reactos/include/psdk/winbase.h
@@ -1890,8 +1890,8 @@ BOOL WINAPI MakeAbsoluteSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PDWORD,PACL
 #define MakeProcInstance(p,i) (p)
 BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PDWORD);
 VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING);
-PVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
-PVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,DWORD,PVOID);
+PVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T);
+PVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,PVOID);
 BOOL WINAPI MoveFileA(LPCSTR,LPCSTR);
 BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD);
 BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD);
diff --git a/reactos/lib/rtl/thread.c b/reactos/lib/rtl/thread.c
index 23ea94af439..3213b338e64 100644
--- a/reactos/lib/rtl/thread.c
+++ b/reactos/lib/rtl/thread.c
@@ -31,7 +31,8 @@ RtlpCreateUserStack(IN HANDLE hProcess,
     PIMAGE_NT_HEADERS Headers;
     ULONG_PTR Stack = 0;
     BOOLEAN UseGuard = FALSE;
-    ULONG Dummy, GuardPageSize;
+    ULONG Dummy;
+    SIZE_T GuardPageSize;
 
     /* Get some memory information */
     Status = ZwQuerySystemInformation(SystemBasicInformation,
diff --git a/reactos/ntoskrnl/config/i386/cmhardwr.c b/reactos/ntoskrnl/config/i386/cmhardwr.c
index a3a04fe7e58..7c3c2840a72 100644
--- a/reactos/ntoskrnl/config/i386/cmhardwr.c
+++ b/reactos/ntoskrnl/config/i386/cmhardwr.c
@@ -232,7 +232,8 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
 {
     UNICODE_STRING KeyName, ValueName, Data, SectionName;
     OBJECT_ATTRIBUTES ObjectAttributes;
-    ULONG HavePae, CacheSize, ViewSize, Length, TotalLength = 0, i, Disposition;
+    ULONG HavePae, CacheSize, Length, TotalLength = 0, i, Disposition;
+    SIZE_T ViewSize;
     NTSTATUS Status;
     HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle;
     CONFIGURATION_COMPONENT_DATA ConfigData;