Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-26 23:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more function prototype fixes and pointer type warning fixes

Browse source 
svn path=/trunk/; revision=27977
This commit is contained in:
Thomas Bluemel 2007-07-28 21:30:16 +00:00
parent 40c483fa1a
commit ff56fe5fb3
16 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/ntdll/ldr/utils.c
View file

@ -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;

10
reactos/dll/win32/advapi32/reg/reg.c
View file

@ -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 );

22
reactos/include/ndk/mmfuncs.h
View file

@ -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

2
reactos/include/ndk/rtlfuncs.h
View file

@ -576,7 +576,7 @@ RtlReAllocateHeap(
HANDLE Heap,
ULONG Flags,
PVOID Ptr,
ULONG Size
SIZE_T Size
);
NTSYSAPI

4
reactos/lib/rtl/dbgbuffer.c
View file

@ -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))

2
reactos/lib/rtl/debug.c
View file

@ -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;

6
reactos/lib/rtl/env.c
View file

@ -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;

2
reactos/lib/rtl/error.c
View file

@ -932,7 +932,7 @@ RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status)
*
* @implemented
*/
DWORD NTAPI
ULONG NTAPI
RtlNtStatusToDosError(IN NTSTATUS Status)
{
PTEB Teb = NtCurrentTeb ();

4
reactos/lib/rtl/handle.c
View file

@ -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;

2
reactos/lib/rtl/nls.c
View file

@ -810,6 +810,8 @@ RtlUpcaseUnicodeToOemN (PCHAR OemString,
ULONG Size = 0;
ULONG i;
ASSERT(NlsUnicodeToOemTable != NULL);
if (NlsMbOemCodePageTag == FALSE)
{
/* single-byte code page */

6
reactos/lib/rtl/path.c
View file

@ -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);

4
reactos/lib/rtl/ppb.c
View file

@ -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,

4
reactos/lib/rtl/process.c
View file

@ -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);

2
reactos/lib/rtl/sid.c
View file

@ -80,7 +80,7 @@ RtlSubAuthoritySid(IN PSID Sid_,
PAGED_CODE_RTL();
return &Sid->SubAuthority[SubAuthority];
return (PULONG)&Sid->SubAuthority[SubAuthority];
}

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

@ -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 */

10
reactos/lib/rtl/timerqueue.c
View file

@ -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;