Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 05:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix Nt/ZwMapViewOfSection parameters (ULONG -> ULONG_PTR and SIZE_T) and the few callers which sent incorrect types

Browse source 
- Also fix MapViewOfFile/Ex parameters

svn path=/trunk/; revision=36915
This commit is contained in:
Stefan Ginsberg 2008-10-23 18:19:20 +00:00
parent 688a20a68b
commit be7afb4f81
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/kernel32/mem/section.c
View file

@ -158,12 +158,12 @@ MapViewOfFileEx(HANDLE hFileMappingObject,
DWORD dwDesiredAccess, DWORD dwDesiredAccess,
DWORD dwFileOffsetHigh, DWORD dwFileOffsetHigh,
DWORD dwFileOffsetLow, DWORD dwFileOffsetLow,
DWORD dwNumberOfBytesToMap, SIZE_T dwNumberOfBytesToMap,
LPVOID lpBaseAddress) LPVOID lpBaseAddress)
{ {
NTSTATUS Status; NTSTATUS Status;
LARGE_INTEGER SectionOffset; LARGE_INTEGER SectionOffset;
ULONG ViewSize; SIZE_T ViewSize;
ULONG Protect; ULONG Protect;
LPVOID ViewBase; LPVOID ViewBase;
@ -224,7 +224,7 @@ MapViewOfFile(HANDLE hFileMappingObject,
DWORD dwDesiredAccess, DWORD dwDesiredAccess,
DWORD dwFileOffsetHigh, DWORD dwFileOffsetHigh,
DWORD dwFileOffsetLow, DWORD dwFileOffsetLow,
DWORD dwNumberOfBytesToMap) SIZE_T dwNumberOfBytesToMap)
{ {
/* Call the extended API */ /* Call the extended API */
return MapViewOfFileEx(hFileMappingObject, return MapViewOfFileEx(hFileMappingObject,

8
reactos/include/ddk/winddk.h
View file

@ -11105,8 +11105,8 @@ NtMapViewOfSection(
IN HANDLE SectionHandle, IN HANDLE SectionHandle,
IN HANDLE ProcessHandle, IN HANDLE ProcessHandle,
IN OUT PVOID *BaseAddress, IN OUT PVOID *BaseAddress,
IN ULONG ZeroBits, IN ULONG_PTR ZeroBits,
IN ULONG CommitSize, IN SIZE_T CommitSize,
IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL,
IN OUT PSIZE_T ViewSize, IN OUT PSIZE_T ViewSize,
IN SECTION_INHERIT InheritDisposition, IN SECTION_INHERIT InheritDisposition,
@ -11120,8 +11120,8 @@ ZwMapViewOfSection(
IN HANDLE SectionHandle, IN HANDLE SectionHandle,
IN HANDLE ProcessHandle, IN HANDLE ProcessHandle,
IN OUT PVOID *BaseAddress, IN OUT PVOID *BaseAddress,
IN ULONG ZeroBits, IN ULONG_PTR ZeroBits,
IN ULONG CommitSize, IN SIZE_T CommitSize,
IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL,
IN OUT PSIZE_T ViewSize, IN OUT PSIZE_T ViewSize,
IN SECTION_INHERIT InheritDisposition, IN SECTION_INHERIT InheritDisposition,

4
reactos/include/psdk/winbase.h
View file

@ -1890,8 +1890,8 @@ BOOL WINAPI MakeAbsoluteSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PDWORD,PACL
#define MakeProcInstance(p,i) (p) #define MakeProcInstance(p,i) (p)
BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PDWORD); BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PDWORD);
VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING); VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING);
PVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,DWORD); PVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T);
PVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,DWORD,PVOID); PVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,PVOID);
BOOL WINAPI MoveFileA(LPCSTR,LPCSTR); BOOL WINAPI MoveFileA(LPCSTR,LPCSTR);
BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD); BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD);
BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD); BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD);

3
reactos/lib/rtl/thread.c
View file

@ -31,7 +31,8 @@ RtlpCreateUserStack(IN HANDLE hProcess,
PIMAGE_NT_HEADERS Headers; PIMAGE_NT_HEADERS Headers;
ULONG_PTR Stack = 0; ULONG_PTR Stack = 0;
BOOLEAN UseGuard = FALSE; BOOLEAN UseGuard = FALSE;
ULONG Dummy, GuardPageSize; ULONG Dummy;
SIZE_T GuardPageSize;
/* Get some memory information */ /* Get some memory information */
Status = ZwQuerySystemInformation(SystemBasicInformation, Status = ZwQuerySystemInformation(SystemBasicInformation,

3
reactos/ntoskrnl/config/i386/cmhardwr.c
View file

@ -232,7 +232,8 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
{ {
UNICODE_STRING KeyName, ValueName, Data, SectionName; UNICODE_STRING KeyName, ValueName, Data, SectionName;
OBJECT_ATTRIBUTES ObjectAttributes; 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; NTSTATUS Status;
HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle;
CONFIGURATION_COMPONENT_DATA ConfigData; CONFIGURATION_COMPONENT_DATA ConfigData;