From ff56fe5fb38c7e22f0c6d083fa009dd9941db2a1 Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sat, 28 Jul 2007 21:30:16 +0000 Subject: [PATCH] Some more function prototype fixes and pointer type warning fixes svn path=/trunk/; revision=27977 --- reactos/dll/ntdll/ldr/utils.c | 4 ++-- reactos/dll/win32/advapi32/reg/reg.c | 10 +++++----- reactos/include/ndk/mmfuncs.h | 22 +++++++++++----------- reactos/include/ndk/rtlfuncs.h | 2 +- reactos/lib/rtl/dbgbuffer.c | 4 ++-- reactos/lib/rtl/debug.c | 2 +- reactos/lib/rtl/env.c | 6 +++--- reactos/lib/rtl/error.c | 2 +- reactos/lib/rtl/handle.c | 4 ++-- reactos/lib/rtl/nls.c | 2 ++ reactos/lib/rtl/path.c | 6 +++--- reactos/lib/rtl/ppb.c | 4 ++-- reactos/lib/rtl/process.c | 4 ++-- reactos/lib/rtl/sid.c | 2 +- reactos/lib/rtl/thread.c | 4 ++-- reactos/lib/rtl/timerqueue.c | 10 +++++----- 16 files changed, 45 insertions(+), 43 deletions(-) diff --git a/reactos/dll/ntdll/ldr/utils.c b/reactos/dll/ntdll/ldr/utils.c index e261f9f951e..2ef1dde1f3b 100644 --- a/reactos/dll/ntdll/ldr/utils.c +++ b/reactos/dll/ntdll/ldr/utils.c @@ -1991,7 +1991,7 @@ LdrpLoadModule(IN PWSTR SearchPath OPTIONAL, NTSTATUS Status; PLDR_DATA_TABLE_ENTRY tmpModule; HANDLE SectionHandle; - ULONG ViewSize; + SIZE_T ViewSize; PVOID ImageBase; PIMAGE_NT_HEADERS NtHeaders; BOOLEAN MappedAsDataFile; @@ -2963,7 +2963,7 @@ LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle, FILE_STANDARD_INFORMATION FileInfo; IO_STATUS_BLOCK IoStatusBlock; HANDLE SectionHandle; - ULONG ViewSize; + SIZE_T ViewSize; PVOID BaseAddress; BOOLEAN Result; NTSTATUS Status; diff --git a/reactos/dll/win32/advapi32/reg/reg.c b/reactos/dll/win32/advapi32/reg/reg.c index 0cff90153f6..e23ad50bd16 100644 --- a/reactos/dll/win32/advapi32/reg/reg.c +++ b/reactos/dll/win32/advapi32/reg/reg.c @@ -2240,7 +2240,7 @@ RegEnumKeyExA (HKEY hKey, DWORD NameLength; DWORD ClassLength = 0; DWORD BufferSize; - DWORD ResultSize; + ULONG ResultSize; HANDLE KeyHandle; NTSTATUS Status; @@ -2541,7 +2541,7 @@ RegEnumValueA( HKEY hKey, DWORD index, LPSTR value, LPDWORD val_count, { HANDLE KeyHandle; NTSTATUS status; - DWORD total_size; + ULONG total_size; char buffer[256], *buf_ptr = buffer; KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; static const int info_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ); @@ -2587,7 +2587,7 @@ RegEnumValueA( HKEY hKey, DWORD index, LPSTR value, LPDWORD val_count, if (is_string(info->Type)) { - DWORD len; + ULONG len; RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), total_size - info->DataOffset ); if (data && len) @@ -2612,7 +2612,7 @@ RegEnumValueA( HKEY hKey, DWORD index, LPSTR value, LPDWORD val_count, if (value && !status) { - DWORD len; + ULONG len; RtlUnicodeToMultiByteSize( &len, info->Name, info->NameLength ); if (len >= *val_count) @@ -2668,7 +2668,7 @@ RegEnumValueW( HKEY hKey, DWORD index, LPWSTR value, PDWORD val_count, { HANDLE KeyHandle; NTSTATUS status; - DWORD total_size; + ULONG total_size; char buffer[256], *buf_ptr = buffer; KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; static const int info_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ); diff --git a/reactos/include/ndk/mmfuncs.h b/reactos/include/ndk/mmfuncs.h index 5c2a98c40e0..5a33f6046a1 100644 --- a/reactos/include/ndk/mmfuncs.h +++ b/reactos/include/ndk/mmfuncs.h @@ -261,8 +261,8 @@ NtReadVirtualMemory( IN HANDLE ProcessHandle, IN PVOID BaseAddress, OUT PVOID Buffer, - IN ULONG NumberOfBytesToRead, - OUT PULONG NumberOfBytesRead + IN SIZE_T NumberOfBytesToRead, + OUT PSIZE_T NumberOfBytesRead ); NTSTATUS @@ -270,7 +270,7 @@ NTAPI NtResetWriteWatch( IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG RegionSize + IN SIZE_T RegionSize ); NTSYSCALLAPI @@ -279,8 +279,8 @@ NTAPI NtUnlockVirtualMemory( IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG NumberOfBytesToUnlock, - OUT PULONG NumberOfBytesUnlocked OPTIONAL + IN SIZE_T NumberOfBytesToUnlock, + OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL ); NTSYSCALLAPI @@ -369,8 +369,8 @@ NTAPI ZwLockVirtualMemory( HANDLE ProcessHandle, PVOID BaseAddress, - ULONG NumberOfBytesToLock, - PULONG NumberOfBytesLocked + SIZE_T NumberOfBytesToLock, + PSIZE_T NumberOfBytesLocked ); NTSYSAPI @@ -439,8 +439,8 @@ ZwReadVirtualMemory( IN HANDLE ProcessHandle, IN PVOID BaseAddress, OUT PVOID Buffer, - IN ULONG NumberOfBytesToRead, - OUT PULONG NumberOfBytesRead + IN SIZE_T NumberOfBytesToRead, + OUT PSIZE_T NumberOfBytesRead ); NTSYSAPI @@ -449,8 +449,8 @@ NTAPI ZwUnlockVirtualMemory( IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG NumberOfBytesToUnlock, - OUT PULONG NumberOfBytesUnlocked OPTIONAL + IN SIZE_T NumberOfBytesToUnlock, + OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL ); NTSYSAPI diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index 21caee76379..fdc633ebeb3 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -576,7 +576,7 @@ RtlReAllocateHeap( HANDLE Heap, ULONG Flags, PVOID Ptr, - ULONG Size + SIZE_T Size ); NTSYSAPI diff --git a/reactos/lib/rtl/dbgbuffer.c b/reactos/lib/rtl/dbgbuffer.c index 588b39c1e92..f723fe12839 100644 --- a/reactos/lib/rtl/dbgbuffer.c +++ b/reactos/lib/rtl/dbgbuffer.c @@ -54,8 +54,8 @@ RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_INFORMATION Buf) if (NULL != Buf) { Status = NtFreeVirtualMemory( NtCurrentProcess(), - (PVOID)&Buf, - &Buf->ViewSize, + (PVOID)&Buf, + (PSIZE_T)&Buf->ViewSize, /* FIXME: not portable! */ MEM_RELEASE); } if (!NT_SUCCESS(Status)) diff --git a/reactos/lib/rtl/debug.c b/reactos/lib/rtl/debug.c index 308484551c7..5993cd02e8e 100644 --- a/reactos/lib/rtl/debug.c +++ b/reactos/lib/rtl/debug.c @@ -313,7 +313,7 @@ NTSTATUS NTAPI DbgLoadImageSymbols(IN PANSI_STRING Name, IN PVOID Base, - IN ULONG ProcessId) + IN ULONG_PTR ProcessId) { PIMAGE_NT_HEADERS NtHeader; KD_SYMBOLS_INFO SymbolInfo; diff --git a/reactos/lib/rtl/env.c b/reactos/lib/rtl/env.c index 31ab8fe942f..cdce0379083 100644 --- a/reactos/lib/rtl/env.c +++ b/reactos/lib/rtl/env.c @@ -25,7 +25,7 @@ RtlCreateEnvironment(BOOLEAN Inherit, MEMORY_BASIC_INFORMATION MemInfo; PVOID EnvPtr = NULL; NTSTATUS Status = STATUS_SUCCESS; - ULONG RegionSize = PAGE_SIZE; + SIZE_T RegionSize = PAGE_SIZE; if (Inherit == TRUE) { @@ -96,7 +96,7 @@ RtlCreateEnvironment(BOOLEAN Inherit, VOID NTAPI RtlDestroyEnvironment(PWSTR Environment) { - ULONG Size = 0; + SIZE_T Size = 0; NtFreeVirtualMemory(NtCurrentProcess(), (PVOID)&Environment, @@ -275,7 +275,7 @@ RtlSetEnvironmentVariable(PWSTR *Environment, int hole_len, new_len, env_len = 0; WCHAR *new_env = 0, *env_end = 0, *wcs, *env, *val = 0, *tail = 0, *hole = 0; PWSTR head = NULL; - ULONG size = 0, new_size; + SIZE_T size = 0, new_size; LONG f = 1; NTSTATUS Status = STATUS_SUCCESS; diff --git a/reactos/lib/rtl/error.c b/reactos/lib/rtl/error.c index d9c71d2781a..ad73e45f225 100644 --- a/reactos/lib/rtl/error.c +++ b/reactos/lib/rtl/error.c @@ -932,7 +932,7 @@ RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status) * * @implemented */ -DWORD NTAPI +ULONG NTAPI RtlNtStatusToDosError(IN NTSTATUS Status) { PTEB Teb = NtCurrentTeb (); diff --git a/reactos/lib/rtl/handle.c b/reactos/lib/rtl/handle.c index 1e67cbc0834..c6825cea4a8 100644 --- a/reactos/lib/rtl/handle.c +++ b/reactos/lib/rtl/handle.c @@ -35,7 +35,7 @@ VOID NTAPI RtlDestroyHandleTable(PRTL_HANDLE_TABLE HandleTable) { PVOID ArrayPointer; - ULONG ArraySize; + SIZE_T ArraySize; /* free handle array */ if (HandleTable->CommittedHandles) @@ -61,7 +61,7 @@ RtlAllocateHandle(PRTL_HANDLE_TABLE HandleTable, NTSTATUS Status; PRTL_HANDLE_TABLE_ENTRY retval; PVOID ArrayPointer; - ULONG ArraySize; + SIZE_T ArraySize; pp_new = &HandleTable->FreeHandles; diff --git a/reactos/lib/rtl/nls.c b/reactos/lib/rtl/nls.c index cb6de07d904..e21e16f9472 100644 --- a/reactos/lib/rtl/nls.c +++ b/reactos/lib/rtl/nls.c @@ -810,6 +810,8 @@ RtlUpcaseUnicodeToOemN (PCHAR OemString, ULONG Size = 0; ULONG i; + ASSERT(NlsUnicodeToOemTable != NULL); + if (NlsMbOemCodePageTag == FALSE) { /* single-byte code page */ diff --git a/reactos/lib/rtl/path.c b/reactos/lib/rtl/path.c index 4b23f14f29e..96185ada5eb 100644 --- a/reactos/lib/rtl/path.c +++ b/reactos/lib/rtl/path.c @@ -611,15 +611,15 @@ done: * * @implemented */ -DWORD NTAPI RtlGetFullPathName_U( +ULONG NTAPI RtlGetFullPathName_U( const WCHAR* name, ULONG size, WCHAR* buffer, WCHAR** file_part) { WCHAR* ptr; - DWORD dosdev; - DWORD reqsize; + ULONG dosdev; + ULONG reqsize; DPRINT("RtlGetFullPathName_U(%S %lu %p %p)\n", name, size, buffer, file_part); diff --git a/reactos/lib/rtl/ppb.c b/reactos/lib/rtl/ppb.c index fe7b4bf0a03..d21d8eac86c 100644 --- a/reactos/lib/rtl/ppb.c +++ b/reactos/lib/rtl/ppb.c @@ -55,7 +55,7 @@ RtlCreateProcessParameters(PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, { NTSTATUS Status = STATUS_SUCCESS; PRTL_USER_PROCESS_PARAMETERS Param = NULL; - ULONG RegionSize = 0; + SIZE_T RegionSize = 0; ULONG Length = 0; PWCHAR Dest; UNICODE_STRING EmptyString; @@ -222,7 +222,7 @@ RtlCreateProcessParameters(PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, NTSTATUS NTAPI RtlDestroyProcessParameters(PRTL_USER_PROCESS_PARAMETERS ProcessParameters) { - ULONG RegionSize = 0; + SIZE_T RegionSize = 0; return ZwFreeVirtualMemory (NtCurrentProcess (), (PVOID)ProcessParameters, diff --git a/reactos/lib/rtl/process.c b/reactos/lib/rtl/process.c index 9fad780cb42..c48b1b78a4d 100644 --- a/reactos/lib/rtl/process.c +++ b/reactos/lib/rtl/process.c @@ -72,8 +72,8 @@ RtlpInitEnvironment(HANDLE ProcessHandle, { NTSTATUS Status; PVOID BaseAddress = NULL; - ULONG EnviroSize; - ULONG Size; + SIZE_T EnviroSize; + SIZE_T Size; PWCHAR Environment = 0; DPRINT("RtlpInitEnvironment (hProcess: %p, Peb: %p Params: %p)\n", ProcessHandle, Peb, ProcessParameters); diff --git a/reactos/lib/rtl/sid.c b/reactos/lib/rtl/sid.c index 88c660d1543..7f2a49c5afc 100644 --- a/reactos/lib/rtl/sid.c +++ b/reactos/lib/rtl/sid.c @@ -80,7 +80,7 @@ RtlSubAuthoritySid(IN PSID Sid_, PAGED_CODE_RTL(); - return &Sid->SubAuthority[SubAuthority]; + return (PULONG)&Sid->SubAuthority[SubAuthority]; } diff --git a/reactos/lib/rtl/thread.c b/reactos/lib/rtl/thread.c index 0b87c7b469b..a6396b79e8f 100644 --- a/reactos/lib/rtl/thread.c +++ b/reactos/lib/rtl/thread.c @@ -133,7 +133,7 @@ NTAPI RtlpFreeUserStack(IN HANDLE Process, IN PINITIAL_TEB InitialTeb) { - ULONG Dummy = 0; + SIZE_T Dummy = 0; NTSTATUS Status; /* Free the Stack */ @@ -242,7 +242,7 @@ RtlFreeUserThreadStack(HANDLE ProcessHandle, { NTSTATUS Status; THREAD_BASIC_INFORMATION ThreadBasicInfo; - ULONG Dummy, Size = 0; + SIZE_T Dummy, Size = 0; PVOID StackLocation; /* Query the Basic Info */ diff --git a/reactos/lib/rtl/timerqueue.c b/reactos/lib/rtl/timerqueue.c index 2e85f7b838e..7cfb7d66b83 100644 --- a/reactos/lib/rtl/timerqueue.c +++ b/reactos/lib/rtl/timerqueue.c @@ -32,11 +32,11 @@ NTSTATUS NTAPI RtlCreateTimer(HANDLE TimerQueue, PHANDLE phNewTimer, - WAITORTIMERCALLBACKFUNC Callback, - PVOID Parameter, - DWORD DueTime, - DWORD Period, - ULONG Flags) + WAITORTIMERCALLBACKFUNC Callback, + PVOID Parameter, + ULONG DueTime, + ULONG Period, + ULONG Flags) { DPRINT1("RtlCreateTimer: stub\n"); return STATUS_NOT_IMPLEMENTED;