From 3533bfc92c70107462cd7a032943d0a17ec7307d Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Mon, 21 Nov 2005 18:38:09 +0000 Subject: [PATCH] - Misc janitorial fixes by Brezenbak to fix some MSVC compile errors. svn path=/trunk/; revision=19413 --- reactos/ntoskrnl/ex/fmutex.c | 6 +++--- reactos/ntoskrnl/ex/init.c | 6 +++--- reactos/ntoskrnl/fs/filelock.c | 4 ++-- reactos/ntoskrnl/include/internal/i386/ke.h | 8 +++++--- reactos/ntoskrnl/include/internal/ke.h | 8 ++++---- reactos/ntoskrnl/include/internal/ntoskrnl.h | 4 ++-- reactos/ntoskrnl/io/bootlog.c | 5 ++++- reactos/ntoskrnl/io/disk.c | 6 +++--- reactos/ntoskrnl/kd/kdio.c | 3 ++- reactos/ntoskrnl/kdbg/kdb.h | 2 +- reactos/ntoskrnl/kdbg/kdb_symbols.c | 4 ++-- reactos/ntoskrnl/ke/apc.c | 2 +- reactos/ntoskrnl/ke/i386/kernel.c | 3 ++- reactos/ntoskrnl/ke/process.c | 2 +- reactos/ntoskrnl/ke/wait.c | 18 +++++++++--------- reactos/ntoskrnl/lpc/reply.c | 2 +- reactos/ntoskrnl/mm/cont.c | 8 ++++---- reactos/ntoskrnl/mm/npool.c | 2 +- reactos/ntoskrnl/mm/rpoolmgr.h | 4 ++-- reactos/ntoskrnl/ob/sdcache.c | 4 ++-- 20 files changed, 54 insertions(+), 47 deletions(-) diff --git a/reactos/ntoskrnl/ex/fmutex.c b/reactos/ntoskrnl/ex/fmutex.c index c29f7cee2b8..689d8365e30 100644 --- a/reactos/ntoskrnl/ex/fmutex.c +++ b/reactos/ntoskrnl/ex/fmutex.c @@ -81,9 +81,9 @@ VOID FASTCALL ExAcquireFastMutex(PFAST_MUTEX FastMutex) { - ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); KIRQL OldIrql; - + ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); + /* Raise IRQL to APC */ OldIrql = KfRaiseIrql(APC_LEVEL); @@ -180,8 +180,8 @@ BOOLEAN FASTCALL ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) { - ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); KIRQL OldIrql; + ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); /* Raise to APC_LEVEL */ OldIrql = KfRaiseIrql(APC_LEVEL); diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c index 5150cb0c931..59d41fce7ed 100644 --- a/reactos/ntoskrnl/ex/init.c +++ b/reactos/ntoskrnl/ex/init.c @@ -220,7 +220,7 @@ InitSystemSharedUserPage (PCSZ ParameterLine) } } -inline +__inline VOID STDCALL ExecuteRuntimeAsserts(VOID) @@ -255,7 +255,7 @@ ExecuteRuntimeAsserts(VOID) ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); } -inline +__inline VOID STDCALL ParseAndCacheLoadedModules(VOID) @@ -303,7 +303,7 @@ ParseAndCacheLoadedModules(VOID) } } -inline +__inline VOID STDCALL ParseCommandLine(PULONG MaxMem, diff --git a/reactos/ntoskrnl/fs/filelock.c b/reactos/ntoskrnl/fs/filelock.c index 2c5c379f1b3..a37f5e2f96f 100644 --- a/reactos/ntoskrnl/fs/filelock.c +++ b/reactos/ntoskrnl/fs/filelock.c @@ -27,7 +27,7 @@ PAGED_LOOKASIDE_LIST LockLookaside; -inline BOOLEAN +__inline BOOLEAN IsOverlappingLock( PFILE_LOCK_INFO Lock, PLARGE_INTEGER StartOffset, @@ -48,7 +48,7 @@ IsOverlappingLock( } -inline BOOLEAN +__inline BOOLEAN IsSurroundingLock( PFILE_LOCK_INFO Lock, PLARGE_INTEGER StartOffset, diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h index 1b6546a8030..78d5edba8ac 100644 --- a/reactos/ntoskrnl/include/internal/i386/ke.h +++ b/reactos/ntoskrnl/include/internal/i386/ke.h @@ -266,9 +266,11 @@ static inline void Ki386Cpuid(ULONG Op, PULONG Eax, PULONG Ebx, PULONG Ecx, PULO #define Ke386GetPageTableDirectory(X) \ __asm mov eax, cr3; \ __asm mov X, eax; -#define Ke386SetPageTableDirectory(X) \ - __asm mov eax, X; \ - __asm mov cr3, eax; +static __forceinline void Ke386SetPageTableDirectory(ULONG X) +{ + __asm mov eax, X + __asm mov cr3, eax +} #else #error Unknown compiler for inline assembler #endif diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h index 3cccbeaf64f..3976c982687 100644 --- a/reactos/ntoskrnl/include/internal/ke.h +++ b/reactos/ntoskrnl/include/internal/ke.h @@ -244,7 +244,7 @@ KiExpireTimers( ); KIRQL -inline +__inline FASTCALL KeAcquireDispatcherDatabaseLock(VOID); @@ -363,7 +363,7 @@ KiInsertTimer( ); VOID -inline +__inline FASTCALL KiSatisfyObjectWait( PDISPATCHER_HEADER Object, @@ -371,7 +371,7 @@ KiSatisfyObjectWait( ); BOOLEAN -inline +__inline FASTCALL KiIsObjectSignaled( PDISPATCHER_HEADER Object, @@ -379,7 +379,7 @@ KiIsObjectSignaled( ); VOID -inline +__inline FASTCALL KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock); diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h index 7b16a96e880..ce712efa182 100644 --- a/reactos/ntoskrnl/include/internal/ntoskrnl.h +++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h @@ -255,7 +255,7 @@ typedef struct _INFORMATION_CLASS_INFO #define ICI_SQ(SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags) \ { SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags } -static inline NTSTATUS +static __inline NTSTATUS DefaultSetInfoBufferCheck(UINT Class, const INFORMATION_CLASS_INFO *ClassList, UINT ClassListEntries, @@ -304,7 +304,7 @@ DefaultSetInfoBufferCheck(UINT Class, return Status; } -static inline NTSTATUS +static __inline NTSTATUS DefaultQueryInfoBufferCheck(UINT Class, const INFORMATION_CLASS_INFO *ClassList, UINT ClassListEntries, diff --git a/reactos/ntoskrnl/io/bootlog.c b/reactos/ntoskrnl/io/bootlog.c index ed9adaafb54..421e568042a 100644 --- a/reactos/ntoskrnl/io/bootlog.c +++ b/reactos/ntoskrnl/io/bootlog.c @@ -310,8 +310,11 @@ IopSaveBootLogToFile(VOID) ExReleaseResourceLite(&IopBootLogResource); return; } - +#if defined (__GNUC__) Status = IopWriteLogFile(L"ReactOS "KERNEL_VERSION_STR); +#elif defined (_MSC_VER) + Status = IopWriteLogFile("ReactOS "KERNEL_VERSION_STR); +#endif if (!NT_SUCCESS(Status)) { DPRINT1("IopWriteLogFile() failed (Status %lx)\n", Status); diff --git a/reactos/ntoskrnl/io/disk.c b/reactos/ntoskrnl/io/disk.c index 20a90697f60..66781133c61 100644 --- a/reactos/ntoskrnl/io/disk.c +++ b/reactos/ntoskrnl/io/disk.c @@ -1070,7 +1070,7 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, AUTO_DRIVE, DOSDEVICE_DRIVE_REMOVABLE, 0, - (LARGE_INTEGER)0LL, + RtlConvertLongToLargeInteger(0), hKey); } } @@ -1101,7 +1101,7 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, (i < 2) ? i : AUTO_DRIVE, DOSDEVICE_DRIVE_REMOVABLE, 0, - (LARGE_INTEGER)0LL, + RtlConvertLongToLargeInteger(0), hKey); } @@ -1121,7 +1121,7 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, AUTO_DRIVE, DOSDEVICE_DRIVE_CDROM, 0, - (LARGE_INTEGER)0LL, + RtlConvertLongToLargeInteger(0), hKey); } diff --git a/reactos/ntoskrnl/kd/kdio.c b/reactos/ntoskrnl/kd/kdio.c index bafc17b5ba2..a15a8b9f825 100644 --- a/reactos/ntoskrnl/kd/kdio.c +++ b/reactos/ntoskrnl/kd/kdio.c @@ -263,10 +263,11 @@ STDCALL KdpPrintString(LPSTR String, ULONG Length) { - if (!KdpDebugMode.Value) return 0; PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; + if (!KdpDebugMode.Value) return 0; + /* Call the registered handlers */ CurrentEntry = KdProviders.Flink; while (CurrentEntry != &KdProviders) diff --git a/reactos/ntoskrnl/kdbg/kdb.h b/reactos/ntoskrnl/kdbg/kdb.h index ff30acc0b48..1b2fa305b07 100644 --- a/reactos/ntoskrnl/kdbg/kdb.h +++ b/reactos/ntoskrnl/kdbg/kdb.h @@ -87,7 +87,7 @@ KdbpGetInstLength( /* from i386/kdb_help.S */ -STDCALL VOID +VOID STDCALL KdbpStackSwitchAndCall( IN PVOID NewStack, IN VOID (*Function)(VOID)); diff --git a/reactos/ntoskrnl/kdbg/kdb_symbols.c b/reactos/ntoskrnl/kdbg/kdb_symbols.c index 4a9ef87de27..bc3719171e1 100644 --- a/reactos/ntoskrnl/kdbg/kdb_symbols.c +++ b/reactos/ntoskrnl/kdbg/kdb_symbols.c @@ -559,7 +559,7 @@ KdbSymLoadDriverSymbols(IN PUNICODE_STRING Filename, IN PLDR_DATA_TABLE_ENTRY Module) { /* Load symbols for the image if available */ - DPRINT("Loading driver %wZ symbols (driver @ %08x)\n", Filename, Module->Base); + DPRINT("Loading driver %wZ symbols (driver @ %08x)\n", Filename, Module->DllBase); Module->PatchInformation = NULL; @@ -664,7 +664,7 @@ KdbSymProcessBootSymbols(IN PCHAR FileName) DPRINT("Installed symbols: %s@%08x-%08x %p\n", FileName, ModuleObject->DllBase, - ModuleObject->SizeOfImage + ModuleObject->DllBase, + ModuleObject->SizeOfImage + (ULONG)ModuleObject->DllBase, ModuleObject->PatchInformation); } } diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c index 1d8db900484..19b71d6b1c6 100644 --- a/reactos/ntoskrnl/ke/apc.c +++ b/reactos/ntoskrnl/ke/apc.c @@ -1064,7 +1064,7 @@ NtQueueApcThread(HANDLE ThreadHandle, return Status; } -static inline +static __inline VOID RepairList(PLIST_ENTRY Original, PLIST_ENTRY Copy, KPROCESSOR_MODE Mode) diff --git a/reactos/ntoskrnl/ke/i386/kernel.c b/reactos/ntoskrnl/ke/i386/kernel.c index 7c5442c33b0..740dc479370 100644 --- a/reactos/ntoskrnl/ke/i386/kernel.c +++ b/reactos/ntoskrnl/ke/i386/kernel.c @@ -170,11 +170,12 @@ INIT_FUNCTION NTAPI KePrepareForApplicationProcessorInit(ULONG Id) { - DPRINT("KePrepareForApplicationProcessorInit(Id %d)\n", Id); PFN_TYPE PrcPfn; PKIPCR Pcr; PKIPCR BootPcr; + DPRINT("KePrepareForApplicationProcessorInit(Id %d)\n", Id); + BootPcr = (PKIPCR)KPCR_BASE; Pcr = (PKIPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE); diff --git a/reactos/ntoskrnl/ke/process.c b/reactos/ntoskrnl/ke/process.c index ba72d8457a6..e6f1c819b9a 100644 --- a/reactos/ntoskrnl/ke/process.c +++ b/reactos/ntoskrnl/ke/process.c @@ -36,7 +36,7 @@ KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES] = { /* FUNCTIONS *****************************************************************/ -static inline void +static __inline void UpdatePageDirs(PKTHREAD Thread, PKPROCESS Process) { /* diff --git a/reactos/ntoskrnl/ke/wait.c b/reactos/ntoskrnl/ke/wait.c index 26f5aff3e2a..2bc9db99549 100644 --- a/reactos/ntoskrnl/ke/wait.c +++ b/reactos/ntoskrnl/ke/wait.c @@ -27,7 +27,7 @@ static KSPIN_LOCK DispatcherDatabaseLock; /* FUNCTIONS *****************************************************************/ BOOLEAN -inline +__inline FASTCALL KiCheckAlertability(BOOLEAN Alertable, PKTHREAD CurrentThread, @@ -771,7 +771,7 @@ KiAcquireFastMutex(IN PFAST_MUTEX FastMutex) } BOOLEAN -inline +__inline FASTCALL KiIsObjectSignaled(PDISPATCHER_HEADER Object, PKTHREAD Thread) @@ -802,7 +802,7 @@ KiIsObjectSignaled(PDISPATCHER_HEADER Object, } VOID -inline +__inline FASTCALL KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock) { @@ -819,7 +819,7 @@ KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock) } VOID -inline +__inline FASTCALL KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header, ULONG Type, @@ -835,7 +835,7 @@ KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header, } KIRQL -inline +__inline FASTCALL KeAcquireDispatcherDatabaseLock(VOID) { @@ -846,7 +846,7 @@ KeAcquireDispatcherDatabaseLock(VOID) } VOID -inline +__inline FASTCALL KeAcquireDispatcherDatabaseLockAtDpcLevel(VOID) { @@ -854,7 +854,7 @@ KeAcquireDispatcherDatabaseLockAtDpcLevel(VOID) } VOID -inline +__inline FASTCALL KeInitializeDispatcher(VOID) { @@ -863,7 +863,7 @@ KeInitializeDispatcher(VOID) } VOID -inline +__inline FASTCALL KeReleaseDispatcherDatabaseLock(KIRQL OldIrql) { @@ -882,7 +882,7 @@ KeReleaseDispatcherDatabaseLock(KIRQL OldIrql) } VOID -inline +__inline FASTCALL KeReleaseDispatcherDatabaseLockFromDpcLevel(VOID) { diff --git a/reactos/ntoskrnl/lpc/reply.c b/reactos/ntoskrnl/lpc/reply.c index bcc225e1b75..e42e30b06ed 100644 --- a/reactos/ntoskrnl/lpc/reply.c +++ b/reactos/ntoskrnl/lpc/reply.c @@ -163,7 +163,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle, PreviousMode = ExGetPreviousMode(); DPRINT("NtReplyWaitReceivePortEx(PortHandle %x, LpcReply %x, " - "LpcMessage %x)\n", PortHandle, LpcReply, LpcMessage); + "LpcMessage %x)\n", PortHandle, ReplyMessage, ReceiveMessage); if (PreviousMode != KernelMode) { diff --git a/reactos/ntoskrnl/mm/cont.c b/reactos/ntoskrnl/mm/cont.c index 095368f8529..8fc409eb206 100644 --- a/reactos/ntoskrnl/mm/cont.c +++ b/reactos/ntoskrnl/mm/cont.c @@ -16,7 +16,7 @@ /* FUNCTIONS *****************************************************************/ -VOID STATIC +static VOID MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) @@ -93,7 +93,7 @@ MmAllocateContiguousMemorySpecifyCache(IN SIZE_T NumberOfBytes, &MArea, FALSE, 0, - (PHYSICAL_ADDRESS)0LL); + RtlConvertLongToLargeInteger(0)); MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) @@ -158,9 +158,9 @@ MmAllocateContiguousMemory (IN ULONG NumberOfBytes, IN PHYSICAL_ADDRESS HighestAcceptableAddress) { return MmAllocateContiguousMemorySpecifyCache(NumberOfBytes, - (PHYSICAL_ADDRESS)0LL, + RtlConvertLongToLargeInteger(0), HighestAcceptableAddress, - (PHYSICAL_ADDRESS)0LL, + RtlConvertLongToLargeInteger(0), MmCached); } diff --git a/reactos/ntoskrnl/mm/npool.c b/reactos/ntoskrnl/mm/npool.c index f05a7b6ffc7..e032be4e323 100644 --- a/reactos/ntoskrnl/mm/npool.c +++ b/reactos/ntoskrnl/mm/npool.c @@ -1472,7 +1472,7 @@ VOID STDCALL ExFreeNonPagedPool (PVOID block) DPRINT("freeing block %x\n",blk); POOL_TRACE("ExFreePool(block %x), size %d, caller %x\n",block,blk->hdr.Size, - block->Caller); + blk->Caller); KeAcquireSpinLock(&MmNpoolLock, &oldIrql); VALIDATE_POOL; diff --git a/reactos/ntoskrnl/mm/rpoolmgr.h b/reactos/ntoskrnl/mm/rpoolmgr.h index 1aa98ad21aa..1cf52d4c0e1 100644 --- a/reactos/ntoskrnl/mm/rpoolmgr.h +++ b/reactos/ntoskrnl/mm/rpoolmgr.h @@ -496,7 +496,7 @@ RNextBlock ( PR_POOL pool, PR_FREE Block ) return NextBlock; } -inline static void* +static __inline void* RHdrToBody ( void* blk ) /* * FUNCTION: Translate a block header address to the corresponding block @@ -506,7 +506,7 @@ RHdrToBody ( void* blk ) return ( (void *) ((char*)blk + sizeof(R_USED) + R_RZ) ); } -inline static PR_USED +static __inline PR_USED RBodyToHdr ( void* addr ) { return (PR_USED) diff --git a/reactos/ntoskrnl/ob/sdcache.c b/reactos/ntoskrnl/ob/sdcache.c index d7dffbf7e01..b1464c49755 100644 --- a/reactos/ntoskrnl/ob/sdcache.c +++ b/reactos/ntoskrnl/ob/sdcache.c @@ -52,7 +52,7 @@ ObpInitSdCache(VOID) } -static inline VOID +static __inline VOID ObpSdCacheLock(VOID) { /* can't acquire a fast mutex in the early boot process... */ @@ -63,7 +63,7 @@ ObpSdCacheLock(VOID) } -static inline VOID +static __inline VOID ObpSdCacheUnlock(VOID) { /* can't acquire a fast mutex in the early boot process... */