ntoskrnl header cleanups

svn path=/trunk/; revision=17846

reactos/ntoskrnl/include/internal/ntoskrnl.h

@@ -28,7 +28,7 @@
 #include "v86m.h"
 #include "fs.h"
 #include "port.h"
-#include "nls.h"
+#include "rtl.h"
 #ifdef KDBG
 #include "../kdbg/kdb.h"
 #endif

reactos/ntoskrnl/include/internal/rtl.h

@@ -10,32 +10,37 @@ extern ULONG NlsUnicodeTableOffset;
 extern PUSHORT NlsUnicodeUpcaseTable;
 extern PUSHORT NlsUnicodeLowercaseTable;
 
-VOID 
+VOID
-STDCALL 
+STDCALL
 RtlpInitNls(VOID);
 
 VOID
+NTAPI
 RtlpImportAnsiCodePage(
-    PUSHORT TableBase, 
+    PUSHORT TableBase,
     ULONG Size
 );
 
 VOID
+NTAPI
 RtlpImportOemCodePage(
-    PUSHORT TableBase, 
+    PUSHORT TableBase,
     ULONG Size
 );
 
 VOID
+NTAPI
 RtlpImportUnicodeCasemap(
-    PUSHORT TableBase, 
+    PUSHORT TableBase,
     ULONG Size
 );
 
 VOID
+NTAPI
 RtlpCreateInitialNlsTables(VOID);
 
 VOID
+NTAPI
 RtlpCreateNlsSection(VOID);
 
 #endif /* __NTOSKRNL_INCLUDE_INTERNAL_NLS_H */

reactos/ntoskrnl/mm/anonmem.c

@@ -48,6 +48,7 @@
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS
+NTAPI
 MmWritePageVirtualMemory(PMADDRESS_SPACE AddressSpace,
                          PMEMORY_AREA MemoryArea,
                          PVOID Address,
@@ -129,6 +130,7 @@ MmWritePageVirtualMemory(PMADDRESS_SPACE AddressSpace,
 }
 
 NTSTATUS
+NTAPI
 MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace,
                        PMEMORY_AREA MemoryArea,
                        PVOID Address,
@@ -232,6 +234,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace,
 }
 
 NTSTATUS
+NTAPI
 MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace,
                                MEMORY_AREA* MemoryArea,
                                PVOID Address,
@@ -789,6 +792,7 @@ MmFreeVirtualMemoryPage(PVOID Context,
 }
 
 VOID
+NTAPI
 MmFreeVirtualMemory(PEPROCESS Process,
                     PMEMORY_AREA MemoryArea)
 {
@@ -954,6 +958,7 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle,
 }
 
 NTSTATUS
+NTAPI
 MmProtectAnonMem(PMADDRESS_SPACE AddressSpace,
                  PMEMORY_AREA MemoryArea,
                  PVOID BaseAddress,

reactos/ntoskrnl/mm/aspace.c

@@ -20,6 +20,7 @@ STATIC MADDRESS_SPACE KernelAddressSpace;
 /* FUNCTIONS *****************************************************************/
 
 VOID
+NTAPI
 MmLockAddressSpace(PMADDRESS_SPACE AddressSpace)
 {
    /*
@@ -33,6 +34,7 @@ MmLockAddressSpace(PMADDRESS_SPACE AddressSpace)
 }
 
 VOID
+NTAPI
 MmUnlockAddressSpace(PMADDRESS_SPACE AddressSpace)
 {
    /*
@@ -45,23 +47,30 @@ MmUnlockAddressSpace(PMADDRESS_SPACE AddressSpace)
    ExReleaseFastMutex(&AddressSpace->Lock);
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitializeKernelAddressSpace(VOID)
 {
    MmInitializeAddressSpace(NULL, &KernelAddressSpace);
 }
 
-PMADDRESS_SPACE MmGetCurrentAddressSpace(VOID)
+PMADDRESS_SPACE
+NTAPI
+MmGetCurrentAddressSpace(VOID)
 {
    return(&PsGetCurrentProcess()->AddressSpace);
 }
 
-PMADDRESS_SPACE MmGetKernelAddressSpace(VOID)
+PMADDRESS_SPACE
+NTAPI
+MmGetKernelAddressSpace(VOID)
 {
    return(&KernelAddressSpace);
 }
 
 NTSTATUS
+NTAPI
 MmInitializeAddressSpace(PEPROCESS Process,
                          PMADDRESS_SPACE AddressSpace)
 {
@@ -95,6 +104,7 @@ MmInitializeAddressSpace(PEPROCESS Process,
 }
 
 NTSTATUS
+NTAPI
 MmDestroyAddressSpace(PMADDRESS_SPACE AddressSpace)
 {
    if (AddressSpace->PageTableRefCountTable != NULL)

reactos/ntoskrnl/mm/balance.c

@@ -49,7 +49,9 @@ VOID MmPrintMemoryStatistic(VOID)
             MmStats.NrFreePages);
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitializeBalancer(ULONG NrAvailablePages, ULONG NrSystemPages)
 {
    memset(MiMemoryConsumers, 0, sizeof(MiMemoryConsumers));
@@ -68,7 +70,9 @@ MmInitializeBalancer(ULONG NrAvailablePages, ULONG NrSystemPages)
    MiMemoryConsumers[MC_NPPOOL].PagesUsed = NrSystemPages;
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitializeMemoryConsumer(ULONG Consumer,
                            NTSTATUS (*Trim)(ULONG Target, ULONG Priority,
                                             PULONG NrFreed))
@@ -77,6 +81,7 @@ MmInitializeMemoryConsumer(ULONG Consumer,
 }
 
 NTSTATUS
+NTAPI
 MmReleasePageMemoryConsumer(ULONG Consumer, PFN_TYPE Page)
 {
    PMM_ALLOCATION_REQUEST Request;
@@ -117,6 +122,7 @@ MmReleasePageMemoryConsumer(ULONG Consumer, PFN_TYPE Page)
 }
 
 VOID
+NTAPI
 MiTrimMemoryConsumer(ULONG Consumer)
 {
    LONG Target;
@@ -136,6 +142,7 @@ MiTrimMemoryConsumer(ULONG Consumer)
 }
 
 VOID
+NTAPI
 MmRebalanceMemoryConsumers(VOID)
 {
    LONG Target;
@@ -168,6 +175,7 @@ MiIsBalancerThread(VOID)
 }
 
 NTSTATUS
+NTAPI
 MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait,
                             PPFN_TYPE AllocatedPage)
 {
@@ -353,7 +361,9 @@ MiBalancerThread(PVOID Unused)
    }
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MiInitBalancerThread(VOID)
 {
    KPRIORITY Priority;

reactos/ntoskrnl/mm/freelist.c

@@ -66,6 +66,7 @@ static ULONG UnzeroedPageCount = 0;
 /* FUNCTIONS *************************************************************/
 
 VOID
+NTAPI
 MmTransferOwnershipPage(PFN_TYPE Pfn, ULONG NewConsumer)
 {
    KIRQL oldIrql;
@@ -95,6 +96,7 @@ MmTransferOwnershipPage(PFN_TYPE Pfn, ULONG NewConsumer)
 }
 
 PFN_TYPE
+NTAPI
 MmGetLRUFirstUserPage(VOID)
 {
    PLIST_ENTRY NextListEntry;
@@ -114,6 +116,7 @@ MmGetLRUFirstUserPage(VOID)
 }
 
 VOID
+NTAPI
 MmSetLRULastPage(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -131,6 +134,7 @@ MmSetLRULastPage(PFN_TYPE Pfn)
 }
 
 PFN_TYPE
+NTAPI
 MmGetLRUNextUserPage(PFN_TYPE PreviousPfn)
 {
    PLIST_ENTRY NextListEntry;
@@ -158,6 +162,7 @@ MmGetLRUNextUserPage(PFN_TYPE PreviousPfn)
 }
 
 PFN_TYPE
+NTAPI
 MmGetContinuousPages(ULONG NumberOfBytes,
                      PHYSICAL_ADDRESS LowestAcceptableAddress,
                      PHYSICAL_ADDRESS HighestAcceptableAddress,
@@ -261,6 +266,7 @@ MmGetContinuousPages(ULONG NumberOfBytes,
 
 
 BOOLEAN
+NTAPI
 MiIsPfnRam(PADDRESS_RANGE BIOSMemoryMap,
            ULONG AddressRangeCount,
 	   PFN_TYPE Pfn)
@@ -301,7 +307,9 @@ MiIsPfnRam(PADDRESS_RANGE BIOSMemoryMap,
 }
 
 
-PVOID INIT_FUNCTION
+PVOID
+INIT_FUNCTION
+NTAPI
 MmInitializePageList(ULONG_PTR FirstPhysKernelAddress,
                      ULONG_PTR LastPhysKernelAddress,
                      ULONG MemorySizeInPages,
@@ -536,6 +544,7 @@ MmInitializePageList(ULONG_PTR FirstPhysKernelAddress,
 }
 
 VOID
+NTAPI
 MmSetFlagsPage(PFN_TYPE Pfn, ULONG Flags)
 {
    KIRQL oldIrql;
@@ -547,18 +556,21 @@ MmSetFlagsPage(PFN_TYPE Pfn, ULONG Flags)
 }
 
 VOID
+NTAPI
 MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead)
 {
    MmPageArray[Pfn].RmapListHead = ListHead;
 }
 
 struct _MM_RMAP_ENTRY*
+NTAPI
 MmGetRmapListHeadPage(PFN_TYPE Pfn)
 {
    return(MmPageArray[Pfn].RmapListHead);
 }
 
 VOID
+NTAPI
 MmMarkPageMapped(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -577,6 +589,7 @@ MmMarkPageMapped(PFN_TYPE Pfn)
 }
 
 VOID
+NTAPI
 MmMarkPageUnmapped(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -600,6 +613,7 @@ MmMarkPageUnmapped(PFN_TYPE Pfn)
 }
 
 ULONG
+NTAPI
 MmGetFlagsPage(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -615,6 +629,7 @@ MmGetFlagsPage(PFN_TYPE Pfn)
 
 
 VOID
+NTAPI
 MmSetSavedSwapEntryPage(PFN_TYPE Pfn,  SWAPENTRY SavedSwapEntry)
 {
    KIRQL oldIrql;
@@ -626,6 +641,7 @@ MmSetSavedSwapEntryPage(PFN_TYPE Pfn,  SWAPENTRY SavedSwapEntry)
 }
 
 SWAPENTRY
+NTAPI
 MmGetSavedSwapEntryPage(PFN_TYPE Pfn)
 {
    SWAPENTRY SavedSwapEntry;
@@ -640,6 +656,7 @@ MmGetSavedSwapEntryPage(PFN_TYPE Pfn)
 }
 
 VOID
+NTAPI
 MmReferencePageUnsafe(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -664,6 +681,7 @@ MmReferencePageUnsafe(PFN_TYPE Pfn)
 }
 
 VOID
+NTAPI
 MmReferencePage(PFN_TYPE Pfn)
 {
    DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT);
@@ -677,6 +695,7 @@ MmReferencePage(PFN_TYPE Pfn)
 }
 
 ULONG
+NTAPI
 MmGetReferenceCountPage(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -704,6 +723,7 @@ MmGetReferenceCountPage(PFN_TYPE Pfn)
 }
 
 BOOLEAN
+NTAPI
 MmIsUsablePage(PFN_TYPE Pfn)
 {
 
@@ -724,6 +744,7 @@ MmIsUsablePage(PFN_TYPE Pfn)
 }
 
 VOID
+NTAPI
 MmDereferencePage(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -795,6 +816,7 @@ MmDereferencePage(PFN_TYPE Pfn)
 }
 
 ULONG
+NTAPI
 MmGetLockCountPage(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -822,6 +844,7 @@ MmGetLockCountPage(PFN_TYPE Pfn)
 }
 
 VOID
+NTAPI
 MmLockPageUnsafe(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -846,6 +869,7 @@ MmLockPageUnsafe(PFN_TYPE Pfn)
 }
 
 VOID
+NTAPI
 MmLockPage(PFN_TYPE Pfn)
 {
    DPRINT("MmLockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT);
@@ -859,6 +883,7 @@ MmLockPage(PFN_TYPE Pfn)
 }
 
 VOID
+NTAPI
 MmUnlockPage(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
@@ -883,6 +908,7 @@ MmUnlockPage(PFN_TYPE Pfn)
 }
 
 PFN_TYPE
+NTAPI
 MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry)
 {
    PFN_TYPE PfnOffset;
@@ -958,6 +984,7 @@ MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry)
 }
 
 LONG
+NTAPI
 MmAllocPagesSpecifyRange(ULONG Consumer,
                          PHYSICAL_ADDRESS LowestAddress,
                          PHYSICAL_ADDRESS HighestAddress,
@@ -1174,7 +1201,9 @@ MmZeroPageThreadMain(PVOID Ignored)
    }
 }
 
-NTSTATUS INIT_FUNCTION
+NTSTATUS
+INIT_FUNCTION
+NTAPI
 MmInitZeroPageThread(VOID)
 {
    NTSTATUS Status;

reactos/ntoskrnl/mm/i386/page.c

@@ -195,7 +195,9 @@ ProtectToPTE(ULONG flProtect)
 #define PAE_ADDR_TO_PTE_OFFSET(v)   ((((ULONG_PTR)(v)) % (512 * PAGE_SIZE)) / PAGE_SIZE)
 
 
-NTSTATUS Mmi386ReleaseMmInfo(PEPROCESS Process)
+NTSTATUS
+NTAPI
+Mmi386ReleaseMmInfo(PEPROCESS Process)
 {
    PUSHORT LdtDescriptor;
    ULONG LdtBase;
@@ -398,7 +400,9 @@ MmCopyMmInfo(PEPROCESS Src,
    return(STATUS_SUCCESS);
 }
 
-VOID MmDeletePageTable(PEPROCESS Process, PVOID Address)
+VOID
+NTAPI
+MmDeletePageTable(PEPROCESS Process, PVOID Address)
 {
    PEPROCESS CurrentProcess = PsGetCurrentProcess();
 
@@ -429,7 +433,9 @@ VOID MmDeletePageTable(PEPROCESS Process, PVOID Address)
    }
 }
 
-VOID MmFreePageTable(PEPROCESS Process, PVOID Address)
+VOID
+NTAPI
+MmFreePageTable(PEPROCESS Process, PVOID Address)
 {
    PEPROCESS CurrentProcess = PsGetCurrentProcess();
    ULONG i;
@@ -755,6 +761,7 @@ static ULONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address)
 }
 
 PFN_TYPE
+NTAPI
 MmGetPfnForProcess(PEPROCESS Process,
                    PVOID Address)
 {
@@ -782,6 +789,7 @@ MmGetPfnForProcess(PEPROCESS Process,
 }
 
 VOID
+NTAPI
 MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOL* WasDirty, PPFN_TYPE Page)
 /*
  * FUNCTION: Delete a virtual mapping
@@ -867,6 +875,7 @@ MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOL* WasDirty, PPFN_T
 }
 
 VOID
+NTAPI
 MmRawDeleteVirtualMapping(PVOID Address)
 {
    if (Ke386Pae)
@@ -900,6 +909,7 @@ MmRawDeleteVirtualMapping(PVOID Address)
 }
 
 VOID
+NTAPI
 MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOL FreePage,
                        BOOL* WasDirty, PPFN_TYPE Page)
 /*
@@ -1043,6 +1053,7 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOL FreePage,
 }
 
 VOID
+NTAPI
 MmDeletePageFileMapping(PEPROCESS Process, PVOID Address,
                         SWAPENTRY* SwapEntry)
 /*
@@ -1180,7 +1191,9 @@ Mmi386MakeKernelPageTableGlobal(PVOID PAddress)
    return(FALSE);
 }
 
-BOOLEAN MmIsDirtyPage(PEPROCESS Process, PVOID Address)
+BOOLEAN
+NTAPI
+MmIsDirtyPage(PEPROCESS Process, PVOID Address)
 {
    if (Ke386Pae)
    {
@@ -1193,6 +1206,7 @@ BOOLEAN MmIsDirtyPage(PEPROCESS Process, PVOID Address)
 }
 
 BOOLEAN
+NTAPI
 MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address)
 {
    if (Address < MmSystemRangeStart && Process == NULL)
@@ -1258,7 +1272,9 @@ MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address)
    }
 }
 
-VOID MmSetCleanPage(PEPROCESS Process, PVOID Address)
+VOID
+NTAPI
+MmSetCleanPage(PEPROCESS Process, PVOID Address)
 {
    if (Address < MmSystemRangeStart && Process == NULL)
    {
@@ -1321,7 +1337,9 @@ VOID MmSetCleanPage(PEPROCESS Process, PVOID Address)
    }
 }
 
-VOID MmSetDirtyPage(PEPROCESS Process, PVOID Address)
+VOID
+NTAPI
+MmSetDirtyPage(PEPROCESS Process, PVOID Address)
 {
    if (Address < MmSystemRangeStart && Process == NULL)
    {
@@ -1380,7 +1398,9 @@ VOID MmSetDirtyPage(PEPROCESS Process, PVOID Address)
    }
 }
 
-VOID MmEnableVirtualMapping(PEPROCESS Process, PVOID Address)
+VOID
+NTAPI
+MmEnableVirtualMapping(PEPROCESS Process, PVOID Address)
 {
    if (Ke386Pae)
    {
@@ -1434,7 +1454,9 @@ VOID MmEnableVirtualMapping(PEPROCESS Process, PVOID Address)
    }
 }
 
-BOOLEAN MmIsPagePresent(PEPROCESS Process, PVOID Address)
+BOOLEAN
+NTAPI
+MmIsPagePresent(PEPROCESS Process, PVOID Address)
 {
    if (Ke386Pae)
    {
@@ -1446,7 +1468,9 @@ BOOLEAN MmIsPagePresent(PEPROCESS Process, PVOID Address)
    }
 }
 
-BOOLEAN MmIsPageSwapEntry(PEPROCESS Process, PVOID Address)
+BOOLEAN
+NTAPI
+MmIsPageSwapEntry(PEPROCESS Process, PVOID Address)
 {
    if (Ke386Pae)
    {
@@ -1463,6 +1487,7 @@ BOOLEAN MmIsPageSwapEntry(PEPROCESS Process, PVOID Address)
 }
 
 NTSTATUS
+NTAPI
 MmCreateVirtualMappingForKernel(PVOID Address,
                                 ULONG flProtect,
                                 PPFN_TYPE Pages,
@@ -1590,6 +1615,7 @@ MmCreateVirtualMappingForKernel(PVOID Address,
 }
 
 NTSTATUS
+NTAPI
 MmCreatePageFileMapping(PEPROCESS Process,
                         PVOID Address,
                         SWAPENTRY SwapEntry)
@@ -1677,6 +1703,7 @@ MmCreatePageFileMapping(PEPROCESS Process,
 
 
 NTSTATUS
+NTAPI
 MmCreateVirtualMappingUnsafe(PEPROCESS Process,
                              PVOID Address,
                              ULONG flProtect,
@@ -1882,6 +1909,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process,
 }
 
 NTSTATUS
+NTAPI
 MmCreateVirtualMapping(PEPROCESS Process,
                        PVOID Address,
                        ULONG flProtect,
@@ -1907,6 +1935,7 @@ MmCreateVirtualMapping(PEPROCESS Process,
 }
 
 ULONG
+NTAPI
 MmGetPageProtect(PEPROCESS Process, PVOID Address)
 {
    ULONG Entry;
@@ -1952,6 +1981,7 @@ MmGetPageProtect(PEPROCESS Process, PVOID Address)
 }
 
 VOID
+NTAPI
 MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect)
 {
    ULONG Attributes = 0;
@@ -2063,6 +2093,7 @@ MmGetPhysicalAddress(PVOID vaddr)
 }
 
 PVOID
+NTAPI
 MmCreateHyperspaceMapping(PFN_TYPE Page)
 {
    PVOID Address;
@@ -2191,6 +2222,7 @@ MmCreateHyperspaceMapping(PFN_TYPE Page)
 }
 
 PFN_TYPE
+NTAPI
 MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage)
 {
    PFN_TYPE Pfn;
@@ -2212,6 +2244,7 @@ MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage)
 }
 
 PFN_TYPE
+NTAPI
 MmDeleteHyperspaceMapping(PVOID Address)
 {
    PFN_TYPE Pfn;
@@ -2232,7 +2265,9 @@ MmDeleteHyperspaceMapping(PVOID Address)
    return Pfn;
 }
 
-VOID MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size)
+VOID
+NTAPI
+MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size)
 {
    ULONG StartOffset, EndOffset, Offset;
 
@@ -2315,7 +2350,9 @@ VOID MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size)
    }
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitGlobalKernelPageDirectory(VOID)
 {
    ULONG i;
@@ -2361,12 +2398,15 @@ MmInitGlobalKernelPageDirectory(VOID)
 }
 
 ULONG
+NTAPI
 MiGetUserPageDirectoryCount(VOID)
 {
    return Ke386Pae ? PAE_ADDR_TO_PDE_OFFSET(MmSystemRangeStart) : ADDR_TO_PDE_OFFSET(MmSystemRangeStart);
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MiInitPageDirectoryMap(VOID)
 {
    MEMORY_AREA* kernel_map_desc = NULL;

reactos/ntoskrnl/mm/kmap.c

@@ -18,6 +18,7 @@
 
 /* FUNCTIONS ***************************************************************/
 NTSTATUS
+NTAPI
 MiZeroPage(PFN_TYPE Page)
 {
    PVOID TempAddress;
@@ -33,6 +34,7 @@ MiZeroPage(PFN_TYPE Page)
 }
 
 NTSTATUS
+NTAPI
 MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress)
 {
    PVOID TempAddress;

reactos/ntoskrnl/mm/marea.c

@@ -705,7 +705,9 @@ MmFindGapAtAddress(
  * Initialize the memory area list implementation.
  */
 
-NTSTATUS INIT_FUNCTION
+NTSTATUS
+INIT_FUNCTION
+NTAPI
 MmInitMemoryAreas(VOID)
 {
    DPRINT("MmInitMemoryAreas()\n",0);

reactos/ntoskrnl/mm/mdl.c

@@ -55,7 +55,9 @@ MmAdvanceMdl (
 }
 
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitializeMdlImplementation(VOID)
 {
    MEMORY_AREA* Result;
@@ -97,6 +99,7 @@ MmInitializeMdlImplementation(VOID)
 
 
 PVOID
+NTAPI
 MmGetMdlPageAddress(PMDL Mdl, PVOID Offset)
 {
    PPFN_NUMBER MdlPages;
@@ -298,6 +301,7 @@ MmUnmapReservedMapping (
 
 
 VOID
+NTAPI
 MmBuildMdlFromPages(PMDL Mdl, PPFN_TYPE Pages)
 {
    memcpy(Mdl + 1, Pages, sizeof(PFN_TYPE) * (PAGE_ROUND_UP(Mdl->ByteOffset+Mdl->ByteCount)/PAGE_SIZE));

reactos/ntoskrnl/mm/mm.c

@@ -69,7 +69,9 @@ NTSTATUS MmReleaseMemoryArea(PEPROCESS Process, PMEMORY_AREA Marea)
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS MmReleaseMmInfo(PEPROCESS Process)
+NTSTATUS
+NTAPI
+MmReleaseMmInfo(PEPROCESS Process)
 {
    DPRINT("MmReleaseMmInfo(Process %x (%s))\n", Process,
           Process->ImageFileName);
@@ -136,7 +138,9 @@ BOOLEAN STDCALL MmIsAddressValid(PVOID VirtualAddress)
    return(TRUE);
 }
 
-NTSTATUS MmAccessFault(KPROCESSOR_MODE Mode,
+NTSTATUS
+NTAPI
+MmAccessFault(KPROCESSOR_MODE Mode,
                        ULONG_PTR Address,
                        BOOLEAN FromMdl)
 {
@@ -234,7 +238,9 @@ NTSTATUS MmAccessFault(KPROCESSOR_MODE Mode,
    return(Status);
 }
 
-NTSTATUS MmCommitPagedPoolAddress(PVOID Address, BOOLEAN Locked)
+NTSTATUS
+NTAPI
+MmCommitPagedPoolAddress(PVOID Address, BOOLEAN Locked)
 {
    NTSTATUS Status;
    PFN_TYPE AllocatedPage;
@@ -258,7 +264,9 @@ NTSTATUS MmCommitPagedPoolAddress(PVOID Address, BOOLEAN Locked)
    return(Status);
 }
 
-NTSTATUS MmNotPresentFault(KPROCESSOR_MODE Mode,
+NTSTATUS
+NTAPI
+MmNotPresentFault(KPROCESSOR_MODE Mode,
                            ULONG_PTR Address,
                            BOOLEAN FromMdl)
 {

reactos/ntoskrnl/mm/mminit.c

@@ -69,10 +69,14 @@ MM_SYSTEM_SIZE STDCALL MmQuerySystemSize(VOID)
    return(MmSystemSize);
 }
 
-VOID MiShutdownMemoryManager(VOID)
+VOID
+NTAPI
+MiShutdownMemoryManager(VOID)
 {}
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitVirtualMemory(ULONG_PTR LastKernelAddress,
                     ULONG KernelLength)
 /*
@@ -277,7 +281,9 @@ MmInitVirtualMemory(ULONG_PTR LastKernelAddress,
    MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory);
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInit1(ULONG_PTR FirstKrnlPhysAddr,
         ULONG_PTR LastKrnlPhysAddr,
         ULONG_PTR LastKernelAddress,
@@ -423,7 +429,9 @@ MmInit1(ULONG_PTR FirstKrnlPhysAddr,
    MmInitializeMdlImplementation();
 }
 
-VOID INIT_FUNCTION
+VOID
+NTAPI
+INIT_FUNCTION
 MmInit2(VOID)
 {
    MmInitializeRmapList();
@@ -432,7 +440,9 @@ MmInit2(VOID)
    MmInitPagingFile();
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInit3(VOID)
 {
    /*
@@ -469,6 +479,7 @@ MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
 }
 
 VOID
+NTAPI
 MiFreeInitMemory(VOID)
 {
    MmLockAddressSpace(MmGetKernelAddressSpace());

reactos/ntoskrnl/mm/mpw.c

@@ -93,7 +93,9 @@ MmMpwThreadMain(PVOID Ignored)
    }
 }
 
-NTSTATUS MmInitMpwThread(VOID)
+NTSTATUS
+NTAPI
+MmInitMpwThread(VOID)
 {
    KPRIORITY Priority;
    NTSTATUS Status;

reactos/ntoskrnl/mm/npool.c

@@ -776,6 +776,7 @@ MiDumpTagStats(ULONG CurrentTag, ULONG CurrentNrBlocks, ULONG CurrentSize)
 #endif /* defined(TAG_STATISTICS_TRACKING) */
 
 VOID
+NTAPI
 MiDebugDumpNonPagedPoolStats(BOOLEAN NewOnly)
 {
 #if defined(TAG_STATISTICS_TRACKING)
@@ -857,6 +858,7 @@ MiDebugDumpNonPagedPoolStats(BOOLEAN NewOnly)
 }
 
 VOID
+NTAPI
 MiDebugDumpNonPagedPool(BOOLEAN NewOnly)
 {
 #if defined(POOL_DEBUG_APIS)
@@ -1577,7 +1579,9 @@ ExAllocateNonPagedPoolWithTag(POOL_TYPE Type, ULONG Size, ULONG Tag, PVOID Calle
    return(block);
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MiInitializeNonPagedPool(VOID)
 {
    NTSTATUS Status;

reactos/ntoskrnl/mm/pagefile.c

@@ -135,6 +135,7 @@ MmIsFileAPagingFile(PFILE_OBJECT FileObject)
 }
 
 VOID
+NTAPI
 MmShowOutOfSpaceMessagePagingFile(VOID)
 {
    if (!MmSwapSpaceMessage)
@@ -201,7 +202,9 @@ MmGetOffsetPageFile(PRETRIEVAL_POINTERS_BUFFER RetrievalPointers, LARGE_INTEGER
 #endif
 }
 
-NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
+NTSTATUS
+NTAPI
+MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
 {
    ULONG i, offset;
    LARGE_INTEGER file_offset;
@@ -255,7 +258,9 @@ NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
    return(Status);
 }
 
-NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
+NTSTATUS
+NTAPI
+MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
 {
    ULONG i, offset;
    LARGE_INTEGER file_offset;
@@ -309,7 +314,9 @@ NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
    return(Status);
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitPagingFile(VOID)
 {
    ULONG i;
@@ -344,6 +351,7 @@ MmInitPagingFile(VOID)
 }
 
 BOOLEAN
+NTAPI
 MmReserveSwapPages(ULONG Nr)
 {
    KIRQL oldIrql;
@@ -363,6 +371,7 @@ MmReserveSwapPages(ULONG Nr)
 }
 
 VOID
+NTAPI
 MmDereserveSwapPages(ULONG Nr)
 {
    KIRQL oldIrql;
@@ -400,6 +409,7 @@ MiAllocPageFromPagingFile(PPAGINGFILE PagingFile)
 }
 
 VOID
+NTAPI
 MmFreeSwapPage(SWAPENTRY Entry)
 {
    ULONG i;
@@ -435,12 +445,14 @@ MmFreeSwapPage(SWAPENTRY Entry)
 }
 
 BOOLEAN
+NTAPI
 MmIsAvailableSwapPage(VOID)
 {
    return(MiFreeSwapPages > 0);
 }
 
 SWAPENTRY
+NTAPI
 MmAllocSwapPage(VOID)
 {
    KIRQL oldIrql;

reactos/ntoskrnl/mm/pageop.c

@@ -25,6 +25,7 @@ static NPAGED_LOOKASIDE_LIST MmPageOpLookasideList;
 /* FUNCTIONS *****************************************************************/
 
 VOID
+NTAPI
 MmReleasePageOp(PMM_PAGEOP PageOp)
 /*
  * FUNCTION: Release a reference to a page operation descriptor
@@ -65,6 +66,7 @@ MmReleasePageOp(PMM_PAGEOP PageOp)
 }
 
 PMM_PAGEOP
+NTAPI
 MmCheckForPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address,
                  PMM_SECTION_SEGMENT Segment, ULONG Offset)
 {
@@ -127,6 +129,7 @@ MmCheckForPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address,
 }
 
 PMM_PAGEOP
+NTAPI
 MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address,
             PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, BOOL First)
 /*
@@ -234,7 +237,9 @@ MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address,
    return(PageOp);
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitializePageOp(VOID)
 {
    memset(MmPageOpHashTable, 0, sizeof(MmPageOpHashTable));

reactos/ntoskrnl/mm/ppool.c

@@ -43,7 +43,9 @@ static PR_POOL MmPagedPool = NULL;
 
 /* FUNCTIONS *****************************************************************/
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitializePagedPool(VOID)
 {
 	/*

reactos/ntoskrnl/mm/region.c

@@ -105,6 +105,7 @@ MmSplitRegion(PMM_REGION InitialRegion, PVOID InitialBaseAddress,
 }
 
 NTSTATUS
+NTAPI
 MmAlterRegion(PMADDRESS_SPACE AddressSpace, PVOID BaseAddress,
               PLIST_ENTRY RegionListHead, PVOID StartAddress, ULONG Length,
               ULONG NewType, ULONG NewProtect, PMM_ALTER_REGION_FUNC AlterFunc)
@@ -237,6 +238,7 @@ MmAlterRegion(PMADDRESS_SPACE AddressSpace, PVOID BaseAddress,
 }
 
 VOID
+NTAPI
 MmInitialiseRegion(PLIST_ENTRY RegionListHead, ULONG Length, ULONG Type,
                    ULONG Protect)
 {
@@ -252,6 +254,7 @@ MmInitialiseRegion(PLIST_ENTRY RegionListHead, ULONG Length, ULONG Type,
 }
 
 PMM_REGION
+NTAPI
 MmFindRegion(PVOID BaseAddress, PLIST_ENTRY RegionListHead, PVOID Address,
              PVOID* RegionBaseAddress)
 {

reactos/ntoskrnl/mm/rmap.c

@@ -34,7 +34,9 @@ static NPAGED_LOOKASIDE_LIST RmapLookasideList;
 
 /* FUNCTIONS ****************************************************************/
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 MmInitializeRmapList(VOID)
 {
    ExInitializeFastMutex(&RmapListLock);
@@ -48,6 +50,7 @@ MmInitializeRmapList(VOID)
 }
 
 NTSTATUS
+NTAPI
 MmWritePagePhysicalAddress(PFN_TYPE Page)
 {
    PMM_RMAP_ENTRY entry;
@@ -181,6 +184,7 @@ MmWritePagePhysicalAddress(PFN_TYPE Page)
 }
 
 NTSTATUS
+NTAPI
 MmPageOutPhysicalAddress(PFN_TYPE Page)
 {
    PMM_RMAP_ENTRY entry;
@@ -304,6 +308,7 @@ MmPageOutPhysicalAddress(PFN_TYPE Page)
 }
 
 VOID
+NTAPI
 MmSetCleanAllRmaps(PFN_TYPE Page)
 {
    PMM_RMAP_ENTRY current_entry;
@@ -324,6 +329,7 @@ MmSetCleanAllRmaps(PFN_TYPE Page)
 }
 
 VOID
+NTAPI
 MmSetDirtyAllRmaps(PFN_TYPE Page)
 {
    PMM_RMAP_ENTRY current_entry;
@@ -344,6 +350,7 @@ MmSetDirtyAllRmaps(PFN_TYPE Page)
 }
 
 BOOL
+NTAPI
 MmIsDirtyPageRmap(PFN_TYPE Page)
 {
    PMM_RMAP_ENTRY current_entry;
@@ -369,6 +376,7 @@ MmIsDirtyPageRmap(PFN_TYPE Page)
 }
 
 VOID
+NTAPI
 MmInsertRmap(PFN_TYPE Page, PEPROCESS Process,
              PVOID Address)
 {
@@ -434,6 +442,7 @@ MmInsertRmap(PFN_TYPE Page, PEPROCESS Process,
 }
 
 VOID
+NTAPI
 MmDeleteAllRmaps(PFN_TYPE Page, PVOID Context,
                  VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process,
                                        PVOID Address))
@@ -474,6 +483,7 @@ MmDeleteAllRmaps(PFN_TYPE Page, PVOID Context,
 }
 
 VOID
+NTAPI
 MmDeleteRmap(PFN_TYPE Page, PEPROCESS Process,
              PVOID Address)
 {

reactos/ntoskrnl/mm/section.c

@@ -157,6 +157,7 @@ MmFreePageTablesSectionSegment(PMM_SECTION_SEGMENT Segment)
 }
 
 VOID
+NTAPI
 MmFreeSectionSegments(PFILE_OBJECT FileObject)
 {
    if (FileObject->SectionObjectPointer->ImageSectionObject != NULL)
@@ -202,18 +203,21 @@ MmFreeSectionSegments(PFILE_OBJECT FileObject)
 }
 
 VOID
+NTAPI
 MmLockSectionSegment(PMM_SECTION_SEGMENT Segment)
 {
    ExAcquireFastMutex(&Segment->Lock);
 }
 
 VOID
+NTAPI
 MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment)
 {
    ExReleaseFastMutex(&Segment->Lock);
 }
 
 VOID
+NTAPI
 MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
                              ULONG Offset,
                              ULONG Entry)
@@ -250,6 +254,7 @@ MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
 
 
 ULONG
+NTAPI
 MmGetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
                              ULONG Offset)
 {
@@ -280,6 +285,7 @@ MmGetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
 }
 
 VOID
+NTAPI
 MmSharePageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
                                ULONG Offset)
 {
@@ -305,6 +311,7 @@ MmSharePageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
 }
 
 BOOLEAN
+NTAPI
 MmUnsharePageEntrySectionSegment(PSECTION_OBJECT Section,
                                  PMM_SECTION_SEGMENT Segment,
                                  ULONG Offset,
@@ -453,6 +460,7 @@ BOOL MiIsPageFromCache(PMEMORY_AREA MemoryArea,
 }
 
 NTSTATUS
+NTAPI
 MiReadPage(PMEMORY_AREA MemoryArea,
            ULONG SegOffset,
            PPFN_TYPE Page)
@@ -624,6 +632,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
 }
 
 NTSTATUS
+NTAPI
 MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
                              MEMORY_AREA* MemoryArea,
                              PVOID Address,
@@ -1142,6 +1151,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
 }
 
 NTSTATUS
+NTAPI
 MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace,
                          MEMORY_AREA* MemoryArea,
                          PVOID Address,
@@ -1348,6 +1358,7 @@ MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process, PVOID Address)
 }
 
 NTSTATUS
+NTAPI
 MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
                      MEMORY_AREA* MemoryArea,
                      PVOID Address,
@@ -1693,6 +1704,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
 }
 
 NTSTATUS
+NTAPI
 MmWritePageSectionView(PMADDRESS_SPACE AddressSpace,
                        PMEMORY_AREA MemoryArea,
                        PVOID Address,
@@ -1902,6 +1914,7 @@ MmAlterViewAttributes(PMADDRESS_SPACE AddressSpace,
 }
 
 NTSTATUS
+NTAPI
 MmProtectSectionView(PMADDRESS_SPACE AddressSpace,
                      PMEMORY_AREA MemoryArea,
                      PVOID BaseAddress,
@@ -1972,6 +1985,7 @@ MmQuerySectionView(PMEMORY_AREA MemoryArea,
 }
 
 VOID
+NTAPI
 MmpFreePageFileSegment(PMM_SECTION_SEGMENT Segment)
 {
    ULONG Length;
@@ -2087,7 +2101,9 @@ MmpCloseSection(PVOID ObjectBody,
           ObjectBody, HandleCount, ObGetObjectPointerCount(ObjectBody));
 }
 
-NTSTATUS INIT_FUNCTION
+NTSTATUS
+INIT_FUNCTION
+NTAPI
 MmCreatePhysicalMemorySection(VOID)
 {
    PSECTION_OBJECT PhysSection;
@@ -2134,7 +2150,9 @@ MmCreatePhysicalMemorySection(VOID)
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS INIT_FUNCTION
+NTSTATUS
+INIT_FUNCTION
+NTAPI
 MmInitSectionImplementation(VOID)
 {
    OBJECT_TYPE_INITIALIZER ObjectTypeInitializer;
@@ -2158,6 +2176,7 @@ MmInitSectionImplementation(VOID)
 }
 
 NTSTATUS
+NTAPI
 MmCreatePageFileSection(PSECTION_OBJECT *SectionObject,
                         ACCESS_MASK DesiredAccess,
                         POBJECT_ATTRIBUTES ObjectAttributes,
@@ -2229,6 +2248,7 @@ MmCreatePageFileSection(PSECTION_OBJECT *SectionObject,
 
 
 NTSTATUS
+NTAPI
 MmCreateDataFileSection(PSECTION_OBJECT *SectionObject,
                         ACCESS_MASK DesiredAccess,
                         POBJECT_ATTRIBUTES ObjectAttributes,

reactos/ntoskrnl/rtl/nls.c

@@ -62,7 +62,9 @@ RtlpInitNls(VOID)
     RtlpCreateNlsSection();
 }
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 RtlpImportAnsiCodePage(PUSHORT TableBase,
              ULONG Size)
 {
@@ -71,7 +73,9 @@ RtlpImportAnsiCodePage(PUSHORT TableBase,
 }
 
 
-VOID INIT_FUNCTION
+VOID
+INIT_FUNCTION
+NTAPI
 RtlpImportOemCodePage(PUSHORT TableBase,
             ULONG Size)
 {
@@ -80,7 +84,9 @@ RtlpImportOemCodePage(PUSHORT TableBase,
 }
 
 
-VOID INIT_FUNCTION
+VOID
+NTAPI
+INIT_FUNCTION
 RtlpImportUnicodeCasemap(PUSHORT TableBase,
           ULONG Size)
 {
@@ -89,7 +95,9 @@ RtlpImportUnicodeCasemap(PUSHORT TableBase,
 }
 
 
-VOID INIT_FUNCTION
+VOID
+NTAPI
+INIT_FUNCTION
 RtlpCreateInitialNlsTables(VOID)
 {
   NLSTABLEINFO NlsTable;
@@ -109,8 +117,9 @@ RtlpCreateInitialNlsTables(VOID)
   RtlResetRtlTranslations (&NlsTable);
 }
 
-
+VOID
-VOID INIT_FUNCTION
+NTAPI
+INIT_FUNCTION
 RtlpCreateNlsSection(VOID)
 {
   NLSTABLEINFO NlsTable;