From f0af84da4ee334fb0b5ef147af069cb40c05531c Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Wed, 6 Sep 2006 12:19:00 +0000 Subject: [PATCH] - MSVC Build Fixes svn path=/trunk/; revision=23925 --- reactos/include/ddk/ntifs.h | 8 ++ reactos/include/reactos/ccros.h | 6 +- .../reactos/drivers/diskdump/diskdump.h | 8 +- reactos/lib/rtl/bit.c | 57 ------------- reactos/lib/rtl/registry.c | 2 +- reactos/lib/rtl/rtl.rbuild | 1 - reactos/lib/rtl/sd.c | 2 +- reactos/ntoskrnl/include/internal/cc.h | 6 +- reactos/ntoskrnl/include/internal/dbgk.h | 2 +- reactos/ntoskrnl/include/internal/ex.h | 40 +++++----- reactos/ntoskrnl/include/internal/fsrtl.h | 8 +- reactos/ntoskrnl/include/internal/i386/ke.h | 18 +++-- reactos/ntoskrnl/include/internal/inbv.h | 2 +- reactos/ntoskrnl/include/internal/io.h | 26 ++---- reactos/ntoskrnl/include/internal/ke.h | 80 +++++++++---------- reactos/ntoskrnl/include/internal/lpc.h | 22 ++--- reactos/ntoskrnl/include/internal/mm.h | 52 ++++++------ reactos/ntoskrnl/include/internal/ntoskrnl.h | 26 ++++-- reactos/ntoskrnl/include/internal/ob_x.h | 8 +- reactos/ntoskrnl/include/internal/rtl.h | 2 +- reactos/ntoskrnl/include/internal/se.h | 19 ++--- reactos/ntoskrnl/include/internal/test.h | 8 +- reactos/ntoskrnl/include/ntoskrnl.h | 2 + reactos/ntoskrnl/ke/i386/abios.c | 2 +- 24 files changed, 178 insertions(+), 229 deletions(-) delete mode 100644 reactos/lib/rtl/bit.c diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index d4dc2cc6e5d..4ca545d2c26 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -4373,6 +4373,14 @@ SeTokenIsRestricted ( IN PACCESS_TOKEN Token ); + +NTSTATUS +NTAPI +SeLocateProcessImageName( + IN PEPROCESS Process, + OUT PUNICODE_STRING *pImageFileName +); + #endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI diff --git a/reactos/include/reactos/ccros.h b/reactos/include/reactos/ccros.h index a7907e4aea8..daad2cdcbc5 100644 --- a/reactos/include/reactos/ccros.h +++ b/reactos/include/reactos/ccros.h @@ -1,16 +1,16 @@ #ifndef __INCLUDE_DDK_NTIFS_H #define __INCLUDE_DDK_NTIFS_H -NTSTATUS STDCALL +NTSTATUS NTAPI CcRosInitializeFileCache (PFILE_OBJECT FileObject, ULONG CacheSegmentSize); -NTSTATUS STDCALL +NTSTATUS NTAPI CcRosReleaseFileCache (PFILE_OBJECT FileObject); struct _BCB; VOID -STDCALL +NTAPI CcRosTraceCacheMap ( struct _BCB* Bcb, BOOLEAN Trace ); diff --git a/reactos/include/reactos/drivers/diskdump/diskdump.h b/reactos/include/reactos/drivers/diskdump/diskdump.h index 59d134cfa4c..edfe2f42612 100644 --- a/reactos/include/reactos/drivers/diskdump/diskdump.h +++ b/reactos/include/reactos/drivers/diskdump/diskdump.h @@ -22,10 +22,10 @@ typedef struct _MM_CORE_DUMP_HEADER typedef struct MM_CORE_DUMP_FUNCTIONS { - NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); - NTSTATUS (STDCALL *DumpInit)(VOID); - NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); - NTSTATUS (STDCALL *DumpFinish)(VOID); + NTSTATUS (NTAPI *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); + NTSTATUS (NTAPI *DumpInit)(VOID); + NTSTATUS (NTAPI *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); + NTSTATUS (NTAPI *DumpFinish)(VOID); } MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS; #endif /* __DISKDUMP_H */ diff --git a/reactos/lib/rtl/bit.c b/reactos/lib/rtl/bit.c deleted file mode 100644 index be7008831b1..00000000000 --- a/reactos/lib/rtl/bit.c +++ /dev/null @@ -1,57 +0,0 @@ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/bit.c - * PROGRAMER: Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include - -#define NDEBUG -#include - -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -CCHAR NTAPI -RtlFindLeastSignificantBit(IN ULONGLONG Set) -{ - int i; - - if (Set == 0ULL) - return -1; - - for (i = 0; i < 64; i++) - { - if (Set & (1 << i)) - return (CCHAR)i; - } - - return -1; -} - - -/* - * @implemented - */ -CCHAR NTAPI -RtlFindMostSignificantBit(IN ULONGLONG Set) -{ - int i; - - if (Set == 0ULL) - return -1; - - for (i = 63; i >= 0; i--) - { - if (Set & (1 << i)) - return (CCHAR)i; - } - - return -1; -} - -/* EOF */ diff --git a/reactos/lib/rtl/registry.c b/reactos/lib/rtl/registry.c index 4ffed08cc7b..0da9966bba9 100644 --- a/reactos/lib/rtl/registry.c +++ b/reactos/lib/rtl/registry.c @@ -584,6 +584,7 @@ RtlQueryRegistryValues(IN ULONG RelativeTo, PWSTR ValueName; UNICODE_STRING EnvValue; UNICODE_STRING EnvExpandedValue; + ULONG DataSize = 0; PAGED_CODE_RTL(); @@ -827,7 +828,6 @@ RtlQueryRegistryValues(IN ULONG RelativeTo, !(QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) { DPRINT("Expand REG_MULTI_SZ type\n"); - ULONG DataSize = 0; StringPtr = (PWSTR)ValueInfo->Data; while (DataSize < (ValueInfo->DataLength-2)) { diff --git a/reactos/lib/rtl/rtl.rbuild b/reactos/lib/rtl/rtl.rbuild index c3cacaa6d94..3d28108a795 100644 --- a/reactos/lib/rtl/rtl.rbuild +++ b/reactos/lib/rtl/rtl.rbuild @@ -43,7 +43,6 @@ access.c acl.c atom.c - bit.c bitmap.c bootdata.c compress.c diff --git a/reactos/lib/rtl/sd.c b/reactos/lib/rtl/sd.c index c8b117f066d..e5a382ecc31 100644 --- a/reactos/lib/rtl/sd.c +++ b/reactos/lib/rtl/sd.c @@ -929,7 +929,7 @@ RtlSelfRelativeToAbsoluteSD2(IN OUT PSECURITY_DESCRIPTOR SelfRelativeSD, * @implemented */ BOOLEAN NTAPI -RtlValidRelativeSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptorInput, +RtlValidRelativeSecurityDescriptor(IN PISECURITY_DESCRIPTOR SecurityDescriptorInput, IN ULONG SecurityDescriptorLength, IN SECURITY_INFORMATION RequiredInformation) { diff --git a/reactos/ntoskrnl/include/internal/cc.h b/reactos/ntoskrnl/include/internal/cc.h index 1c2d0f0f7b7..95a43c1a223 100644 --- a/reactos/ntoskrnl/include/internal/cc.h +++ b/reactos/ntoskrnl/include/internal/cc.h @@ -62,14 +62,14 @@ typedef struct _INTERNAL_BCB } INTERNAL_BCB, *PINTERNAL_BCB; VOID -STDCALL +NTAPI CcMdlReadCompleteDev( IN PMDL MdlChain, IN PFILE_OBJECT FileObject ); VOID -STDCALL +NTAPI CcMdlWriteCompleteDev( IN PLARGE_INTEGER FileOffset, IN PMDL MdlChain, @@ -179,7 +179,7 @@ CcRosReleaseCacheSegment( ); NTSTATUS -STDCALL +NTAPI CcRosRequestCacheSegment( BCB *Bcb, ULONG FileOffset, diff --git a/reactos/ntoskrnl/include/internal/dbgk.h b/reactos/ntoskrnl/include/internal/dbgk.h index f757db10b47..d3feb09682b 100644 --- a/reactos/ntoskrnl/include/internal/dbgk.h +++ b/reactos/ntoskrnl/include/internal/dbgk.h @@ -2,7 +2,7 @@ #define __NTOSKRNL_INCLUDE_INTERNAL_DBGK_H VOID -STDCALL +NTAPI DbgkCreateThread(PVOID StartAddress); VOID diff --git a/reactos/ntoskrnl/include/internal/ex.h b/reactos/ntoskrnl/include/internal/ex.h index 213c31fbcf8..0cbad42bfc1 100644 --- a/reactos/ntoskrnl/include/internal/ex.h +++ b/reactos/ntoskrnl/include/internal/ex.h @@ -32,63 +32,63 @@ extern POBJECT_TYPE ExEventPairObjectType; /* INITIALIZATION FUNCTIONS *************************************************/ VOID -STDCALL +NTAPI ExpWin32kInit(VOID); VOID -STDCALL +NTAPI ExInit2(VOID); VOID -STDCALL +NTAPI ExpInitTimeZoneInfo(VOID); VOID -STDCALL +NTAPI ExpInitializeWorkerThreads(VOID); VOID -STDCALL +NTAPI ExpInitLookasideLists(VOID); VOID -STDCALL +NTAPI ExpInitializeCallbacks(VOID); VOID -STDCALL +NTAPI ExpInitUuids(VOID); VOID -STDCALL +NTAPI ExpInitializeExecutive(VOID); VOID -STDCALL +NTAPI ExpInitializeEventImplementation(VOID); VOID -STDCALL +NTAPI ExpInitializeEventImplementation(VOID); VOID -STDCALL +NTAPI ExpInitializeEventPairImplementation(VOID); VOID -STDCALL +NTAPI ExpInitializeSemaphoreImplementation(VOID); VOID -STDCALL +NTAPI ExpInitializeMutantImplementation(VOID); VOID -STDCALL +NTAPI ExpInitializeTimerImplementation(VOID); VOID -STDCALL +NTAPI ExpInitializeProfileImplementation(VOID); VOID @@ -161,19 +161,19 @@ ExfWaitForRundownProtectionRelease( EX_HANDLE_ENTRY_INHERITABLE | \ EX_HANDLE_ENTRY_AUDITONCLOSE) -typedef VOID (STDCALL PEX_SWEEP_HANDLE_CALLBACK)( +typedef VOID (NTAPI PEX_SWEEP_HANDLE_CALLBACK)( PHANDLE_TABLE_ENTRY HandleTableEntry, HANDLE Handle, PVOID Context ); -typedef BOOLEAN (STDCALL PEX_DUPLICATE_HANDLE_CALLBACK)( +typedef BOOLEAN (NTAPI PEX_DUPLICATE_HANDLE_CALLBACK)( PHANDLE_TABLE HandleTable, PHANDLE_TABLE_ENTRY HandleTableEntry, PVOID Context ); -typedef BOOLEAN (STDCALL PEX_CHANGE_HANDLE_CALLBACK)( +typedef BOOLEAN (NTAPI PEX_CHANGE_HANDLE_CALLBACK)( PHANDLE_TABLE HandleTable, PHANDLE_TABLE_ENTRY HandleTableEntry, PVOID Context @@ -253,7 +253,7 @@ ExChangeHandle( /* PSEH EXCEPTION HANDLING **************************************************/ LONG -STDCALL +NTAPI ExSystemExceptionFilter(VOID); static __inline _SEH_FILTER(_SEH_ExSystemExceptionFilter) @@ -698,7 +698,7 @@ NTAPI ExpAllocateLocallyUniqueId(OUT LUID *LocallyUniqueId); VOID -STDCALL +NTAPI ExTimerRundown(VOID); #define InterlockedDecrementUL(Addend) \ diff --git a/reactos/ntoskrnl/include/internal/fsrtl.h b/reactos/ntoskrnl/include/internal/fsrtl.h index c74f5719a70..7ff0f24c4d7 100644 --- a/reactos/ntoskrnl/include/internal/fsrtl.h +++ b/reactos/ntoskrnl/include/internal/fsrtl.h @@ -17,15 +17,15 @@ typedef struct _FILE_LOCK_TOC VOID INIT_FUNCTION -STDCALL +NTAPI FsRtlpInitNotifyImplementation(VOID); VOID -STDCALL +NTAPI FsRtlpInitFileLockingImplementation(VOID); VOID -STDCALL +NTAPI FsRtlpFileLockCancelRoutine( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -49,7 +49,7 @@ FsRtlpFastUnlockAllByKey( IN PFILE_LOCK FileLock, IN PFILE_OBJECT FileObject, IN PEPROCESS Process, - IN DWORD Key, + IN ULONG Key, IN BOOLEAN UseKey, IN PVOID Context OPTIONAL ); diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h index 9925e96ad06..430819fabe3 100644 --- a/reactos/ntoskrnl/include/internal/i386/ke.h +++ b/reactos/ntoskrnl/include/internal/i386/ke.h @@ -99,11 +99,11 @@ KeCreateApplicationProcessorIdleThread(ULONG Id); typedef VOID -(STDCALL*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, +(NTAPI*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, PVOID StartContext); VOID -STDCALL +NTAPI Ke386InitThreadWithContext(PKTHREAD Thread, PKSYSTEM_ROUTINE SystemRoutine, PKSTART_ROUTINE StartRoutine, @@ -112,7 +112,7 @@ Ke386InitThreadWithContext(PKTHREAD Thread, #ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ VOID -STDCALL +NTAPI KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, PKSTART_ROUTINE StartRoutine, PVOID StartContext, @@ -239,8 +239,9 @@ static __forceinline void Ke386SetPageTableDirectory(ULONG X) #error Unknown compiler for inline assembler #endif -static __inline struct _KPCR * KeGetCurrentKPCR( - VOID) +FORCEINLINE +struct _KPCR * +KeGetCurrentKPCR(VOID) { ULONG Value; #if defined(__GNUC__) @@ -255,8 +256,10 @@ static __inline struct _KPCR * KeGetCurrentKPCR( return (struct _KPCR *) Value; } -static __inline struct _KPRCB * KeGetCurrentPrcb( - VOID) +#ifdef __GNUC__ +FORCEINLINE +struct _KPRCB * +KeGetCurrentPrcb(VOID) { ULONG Value; #if defined(__GNUC__) @@ -270,6 +273,7 @@ static __inline struct _KPRCB * KeGetCurrentPrcb( #endif return (struct _KPRCB *) Value; } +#endif #endif #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H */ diff --git a/reactos/ntoskrnl/include/internal/inbv.h b/reactos/ntoskrnl/include/internal/inbv.h index c79d3083a17..ea6003c0378 100644 --- a/reactos/ntoskrnl/include/internal/inbv.h +++ b/reactos/ntoskrnl/include/internal/inbv.h @@ -8,7 +8,7 @@ /* FUNCTIONS *****************************************************************/ BOOLEAN -STDCALL +NTAPI InbvDisplayString(IN PCHAR String); #endif /* NTOSKRNL_INBV_H */ diff --git a/reactos/ntoskrnl/include/internal/io.h b/reactos/ntoskrnl/include/internal/io.h index 1e30e5e883f..c0dc51181bc 100644 --- a/reactos/ntoskrnl/include/internal/io.h +++ b/reactos/ntoskrnl/include/internal/io.h @@ -730,7 +730,7 @@ IopSaveBootLogToFile( // I/O Cancellation Routines // VOID -STDCALL +NTAPI IoCancelThreadIo( IN PETHREAD Thread ); @@ -777,7 +777,7 @@ RawFsIsRawFileSystemDeviceObject( ); NTSTATUS -STDCALL +NTAPI RawFsDriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath @@ -787,7 +787,7 @@ RawFsDriverEntry( // PnP Root MiniDriver // NTSTATUS -STDCALL +NTAPI PnpRootDriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath @@ -908,13 +908,13 @@ IopParseFile( ); VOID -STDCALL +NTAPI IopDeleteFile( IN PVOID ObjectBody ); NTSTATUS -STDCALL +NTAPI IopSecurityFile( IN PVOID ObjectBody, IN SECURITY_OPERATION_CODE OperationCode, @@ -927,7 +927,7 @@ IopSecurityFile( ); NTSTATUS -STDCALL +NTAPI IopQueryNameFile( IN PVOID ObjectBody, IN BOOLEAN HasName, @@ -938,7 +938,7 @@ IopQueryNameFile( ); VOID -STDCALL +NTAPI IopCloseFile( IN PEPROCESS Process OPTIONAL, IN PVOID Object, @@ -957,7 +957,7 @@ IopInitTimerImplementation( ); VOID -STDCALL +NTAPI IopRemoveTimerFromTimerList( IN PIO_TIMER Timer ); @@ -981,16 +981,6 @@ xHalQueryDriveLayout( OUT PDRIVE_LAYOUT_INFORMATION *LayoutInfo ); -#undef HalExamineMBR -VOID -FASTCALL -HalExamineMBR( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG MBRTypeIdentifier, - OUT PVOID *Buffer -); - VOID FASTCALL xHalIoAssignDriveLetters( diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h index f184b4e0101..1559097c27d 100644 --- a/reactos/ntoskrnl/include/internal/ke.h +++ b/reactos/ntoskrnl/include/internal/ke.h @@ -215,12 +215,12 @@ extern KSPIN_LOCK DispatcherDatabaseLock; /* Readies a Thread for Execution. */ BOOLEAN -STDCALL +NTAPI KiDispatchThreadNoLock(ULONG NewThreadStatus); /* Readies a Thread for Execution. */ VOID -STDCALL +NTAPI KiDispatchThread(ULONG NewThreadStatus); /* Finds a new thread to run */ @@ -235,7 +235,7 @@ NTAPI KiReadyThread(IN PKTHREAD Thread); NTSTATUS -STDCALL +NTAPI KeSuspendThread(PKTHREAD Thread); NTSTATUS @@ -246,7 +246,7 @@ KiSwapContext( ); VOID -STDCALL +NTAPI KiAdjustQuantumThread(IN PKTHREAD Thread); VOID @@ -296,11 +296,11 @@ KeFindNextRightSetAffinity( ); VOID -STDCALL +NTAPI DbgBreakPointNoBugCheck(VOID); VOID -STDCALL +NTAPI KeInitializeProfile( struct _KPROFILE* Profile, struct _KPROCESS* Process, @@ -312,53 +312,53 @@ KeInitializeProfile( ); VOID -STDCALL +NTAPI KeStartProfile( struct _KPROFILE* Profile, PVOID Buffer ); BOOLEAN -STDCALL +NTAPI KeStopProfile(struct _KPROFILE* Profile); ULONG -STDCALL +NTAPI KeQueryIntervalProfile(KPROFILE_SOURCE ProfileSource); VOID -STDCALL +NTAPI KeSetIntervalProfile( KPROFILE_SOURCE ProfileSource, ULONG Interval ); VOID -STDCALL +NTAPI KeProfileInterrupt( PKTRAP_FRAME TrapFrame ); VOID -STDCALL +NTAPI KeProfileInterruptWithSource( IN PKTRAP_FRAME TrapFrame, IN KPROFILE_SOURCE Source ); BOOLEAN -STDCALL +NTAPI KiRosPrintAddress(PVOID Address); VOID -STDCALL +NTAPI KeUpdateRunTime( PKTRAP_FRAME TrapFrame, KIRQL Irql ); VOID -STDCALL +NTAPI KiExpireTimers( PKDPC Dpc, PVOID DeferredContext, @@ -431,7 +431,7 @@ KeSwitchKernelStack( ); VOID -STDCALL +NTAPI KeRundownThread(VOID); NTSTATUS @@ -439,11 +439,11 @@ NTAPI KeReleaseThread(PKTHREAD Thread); LONG -STDCALL +NTAPI KeQueryBasePriorityThread(IN PKTHREAD Thread); VOID -STDCALL +NTAPI KiSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority, @@ -458,7 +458,7 @@ KiDispatcherObjectWake( ); VOID -STDCALL +NTAPI KeExpireTimers( PKDPC Apc, PVOID Arg1, @@ -483,7 +483,7 @@ KiAbortWaitThread( ); VOID -STDCALL +NTAPI KeInitializeProcess( struct _KPROCESS *Process, KPRIORITY Priority, @@ -507,15 +507,15 @@ KeSetPriorityAndQuantumProcess( ); ULONG -STDCALL +NTAPI KeForceResumeThread(IN PKTHREAD Thread); BOOLEAN -STDCALL +NTAPI KeDisableThreadApcQueueing(IN PKTHREAD Thread); BOOLEAN -STDCALL +NTAPI KiInsertTimer( PKTIMER Timer, LARGE_INTEGER DueTime @@ -533,7 +533,7 @@ NTAPI KeGetStackTopThread(struct _ETHREAD* Thread); VOID -STDCALL +NTAPI KeContextToTrapFrame( PCONTEXT Context, PKEXCEPTION_FRAME ExeptionFrame, @@ -543,7 +543,7 @@ KeContextToTrapFrame( ); VOID -STDCALL +NTAPI KiDeliverApc( KPROCESSOR_MODE PreviousMode, PVOID Reserved, @@ -551,11 +551,11 @@ KiDeliverApc( ); VOID -STDCALL +NTAPI KiCheckForKernelApcDelivery(VOID); LONG -STDCALL +NTAPI KiInsertQueue( IN PKQUEUE Queue, IN PLIST_ENTRY Entry, @@ -563,7 +563,7 @@ KiInsertQueue( ); ULONG -STDCALL +NTAPI KeSetProcess( struct _KPROCESS* Process, KPRIORITY Increment, @@ -571,11 +571,11 @@ KeSetProcess( ); VOID -STDCALL +NTAPI KeInitializeEventPair(PKEVENT_PAIR EventPair); VOID -STDCALL +NTAPI KiInitializeUserApc( IN PKEXCEPTION_FRAME Reserved, IN PKTRAP_FRAME TrapFrame, @@ -586,14 +586,14 @@ KiInitializeUserApc( ); PLIST_ENTRY -STDCALL +NTAPI KeFlushQueueApc( IN PKTHREAD Thread, IN KPROCESSOR_MODE PreviousMode ); VOID -STDCALL +NTAPI KiAttachProcess( struct _KTHREAD *Thread, struct _KPROCESS *Process, @@ -602,18 +602,18 @@ KiAttachProcess( ); VOID -STDCALL +NTAPI KiSwapProcess( struct _KPROCESS *NewProcess, struct _KPROCESS *OldProcess ); BOOLEAN -STDCALL +NTAPI KeTestAlertThread(IN KPROCESSOR_MODE AlertMode); BOOLEAN -STDCALL +NTAPI KeRemoveQueueApc(PKAPC Apc); VOID @@ -665,7 +665,7 @@ NTAPI KiDeliverUserApc(PKTRAP_FRAME TrapFrame); VOID -STDCALL +NTAPI KiMoveApcState( PKAPC_STATE OldState, PKAPC_STATE NewState @@ -713,18 +713,18 @@ KiUserTrapHandler( ); VOID -STDCALL +NTAPI KePushAndStackSwitchAndSysRet( ULONG Push, PVOID NewStack ); VOID -STDCALL +NTAPI KeStackSwitchAndRet(PVOID NewStack); VOID -STDCALL +NTAPI KeBugCheckWithTf( ULONG BugCheckCode, ULONG BugCheckParameter1, @@ -739,7 +739,7 @@ NTAPI KeFlushCurrentTb(VOID); VOID -STDCALL +NTAPI KeRosDumpStackFrames( PULONG Frame, ULONG FrameCount diff --git a/reactos/ntoskrnl/include/internal/lpc.h b/reactos/ntoskrnl/include/internal/lpc.h index af40b0e14d0..6e0d1830419 100644 --- a/reactos/ntoskrnl/include/internal/lpc.h +++ b/reactos/ntoskrnl/include/internal/lpc.h @@ -75,14 +75,14 @@ typedef struct _QUEUEDMESSAGE } QUEUEDMESSAGE, *PQUEUEDMESSAGE; NTSTATUS -STDCALL +NTAPI LpcRequestPort( PEPORT Port, PPORT_MESSAGE LpcMessage ); NTSTATUS -STDCALL +NTAPI LpcSendTerminationPort( PEPORT Port, LARGE_INTEGER CreationTime @@ -91,7 +91,7 @@ LpcSendTerminationPort( /* Code in ntoskrnl/lpc/close.c */ VOID -STDCALL +NTAPI LpcpClosePort( IN PEPROCESS Process OPTIONAL, IN PVOID Object, @@ -101,7 +101,7 @@ LpcpClosePort( ); VOID -STDCALL +NTAPI LpcpDeletePort(IN PVOID ObjectBody); VOID @@ -111,38 +111,38 @@ LpcExitThread(IN PETHREAD Thread); /* Code in ntoskrnl/lpc/queue.c */ VOID -STDCALL +NTAPI EiEnqueueConnectMessagePort( IN OUT PEPORT Port, IN PQUEUEDMESSAGE Message ); VOID -STDCALL +NTAPI EiEnqueueMessagePort( IN OUT PEPORT Port, IN PQUEUEDMESSAGE Message ); VOID -STDCALL +NTAPI EiEnqueueMessageAtHeadPort( IN OUT PEPORT Port, IN PQUEUEDMESSAGE Message ); PQUEUEDMESSAGE -STDCALL +NTAPI EiDequeueConnectMessagePort(IN OUT PEPORT Port); PQUEUEDMESSAGE -STDCALL +NTAPI EiDequeueMessagePort(IN OUT PEPORT Port); /* Code in ntoskrnl/lpc/port.c */ NTSTATUS -STDCALL +NTAPI LpcpInitializePort( IN OUT PEPORT Port, IN USHORT Type, @@ -156,7 +156,7 @@ LpcpInitSystem (VOID); /* Code in ntoskrnl/lpc/reply.c */ NTSTATUS -STDCALL +NTAPI EiReplyOrRequestPort( IN PEPORT Port, IN PPORT_MESSAGE LpcReply, diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h index f23b43ad674..db296c65c8b 100644 --- a/reactos/ntoskrnl/include/internal/mm.h +++ b/reactos/ntoskrnl/include/internal/mm.h @@ -374,7 +374,7 @@ NTAPI MmInitMemoryAreas(VOID); NTSTATUS -STDCALL +NTAPI MmCreateMemoryArea( PMADDRESS_SPACE AddressSpace, ULONG Type, @@ -388,21 +388,21 @@ MmCreateMemoryArea( ); PMEMORY_AREA -STDCALL +NTAPI MmLocateMemoryAreaByAddress( PMADDRESS_SPACE AddressSpace, PVOID Address ); ULONG_PTR -STDCALL +NTAPI MmFindGapAtAddress( PMADDRESS_SPACE AddressSpace, PVOID Address ); NTSTATUS -STDCALL +NTAPI MmFreeMemoryArea( PMADDRESS_SPACE AddressSpace, PMEMORY_AREA MemoryArea, @@ -411,7 +411,7 @@ MmFreeMemoryArea( ); NTSTATUS -STDCALL +NTAPI MmFreeMemoryAreaByPtr( PMADDRESS_SPACE AddressSpace, PVOID BaseAddress, @@ -420,11 +420,11 @@ MmFreeMemoryAreaByPtr( ); VOID -STDCALL +NTAPI MmDumpMemoryAreas(PMADDRESS_SPACE AddressSpace); PMEMORY_AREA -STDCALL +NTAPI MmLocateMemoryAreaByRegion( PMADDRESS_SPACE AddressSpace, PVOID Address, @@ -432,7 +432,7 @@ MmLocateMemoryAreaByRegion( ); PVOID -STDCALL +NTAPI MmFindGap( PMADDRESS_SPACE AddressSpace, ULONG_PTR Length, @@ -441,7 +441,7 @@ MmFindGap( ); VOID -STDCALL +NTAPI MmReleaseMemoryAreaIfDecommitted( struct _EPROCESS *Process, PMADDRESS_SPACE AddressSpace, @@ -472,7 +472,7 @@ MmGetMdlPageAddress( /* pool.c *******************************************************************/ PVOID -STDCALL +NTAPI ExAllocateNonPagedPoolWithTag( POOL_TYPE type, ULONG size, @@ -481,7 +481,7 @@ ExAllocateNonPagedPoolWithTag( ); PVOID -STDCALL +NTAPI ExAllocatePagedPoolWithTag( POOL_TYPE Type, ULONG size, @@ -489,11 +489,11 @@ ExAllocatePagedPoolWithTag( ); VOID -STDCALL +NTAPI ExFreeNonPagedPool(PVOID block); VOID -STDCALL +NTAPI ExFreePagedPool(IN PVOID Block); VOID @@ -501,7 +501,7 @@ NTAPI MmInitializePagedPool(VOID); PVOID -STDCALL +NTAPI MiAllocateSpecialPool( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes, @@ -510,7 +510,7 @@ MiAllocateSpecialPool( ); BOOLEAN -STDCALL +NTAPI MiRaisePoolQuota( IN POOL_TYPE PoolType, IN ULONG CurrentMaxQuota, @@ -596,7 +596,7 @@ MmWriteToSwapPage( ); NTSTATUS -STDCALL +NTAPI MmDumpToPagingFile( ULONG BugCode, ULONG BugCodeParameter1, @@ -617,7 +617,7 @@ MmShowOutOfSpaceMessagePagingFile(VOID); /* process.c ****************************************************************/ NTSTATUS -STDCALL +NTAPI MmCreateProcessAddressSpace( IN PEPROCESS Process, IN PROS_SECTION_OBJECT Section OPTIONAL, @@ -625,11 +625,11 @@ MmCreateProcessAddressSpace( ); NTSTATUS -STDCALL +NTAPI MmCreatePeb(struct _EPROCESS *Process); PTEB -STDCALL +NTAPI MmCreateTeb( struct _EPROCESS *Process, PCLIENT_ID ClientId, @@ -637,7 +637,7 @@ MmCreateTeb( ); VOID -STDCALL +NTAPI MmDeleteTeb( struct _EPROCESS *Process, PTEB Teb @@ -713,7 +713,7 @@ MmPageOutVirtualMemory( ); NTSTATUS -STDCALL +NTAPI MmQueryAnonMem( PMEMORY_AREA MemoryArea, PVOID Address, @@ -814,11 +814,11 @@ MmInitializePageOp(VOID); /* process.c *****************************************************************/ PVOID -STDCALL +NTAPI MmCreateKernelStack(BOOLEAN GuiStack); VOID -STDCALL +NTAPI MmDeleteKernelStack(PVOID Stack, BOOLEAN GuiStack); @@ -1201,7 +1201,7 @@ MmGetPfnForProcess( ); NTSTATUS -STDCALL +NTAPI MmCopyMmInfo( struct _EPROCESS *Src, struct _EPROCESS *Dest, @@ -1308,14 +1308,14 @@ MmGetFileObjectForSection( ); PVOID -STDCALL +NTAPI MmAllocateSection( IN ULONG Length, PVOID BaseAddress ); NTSTATUS -STDCALL +NTAPI MmQuerySectionView( PMEMORY_AREA MemoryArea, PVOID Address, diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h index 743709528d5..2871087b450 100644 --- a/reactos/ntoskrnl/include/internal/ntoskrnl.h +++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h @@ -5,9 +5,15 @@ * Use these to place a function in a specific section of the executable */ #define PLACE_IN_SECTION(s) __attribute__((section (s))) +#ifdef _GNUC_ #define INIT_FUNCTION PLACE_IN_SECTION("init") #define PAGE_LOCKED_FUNCTION PLACE_IN_SECTION("pagelk") #define PAGE_UNLOCKED_FUNCTION PLACE_IN_SECTION("pagepo") +#else +#define INIT_FUNCTION +#define PAGE_LOCKED_FUNCTION +#define PAGE_UNLOCKED_FUNCTION +#endif #ifdef _NTOSKRNL_ @@ -56,11 +62,11 @@ typedef struct __DESCRIPTOR VOID MmInitSystem(ULONG Phase, PROS_LOADER_PARAMETER_BLOCK LoaderBlock, ULONG LastKernelAddress); VOID IoInit(VOID); VOID IoInit2(BOOLEAN BootLog); -VOID STDCALL IoInit3(VOID); +VOID NTAPI IoInit3(VOID); VOID ObInit(VOID); VOID PsInit(VOID); VOID CmInitializeRegistry(VOID); -VOID STDCALL CmInitHives(BOOLEAN SetupBoot); +VOID NTAPI CmInitHives(BOOLEAN SetupBoot); VOID CmInit2(PCHAR CommandLine); VOID CmShutdownRegistry(VOID); BOOLEAN CmImportSystemHive(PCHAR ChunkBase, ULONG ChunkSize); @@ -82,6 +88,7 @@ RtlpLogException(IN PEXCEPTION_RECORD ExceptionRecord, IN ULONG Size); /* FIXME: Interlocked functions that need to be made into a public header */ +#ifdef __GNUC__ FORCEINLINE LONG InterlockedAnd(IN OUT LONG volatile *Target, @@ -121,6 +128,7 @@ InterlockedOr(IN OUT LONG volatile *Target, return j; } +#endif /* * generic information class probing code @@ -156,10 +164,11 @@ typedef struct _INFORMATION_CLASS_INFO #define IQS(TypeQuery, TypeSet, AlignmentQuery, AlignmentSet, Flags) \ { sizeof(TypeQuery), sizeof(TypeSet), sizeof(AlignmentQuery), sizeof(AlignmentSet), Flags } -static __inline NTSTATUS -DefaultSetInfoBufferCheck(UINT Class, +FORCEINLINE +NTSTATUS +DefaultSetInfoBufferCheck(ULONG Class, const INFORMATION_CLASS_INFO *ClassList, - UINT ClassListEntries, + ULONG ClassListEntries, PVOID Buffer, ULONG BufferLength, KPROCESSOR_MODE PreviousMode) @@ -205,10 +214,11 @@ DefaultSetInfoBufferCheck(UINT Class, return Status; } -static __inline NTSTATUS -DefaultQueryInfoBufferCheck(UINT Class, +FORCEINLINE +NTSTATUS +DefaultQueryInfoBufferCheck(ULONG Class, const INFORMATION_CLASS_INFO *ClassList, - UINT ClassListEntries, + ULONG ClassListEntries, PVOID Buffer, ULONG BufferLength, PULONG ReturnLength, diff --git a/reactos/ntoskrnl/include/internal/ob_x.h b/reactos/ntoskrnl/include/internal/ob_x.h index c1dfeec9659..42e469922da 100644 --- a/reactos/ntoskrnl/include/internal/ob_x.h +++ b/reactos/ntoskrnl/include/internal/ob_x.h @@ -7,7 +7,7 @@ */ VOID -static __inline +FORCEINLINE ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) { /* Check if we have a security descriptor */ @@ -22,12 +22,12 @@ ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) } PVOID -static __inline +FORCEINLINE ObpAllocateCapturedAttributes(IN PP_NPAGED_LOOKASIDE_NUMBER Type) { - PKPRCB Prcb = KeGetCurrentPrcb(); PVOID Buffer; PNPAGED_LOOKASIDE_LIST List; + PKPRCB Prcb = KeGetCurrentPrcb(); /* Get the P list first */ List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].P; @@ -63,8 +63,8 @@ static __inline ObpFreeCapturedAttributes(IN PVOID Buffer, IN PP_NPAGED_LOOKASIDE_NUMBER Type) { - PKPRCB Prcb = KeGetCurrentPrcb(); PNPAGED_LOOKASIDE_LIST List; + PKPRCB Prcb = KeGetCurrentPrcb(); /* Use the P List */ List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].P; diff --git a/reactos/ntoskrnl/include/internal/rtl.h b/reactos/ntoskrnl/include/internal/rtl.h index d3d0c9e2d59..7aa46a163db 100644 --- a/reactos/ntoskrnl/include/internal/rtl.h +++ b/reactos/ntoskrnl/include/internal/rtl.h @@ -11,7 +11,7 @@ extern PUSHORT NlsUnicodeUpcaseTable; extern PUSHORT NlsUnicodeLowercaseTable; VOID -STDCALL +NTAPI RtlpInitNls(VOID); VOID diff --git a/reactos/ntoskrnl/include/internal/se.h b/reactos/ntoskrnl/include/internal/se.h index facbdae868f..a158320434f 100644 --- a/reactos/ntoskrnl/include/internal/se.h +++ b/reactos/ntoskrnl/include/internal/se.h @@ -137,13 +137,6 @@ SeInitializeProcessAuditName( OUT POBJECT_NAME_INFORMATION *AuditInfo ); -NTSTATUS -NTAPI -SeLocateProcessImageName( - IN PEPROCESS Process, - OUT PUNICODE_STRING *ProcessImageName -); - NTSTATUS NTAPI SeCreateAccessStateEx( @@ -163,7 +156,7 @@ SeIsTokenChild( ); NTSTATUS -STDCALL +NTAPI SepCreateImpersonationTokenDacl( PTOKEN Token, PTOKEN PrimaryToken, @@ -175,7 +168,7 @@ NTAPI SepInitializeTokenImplementation(VOID); PTOKEN -STDCALL +NTAPI SepCreateSystemProcessToken(VOID); BOOLEAN @@ -239,7 +232,7 @@ SepPrivilegeCheck( ); NTSTATUS -STDCALL +NTAPI SepDuplicateToken( PTOKEN Token, POBJECT_ATTRIBUTES ObjectAttributes, @@ -306,7 +299,7 @@ SepReleaseAcl( ); NTSTATUS -STDCALL +NTAPI SeDefaultObjectMethod( PVOID Object, SECURITY_OPERATION_CODE OperationType, @@ -344,11 +337,11 @@ SeSetWorldSecurityDescriptor( KeLeaveCriticalRegion(); \ while(0) -VOID STDCALL +VOID NTAPI SeQuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); -VOID STDCALL +VOID NTAPI SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); diff --git a/reactos/ntoskrnl/include/internal/test.h b/reactos/ntoskrnl/include/internal/test.h index 955fa7944e6..504298f9bb6 100644 --- a/reactos/ntoskrnl/include/internal/test.h +++ b/reactos/ntoskrnl/include/internal/test.h @@ -2,11 +2,11 @@ #define __NTOSKRNL_INCLUDE_INTERNAL_TEST_H typedef VOID -STDCALL +NTAPI PExFreePool(PVOID Block); typedef PMDL -STDCALL +NTAPI PMmCreateMdl( PMDL Mdl, PVOID Base, @@ -14,7 +14,7 @@ PMmCreateMdl( ); typedef VOID -STDCALL +NTAPI PMmProbeAndLockPages( PMDL Mdl, KPROCESSOR_MODE AccessMode, @@ -26,7 +26,7 @@ FASTCALL PObDereferenceObject(PVOID Object); typedef NTSTATUS -STDCALL +NTAPI PObReferenceObjectByHandle( HANDLE Handle, ACCESS_MASK DesiredAccess, diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h index 1fdfb208761..92d3ecb9253 100644 --- a/reactos/ntoskrnl/include/ntoskrnl.h +++ b/reactos/ntoskrnl/include/ntoskrnl.h @@ -13,7 +13,9 @@ #define _NTSYSTEM_ /* DDK/IFS/NDK Headers */ +#ifdef __GNUC__ #include +#endif #include #include #include diff --git a/reactos/ntoskrnl/ke/i386/abios.c b/reactos/ntoskrnl/ke/i386/abios.c index b47feb86a94..0f05043c597 100644 --- a/reactos/ntoskrnl/ke/i386/abios.c +++ b/reactos/ntoskrnl/ke/i386/abios.c @@ -18,7 +18,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI KeI386FlatToGdtSelector(IN ULONG Base, IN USHORT Length, IN USHORT Selector)