[gadamopoulos] 48287: [ntos] - Fix several issues with msvc in ntoskrnl - Add ATTRIB_NORETURN definition which will be used by function pointers because msvc doesn't like DECLSPEC_NORETURN in function pointers
Author: gadamopoulos Date: Mon Jul 26 21:32:38 2010 New Revision: 48287
URL: http://svn.reactos.org/svn/reactos?rev=48287&view=rev Log: [ntos] - Fix several issues with msvc in ntoskrnl - Add ATTRIB_NORETURN definition which will be used by function pointers because msvc doesn't like DECLSPEC_NORETURN in function pointers
Modified: trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/stdlib.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c
Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?r... ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -28,10 +28,9 @@ );
typedef -FASTCALL -VOID -DECLSPEC_NORETURN -(*PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)( +VOID +ATTRIB_NORETURN +(FASTCALL *PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)( IN PKTRAP_FRAME TrapFrame );
@@ -558,8 +557,8 @@ VOID HalpApcInterrupt(VOID); VOID HalpDispatchInterrupt(VOID); VOID HalpDispatchInterrupt2(VOID); -VOID FASTCALL DECLSPEC_NORETURN HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); -VOID FASTCALL DECLSPEC_NORETURN HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame);
/* timer.c */ VOID NTAPI HalpInitializeClock(VOID);
Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=48... ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -205,6 +205,12 @@ #define _CRT_UNUSED(x) (void)x #endif
+#ifdef _MSC_VER +#define ATTRIB_NORETURN +#else +#define ATTRIB_NORETURN DECLSPEC_NORETURN +#endif + #include "_mingw_mac.h"
#endif /* !_INC_MINGW */
Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=48... ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -136,7 +136,7 @@ #define _JMP_BUF_DEFINED #endif
-static inline __attribute__((always_inline)) void * mingw_getsp(void) +FORCEINLINE void * mingw_getsp(void) { void *value; #if defined(__x86_64)
Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=48... ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -489,7 +489,9 @@
__MINGW_EXTENSION lldiv_t __cdecl lldiv(long long, long long);
+#ifndef _MSC_VER __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(long long _j) { return (_j >= 0 ? _j : -_j); } +#endif
__MINGW_EXTENSION long long __cdecl strtoll(const char* __restrict__, char** __restrict, int); __MINGW_EXTENSION unsigned long long __cdecl strtoull(const char* __restrict__, char** __restrict__, int);
Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=4828... ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -1230,6 +1230,8 @@ SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARCHITECTURE; }
+extern BOOLEAN AllowPagedPool; + VOID NTAPI Phase1InitializationDiscard(IN PVOID Context) @@ -1860,7 +1862,6 @@ InbvEnableDisplayString(TRUE);
/* Enough fun for now */ - extern BOOLEAN AllowPagedPool; AllowPagedPool = FALSE;
/* Wait 5 seconds for it to initialize */
Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -455,7 +455,7 @@ extern ULONG KiFastSystemCallDisable; extern UCHAR KiDebugRegisterTrapOffsets[9]; extern UCHAR KiDebugRegisterContextOffsets[9]; -extern VOID __cdecl KiTrap02(VOID); +extern DECLSPEC_NORETURN VOID __cdecl KiTrap02(VOID); extern VOID __cdecl KiTrap08(VOID); extern VOID __cdecl KiTrap13(VOID); extern VOID __cdecl KiFastCallEntry(VOID);
Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/k... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -940,6 +940,7 @@ IN PKTRAP_FRAME TrapFrame );
+DECLSPEC_NORETURN VOID FASTCALL KiServiceExit( @@ -947,6 +948,7 @@ IN NTSTATUS Status );
+DECLSPEC_NORETURN VOID FASTCALL KiServiceExit2(
Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/t... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -199,7 +199,7 @@ DECLSPEC_NORETURN VOID FASTCALL KiTrapReturnNoSegments(IN PKTRAP_FRAME TrapFrame);
typedef -DECLSPEC_NORETURN +ATTRIB_NORETURN VOID (FASTCALL *PFAST_SYSTEM_CALL_EXIT)( IN PKTRAP_FRAME TrapFrame
Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c?... ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -29,8 +29,8 @@ NTAPI IopReadyDeviceObjects(IN PDRIVER_OBJECT Driver) { + PDEVICE_OBJECT DeviceObject; PAGED_CODE(); - PDEVICE_OBJECT DeviceObject;
/* Set the driver as initialized */ Driver->Flags |= DRVO_INITIALIZED;
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c... ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -3035,10 +3035,11 @@ PpIrpQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, OUT PDEVICE_CAPABILITIES DeviceCaps) { - PAGED_CODE(); PVOID Dummy; IO_STACK_LOCATION Stack; - + + PAGED_CODE(); + /* Set up the Header */ RtlZeroMemory(DeviceCaps, sizeof(DEVICE_CAPABILITIES)); DeviceCaps->Size = sizeof(DEVICE_CAPABILITIES);
Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -1173,7 +1173,12 @@ Cr0 = __readcr0() & ~(CR0_MP | CR0_TS | CR0_EM | CR0_ET);
/* Store on FPU stack */ +#ifdef _MSC_VER + __asm fninit; + __asm fnstsw Magic; +#else asm volatile ("fninit;" "fnstsw %0" : "+m"(Magic)); +#endif
/* Magic should now be cleared */ if (Magic & 0xFF) @@ -1210,7 +1215,7 @@ __writecr0(Cr0 & ~(CR0_MP | CR0_TS | CR0_EM));
/* Initialize FPU state */ - asm volatile ("fninit"); + Ke386FnInit();
/* Multiply the magic values and divide, we should get the result back */ Value1 = 4195835.0; @@ -1227,8 +1232,8 @@ return ErrataPresent; }
-NTAPI -VOID +VOID +NTAPI KiFlushNPXState(IN PFLOATING_SAVE_AREA SaveArea) { ULONG EFlags, Cr0;
Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -1106,9 +1106,9 @@ return; }
+DECLSPEC_NORETURN VOID NTAPI -DECLSPEC_NORETURN KiDispatchExceptionFromTrapFrame(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG ParameterCount, @@ -1145,9 +1145,9 @@ KiEoiHelper(TrapFrame); }
+DECLSPEC_NORETURN VOID FASTCALL -DECLSPEC_NORETURN KiSystemFatalException(IN ULONG ExceptionCode, IN PKTRAP_FRAME TrapFrame) {
Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?r... ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -184,9 +184,8 @@ }
typedef -FASTCALL -VOID -(PKI_INTERRUPT_DISPATCH)( +VOID +(FASTCALL *PKI_INTERRUPT_DISPATCH)( IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt ); @@ -310,7 +309,7 @@ KiEnterInterruptTrap(TrapFrame);
/* Call the correct dispatcher */ - ((PKI_INTERRUPT_DISPATCH*)Interrupt->DispatchAddress)(TrapFrame, Interrupt); + ((PKI_INTERRUPT_DISPATCH)Interrupt->DispatchAddress)(TrapFrame, Interrupt); }
Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?r... ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -16,8 +16,8 @@ /* GLOBALS *******************************************************************/
/* Boot and double-fault/NMI/DPC stack */ -UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; -UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; +UCHAR DECLSPEC_ALIGN(16) P0BootStackData[KERNEL_STACK_SIZE] = {0}; +UCHAR DECLSPEC_ALIGN(16) KiDoubleFaultStackData[KERNEL_STACK_SIZE] = {0}; ULONG_PTR P0BootStack = (ULONG_PTR)&P0BootStackData[KERNEL_STACK_SIZE]; ULONG_PTR KiDoubleFaultStack = (ULONG_PTR)&KiDoubleFaultStackData[KERNEL_STACK_SIZE];
Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.c... ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -102,9 +102,9 @@ } }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiEoiHelper(IN PKTRAP_FRAME TrapFrame) { /* Common trap exit code */ @@ -123,9 +123,9 @@ KiTrapReturnNoSegments(TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiServiceExit(IN PKTRAP_FRAME TrapFrame, IN NTSTATUS Status) { @@ -161,9 +161,9 @@ KiSystemCallReturn(TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiServiceExit2(IN PKTRAP_FRAME TrapFrame) { /* Common trap exit code */ @@ -188,9 +188,9 @@
/* TRAP HANDLERS **************************************************************/
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiDebugHandler(IN PKTRAP_FRAME TrapFrame, IN ULONG Parameter1, IN ULONG Parameter2, @@ -212,9 +212,9 @@ TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiNpxHandler(IN PKTRAP_FRAME TrapFrame, IN PKTHREAD Thread, IN PFX_SAVE_AREA SaveArea) @@ -369,9 +369,9 @@ KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 1, Error, 0, 0, TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap00Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -389,9 +389,9 @@ TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap01Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -410,8 +410,9 @@ TrapFrame); }
-VOID -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +__cdecl KiTrap02(VOID) { PKTSS Tss, NmiTss; @@ -556,9 +557,9 @@ KiSystemFatalException(EXCEPTION_NMI, NULL); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap03Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -568,9 +569,9 @@ KiDebugHandler(TrapFrame, BREAKPOINT_BREAK, 0, 0); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap04Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -588,9 +589,9 @@ TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap05Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -611,9 +612,9 @@ TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap06Handler(IN PKTRAP_FRAME TrapFrame) { PUCHAR Instruction; @@ -693,9 +694,9 @@
}
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap07Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread, NpxThread; @@ -803,18 +804,18 @@ KiNpxHandler(TrapFrame, Thread, SaveArea); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap08Handler(IN PKTRAP_FRAME TrapFrame) { /* FIXME: Not handled */ KiSystemFatalException(EXCEPTION_DOUBLE_FAULT, TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap09Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -825,9 +826,9 @@ KiSystemFatalException(EXCEPTION_NPX_OVERRUN, TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0AHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -840,9 +841,9 @@ KiSystemFatalException(EXCEPTION_INVALID_TSS, TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0BHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -853,9 +854,9 @@ KiSystemFatalException(EXCEPTION_SEGMENT_NOT_PRESENT, TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0CHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -866,9 +867,9 @@ KiSystemFatalException(EXCEPTION_STACK_FAULT, TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame) { ULONG i, j, Iopl; @@ -1145,9 +1146,9 @@ KiTrapReturn(TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1260,9 +1261,9 @@ TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0FHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1273,9 +1274,9 @@ KiSystemFatalException(EXCEPTION_RESERVED_TRAP, TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap10Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1301,9 +1302,9 @@ KiNpxHandler(TrapFrame, Thread, SaveArea); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap11Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1314,9 +1315,9 @@ KiSystemFatalException(EXCEPTION_ALIGNMENT_CHECK, TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap13Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1417,9 +1418,9 @@ while (TRUE); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiRaiseAssertionHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1434,9 +1435,9 @@ TrapFrame); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiDebugServiceHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1449,9 +1450,9 @@ KiDebugHandler(TrapFrame, TrapFrame->Eax, TrapFrame->Ecx, TrapFrame->Edx); }
+DECLSPEC_NORETURN VOID FORCEINLINE -DECLSPEC_NORETURN KiSystemCall(IN PKTRAP_FRAME TrapFrame, IN PVOID Arguments) { @@ -1574,9 +1575,9 @@ KiServiceExit(TrapFrame, Result); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiSystemServiceHandler(IN PKTRAP_FRAME TrapFrame, IN PVOID Arguments) { @@ -1584,9 +1585,9 @@ KiSystemCall(TrapFrame, Arguments); }
-VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiFastCallEntryHandler(IN PKTRAP_FRAME TrapFrame, IN PVOID Arguments) {
Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init.... ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -145,6 +145,8 @@ } }
+extern KEVENT ZeroPageThreadEvent; + NTSTATUS NTAPI MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -497,7 +499,6 @@ MiInitializeColorTables();
/* ReactOS Stuff */ - extern KEVENT ZeroPageThreadEvent; KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE);
/* Build the PFN Database */
Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c?... ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -566,6 +566,8 @@ return Pfn1; }
+extern KEVENT ZeroPageThreadEvent; + VOID NTAPI MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) @@ -674,7 +676,6 @@ #endif
/* Notify zero page thread if enough pages are on the free list now */ - extern KEVENT ZeroPageThreadEvent; if ((MmFreePageListHead.Total > 8) && !(KeReadStateEvent(&ZeroPageThreadEvent))) { /* This is ReactOS-specific */
-
gadamopoulos＠svn.reactos.org