Author: tkreuzer Date: Fri Sep 19 17:42:40 2008 New Revision: 36332
URL: http://svn.reactos.org/svn/reactos?rev=36332&view=rev Log: fix some 64 bit warnings
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/cc/copy.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/harderr.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/queue.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdobj.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdschd.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/wait.c
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Fri Sep 19 17:42:40 2008 @@ -612,7 +612,7 @@ { CurrentLength = Length; } - MmInitializeMdl(Mdl, (PVOID)WriteOffset.u.LowPart, CurrentLength); + MmInitializeMdl(Mdl, (PVOID)(ULONG_PTR)WriteOffset.QuadPart, CurrentLength); Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); for (i = 0; i < ((Mdl->Size - sizeof(MDL)) / sizeof(ULONG)); i++) {
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Fri Sep 19 17:42:40 2008 @@ -370,7 +370,7 @@ IN ULONG ValidResponseOptions, OUT PULONG Response) { - ULONG Size; + SIZE_T Size; UNICODE_STRING CapturedParams[MAXIMUM_HARDERROR_PARAMETERS]; ULONG i; PULONG_PTR UserData = NULL, ParameterBase;
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Fri Sep 19 17:42:40 2008 @@ -196,7 +196,7 @@ /* INTERNAL KERNEL FUNCTIONS ************************************************/
/* Finds a new thread to run */ -NTSTATUS +LONG_PTR FASTCALL KiSwapThread( IN PKTHREAD Thread, @@ -527,7 +527,7 @@ FASTCALL KiUnwaitThread( IN PKTHREAD Thread, - IN NTSTATUS WaitStatus, + IN LONG_PTR WaitStatus, IN KPRIORITY Increment );
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Fri Sep 19 17:42:40 2008 @@ -57,7 +57,7 @@ KWAIT_BLOCK, WaitListEntry); Thread = WaitBlock->Thread; - KiUnwaitThread(Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); + KiUnwaitThread(Thread, (LONG_PTR)QueueEntry, IO_NO_INCREMENT); } } } @@ -102,7 +102,7 @@ Thread = WaitBlock->Thread;
/* Remove the queue from the thread's wait list */ - Thread->WaitStatus = (NTSTATUS)Entry; + Thread->WaitStatus = (LONG_PTR)Entry; if (Thread->WaitListEntry.Flink) RemoveEntryList(&Thread->WaitListEntry);
/* Increase the active threads and remove any wait reason */ @@ -239,7 +239,7 @@ IN PLARGE_INTEGER Timeout OPTIONAL) { PLIST_ENTRY QueueEntry; - NTSTATUS Status; + LONG_PTR Status; PKTHREAD Thread = KeGetCurrentThread(); PKQUEUE PreviousQueue; PKWAIT_BLOCK WaitBlock = &Thread->WaitBlock[0];
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Fri Sep 19 17:42:40 2008 @@ -1353,7 +1353,9 @@ SavedEntry = Entry;
/* Now try to do the exchange */ - Entry = InterlockedCompareExchangePointer(ListHead, ThreadAddr, Entry); + Entry = InterlockedCompareExchangePointer((PVOID*)ListHead, + ThreadAddr, + Entry);
/* Break out if the change was succesful */ } while (Entry != SavedEntry);
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Fri Sep 19 17:42:40 2008 @@ -291,7 +291,7 @@ return Thread; }
-NTSTATUS +LONG_PTR FASTCALL KiSwapThread(IN PKTHREAD CurrentThread, IN PKPRCB Prcb)
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Fri Sep 19 17:42:40 2008 @@ -87,7 +87,7 @@ VOID FASTCALL KiUnwaitThread(IN PKTHREAD Thread, - IN NTSTATUS WaitStatus, + IN LONG_PTR WaitStatus, IN KPRIORITY Increment) { /* Unlink the thread */