Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge MMerge 34969 from ros-amd64-bringup branch:

Browse source 
- Fix parameter types of NtQuery/SetSystemInformation, ExInitialize(N)PagedLookasideList, KeBugCheckWithTf, IoGetstackLimits
- Use ALIGN_UP_POINTER for a pointer
- Fix pointer to ULONG cast

svn path=/trunk/; revision=35715
This commit is contained in:
Timo Kreuzer 2008-08-27 22:40:17 +00:00
parent 50eb47c31e
commit 7191a6d896
6 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/include/ndk/exfuncs.h
View file

@ -390,8 +390,8 @@ NTAPI
NtQuerySystemInformation( NtQuerySystemInformation(
IN SYSTEM_INFORMATION_CLASS SystemInformationClass, IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
OUT PVOID SystemInformation, OUT PVOID SystemInformation,
IN SIZE_T Length, IN ULONG Length,
OUT PSIZE_T ResultLength OUT PULONG ResultLength
); );
NTSYSCALLAPI NTSYSCALLAPI
@ -539,7 +539,7 @@ NTAPI
NtSetSystemInformation( NtSetSystemInformation(
IN SYSTEM_INFORMATION_CLASS SystemInformationClass, IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
IN PVOID SystemInformation, IN PVOID SystemInformation,
IN SIZE_T SystemInformationLength IN ULONG SystemInformationLength
); );
NTSYSCALLAPI NTSYSCALLAPI

4
reactos/ntoskrnl/ex/lookas.c
View file

@ -222,7 +222,7 @@ ExInitializeNPagedLookasideList(IN PNPAGED_LOOKASIDE_LIST Lookaside,
IN PALLOCATE_FUNCTION Allocate OPTIONAL, IN PALLOCATE_FUNCTION Allocate OPTIONAL,
IN PFREE_FUNCTION Free OPTIONAL, IN PFREE_FUNCTION Free OPTIONAL,
IN ULONG Flags, IN ULONG Flags,
IN ULONG Size, IN SIZE_T Size,
IN ULONG Tag, IN ULONG Tag,
IN USHORT Depth) IN USHORT Depth)
{ {
@ -274,7 +274,7 @@ ExInitializePagedLookasideList(IN PPAGED_LOOKASIDE_LIST Lookaside,
IN PALLOCATE_FUNCTION Allocate OPTIONAL, IN PALLOCATE_FUNCTION Allocate OPTIONAL,
IN PFREE_FUNCTION Free OPTIONAL, IN PFREE_FUNCTION Free OPTIONAL,
IN ULONG Flags, IN ULONG Flags,
IN ULONG Size, IN SIZE_T Size,
IN ULONG Tag, IN ULONG Tag,
IN USHORT Depth) IN USHORT Depth)
{ {

8
reactos/ntoskrnl/include/internal/ke.h
View file

@ -742,10 +742,10 @@ VOID
NTAPI NTAPI
KeBugCheckWithTf( KeBugCheckWithTf(
ULONG BugCheckCode, ULONG BugCheckCode,
ULONG BugCheckParameter1, ULONG_PTR BugCheckParameter1,
ULONG BugCheckParameter2, ULONG_PTR BugCheckParameter2,
ULONG BugCheckParameter3, ULONG_PTR BugCheckParameter3,
ULONG BugCheckParameter4, ULONG_PTR BugCheckParameter4,
PKTRAP_FRAME Tf PKTRAP_FRAME Tf
); );

4
reactos/ntoskrnl/io/iomgr/error.c
View file

@ -214,10 +214,10 @@ IopLogWorker(IN PVOID Parameter)
} }
/* Align the buffer */ /* Align the buffer */
StringBuffer = (PVOID)ALIGN_UP(StringBuffer, WCHAR); StringBuffer = ALIGN_UP_POINTER(StringBuffer, WCHAR);
/* Set the offset for the driver's name to the current buffer */ /* Set the offset for the driver's name to the current buffer */
ErrorMessage->DriverNameOffset = (ULONG)(StringBuffer - ErrorMessage->DriverNameOffset = (ULONG_PTR)(StringBuffer -
(ULONG_PTR)ErrorMessage); (ULONG_PTR)ErrorMessage);
/* Check how much space we have left for the device string */ /* Check how much space we have left for the device string */

4
reactos/ntoskrnl/io/iomgr/util.c
View file

@ -48,8 +48,8 @@ IoGetInitialStack(VOID)
*/ */
VOID VOID
NTAPI NTAPI
IoGetStackLimits(OUT PULONG LowLimit, IoGetStackLimits(OUT PULONG_PTR LowLimit,
OUT PULONG HighLimit) OUT PULONG_PTR HighLimit)
{ {
PKPRCB Prcb = KeGetCurrentPrcb(); PKPRCB Prcb = KeGetCurrentPrcb();
ULONG_PTR DpcStack = (ULONG_PTR)(Prcb->DpcStack); ULONG_PTR DpcStack = (ULONG_PTR)(Prcb->DpcStack);

5
reactos/ntoskrnl/ps/thread.c
View file

@ -104,7 +104,7 @@ PspUserThreadStartup(IN PKSTART_ROUTINE StartRoutine,
Prcb = KeGetCurrentPrcb(); Prcb = KeGetCurrentPrcb();
NewCookie = Prcb->MmPageFaultCount ^ Prcb->InterruptTime ^ NewCookie = Prcb->MmPageFaultCount ^ Prcb->InterruptTime ^
SystemTime.u.LowPart ^ SystemTime.u.HighPart ^ SystemTime.u.LowPart ^ SystemTime.u.HighPart ^
(ULONG)&SystemTime; (ULONG_PTR)&SystemTime;
/* Set the new cookie*/ /* Set the new cookie*/
InterlockedCompareExchange((LONG*)&SharedUserData->Cookie, InterlockedCompareExchange((LONG*)&SharedUserData->Cookie,
@ -333,6 +333,9 @@ PspCreateThread(OUT PHANDLE ThreadHandle,
#elif defined(_M_ARM) #elif defined(_M_ARM)
Thread->StartAddress = (PVOID)ThreadContext->Pc; Thread->StartAddress = (PVOID)ThreadContext->Pc;
Thread->Win32StartAddress = (PVOID)ThreadContext->R0; Thread->Win32StartAddress = (PVOID)ThreadContext->R0;
#elif defined(_M_AMD64)
Thread->StartAddress = (PVOID)ThreadContext->Rip;
Thread->Win32StartAddress = (PVOID)ThreadContext->Rax;
#else #else
#error Unknown architecture #error Unknown architecture
#endif #endif