[ros-diffs] [sginsberg] 36915: - Fix Nt/ZwMapViewOfSection parameters (ULONG -> ULONG_PTR and SIZE_T) and the few callers which sent incorrect types - Also fix MapViewOfFile/Ex parameters

Author: sginsberg
Date: Thu Oct 23 13:19:20 2008
New Revision: 36915

URL: http://svn.reactos.org/svn/reactos?rev=36915&view=rev
Log:
- Fix Nt/ZwMapViewOfSection parameters (ULONG -> ULONG_PTR and SIZE_T) and the few
callers which sent incorrect types
- Also fix MapViewOfFile/Ex parameters

Modified:
    trunk/reactos/dll/win32/kernel32/mem/section.c
    trunk/reactos/include/ddk/winddk.h
    trunk/reactos/include/psdk/winbase.h
    trunk/reactos/lib/rtl/thread.c
    trunk/reactos/ntoskrnl/config/i386/cmhardwr.c

Modified: trunk/reactos/dll/win32/kernel32/mem/section.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] Thu Oct 23 13:19:20 2008
@@ -158,12 +158,12 @@
                 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 @@
               DWORD dwDesiredAccess,
               DWORD dwFileOffsetHigh,
               DWORD dwFileOffsetLow,
-              DWORD dwNumberOfBytesToMap)
+              SIZE_T dwNumberOfBytesToMap)
 {
     /* Call the extended API */
     return MapViewOfFileEx(hFileMappingObject,

Modified: trunk/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3…
==============================================================================
--- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Oct 23 13:19:20 2008
@@ -11105,8 +11105,8 @@
   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 @@
   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,

Modified: trunk/reactos/include/psdk/winbase.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Thu Oct 23 13:19:20 2008
@@ -1890,8 +1890,8 @@
 #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);

Modified: trunk/reactos/lib/rtl/thread.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=36915…
==============================================================================
--- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/thread.c [iso-8859-1] Thu Oct 23 13:19:20 2008
@@ -31,7 +31,8 @@
     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,

Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar…
==============================================================================
--- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Thu Oct 23 13:19:20 2008
@@ -232,7 +232,8 @@
 {
     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;