ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Misc janitorial fixes by Brezenbak to fix some MSVC compile errors.

Browse Source 
svn path=/trunk/; revision=19413
This commit is contained in:
Alex Ionescu
2005-11-21 18:38:09 +00:00
parent 90f9ace5cf
commit 3533bfc92c
20 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/ntoskrnl/ex/fmutex.c
+3 -3
View File
@@ -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);
reactos/ntoskrnl/ex/init.c
+3 -3
View File
@@ -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,
reactos/ntoskrnl/fs/filelock.c
+2 -2
View File
@@ -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,
reactos/ntoskrnl/include/internal/i386/ke.h
+5 -3
View File
@@ -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
reactos/ntoskrnl/include/internal/ke.h
+4 -4
View File
@@ -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);
reactos/ntoskrnl/include/internal/ntoskrnl.h
+2 -2
View File
@@ -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,
reactos/ntoskrnl/io/bootlog.c
+4 -1
View File
@@ -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);
reactos/ntoskrnl/io/disk.c
+3 -3
View File
@@ -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);
}
reactos/ntoskrnl/kd/kdio.c
+2 -1
View File
@@ -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)
reactos/ntoskrnl/kdbg/kdb.h
+1 -1
View File
@@ -87,7 +87,7 @@ KdbpGetInstLength(
/* from i386/kdb_help.S */
STDCALL VOID
VOID STDCALL
KdbpStackSwitchAndCall(
IN PVOID NewStack,
IN VOID (*Function)(VOID));
reactos/ntoskrnl/kdbg/kdb_symbols.c
+2 -2
View File
@@ -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);
}
}
reactos/ntoskrnl/ke/apc.c
+1 -1
View File
@@ -1064,7 +1064,7 @@ NtQueueApcThread(HANDLE ThreadHandle,
return Status;
}
static inline
static __inline
VOID RepairList(PLIST_ENTRY Original,
PLIST_ENTRY Copy,
KPROCESSOR_MODE Mode)
reactos/ntoskrnl/ke/i386/kernel.c
+2 -1
View File
@@ -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);
reactos/ntoskrnl/ke/process.c
+1 -1
View File
@@ -36,7 +36,7 @@ KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES] = {
/* FUNCTIONS *****************************************************************/
static inline void
static __inline void
UpdatePageDirs(PKTHREAD Thread, PKPROCESS Process)
{
/*
reactos/ntoskrnl/ke/wait.c
+9 -9
View File
@@ -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)
{
reactos/ntoskrnl/lpc/reply.c
+1 -1
View File
@@ -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)
{
reactos/ntoskrnl/mm/cont.c
+4 -4
View File
@@ -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);
}
reactos/ntoskrnl/mm/npool.c
+1 -1
View File
@@ -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;
reactos/ntoskrnl/mm/rpoolmgr.h
+2 -2
View File
@@ -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)
reactos/ntoskrnl/ob/sdcache.c
+2 -2
View File
@@ -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... */