[ros-diffs] [sginsberg] 37745: - STDCALL -> NTAPI

Author: sginsberg
Date: Sat Nov 29 14:47:48 2008
New Revision: 37745

URL: http://svn.reactos.org/svn/reactos?rev=37745&view=rev
Log:
- STDCALL -> NTAPI

Modified:
    trunk/reactos/ntoskrnl/cc/cacheman.c
    trunk/reactos/ntoskrnl/cc/copy.c
    trunk/reactos/ntoskrnl/cc/fs.c
    trunk/reactos/ntoskrnl/cc/mdl.c
    trunk/reactos/ntoskrnl/cc/pin.c
    trunk/reactos/ntoskrnl/cc/view.c
    trunk/reactos/ntoskrnl/ex/shutdown.c
    trunk/reactos/ntoskrnl/ex/uuid.c
    trunk/reactos/ntoskrnl/ex/win32k.c
    trunk/reactos/ntoskrnl/ex/zone.c
    trunk/reactos/ntoskrnl/fsrtl/dbcsname.c
    trunk/reactos/ntoskrnl/include/internal/kd.h
    trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h
    trunk/reactos/ntoskrnl/include/internal/se.h
    trunk/reactos/ntoskrnl/io/iomgr/driver.c
    trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c
    trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c
    trunk/reactos/ntoskrnl/kd/kdinit.c
    trunk/reactos/ntoskrnl/kd/kdio.c
    trunk/reactos/ntoskrnl/kd/kdmain.c
    trunk/reactos/ntoskrnl/kd/wrappers/bochs.c
    trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c
    trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c
    trunk/reactos/ntoskrnl/kdbg/kdb.c
    trunk/reactos/ntoskrnl/kdbg/kdb.h
    trunk/reactos/ntoskrnl/ke/i386/ldt.c
    trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c
    trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
    trunk/reactos/ntoskrnl/ke/powerpc/stubs.c
    trunk/reactos/ntoskrnl/ke/profobj.c
    trunk/reactos/ntoskrnl/mm/anonmem.c
    trunk/reactos/ntoskrnl/mm/balance.c
    trunk/reactos/ntoskrnl/mm/cont.c
    trunk/reactos/ntoskrnl/mm/drvlck.c
    trunk/reactos/ntoskrnl/mm/i386/page.c
    trunk/reactos/ntoskrnl/mm/i386/pagepae.c
    trunk/reactos/ntoskrnl/mm/iospace.c
    trunk/reactos/ntoskrnl/mm/marea.c
    trunk/reactos/ntoskrnl/mm/mdlsup.c
    trunk/reactos/ntoskrnl/mm/mpw.c
    trunk/reactos/ntoskrnl/mm/ncache.c
    trunk/reactos/ntoskrnl/mm/npool.c
    trunk/reactos/ntoskrnl/mm/pagefile.c
    trunk/reactos/ntoskrnl/mm/pool.c
    trunk/reactos/ntoskrnl/mm/powerpc/page.c
    trunk/reactos/ntoskrnl/mm/ppool.c
    trunk/reactos/ntoskrnl/mm/procsup.c
    trunk/reactos/ntoskrnl/mm/section.c
    trunk/reactos/ntoskrnl/mm/virtual.c
    trunk/reactos/ntoskrnl/mm/wset.c
    trunk/reactos/ntoskrnl/ps/quota.c
    trunk/reactos/ntoskrnl/rtl/libsupp.c
    trunk/reactos/ntoskrnl/rtl/misc.c
    trunk/reactos/ntoskrnl/se/access.c
    trunk/reactos/ntoskrnl/se/acl.c
    trunk/reactos/ntoskrnl/se/audit.c
    trunk/reactos/ntoskrnl/se/lsa.c
    trunk/reactos/ntoskrnl/se/priv.c
    trunk/reactos/ntoskrnl/se/sd.c
    trunk/reactos/ntoskrnl/se/semgr.c
    trunk/reactos/ntoskrnl/se/token.c
    trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c

Modified: trunk/reactos/ntoskrnl/cc/cacheman.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -46,7 +46,7 @@
  * @unimplemented
  */
 LARGE_INTEGER
-STDCALL
+NTAPI
 CcGetFlushedValidData (
     IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
     IN BOOLEAN BcbListHeld
@@ -64,7 +64,7 @@
  * @unimplemented
  */
 PVOID
-STDCALL
+NTAPI
 CcRemapBcb (
     IN PVOID Bcb
     )
@@ -78,7 +78,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcScheduleReadAhead (
 	IN	PFILE_OBJECT		FileObject,
 	IN	PLARGE_INTEGER		FileOffset,
@@ -92,7 +92,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcSetAdditionalCacheAttributes (
 	IN	PFILE_OBJECT	FileObject,
 	IN	BOOLEAN		DisableReadAhead,
@@ -106,7 +106,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcSetBcbOwnerPointer (
 	IN	PVOID	Bcb,
 	IN	PVOID	Owner
@@ -119,7 +119,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcSetDirtyPageThreshold (
 	IN	PFILE_OBJECT	FileObject,
 	IN	ULONG		DirtyPageThreshold
@@ -132,7 +132,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcSetReadAheadGranularity (
 	IN	PFILE_OBJECT	FileObject,
 	IN	ULONG		Granularity

Modified: trunk/reactos/ntoskrnl/cc/copy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -271,7 +271,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcCanIWrite (
 			IN	PFILE_OBJECT	FileObject,
 			IN	ULONG			BytesToWrite,
@@ -286,7 +286,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcCopyRead (IN PFILE_OBJECT FileObject,
 	    IN PLARGE_INTEGER FileOffset,
 	    IN ULONG Length,
@@ -404,7 +404,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcCopyWrite (IN PFILE_OBJECT FileObject,
 	     IN PLARGE_INTEGER FileOffset,
 	     IN ULONG Length,
@@ -515,7 +515,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcDeferWrite (
 	IN	PFILE_OBJECT		FileObject,
 	IN	PCC_POST_DEFERRED_WRITE	PostRoutine,
@@ -532,7 +532,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcFastCopyRead (
     IN  PFILE_OBJECT FileObject,
     IN  ULONG FileOffset,
@@ -548,7 +548,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcFastCopyWrite(
     IN  PFILE_OBJECT FileObject,
     IN  ULONG FileOffset,
@@ -562,7 +562,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 CcWaitForCurrentLazyWriterActivity (
     VOID
     )
@@ -574,7 +574,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcZeroData (IN PFILE_OBJECT     FileObject,
 	    IN PLARGE_INTEGER   StartOffset,
 	    IN PLARGE_INTEGER   EndOffset,

Modified: trunk/reactos/ntoskrnl/cc/fs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=37745…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -30,7 +30,7 @@
  * @unimplemented
  */
 LARGE_INTEGER
-STDCALL
+NTAPI
 CcGetDirtyPages (
 	IN	PVOID			LogHandle,
 	IN	PDIRTY_PAGE_ROUTINE	DirtyPageRoutine,
@@ -48,7 +48,7 @@
  * @implemented
  */
 PFILE_OBJECT
-STDCALL
+NTAPI
 CcGetFileObjectFromBcb (
 	IN	PVOID	Bcb
 	)
@@ -61,7 +61,7 @@
  * @unimplemented
  */
 LARGE_INTEGER
-STDCALL
+NTAPI
 CcGetLsnForFileObject (
 	IN	PFILE_OBJECT	FileObject,
 	OUT	PLARGE_INTEGER	OldestLsn OPTIONAL
@@ -77,7 +77,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcInitializeCacheMap (
 	IN	PFILE_OBJECT			FileObject,
 	IN	PCC_FILE_SIZES			FileSizes,
@@ -99,7 +99,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 CcIsThereDirtyData (
 	IN	PVPB	Vpb
 	)
@@ -112,7 +112,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 CcPurgeCacheSection (
 	IN	PSECTION_OBJECT_POINTERS	SectionObjectPointer,
 	IN	PLARGE_INTEGER			FileOffset OPTIONAL,
@@ -128,7 +128,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetFileSizes (IN PFILE_OBJECT FileObject,
 		IN PCC_FILE_SIZES FileSizes)
 {
@@ -219,7 +219,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcSetLogHandleForFile (
 	IN	PFILE_OBJECT	FileObject,
 	IN	PVOID		LogHandle,
@@ -233,7 +233,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 CcUninitializeCacheMap (
 	IN	PFILE_OBJECT			FileObject,
 	IN	PLARGE_INTEGER			TruncateSize OPTIONAL,

Modified: trunk/reactos/ntoskrnl/cc/mdl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev=3774…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -19,7 +19,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 CcMdlRead(
 	IN	PFILE_OBJECT		FileObject,
 	IN	PLARGE_INTEGER		FileOffset,
@@ -49,7 +49,7 @@
  *
  */
 VOID
-STDCALL
+NTAPI
 CcMdlReadComplete2(IN PMDL MemoryDescriptorList,
                      IN PFILE_OBJECT FileObject)
 {
@@ -81,7 +81,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 CcMdlReadComplete(IN PFILE_OBJECT FileObject,
                   IN PMDL MdlChain)
 {
@@ -109,7 +109,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 CcMdlWriteComplete(IN PFILE_OBJECT FileObject,
                    IN PLARGE_INTEGER FileOffset,
                    IN PMDL MdlChain)
@@ -150,7 +150,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcMdlWriteAbort (
     IN PFILE_OBJECT FileObject,
     IN PMDL MdlChain
@@ -163,7 +163,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcPrepareMdlWrite (
 	IN	PFILE_OBJECT		FileObject,
 	IN	PLARGE_INTEGER		FileOffset,

Modified: trunk/reactos/ntoskrnl/cc/pin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=3774…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -22,7 +22,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcMapData (IN PFILE_OBJECT FileObject,
 	   IN PLARGE_INTEGER FileOffset,
 	   IN ULONG Length,
@@ -106,7 +106,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 CcPinMappedData (
 	IN	PFILE_OBJECT		FileObject,
 	IN	PLARGE_INTEGER		FileOffset,
@@ -123,7 +123,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 CcPinRead (
 	IN	PFILE_OBJECT		FileObject,
 	IN	PLARGE_INTEGER		FileOffset,
@@ -147,7 +147,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 CcPreparePinWrite (
 	IN	PFILE_OBJECT		FileObject,
 	IN	PLARGE_INTEGER		FileOffset,
@@ -172,7 +172,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetDirtyPinnedData (IN PVOID Bcb,
 		      IN PLARGE_INTEGER Lsn)
 {
@@ -184,7 +184,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcUnpinData (IN PVOID Bcb)
 {
   PINTERNAL_BCB iBcb = Bcb;
@@ -200,7 +200,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcUnpinDataForThread (
 	IN	PVOID			Bcb,
 	IN	ERESOURCE_THREAD	ResourceThreadId
@@ -213,7 +213,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 CcRepinBcb (
 	IN	PVOID	Bcb
 	)
@@ -226,7 +226,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 CcUnpinRepinnedBcb (
 	IN	PVOID			Bcb,
 	IN	BOOLEAN			WriteThrough,

Modified: trunk/reactos/ntoskrnl/cc/view.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -117,7 +117,7 @@
 /* FUNCTIONS *****************************************************************/
 
 VOID
-STDCALL
+NTAPI
 CcRosTraceCacheMap (
 	PBCB Bcb,
 	BOOLEAN Trace )
@@ -818,7 +818,7 @@
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CcRosRequestCacheSegment(PBCB Bcb,
 		      ULONG FileOffset,
 		      PVOID* BaseAddress,
@@ -947,7 +947,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcFlushCache(IN PSECTION_OBJECT_POINTERS SectionObjectPointers,
 	     IN PLARGE_INTEGER FileOffset OPTIONAL,
 	     IN ULONG Length,
@@ -1164,7 +1164,7 @@
   KeReleaseGuardedMutex(&ViewLock);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CcRosReleaseFileCache(PFILE_OBJECT FileObject)
 /*
  * FUNCTION: Called by the file system when a handle to a file object
@@ -1301,7 +1301,7 @@
 /*
  * @implemented
  */
-PFILE_OBJECT STDCALL
+PFILE_OBJECT NTAPI
 CcGetFileObjectFromSectionPtrs(IN PSECTION_OBJECT_POINTERS SectionObjectPointers)
 {
    PBCB Bcb;
@@ -1314,7 +1314,7 @@
    return NULL;
 }
 
-VOID STDCALL
+VOID NTAPI
 CmLazyCloseThreadMain(PVOID Ignored)
 {
    LARGE_INTEGER Timeout;

Modified: trunk/reactos/ntoskrnl/ex/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -14,7 +14,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
-VOID STDCALL
+VOID NTAPI
 KiHaltProcessorDpcRoutine(IN PKDPC Dpc,
 			  IN PVOID DeferredContext,
 			  IN PVOID SystemArgument1,
@@ -36,7 +36,7 @@
      }
 }
 
-VOID STDCALL
+VOID NTAPI
 ShutdownThreadMain(PVOID Context)
 {
    SHUTDOWN_ACTION Action = (SHUTDOWN_ACTION)Context;
@@ -215,7 +215,7 @@
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtSetSystemPowerState(IN POWER_ACTION SystemAction,
 		      IN SYSTEM_POWER_STATE MinSystemState,
 		      IN ULONG Flags)
@@ -227,7 +227,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtShutdownSystem(IN SHUTDOWN_ACTION Action)
 {
    NTSTATUS Status;

Modified: trunk/reactos/ntoskrnl/ex/uuid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/uuid.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/uuid.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/uuid.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -253,7 +253,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtAllocateLocallyUniqueId(OUT LUID *LocallyUniqueId)
 {
     LUID NewLuid;

Modified: trunk/reactos/ntoskrnl/ex/win32k.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -42,7 +42,7 @@
 /* FUNCTIONS ****************************************************************/
 
 VOID
-STDCALL
+NTAPI
 ExpWinStaObjectDelete(PVOID DeletedObject)
 {
     WIN32_DELETEMETHOD_PARAMETERS Parameters;
@@ -55,7 +55,7 @@
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 ExpWinStaObjectParse(IN PVOID ParseObject,
                      IN PVOID ObjectType,
                      IN OUT PACCESS_STATE AccessState,
@@ -85,7 +85,7 @@
     return ExpWindowStationObjectParse(&Parameters);
 }
 VOID
-STDCALL
+NTAPI
 ExpDesktopDelete(PVOID DeletedObject)
 {
     WIN32_DELETEMETHOD_PARAMETERS Parameters;
@@ -99,7 +99,7 @@
 
 VOID
 INIT_FUNCTION
-STDCALL
+NTAPI
 ExpWin32kInit(VOID)
 {
     OBJECT_TYPE_INITIALIZER ObjectTypeInitializer;

Modified: trunk/reactos/ntoskrnl/ex/zone.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/zone.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/zone.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/zone.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -19,7 +19,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 ExExtendZone(PZONE_HEADER Zone,
              PVOID Segment,
              ULONG SegmentSize)
@@ -69,7 +69,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 ExInterlockedExtendZone(PZONE_HEADER Zone,
                         PVOID Segment,
                         ULONG SegmentSize,
@@ -101,7 +101,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 ExInitializeZone(PZONE_HEADER Zone,
                  ULONG BlockSize,
                  PVOID InitialSegment,

Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -171,7 +171,7 @@
  *
  *--*/
 BOOLEAN
-STDCALL
+NTAPI
 FsRtlIsHpfsDbcsLegal(IN ANSI_STRING DbcsName,
                      IN BOOLEAN WildCardsPermissible,
                      IN BOOLEAN PathNamePermissible,

Modified: trunk/reactos/ntoskrnl/include/internal/kd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -157,25 +157,25 @@
 
 typedef
 VOID
-(STDCALL*PKDP_INIT_ROUTINE)(
-    struct _KD_DISPATCH_TABLE *DispatchTable,
-    ULONG BootPhase
-);
-
-typedef
-VOID
-(STDCALL*PKDP_PRINT_ROUTINE)(
+(NTAPI*PKDP_INIT_ROUTINE)(
+    struct _KD_DISPATCH_TABLE *DispatchTable,
+    ULONG BootPhase
+);
+
+typedef
+VOID
+(NTAPI*PKDP_PRINT_ROUTINE)(
     LPSTR String,
     ULONG Length
 );
 
 typedef
 VOID
-(STDCALL*PKDP_PROMPT_ROUTINE)(PCH String);
+(NTAPI*PKDP_PROMPT_ROUTINE)(PCH String);
 
 typedef
 KD_CONTINUE_TYPE
-(STDCALL*PKDP_EXCEPTION_ROUTINE)(
+(NTAPI*PKDP_EXCEPTION_ROUTINE)(
     PEXCEPTION_RECORD ExceptionRecord,
     PCONTEXT Context,
     PKTRAP_FRAME TrapFrame
@@ -191,41 +191,41 @@
 );
 
 VOID
-STDCALL
+NTAPI
 KdpScreenInit(
     struct _KD_DISPATCH_TABLE *DispatchTable,
     ULONG BootPhase
 );
 
 VOID
-STDCALL
+NTAPI
 KdpSerialInit(
     struct _KD_DISPATCH_TABLE *DispatchTable,
     ULONG BootPhase
 );
 
 VOID
-STDCALL
+NTAPI
 KdpInitDebugLog(
     struct _KD_DISPATCH_TABLE *DispatchTable,
     ULONG BootPhase
 );
 
 VOID
-STDCALL
+NTAPI
 KdpBochsInit(
     struct _KD_DISPATCH_TABLE *DispatchTable,
     ULONG BootPhase
 );
 
 VOID
-STDCALL
+NTAPI
 KdpGdbStubInit(
     struct _KD_DISPATCH_TABLE *DispatchTable,
     ULONG BootPhase);
 
 VOID
-STDCALL
+NTAPI
 KdpKdbgInit(
     struct _KD_DISPATCH_TABLE *DispatchTable,
     ULONG BootPhase);
@@ -242,24 +242,24 @@
 );
 
 ULONG
-STDCALL
+NTAPI
 KdpPrintString(
     LPSTR String,
     ULONG Length);
 
 BOOLEAN
-STDCALL
+NTAPI
 KdpDetectConflicts(PCM_RESOURCE_LIST DriverList);
 
 VOID
-STDCALL
+NTAPI
 KdpBochsDebugPrint(
     IN PCH Message,
     IN ULONG Length
 );
 
 BOOLEAN
-STDCALL
+NTAPI
 KdpSafeReadMemory(
     IN ULONG_PTR Addr,
     IN LONG Len,
@@ -267,7 +267,7 @@
 );
 
 BOOLEAN
-STDCALL
+NTAPI
 KdpSafeWriteMemory(
     IN ULONG_PTR Addr,
     IN LONG Len,
@@ -275,7 +275,7 @@
 );
 
 VOID
-STDCALL
+NTAPI
 KdpEnableSafeMem();
 
 

Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Sat Nov 29 14:47:48
2008
@@ -135,7 +135,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KePPCInitThreadWithContext(
 	PKTHREAD Thread,
 	PKSYSTEM_ROUTINE SystemRoutine,
@@ -144,12 +144,12 @@
 	PCONTEXT Context);
 
 VOID
-STDCALL
+NTAPI
 KeApplicationProcessorInitDispatcher(
   VOID);
 
 VOID
-STDCALL
+NTAPI
 KeCreateApplicationProcessorIdleThread(
   ULONG Id);
 
@@ -160,7 +160,7 @@
 
 #ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */
 VOID
-STDCALL
+NTAPI
 KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine,
                 PKSTART_ROUTINE StartRoutine,
                 PVOID StartContext,

Modified: trunk/reactos/ntoskrnl/include/internal/se.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -316,7 +316,7 @@
 );
 
 NTSTATUS
-STDCALL
+NTAPI
 SeCopyClientToken(
     IN PACCESS_TOKEN Token,
     IN SECURITY_IMPERSONATION_LEVEL Level,

Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -35,7 +35,7 @@
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 IopInvalidDeviceRequest(
    PDEVICE_OBJECT DeviceObject,
    PIRP Irp)
@@ -493,7 +493,7 @@
  * Internal routine used by IopAttachFilterDrivers.
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 IopAttachFilterDriversCallback(
    PWSTR ValueName,
    ULONG ValueType,
@@ -968,7 +968,7 @@
  *    Guard the whole function by SEH.
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers)
 {
    RTL_QUERY_REGISTRY_TABLE QueryTable[2];
@@ -1746,7 +1746,7 @@
  * Status
  *    implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtLoadDriver(IN PUNICODE_STRING DriverServiceName)
 {
     UNICODE_STRING CapturedDriverServiceName = {0};
@@ -1828,7 +1828,7 @@
  *    implemented
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtUnloadDriver(IN PUNICODE_STRING DriverServiceName)
 {
    return IopUnloadDriver(DriverServiceName, FALSE);

Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -53,7 +53,7 @@
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
-static NTSTATUS STDCALL
+static NTSTATUS NTAPI
 IopGetGroupOrderList(PWSTR ValueName,
 		     ULONG ValueType,
 		     PVOID ValueData,
@@ -95,7 +95,7 @@
   return STATUS_SUCCESS;
 }
 
-static NTSTATUS STDCALL
+static NTSTATUS NTAPI
 IopCreateGroupListEntry(PWSTR ValueName,
 			ULONG ValueType,
 			PVOID ValueData,
@@ -146,7 +146,7 @@
 }
 
 
-static NTSTATUS STDCALL
+static NTSTATUS NTAPI
 IopCreateServiceListEntry(PUNICODE_STRING ServiceName)
 {
   RTL_QUERY_REGISTRY_TABLE QueryTable[7];

Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -95,7 +95,7 @@
  *      Status
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 IopQueryDeviceDescription(
    PIO_QUERY Query,
    UNICODE_STRING RootKey,
@@ -449,7 +449,7 @@
  *      Status
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 IopQueryBusDescription(
    PIO_QUERY Query,
    UNICODE_STRING RootKey,
@@ -655,7 +655,7 @@
 /*
  * @implemented
  */
-PCONFIGURATION_INFORMATION STDCALL
+PCONFIGURATION_INFORMATION NTAPI
 IoGetConfigurationInformation(VOID)
 {
   return(&_SystemConfigurationInformation);
@@ -664,7 +664,7 @@
 /*
  * @unimplemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 IoReportResourceUsage(PUNICODE_STRING DriverClassName,
 		      PDRIVER_OBJECT DriverObject,
 		      PCM_RESOURCE_LIST DriverList,
@@ -705,7 +705,7 @@
 /*
  * @unimplemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 IoAssignResources(PUNICODE_STRING RegistryPath,
 		  PUNICODE_STRING DriverClassName,
 		  PDRIVER_OBJECT DriverObject,
@@ -796,7 +796,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 IoReportHalResourceUsage(PUNICODE_STRING HalDescription,
 			 PCM_RESOURCE_LIST RawList,
 			 PCM_RESOURCE_LIST TranslatedList,

Modified: trunk/reactos/ntoskrnl/kd/kdinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -43,7 +43,7 @@
 /* PRIVATE FUNCTIONS *********************************************************/
 
 PCHAR
-STDCALL
+NTAPI
 KdpGetWrapperDebugMode(PCHAR Currentp2,
                        PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
@@ -84,7 +84,7 @@
 }
 
 PCHAR
-STDCALL
+NTAPI
 KdpGetDebugMode(PCHAR Currentp2)
 {
     PCHAR p2 = Currentp2;
@@ -133,7 +133,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdpCallInitRoutine(ULONG BootPhase)
 {
     PLIST_ENTRY CurrentEntry;

Modified: trunk/reactos/ntoskrnl/kd/kdio.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -30,7 +30,7 @@
 /* DEBUG LOG FUNCTIONS *******************************************************/
 
 VOID
-STDCALL
+NTAPI
 KdpPrintToLogInternal(PVOID Context)
 {
     IO_STATUS_BLOCK Iosb;
@@ -54,7 +54,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdpPrintToLog(PCH String,
               ULONG StringLength)
 {
@@ -84,7 +84,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdpInitDebugLog(PKD_DISPATCH_TABLE DispatchTable,
                 ULONG BootPhase)
 {
@@ -146,7 +146,7 @@
 /* SERIAL FUNCTIONS **********************************************************/
 
 VOID
-STDCALL
+NTAPI
 KdpSerialDebugPrint(LPSTR Message,
                     ULONG Length)
 {
@@ -164,7 +164,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable,
               ULONG BootPhase)
 {
@@ -205,7 +205,7 @@
 /* SCREEN FUNCTIONS **********************************************************/
 
 VOID
-STDCALL
+NTAPI
 KdpScreenPrint(LPSTR Message,
                ULONG Length)
 {
@@ -214,7 +214,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable,
               ULONG BootPhase)
 {
@@ -238,7 +238,7 @@
 /* GENERAL FUNCTIONS *********************************************************/
 
 ULONG
-STDCALL
+NTAPI
 KdpPrintString(LPSTR String,
                ULONG Length)
 {

Modified: trunk/reactos/ntoskrnl/kd/kdmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -20,7 +20,7 @@
 BOOLEAN KdBreakAfterSymbolLoad = FALSE;
 BOOLEAN KdpBreakPending;
 BOOLEAN KdPitchDebugger = TRUE;
-VOID STDCALL PspDumpThreads(BOOLEAN SystemThreads);
+VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads);
 
 typedef struct
 {
@@ -36,7 +36,7 @@
 /* PRIVATE FUNCTIONS *********************************************************/
 
 ULONG
-STDCALL
+NTAPI
 KdpServiceDispatcher(ULONG Service,
                      PVOID Buffer1,
                      ULONG Buffer1Length)
@@ -224,7 +224,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 KdDisableDebugger(VOID)
 {
     KIRQL OldIrql;
@@ -248,7 +248,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 KdEnableDebugger(VOID)
 {
     KIRQL OldIrql;
@@ -272,7 +272,7 @@
  * @implemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 KdPollBreakIn(VOID)
 {
     return KdpBreakPending;
@@ -282,7 +282,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 KdPowerTransition(ULONG PowerState)
 {
     UNIMPLEMENTED;

Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/bochs…
==============================================================================
--- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -17,7 +17,7 @@
 /* FUNCTIONS *****************************************************************/
 
 VOID
-STDCALL
+NTAPI
 KdpBochsDebugPrint(IN PCH Message,
                    IN ULONG Length)
 {
@@ -35,7 +35,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdpBochsInit(PKD_DISPATCH_TABLE DispatchTable,
              ULONG BootPhase)
 {

Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst…
==============================================================================
--- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -1282,7 +1282,7 @@
  * This function does all command procesing for interfacing to gdb.
  */
 KD_CONTINUE_TYPE
-STDCALL
+NTAPI
 KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
                              PCONTEXT Context,
                              PKTRAP_FRAME TrapFrame)
@@ -1660,7 +1660,7 @@
 
 
 BOOLEAN
-STDCALL
+NTAPI
 GspBreakIn(PKINTERRUPT Interrupt,
   PVOID ServiceContext)
 {
@@ -1702,14 +1702,14 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdpGdbDebugPrint(PCH Message, ULONG Length)
 {
 }
 
 /* Initialize the GDB stub */
 VOID
-STDCALL
+NTAPI
 KdpGdbStubInit(PKD_DISPATCH_TABLE WrapperTable,
                ULONG BootPhase)
 {

Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst…
==============================================================================
--- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] Sat Nov 29 14:47:48
2008
@@ -1257,7 +1257,7 @@
  * This function does all command procesing for interfacing to gdb.
  */
 KD_CONTINUE_TYPE
-STDCALL
+NTAPI
 KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
                              PCONTEXT Context,
                              PKTRAP_FRAME TrapFrame)
@@ -1622,7 +1622,7 @@
 
 
 BOOLEAN
-STDCALL
+NTAPI
 GspBreakIn(PKINTERRUPT Interrupt,
   PVOID ServiceContext)
 {
@@ -1664,14 +1664,14 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdpGdbDebugPrint(PCH Message, ULONG Length)
 {
 }
 
 /* Initialize the GDB stub */
 VOID
-STDCALL
+NTAPI
 KdpGdbStubInit(PKD_DISPATCH_TABLE WrapperTable,
                ULONG BootPhase)
 {

Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -1639,7 +1639,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdbpGetCommandLineSettings(PCHAR p1)
 {
     PCHAR p2;

Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.h?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -95,7 +95,7 @@
 
 /* from i386/kdb_help.S */
 
-VOID STDCALL
+VOID NTAPI
 KdbpStackSwitchAndCall(
    IN PVOID NewStack,
    IN VOID (*Function)(VOID));
@@ -234,7 +234,7 @@
    PVOID ProcessId);
 
 VOID
-STDCALL
+NTAPI
 KdbpGetCommandLineSettings(PCHAR p1);
 
 KD_CONTINUE_TYPE

Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -131,7 +131,7 @@
           (Base > Base+SegLimit) ? FALSE : TRUE*/ TRUE);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtSetLdtEntries (ULONG Selector1,
 		 LDT_ENTRY LdtEntry1,
 		 ULONG Selector2,

Modified: trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ctxswi…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -46,7 +46,7 @@
  *--*/
 
 VOID
-STDCALL
+NTAPI
 KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine,
                 PKSTART_ROUTINE StartRoutine,
                 PVOID StartContext,
@@ -81,7 +81,7 @@
 PKTRAP_FRAME KiLastThreadTrapFrame = NULL;
 
 VOID
-STDCALL
+NTAPI
 KiDecrementerTrap(PKTRAP_FRAME TrapFrame)
 {
     KIRQL Irql;

Modified: trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ppc_ir…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -191,7 +191,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 KeUpdateRunTime(IN PKTRAP_FRAME  TrapFrame,
                 IN KIRQL  Irql)
 {
@@ -301,7 +301,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame,
                    IN KIRQL Irql,
                    IN ULONG Increment)
@@ -365,7 +365,7 @@
     }
 }
 
-VOID STDCALL
+VOID NTAPI
 KiInterruptDispatch2 (ULONG vector, KIRQL old_level)
 /*
  * FUNCTION: Calls all the interrupt handlers for a given irq.
@@ -540,7 +540,7 @@
  * @implemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 KeConnectInterrupt(PKINTERRUPT InterruptObject)
 {
    KIRQL oldlvl,synch_oldlvl;
@@ -615,7 +615,7 @@
  *        InterruptObject = isr to release
  */
 BOOLEAN
-STDCALL
+NTAPI
 KeDisconnectInterrupt(PKINTERRUPT InterruptObject)
 {
     KIRQL oldlvl,synch_oldlvl;
@@ -671,7 +671,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 KeInitializeInterrupt(PKINTERRUPT Interrupt,
                       PKSERVICE_ROUTINE ServiceRoutine,
                       PVOID ServiceContext,

Modified: trunk/reactos/ntoskrnl/ke/powerpc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/stubs.…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/powerpc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/powerpc/stubs.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -188,7 +188,7 @@
 NtGetTickCount() { return __rdtsc(); }
 
 NTSTATUS
-STDCALL
+NTAPI
 NtSetLdtEntries
 (ULONG Selector1, LDT_ENTRY LdtEntry1, ULONG Selector2, LDT_ENTRY LdtEntry2)
 {

Modified: trunk/reactos/ntoskrnl/ke/profobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -23,7 +23,7 @@
 /* FUNCTIONS *****************************************************************/
 
 VOID
-STDCALL
+NTAPI
 KeInitializeProfile(PKPROFILE Profile,
                     PKPROCESS Process,
                     PVOID ImageBase,
@@ -47,7 +47,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KeStartProfile(PKPROFILE Profile,
                PVOID Buffer)
 {
@@ -136,7 +136,7 @@
 }
 
 BOOLEAN
-STDCALL
+NTAPI
 KeStopProfile(PKPROFILE Profile)
 {
     KIRQL OldIrql;
@@ -194,7 +194,7 @@
 }
 
 ULONG
-STDCALL
+NTAPI
 KeQueryIntervalProfile(KPROFILE_SOURCE ProfileSource)
 {
     /* Check if this is the timer profile */
@@ -216,7 +216,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KeSetIntervalProfile(KPROFILE_SOURCE ProfileSource,
                      ULONG Interval)
 {
@@ -239,7 +239,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 KeProfileInterrupt(PKTRAP_FRAME TrapFrame)
 {
     /* Called from HAL for Timer Profiling */
@@ -247,7 +247,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KiParseProfileList(IN PKTRAP_FRAME TrapFrame,
                    IN KPROFILE_SOURCE Source,
                    IN PLIST_ENTRY ListHead)
@@ -297,7 +297,7 @@
  *         shifting like we specified. -- Alex
  */
 VOID
-STDCALL
+NTAPI
 KeProfileInterruptWithSource(IN PKTRAP_FRAME TrapFrame,
                              IN KPROFILE_SOURCE Source)
 {
@@ -312,7 +312,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 KeSetProfileIrql(IN KIRQL ProfileIrql)
 {
     /* Set the IRQL at which Profiling will run */

Modified: trunk/reactos/ntoskrnl/mm/anonmem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -519,7 +519,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtAllocateVirtualMemory(IN     HANDLE ProcessHandle,
                         IN OUT PVOID* UBaseAddress,
                         IN     ULONG_PTR  ZeroBits,
@@ -915,7 +915,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtFreeVirtualMemory(IN HANDLE ProcessHandle,
                     IN PVOID*  PBaseAddress,
                     IN PSIZE_T PRegionSize,
@@ -1030,7 +1030,7 @@
    return(Status);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmQueryAnonMem(PMEMORY_AREA MemoryArea,
                PVOID Address,
                PMEMORY_BASIC_INFORMATION Info,

Modified: trunk/reactos/ntoskrnl/mm/balance.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -287,7 +287,7 @@
    return(STATUS_SUCCESS);
 }
 
-VOID STDCALL
+VOID NTAPI
 MiBalancerThread(PVOID Unused)
 {
    PVOID WaitObjects[2];

Modified: trunk/reactos/ntoskrnl/mm/cont.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/cont.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/cont.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/cont.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -59,7 +59,7 @@
  *
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 MmAllocateContiguousMemorySpecifyCache(IN SIZE_T NumberOfBytes,
                                        IN PHYSICAL_ADDRESS LowestAcceptableAddress
OPTIONAL,
                                        IN PHYSICAL_ADDRESS HighestAcceptableAddress,
@@ -152,7 +152,7 @@
  *
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 MmAllocateContiguousMemory (IN ULONG NumberOfBytes,
                             IN PHYSICAL_ADDRESS HighestAcceptableAddress)
 {
@@ -187,7 +187,7 @@
  *
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 MmFreeContiguousMemory(IN PVOID BaseAddress)
 {
    MmLockAddressSpace(MmGetKernelAddressSpace());
@@ -223,7 +223,7 @@
  *
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 MmFreeContiguousMemorySpecifyCache(IN PVOID BaseAddress,
                                    IN ULONG NumberOfBytes,
                                    IN MEMORY_CACHING_TYPE CacheType)

Modified: trunk/reactos/ntoskrnl/mm/drvlck.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/drvlck.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -37,7 +37,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 MmLockPagableSectionByHandle(IN PVOID ImageSectionHandle)
 {
     UNIMPLEMENTED;
@@ -59,7 +59,7 @@
 /*
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 MmLockPagableDataSection(IN PVOID AddressWithinSection)
 {
    PVOID Handle;
@@ -73,7 +73,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 MmUnlockPagableImageSection(IN PVOID ImageSectionHandle)
 {
     UNIMPLEMENTED;
@@ -82,7 +82,7 @@
 /*
  * @unimplemented
  */
-PVOID STDCALL
+PVOID NTAPI
 MmPageEntireDriver(IN PVOID AddressWithinSection)
 {
     UNIMPLEMENTED;
@@ -93,7 +93,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 MmResetDriverPaging(IN PVOID AddressWithinSection)
 {
     UNIMPLEMENTED;

Modified: trunk/reactos/ntoskrnl/mm/i386/page.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -180,7 +180,7 @@
 }
 
 BOOLEAN
-STDCALL
+NTAPI
 MmCreateProcessAddressSpace(IN ULONG MinWs,
                             IN PEPROCESS Process,
                             IN PULONG DirectoryTableBase)
@@ -1044,7 +1044,7 @@
 /*
  * @implemented
  */
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
 MmGetPhysicalAddress(PVOID vaddr)
 /*
  * FUNCTION: Returns the physical address corresponding to a virtual address

Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -341,7 +341,7 @@
 }
 
 BOOLEAN
-STDCALL
+NTAPI
 MmCreateProcessAddressSpace(IN ULONG MinWs,
                             IN PEPROCESS Process,
                             IN PLARGE_INTEGER DirectoryTableBase)
@@ -2072,7 +2072,7 @@
 /*
  * @implemented
  */
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
 MmGetPhysicalAddress(PVOID vaddr)
 /*
  * FUNCTION: Returns the physical address corresponding to a virtual address

Modified: trunk/reactos/ntoskrnl/mm/iospace.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/iospace.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -43,7 +43,7 @@
  *
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 MmMapIoSpace (IN PHYSICAL_ADDRESS PhysicalAddress,
               IN ULONG NumberOfBytes,
               IN MEMORY_CACHING_TYPE CacheEnable)
@@ -135,7 +135,7 @@
  *
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 MmUnmapIoSpace (IN PVOID BaseAddress,
                 IN ULONG NumberOfBytes)
 {
@@ -161,7 +161,7 @@
  *
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 MmMapVideoDisplay (IN PHYSICAL_ADDRESS PhysicalAddress,
                    IN ULONG   NumberOfBytes,
                    IN MEMORY_CACHING_TYPE CacheType)
@@ -173,7 +173,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 MmUnmapVideoDisplay (IN PVOID BaseAddress,
                      IN ULONG NumberOfBytes)
 {

Modified: trunk/reactos/ntoskrnl/mm/marea.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -185,7 +185,7 @@
 #define MmVerifyMemoryAreas(x)
 #endif
 
-VOID STDCALL
+VOID NTAPI
 MmDumpMemoryAreas(PMM_AVL_TABLE AddressSpace)
 {
    PMEMORY_AREA Node;
@@ -209,7 +209,7 @@
    DbgPrint("Finished MmDumpMemoryAreas()\n");
 }
 
-PMEMORY_AREA STDCALL
+PMEMORY_AREA NTAPI
 MmLocateMemoryAreaByAddress(
    PMM_AVL_TABLE AddressSpace,
    PVOID Address)
@@ -239,7 +239,7 @@
    return NULL;
 }
 
-PMEMORY_AREA STDCALL
+PMEMORY_AREA NTAPI
 MmLocateMemoryAreaByRegion(
    PMM_AVL_TABLE AddressSpace,
    PVOID Address,
@@ -628,7 +628,7 @@
 }
 
 
-PVOID STDCALL
+PVOID NTAPI
 MmFindGap(
    PMM_AVL_TABLE AddressSpace,
    ULONG_PTR Length,
@@ -641,7 +641,7 @@
    return MmFindGapBottomUp(AddressSpace, Length, Granularity);
 }
 
-ULONG_PTR STDCALL
+ULONG_PTR NTAPI
 MmFindGapAtAddress(
    PMM_AVL_TABLE AddressSpace,
    PVOID Address)
@@ -738,7 +738,7 @@
  * @remarks Lock the address space before calling this function.
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmFreeMemoryArea(
    PMM_AVL_TABLE AddressSpace,
    PMEMORY_AREA MemoryArea,
@@ -880,7 +880,7 @@
  * @remarks Lock the address space before calling this function.
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmFreeMemoryAreaByPtr(
    PMM_AVL_TABLE AddressSpace,
    PVOID BaseAddress,
@@ -932,7 +932,7 @@
  * @remarks Lock the address space before calling this function.
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmCreateMemoryArea(PMM_AVL_TABLE AddressSpace,
                    ULONG Type,
                    PVOID *BaseAddress,
@@ -1055,7 +1055,7 @@
 }
 
 
-VOID STDCALL
+VOID NTAPI
 MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process,
                                  PMM_AVL_TABLE AddressSpace,
                                  PVOID BaseAddress)

Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -882,7 +882,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 MmProbeAndLockProcessPages(IN OUT PMDL MemoryDescriptorList,
                            IN PEPROCESS Process,
                            IN KPROCESSOR_MODE AccessMode,
@@ -896,7 +896,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 MmProbeAndLockSelectedPages(IN OUT PMDL MemoryDescriptorList,
                             IN LARGE_INTEGER PageList[],
                             IN KPROCESSOR_MODE AccessMode,

Modified: trunk/reactos/ntoskrnl/mm/mpw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev=3774…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -23,7 +23,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmWriteDirtyPages(ULONG Target, PULONG Actual)
 {
    PFN_TYPE Page;
@@ -52,7 +52,7 @@
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmMpwThreadMain(PVOID Ignored)
 {
    NTSTATUS Status;

Modified: trunk/reactos/ntoskrnl/mm/ncache.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ncache.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -40,7 +40,7 @@
  *
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 MmAllocateNonCachedMemory(IN ULONG NumberOfBytes)
 {
    PVOID Result;
@@ -114,7 +114,7 @@
  *
  * @implemented
  */
-VOID STDCALL MmFreeNonCachedMemory (IN PVOID BaseAddress,
+VOID NTAPI MmFreeNonCachedMemory (IN PVOID BaseAddress,
                                     IN ULONG NumberOfBytes)
 {
    MmLockAddressSpace(MmGetKernelAddressSpace());

Modified: trunk/reactos/ntoskrnl/mm/npool.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -1455,7 +1455,7 @@
    return (HDR_USED*)current;
 }
 
-ULONG STDCALL
+ULONG NTAPI
 ExRosQueryNonPagedPoolTag ( PVOID Addr )
 {
    HDR_USED* blk=(HDR_USED*)((ULONG_PTR)Addr - HDR_USED_SIZE);
@@ -1530,7 +1530,7 @@
 #endif
 
 
-VOID STDCALL ExFreeNonPagedPool (PVOID block)
+VOID NTAPI ExFreeNonPagedPool (PVOID block)
 /*
  * FUNCTION: Releases previously allocated memory
  * ARGUMENTS:
@@ -1586,7 +1586,7 @@
    KeReleaseSpinLock(&MmNpoolLock, oldIrql);
 }
 
-PVOID STDCALL
+PVOID NTAPI
 ExAllocateNonPagedPoolWithTag(POOL_TYPE Type, ULONG Size, ULONG Tag, PVOID Caller)
 {
 #if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL)
@@ -1787,7 +1787,7 @@
 }
 
 PVOID
-STDCALL
+NTAPI
 MiAllocateSpecialPool  (IN POOL_TYPE PoolType,
                         IN SIZE_T NumberOfBytes,
                         IN ULONG Tag,

Modified: trunk/reactos/ntoskrnl/mm/pagefile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -137,7 +137,7 @@
 
 
 BOOLEAN
-STDCALL
+NTAPI
 MmIsFileAPagingFile(PFILE_OBJECT FileObject)
 {
     ULONG i;
@@ -538,7 +538,7 @@
    return RetDescList;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmDumpToPagingFile(ULONG BugCode,
                    ULONG BugCodeParameter1,
                    ULONG BugCodeParameter2,
@@ -681,7 +681,7 @@
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmInitializeCrashDump(HANDLE PageFileHandle, ULONG PageFileNum)
 {
    PFILE_OBJECT PageFile;
@@ -795,7 +795,7 @@
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtCreatePagingFile(IN PUNICODE_STRING FileName,
                    IN PLARGE_INTEGER InitialSize,
                    IN PLARGE_INTEGER MaximumSize,

Modified: trunk/reactos/ntoskrnl/mm/pool.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -27,7 +27,7 @@
 ULONG NTAPI
 EiGetNonPagedPoolTag(IN PVOID Block);
 
-static PVOID STDCALL
+static PVOID NTAPI
 EiAllocatePool(POOL_TYPE PoolType,
                ULONG NumberOfBytes,
                ULONG Tag,
@@ -70,7 +70,7 @@
 /*
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 ExAllocatePool (POOL_TYPE PoolType, ULONG NumberOfBytes)
 /*
  * FUNCTION: Allocates pool memory of a specified type and returns a pointer
@@ -119,7 +119,7 @@
 /*
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 ExAllocatePoolWithTag (POOL_TYPE PoolType, ULONG NumberOfBytes, ULONG Tag)
 {
    PVOID Block;
@@ -147,7 +147,7 @@
 /*
  * @implemented
  */
-PVOID STDCALL
+PVOID NTAPI
 ExAllocatePoolWithQuota (POOL_TYPE PoolType, ULONG NumberOfBytes)
 {
    return(ExAllocatePoolWithQuotaTag(PoolType, NumberOfBytes, TAG_NONE));
@@ -157,7 +157,7 @@
  * @implemented
  */
 PVOID
-STDCALL
+NTAPI
 ExAllocatePoolWithTagPriority(
     IN POOL_TYPE PoolType,
     IN SIZE_T NumberOfBytes,
@@ -269,7 +269,7 @@
  * @unimplemented
  */
 SIZE_T
-STDCALL
+NTAPI
 ExQueryPoolBlockSize (
     IN PVOID PoolBlock,
     OUT PBOOLEAN QuotaCharged
@@ -283,7 +283,7 @@
  * @unimplemented
  */
 PVOID
-STDCALL
+NTAPI
 MmAllocateMappingAddress (
      IN SIZE_T NumberOfBytes,
      IN ULONG PoolTag
@@ -298,7 +298,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 MmFreeMappingAddress (
      IN PVOID BaseAddress,
      IN ULONG PoolTag
@@ -308,7 +308,7 @@
 }
 
 BOOLEAN
-STDCALL
+NTAPI
 MiRaisePoolQuota(
     IN POOL_TYPE PoolType,
     IN ULONG CurrentMaxQuota,

Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -52,7 +52,7 @@
 /* FUNCTIONS ***************************************************************/
 
 VOID
-STDCALL
+NTAPI
 MiFlushTlbIpiRoutine(PVOID Address)
 {
    if (Address == (PVOID)0xffffffff)
@@ -91,7 +91,7 @@
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 MmCopyMmInfo(PEPROCESS Src,
              PEPROCESS Dest,
              PPHYSICAL_ADDRESS DirectoryTableBase)
@@ -120,7 +120,7 @@
 }
 
 BOOLEAN
-STDCALL
+NTAPI
 MmCreateProcessAddressSpace(IN ULONG MinWs,
                             IN PEPROCESS Process,
                             IN PLARGE_INTEGER DirectoryTableBase)
@@ -180,7 +180,7 @@
 /*
  * @implemented
  */
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
 MmGetPhysicalAddress(PVOID vaddr)
 /*
  * FUNCTION: Returns the physical address corresponding to a virtual address

Modified: trunk/reactos/ntoskrnl/mm/ppool.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -77,7 +77,7 @@
  *
  * RETURN VALUE
  */
-PVOID STDCALL
+PVOID NTAPI
 ExAllocatePagedPoolWithTag (IN POOL_TYPE PoolType,
                             IN ULONG  NumberOfBytes,
                             IN ULONG  Tag)
@@ -96,7 +96,7 @@
 	return RPoolAlloc ( MmPagedPool, NumberOfBytes, Tag, align );
 }
 
-VOID STDCALL
+VOID NTAPI
 ExFreePagedPool(IN PVOID Block)
 {
 	ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL);

Modified: trunk/reactos/ntoskrnl/mm/procsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -75,7 +75,7 @@
 }
 
 PVOID
-STDCALL
+NTAPI
 MiCreatePebOrTeb(PEPROCESS Process,
                  PVOID BaseAddress)
 {
@@ -139,7 +139,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 MmDeleteKernelStack(PVOID StackBase,
                     BOOLEAN GuiStack)
 {
@@ -159,7 +159,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 MmDeleteTeb(PEPROCESS Process,
             PTEB Teb)
 {
@@ -181,7 +181,7 @@
 }
 
 PVOID
-STDCALL
+NTAPI
 MmCreateKernelStack(BOOLEAN GuiStack,
                     UCHAR Node)
 {
@@ -253,7 +253,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 MmGrowKernelStack(PVOID StackPointer)
 {
     PETHREAD Thread = PsGetCurrentThread();
@@ -274,7 +274,7 @@
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 MmCreatePeb(PEPROCESS Process)
 {
     PPEB Peb = NULL;
@@ -424,7 +424,7 @@
 }
 
 PTEB
-STDCALL
+NTAPI
 MmCreateTeb(PEPROCESS Process,
             PCLIENT_ID ClientId,
             PINITIAL_TEB InitialTeb)

Modified: trunk/reactos/ntoskrnl/mm/section.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -2089,7 +2089,7 @@
    return(Status);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmQuerySectionView(PMEMORY_AREA MemoryArea,
                    PVOID Address,
                    PMEMORY_BASIC_INFORMATION Info,
@@ -2168,7 +2168,7 @@
    }
 }
 
-VOID STDCALL
+VOID NTAPI
 MmpDeleteSection(PVOID ObjectBody)
 {
    PROS_SECTION_OBJECT Section = (PROS_SECTION_OBJECT)ObjectBody;
@@ -2239,7 +2239,7 @@
    }
 }
 
-VOID STDCALL
+VOID NTAPI
 MmpCloseSection(IN PEPROCESS Process OPTIONAL,
                 IN PVOID Object,
                 IN ACCESS_MASK GrantedAccess,
@@ -3477,7 +3477,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtCreateSection (OUT PHANDLE SectionHandle,
                  IN ACCESS_MASK DesiredAccess,
                  IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
@@ -3552,7 +3552,7 @@
  *
  * REVISIONS
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtOpenSection(PHANDLE   SectionHandle,
               ACCESS_MASK  DesiredAccess,
               POBJECT_ATTRIBUTES ObjectAttributes)
@@ -3699,7 +3699,7 @@
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtMapViewOfSection(IN HANDLE SectionHandle,
                    IN HANDLE ProcessHandle,
                    IN OUT PVOID* BaseAddress  OPTIONAL,
@@ -4029,7 +4029,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmUnmapViewOfSection(PEPROCESS Process,
                      PVOID BaseAddress)
 {
@@ -4166,7 +4166,7 @@
  *
  * REVISIONS
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtUnmapViewOfSection (HANDLE ProcessHandle,
                       PVOID BaseAddress)
 {
@@ -4222,7 +4222,7 @@
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtQuerySection(IN HANDLE SectionHandle,
                IN SECTION_INFORMATION_CLASS SectionInformationClass,
                OUT PVOID SectionInformation,
@@ -4352,7 +4352,7 @@
  * @todo Move the actual code to internal function MmExtendSection.
  * @unimplemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtExtendSection(IN HANDLE SectionHandle,
                 IN PLARGE_INTEGER NewMaximumSize)
 {
@@ -4430,7 +4430,7 @@
  *
  * REVISIONS
  */
-PVOID STDCALL
+PVOID NTAPI
 MmAllocateSection (IN ULONG Length, PVOID BaseAddress)
 {
    PVOID Result;
@@ -4519,7 +4519,7 @@
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmMapViewOfSection(IN PVOID SectionObject,
                    IN PEPROCESS Process,
                    IN OUT PVOID *BaseAddress,
@@ -4716,7 +4716,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
                       IN PLARGE_INTEGER   NewFileSize)
 {
@@ -4728,7 +4728,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 MmDisableModifiedWriteOfSection (ULONG Unknown0)
 {
    UNIMPLEMENTED;
@@ -4738,7 +4738,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
                      IN MMFLUSH_TYPE   FlushType)
 {
@@ -4761,7 +4761,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 MmForceSectionClosed (
     IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
     IN BOOLEAN                  DelayClose)
@@ -4774,7 +4774,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmMapViewInSystemSpace (IN PVOID SectionObject,
                         OUT PVOID * MappedBase,
                         IN OUT PULONG ViewSize)
@@ -4822,7 +4822,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 MmMapViewInSessionSpace (
     IN PVOID Section,
     OUT PVOID *MappedBase,
@@ -4837,7 +4837,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmUnmapViewInSystemSpace (IN PVOID MappedBase)
 {
    PMM_AVL_TABLE AddressSpace;
@@ -4856,7 +4856,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 MmUnmapViewInSessionSpace (
     IN PVOID MappedBase
     )
@@ -4868,7 +4868,7 @@
 /*
  * @unimplemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmSetBankedSection (ULONG Unknown0,
                     ULONG Unknown1,
                     ULONG Unknown2,
@@ -4936,7 +4936,7 @@
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MmCreateSection (OUT PVOID  * Section,
                  IN ACCESS_MASK  DesiredAccess,
                  IN POBJECT_ATTRIBUTES ObjectAttributes     OPTIONAL,

Modified: trunk/reactos/ntoskrnl/mm/virtual.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -568,7 +568,7 @@
     return Status;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MiProtectVirtualMemory(IN PEPROCESS Process,
                        IN OUT PVOID *BaseAddress,
                        IN OUT PSIZE_T NumberOfBytesToProtect,
@@ -932,7 +932,7 @@
     return Status;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtQueryVirtualMemory(IN HANDLE ProcessHandle,
                      IN PVOID Address,
                      IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass,

Modified: trunk/reactos/ntoskrnl/mm/wset.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/wset.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -51,7 +51,7 @@
  * @unimplemented
  */
 ULONG
-STDCALL
+NTAPI
 MmTrimAllSystemPagableMemory (
 	IN ULONG PurgeTransitionList
 	)

Modified: trunk/reactos/ntoskrnl/ps/quota.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -108,7 +108,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 PspInheritQuota(PEPROCESS Process, PEPROCESS ParentProcess)
 {
     if (ParentProcess != NULL)
@@ -126,7 +126,7 @@
 }
 
 VOID
-STDCALL
+NTAPI
 PspDestroyQuotaBlock(PEPROCESS Process)
 {
     PEPROCESS_QUOTA_BLOCK QuotaBlock = Process->QuotaBlock;
@@ -159,7 +159,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 PsChargePoolQuota(IN PEPROCESS Process,
                   IN POOL_TYPE PoolType,
                   IN SIZE_T Amount)
@@ -184,7 +184,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 PsChargeProcessNonPagedPoolQuota(IN PEPROCESS Process,
                                  IN SIZE_T Amount)
 {
@@ -196,7 +196,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 PsChargeProcessPagedPoolQuota(IN PEPROCESS Process,
                               IN SIZE_T Amount)
 {
@@ -208,7 +208,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 PsChargeProcessPoolQuota(IN PEPROCESS Process,
                          IN POOL_TYPE PoolType,
                          IN SIZE_T Amount)
@@ -230,7 +230,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 PsReturnPoolQuota(IN PEPROCESS Process,
                   IN POOL_TYPE PoolType,
                   IN SIZE_T Amount)
@@ -257,7 +257,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 PsReturnProcessNonPagedPoolQuota(IN PEPROCESS Process,
                                  IN SIZE_T Amount)
 {
@@ -275,7 +275,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 PsReturnProcessPagedPoolQuota(IN PEPROCESS Process,
                               IN SIZE_T Amount)
 {

Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -59,14 +59,14 @@
 }
 
 KPROCESSOR_MODE
-STDCALL
+NTAPI
 RtlpGetMode()
 {
    return KernelMode;
 }
 
 PVOID
-STDCALL
+NTAPI
 RtlpAllocateMemory(ULONG Bytes,
                    ULONG Tag)
 {
@@ -80,7 +80,7 @@
 #define TAG_ASTR        TAG('A', 'S', 'T', 'R')
 #define TAG_OSTR        TAG('O', 'S', 'T', 'R')
 VOID
-STDCALL
+NTAPI
 RtlpFreeMemory(PVOID Mem,
                ULONG Tag)
 {
@@ -93,7 +93,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 RtlAcquirePebLock(VOID)
 {
 
@@ -102,14 +102,14 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 RtlReleasePebLock(VOID)
 {
 
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 LdrShutdownThread(VOID)
 {
     return STATUS_SUCCESS;
@@ -117,14 +117,14 @@
 
 
 PPEB
-STDCALL
+NTAPI
 RtlGetCurrentPeb(VOID)
 {
    return ((PEPROCESS)(KeGetCurrentThread()->ApcState.Process))->Peb;
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 RtlDeleteHeapLock(
     PRTL_CRITICAL_SECTION CriticalSection)
 {
@@ -133,7 +133,7 @@
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 RtlEnterHeapLock(
     PRTL_CRITICAL_SECTION CriticalSection)
 {
@@ -142,7 +142,7 @@
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 RtlInitializeHeapLock(
     PRTL_CRITICAL_SECTION CriticalSection)
 {
@@ -151,7 +151,7 @@
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 RtlLeaveHeapLock(
     PRTL_CRITICAL_SECTION CriticalSection)
 {

Modified: trunk/reactos/ntoskrnl/rtl/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -26,7 +26,7 @@
 * @implemented
 */
 ULONG
-STDCALL
+NTAPI
 RtlGetNtGlobalFlags(VOID)
 {
 	return(NtGlobalFlag);
@@ -36,7 +36,7 @@
 /*
 * @implemented
 */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation)
 {
    ULONG i, MaxLength;

Modified: trunk/reactos/ntoskrnl/se/access.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/access.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -175,7 +175,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeCreateAccessState(IN OUT PACCESS_STATE AccessState,
                     IN PAUX_ACCESS_DATA AuxData,
                     IN ACCESS_MASK Access,
@@ -196,7 +196,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 SeDeleteAccessState(IN PACCESS_STATE AccessState)
 {
     PAUX_ACCESS_DATA AuxData;
@@ -226,7 +226,7 @@
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 SeSetAccessStateGenericMapping(IN PACCESS_STATE AccessState,
                                IN PGENERIC_MAPPING GenericMapping)
 {

Modified: trunk/reactos/ntoskrnl/se/acl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=3774…
==============================================================================
--- trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -219,7 +219,7 @@
     return(TRUE);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SepCreateImpersonationTokenDacl(PTOKEN Token,
                                 PTOKEN PrimaryToken,
                                 PACL *Dacl)

Modified: trunk/reactos/ntoskrnl/se/audit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -187,7 +187,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 SeAuditHardLinkCreation(IN PUNICODE_STRING FileName,
                         IN PUNICODE_STRING LinkName,
                         IN BOOLEAN bSuccess)
@@ -199,7 +199,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 SeAuditingFileEvents(IN BOOLEAN AccessGranted,
                      IN PSECURITY_DESCRIPTOR SecurityDescriptor)
 {
@@ -211,7 +211,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 SeAuditingFileEventsWithContext(IN BOOLEAN AccessGranted,
                                 IN PSECURITY_DESCRIPTOR SecurityDescriptor,
                                 IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext
OPTIONAL)
@@ -224,7 +224,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 SeAuditingHardLinkEvents(IN BOOLEAN AccessGranted,
                          IN PSECURITY_DESCRIPTOR SecurityDescriptor)
 {
@@ -236,7 +236,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 SeAuditingHardLinkEventsWithContext(IN BOOLEAN AccessGranted,
                                     IN PSECURITY_DESCRIPTOR SecurityDescriptor,
                                     IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext
OPTIONAL)
@@ -249,7 +249,7 @@
  * @unimplemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 SeAuditingFileOrGlobalEvents(IN BOOLEAN AccessGranted,
                              IN PSECURITY_DESCRIPTOR SecurityDescriptor,
                              IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext)
@@ -262,7 +262,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 SeCloseObjectAuditAlarm(
                         IN PVOID Object,
                         IN HANDLE Handle,
@@ -275,7 +275,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 SeDeleteObjectAuditAlarm(IN PVOID Object,
                          IN HANDLE Handle)
 {
@@ -310,7 +310,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 SeOpenObjectForDeleteAuditAlarm(IN PUNICODE_STRING ObjectTypeName,
                                 IN PVOID Object OPTIONAL,
                                 IN PUNICODE_STRING AbsoluteObjectName OPTIONAL,
@@ -328,7 +328,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 SePrivilegeObjectAuditAlarm(IN HANDLE Handle,
                             IN PSECURITY_SUBJECT_CONTEXT SubjectContext,
                             IN ACCESS_MASK DesiredAccess,
@@ -360,7 +360,7 @@
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtCloseObjectAuditAlarm(IN PUNICODE_STRING SubsystemName,
                         IN PVOID HandleId,
                         IN BOOLEAN GenerateOnClose)
@@ -370,7 +370,7 @@
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtDeleteObjectAuditAlarm(IN PUNICODE_STRING SubsystemName,
                          IN PVOID HandleId,
                          IN BOOLEAN GenerateOnClose)
@@ -380,7 +380,7 @@
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtOpenObjectAuditAlarm(IN PUNICODE_STRING SubsystemName,
                        IN PVOID HandleId,
                        IN PUNICODE_STRING ObjectTypeName,
@@ -399,7 +399,7 @@
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtPrivilegedServiceAuditAlarm(IN PUNICODE_STRING SubsystemName,
                               IN PUNICODE_STRING ServiceName,
                               IN HANDLE ClientToken,
@@ -411,7 +411,7 @@
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtPrivilegeObjectAuditAlarm(IN PUNICODE_STRING SubsystemName,
                             IN PVOID HandleId,
                             IN HANDLE ClientToken,

Modified: trunk/reactos/ntoskrnl/se/lsa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/lsa.c?rev=3774…
==============================================================================
--- trunk/reactos/ntoskrnl/se/lsa.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/lsa.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -107,7 +107,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeMarkLogonSessionForTerminationNotification(IN PLUID LogonId)
 {
 	UNIMPLEMENTED;
@@ -118,7 +118,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeRegisterLogonSessionTerminatedRoutine(IN PSE_LOGON_SESSION_TERMINATED_ROUTINE
CallbackRoutine)
 {
 	UNIMPLEMENTED;
@@ -129,7 +129,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeUnregisterLogonSessionTerminatedRoutine(IN PSE_LOGON_SESSION_TERMINATED_ROUTINE
CallbackRoutine)
 {
 	UNIMPLEMENTED;

Modified: trunk/reactos/ntoskrnl/se/priv.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=377…
==============================================================================
--- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -289,7 +289,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeAppendPrivileges(PACCESS_STATE AccessState,
                    PPRIVILEGE_SET Privileges)
 {
@@ -301,7 +301,7 @@
  * @unimplemented
  */
 VOID
-STDCALL
+NTAPI
 SeFreePrivileges(IN PPRIVILEGE_SET Privileges)
 {
     UNIMPLEMENTED;
@@ -310,7 +310,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 SePrivilegeCheck (PPRIVILEGE_SET Privileges,
                   PSECURITY_SUBJECT_CONTEXT SubjectContext,
                   KPROCESSOR_MODE PreviousMode)
@@ -342,7 +342,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 SeSinglePrivilegeCheck (IN LUID PrivilegeValue,
                         IN KPROCESSOR_MODE PreviousMode)
 {
@@ -379,7 +379,7 @@
 
 /* SYSTEM CALLS ***************************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtPrivilegeCheck (IN HANDLE ClientToken,
                   IN PPRIVILEGE_SET RequiredPrivileges,
                   OUT PBOOLEAN Result)

Modified: trunk/reactos/ntoskrnl/se/sd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=37745…
==============================================================================
--- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -383,7 +383,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeCaptureSecurityDescriptor(IN PSECURITY_DESCRIPTOR _OriginalSecurityDescriptor,
                             IN KPROCESSOR_MODE CurrentMode,
                             IN POOL_TYPE PoolType,
@@ -720,7 +720,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SeQuerySecurityDescriptorInfo(IN PSECURITY_INFORMATION SecurityInformation,
                               IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
                               IN OUT PULONG Length,
@@ -858,7 +858,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeReleaseSecurityDescriptor(IN PSECURITY_DESCRIPTOR CapturedSecurityDescriptor,
                             IN KPROCESSOR_MODE CurrentMode,
                             IN BOOLEAN CaptureIfKernelMode)
@@ -882,7 +882,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SeSetSecurityDescriptorInfo(IN PVOID Object OPTIONAL,
                             IN PSECURITY_INFORMATION _SecurityInformation,
                             IN PSECURITY_DESCRIPTOR _SecurityDescriptor,
@@ -1073,7 +1073,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeSetSecurityDescriptorInfoEx(IN PVOID Object OPTIONAL,
                               IN PSECURITY_INFORMATION SecurityInformation,
                               IN PSECURITY_DESCRIPTOR ModificationDescriptor,
@@ -1095,7 +1095,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 SeValidSecurityDescriptor(IN ULONG Length,
                           IN PSECURITY_DESCRIPTOR _SecurityDescriptor)
 {
@@ -1231,7 +1231,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SeDeassignSecurity(PSECURITY_DESCRIPTOR *SecurityDescriptor)
 {
     PAGED_CODE();
@@ -1249,7 +1249,7 @@
 /*
  * @unimplemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SeAssignSecurityEx(IN PSECURITY_DESCRIPTOR ParentDescriptor OPTIONAL,
                    IN PSECURITY_DESCRIPTOR ExplicitDescriptor OPTIONAL,
                    OUT PSECURITY_DESCRIPTOR *NewDescriptor,
@@ -1267,7 +1267,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SeAssignSecurity(PSECURITY_DESCRIPTOR _ParentDescriptor OPTIONAL,
                  PSECURITY_DESCRIPTOR _ExplicitDescriptor OPTIONAL,
                  PSECURITY_DESCRIPTOR *NewDescriptor,

Modified: trunk/reactos/ntoskrnl/se/semgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -309,7 +309,7 @@
 }
 
 
-VOID STDCALL
+VOID NTAPI
 SeQuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation,
                           OUT PACCESS_MASK DesiredAccess)
 {
@@ -326,7 +326,7 @@
     }
 }
 
-VOID STDCALL
+VOID NTAPI
 SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation,
                         OUT PACCESS_MASK DesiredAccess)
 {
@@ -351,7 +351,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
               IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext,
               IN BOOLEAN SubjectContextLocked,
@@ -619,7 +619,7 @@
 
 /* SYSTEM CALLS ***************************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
               IN HANDLE TokenHandle,
               IN ACCESS_MASK DesiredAccess,

Modified: trunk/reactos/ntoskrnl/se/token.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=37…
==============================================================================
--- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sat Nov 29 14:47:48 2008
@@ -216,7 +216,7 @@
 
 
 NTSTATUS
-STDCALL
+NTAPI
 SepDuplicateToken(PTOKEN Token,
                   POBJECT_ATTRIBUTES ObjectAttributes,
                   BOOLEAN EffectiveOnly,
@@ -422,7 +422,7 @@
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 SeCopyClientToken(IN PACCESS_TOKEN Token,
                   IN SECURITY_IMPERSONATION_LEVEL Level,
                   IN KPROCESSOR_MODE PreviousMode,
@@ -449,7 +449,7 @@
     return(Status);
 }
 
-VOID STDCALL
+VOID NTAPI
 SepDeleteToken(PVOID ObjectBody)
 {
     PTOKEN AccessToken = (PTOKEN)ObjectBody;
@@ -513,7 +513,7 @@
 }
 
 PTOKEN
-STDCALL
+NTAPI
 SepCreateSystemProcessToken(VOID)
 {
     NTSTATUS Status;
@@ -728,7 +728,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeFilterToken(IN PACCESS_TOKEN ExistingToken,
               IN ULONG Flags,
               IN PTOKEN_GROUPS SidsToDisable OPTIONAL,
@@ -744,7 +744,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeQueryInformationToken(IN PACCESS_TOKEN Token,
                         IN TOKEN_INFORMATION_CLASS TokenInformationClass,
                         OUT PVOID *TokenInformation)
@@ -757,7 +757,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 SeQuerySessionIdToken(IN PACCESS_TOKEN Token,
                       IN PULONG pSessionId)
 {
@@ -768,7 +768,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SeQueryAuthenticationIdToken(IN PACCESS_TOKEN Token,
                              OUT PLUID LogonId)
 {
@@ -784,7 +784,7 @@
  * @implemented
  */
 SECURITY_IMPERSONATION_LEVEL
-STDCALL
+NTAPI
 SeTokenImpersonationLevel(IN PACCESS_TOKEN Token)
 {
     PAGED_CODE();
@@ -796,7 +796,7 @@
 /*
  * @implemented
  */
-TOKEN_TYPE STDCALL
+TOKEN_TYPE NTAPI
 SeTokenType(IN PACCESS_TOKEN Token)
 {
     PAGED_CODE();
@@ -809,7 +809,7 @@
  * @implemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 SeTokenIsAdmin(IN PACCESS_TOKEN Token)
 {
     PAGED_CODE();
@@ -820,7 +820,7 @@
  * @implemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 SeTokenIsRestricted(IN PACCESS_TOKEN Token)
 {
     PAGED_CODE();
@@ -831,7 +831,7 @@
  * @implemented
  */
 BOOLEAN
-STDCALL
+NTAPI
 SeTokenIsWriteRestricted(IN PACCESS_TOKEN Token)
 {
     PAGED_CODE();
@@ -843,7 +843,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtQueryInformationToken(IN HANDLE TokenHandle,
                         IN TOKEN_INFORMATION_CLASS TokenInformationClass,
                         OUT PVOID TokenInformation,
@@ -1405,7 +1405,7 @@
  *  TokenOrigin, TokenDefaultDacl
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtSetInformationToken(IN HANDLE TokenHandle,
                       IN TOKEN_INFORMATION_CLASS TokenInformationClass,
                       OUT PVOID TokenInformation,
@@ -1647,7 +1647,7 @@
  * is correct either. -Gunnar
  * This is true. EffectiveOnly overrides SQOS.EffectiveOnly. - IAI
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtDuplicateToken(IN HANDLE ExistingTokenHandle,
                  IN ACCESS_MASK DesiredAccess,
                  IN POBJECT_ATTRIBUTES ObjectAttributes  OPTIONAL,
@@ -1747,7 +1747,7 @@
     return Status;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtAdjustGroupsToken(IN HANDLE TokenHandle,
                     IN BOOLEAN ResetToDefault,
                     IN PTOKEN_GROUPS NewState,
@@ -1762,7 +1762,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtAdjustPrivilegesToken (IN HANDLE TokenHandle,
                          IN BOOLEAN DisableAllPrivileges,
                          IN PTOKEN_PRIVILEGES NewState,
@@ -1940,7 +1940,7 @@
     return Status;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtCreateToken(OUT PHANDLE TokenHandle,
               IN ACCESS_MASK DesiredAccess,
               IN POBJECT_ATTRIBUTES ObjectAttributes,
@@ -2181,7 +2181,7 @@
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 NtOpenThreadTokenEx(IN HANDLE ThreadHandle,
                     IN ACCESS_MASK DesiredAccess,
                     IN BOOLEAN OpenAsSelf,
@@ -2349,7 +2349,7 @@
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NtOpenThreadToken(IN HANDLE ThreadHandle,
                   IN ACCESS_MASK DesiredAccess,
                   IN BOOLEAN OpenAsSelf,
@@ -2461,7 +2461,7 @@
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 NtImpersonateAnonymousToken(IN HANDLE Thread)
 {
     UNIMPLEMENTED;

Modified: trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/tests/Virtu…
==============================================================================
--- trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c [iso-8859-1] Sat Nov 29 14:47:48
2008
@@ -18,7 +18,7 @@
 
 static BOOLEAN MockExFreePoolCalled = FALSE;
 
-static VOID STDCALL
+static VOID NTAPI
 MockExFreePool(PVOID Block)
 {
   _AssertFalse(MockExFreePoolCalled);
@@ -28,7 +28,7 @@
 
 static BOOLEAN MockMmCreateMdlCalled = FALSE;
 
-static PMDL STDCALL
+static PMDL NTAPI
 MockMmCreateMdl(PMDL Mdl,
   PVOID Base,
   ULONG Length)
@@ -42,7 +42,7 @@
 
 static BOOLEAN MockMmProbeAndLockPagesCalled = FALSE;
 
-static VOID STDCALL
+static VOID NTAPI
 MockMmProbeAndLockPages(PMDL Mdl,
   KPROCESSOR_MODE AccessMode,
   LOCK_OPERATION Operation)
@@ -66,7 +66,7 @@
 
 static BOOLEAN MockObReferenceObjectByHandleCalled = FALSE;
 
-static NTSTATUS STDCALL
+static NTSTATUS NTAPI
 MockObReferenceObjectByHandle(HANDLE Handle,
   ACCESS_MASK DesiredAccess,
   POBJECT_TYPE ObjectType,