[ros-diffs] [sginsberg] 37755: - Deprecate STDCALL from HAL

Author: sginsberg
Date: Sat Nov 29 17:16:39 2008
New Revision: 37755

URL: http://svn.reactos.org/svn/reactos?rev=37755&view=rev
Log:
- Deprecate STDCALL from HAL

Modified:
    trunk/reactos/hal/halppc/generic/beep.c
    trunk/reactos/hal/halppc/generic/display.c
    trunk/reactos/hal/halppc/generic/dma.c
    trunk/reactos/hal/halppc/generic/irql.c
    trunk/reactos/hal/halppc/generic/isa.c
    trunk/reactos/hal/halppc/generic/portio.c
    trunk/reactos/hal/halppc/generic/processor.c
    trunk/reactos/hal/halppc/generic/reboot.c
    trunk/reactos/hal/halppc/include/haldma.h
    trunk/reactos/hal/halppc/include/halp.h
    trunk/reactos/hal/halx86/generic/dma.c
    trunk/reactos/hal/halx86/generic/pci.c
    trunk/reactos/hal/halx86/include/haldma.h
    trunk/reactos/hal/halx86/include/halp.h
    trunk/reactos/hal/halx86/mp/ipi_mp.c
    trunk/reactos/hal/halx86/mp/mpsirql.c
    trunk/reactos/hal/halx86/mp/processor_mp.c
    trunk/reactos/hal/halx86/mp/spinlock.c

Modified: trunk/reactos/hal/halppc/generic/beep.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/beep.c?…
==============================================================================
--- trunk/reactos/hal/halppc/generic/beep.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/generic/beep.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -32,7 +32,7 @@
  */
 
 BOOLEAN
-STDCALL
+NTAPI
 HalMakeBeep (
 	ULONG	Frequency
 	)

Modified: trunk/reactos/hal/halppc/generic/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/display…
==============================================================================
--- trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -250,7 +250,7 @@
 
 /* PUBLIC FUNCTIONS *********************************************************/
 
-VOID STDCALL
+VOID NTAPI
 HalReleaseDisplayOwnership(VOID)
 /*
  * FUNCTION: Release ownership of display back to HAL
@@ -267,7 +267,7 @@
 }
 
 
-VOID STDCALL
+VOID NTAPI
 HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters)
 /*
  * FUNCTION:
@@ -280,7 +280,7 @@
   HalResetDisplayParameters = ResetDisplayParameters;
 }
 
-VOID STDCALL
+VOID NTAPI
 HalDisplayString(IN PCH String)
 /*
  * FUNCTION: Switches the screen to HAL console mode (BSOD) if not there
@@ -350,7 +350,7 @@
   KeLowerIrql(OldIrql);
 }
 
-VOID STDCALL
+VOID NTAPI
 HalQueryDisplayParameters(OUT PULONG DispSizeX,
 			  OUT PULONG DispSizeY,
 			  OUT PULONG CursorPosX,
@@ -367,7 +367,7 @@
 }
 
 
-VOID STDCALL
+VOID NTAPI
 HalSetDisplayParameters(IN ULONG CursorPosX,
 			IN ULONG CursorPosY)
 {
@@ -376,7 +376,7 @@
 }
 
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalQueryDisplayOwnership(VOID)
 {
   return !HalOwnsDisplay;

Modified: trunk/reactos/hal/halppc/generic/dma.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?r…
==============================================================================
--- trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -164,7 +164,7 @@
  * by the passed DMA adapter.
  */
 
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
 HalpGetAdapterMaximumPhysicalAddress(
    IN PADAPTER_OBJECT AdapterObject)
 {
@@ -200,7 +200,7 @@
  *        already allocated).
  */
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalpGrowMapBuffers(
    IN PADAPTER_OBJECT AdapterObject,
    IN ULONG SizeOfMapBuffers)
@@ -329,7 +329,7 @@
  * @see HalpInitDma
  */
 
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
 HalpDmaAllocateMasterAdapter(VOID)
 {
    PADAPTER_OBJECT MasterAdapter;
@@ -388,7 +388,7 @@
  * @see HalGetAdapter
  */
 
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
 HalpDmaAllocateChildAdapter(
    ULONG NumberOfMapRegisters,
    PDEVICE_DESCRIPTION DeviceDescription)
@@ -458,7 +458,7 @@
  * Setup DMA modes and extended modes for (E)ISA DMA adapter object.
  */
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalpDmaInitializeEisaAdapter(
    PADAPTER_OBJECT AdapterObject,
    PDEVICE_DESCRIPTION DeviceDescription)
@@ -588,7 +588,7 @@
  * @implemented
  */
 
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
 HalGetAdapter(
    PDEVICE_DESCRIPTION DeviceDescription,
    PULONG NumberOfMapRegisters)
@@ -787,7 +787,7 @@
  * @see HalGetAdapter
  */
 
-PDMA_ADAPTER STDCALL
+PDMA_ADAPTER NTAPI
 HalpGetDmaAdapter(
    IN PVOID Context,
    IN PDEVICE_DESCRIPTION DeviceDescription,
@@ -805,7 +805,7 @@
  * @see HalGetAdapter
  */
 
-VOID STDCALL
+VOID NTAPI
 HalPutDmaAdapter(
    PADAPTER_OBJECT AdapterObject)
 {
@@ -846,7 +846,7 @@
  * @implemented
  */
 
-PVOID STDCALL
+PVOID NTAPI
 HalAllocateCommonBuffer(
    PADAPTER_OBJECT AdapterObject,
    ULONG Length,
@@ -895,7 +895,7 @@
  * @implemented
  */
 
-VOID STDCALL
+VOID NTAPI
 HalFreeCommonBuffer(
    PADAPTER_OBJECT AdapterObject,
    ULONG Length,
@@ -915,7 +915,7 @@
  * @see HalGetAdapter
  */
 
-ULONG STDCALL
+ULONG NTAPI
 HalpDmaGetDmaAlignment(
    PADAPTER_OBJECT AdapterObject)
 {
@@ -930,7 +930,7 @@
  * @implemented
  */
 
-ULONG STDCALL
+ULONG NTAPI
 HalReadDmaCounter(
    PADAPTER_OBJECT AdapterObject)
 {
@@ -1002,7 +1002,7 @@
  * at PASSIVE_LEVEL in work item.
  */
 
-VOID STDCALL
+VOID NTAPI
 HalpGrowMapBufferWorker(PVOID DeferredContext)
 {
    PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext;
@@ -1064,7 +1064,7 @@
  * @implemented
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 HalAllocateAdapterChannel(
    PADAPTER_OBJECT AdapterObject,
    PWAIT_CONTEXT_BLOCK WaitContextBlock,
@@ -1235,7 +1235,7 @@
  * @implemented
  */
 
-VOID STDCALL
+VOID NTAPI
 IoFreeAdapterChannel(
    PADAPTER_OBJECT AdapterObject)
 {
@@ -1359,7 +1359,7 @@
  * @implemented
  */
 
-VOID STDCALL
+VOID NTAPI
 IoFreeMapRegisters(
    IN PADAPTER_OBJECT AdapterObject,
    IN PVOID MapRegisterBase,
@@ -1465,7 +1465,7 @@
  * @see IoFlushAdapterBuffers, IoMapTransfer
  */
 
-VOID STDCALL
+VOID NTAPI
 HalpCopyBufferMap(
    PMDL Mdl,
    PROS_MAP_REGISTER_ENTRY MapRegisterBase,
@@ -1554,7 +1554,7 @@
  * @unimplemented.
  */
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 IoFlushAdapterBuffers(
    PADAPTER_OBJECT AdapterObject,
    PMDL Mdl,
@@ -1661,7 +1661,7 @@
  * @implemented
  */
 
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
 IoMapTransfer(
    IN PADAPTER_OBJECT AdapterObject,
    IN PMDL Mdl,

Modified: trunk/reactos/hal/halppc/generic/irql.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/irql.c?…
==============================================================================
--- trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -61,7 +61,7 @@
 
 #else
 
-VOID STDCALL
+VOID NTAPI
 KiInterruptDispatch2 (ULONG Irq, KIRQL old_level);
 
 #endif
@@ -69,7 +69,7 @@
 /* FUNCTIONS ****************************************************************/
 
 #undef KeGetCurrentIrql
-KIRQL STDCALL KeGetCurrentIrql (VOID)
+KIRQL NTAPI KeGetCurrentIrql (VOID)
 /*
  * PURPOSE: Returns the current irq level
  * RETURNS: The current irq level
@@ -277,7 +277,7 @@
  *	Calls KfRaiseIrql
  */
 
-KIRQL STDCALL
+KIRQL NTAPI
 KeRaiseIrqlToDpcLevel (VOID)
 {
   return KfRaiseIrql (DISPATCH_LEVEL);
@@ -301,14 +301,14 @@
  *	Calls KfRaiseIrql
  */
 
-KIRQL STDCALL
+KIRQL NTAPI
 KeRaiseIrqlToSynchLevel (VOID)
 {
   return KfRaiseIrql (DISPATCH_LEVEL);
 }
 
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalBeginSystemInterrupt (KIRQL Irql,
 			 ULONG Vector,
 			 PKIRQL OldIrql)
@@ -347,7 +347,7 @@
 }
 
 
-VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
+VOID NTAPI HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
 /*
  * FUNCTION: Finish a system interrupt and restore the specified irq level.
  */
@@ -357,7 +357,7 @@
 }
 
 BOOLEAN
-STDCALL
+NTAPI
 HalDisableSystemInterrupt(
   ULONG Vector,
   KIRQL Irql)
@@ -383,7 +383,7 @@
 
 
 BOOLEAN
-STDCALL
+NTAPI
 HalEnableSystemInterrupt(
   ULONG Vector,
   KIRQL Irql,

Modified: trunk/reactos/hal/halppc/generic/isa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/isa.c?r…
==============================================================================
--- trunk/reactos/hal/halppc/generic/isa.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/generic/isa.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -34,7 +34,7 @@
 }
 
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalpTranslateIsaBusAddress(PBUS_HANDLER BusHandler,
 			   ULONG BusNumber,
 			   PHYSICAL_ADDRESS BusAddress,
@@ -59,7 +59,7 @@
    return Result;
 }
 
-ULONG STDCALL
+ULONG NTAPI
 HalpGetIsaInterruptVector(PVOID BusHandler,
 			  ULONG BusNumber,
 			  ULONG BusInterruptLevel,

Modified: trunk/reactos/hal/halppc/generic/portio.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/portio.…
==============================================================================
--- trunk/reactos/hal/halppc/generic/portio.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/generic/portio.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -193,7 +193,7 @@
 	"blr"
     );
 
-VOID STDCALL
+VOID NTAPI
 READ_PORT_BUFFER_UCHAR (PUCHAR Port,
                         PUCHAR Buffer,
                         ULONG Count)
@@ -201,7 +201,7 @@
     while(Count--) { *Buffer++ = GetPhysByte((ULONG)Port); }
 }
 
-VOID STDCALL
+VOID NTAPI
 READ_PORT_BUFFER_USHORT (PUSHORT Port,
                          PUSHORT Buffer,
                          ULONG Count)
@@ -209,7 +209,7 @@
     while(Count--) { *Buffer++ = GetPhysWord((ULONG)Port); }
 }
 
-VOID STDCALL
+VOID NTAPI
 READ_PORT_BUFFER_ULONG (PULONG Port,
                         PULONG Buffer,
                         ULONG Count)
@@ -217,25 +217,25 @@
     while(Count--) { *Buffer++ = GetPhys((ULONG)Port); }
 }
 
-UCHAR STDCALL
+UCHAR NTAPI
 READ_PORT_UCHAR (PUCHAR Port)
 {
     return GetPhys((ULONG)Port);
 }
 
-USHORT STDCALL
+USHORT NTAPI
 READ_PORT_USHORT (PUSHORT Port)
 {
     return GetPhysWord((ULONG)Port);
 }
 
-ULONG STDCALL
+ULONG NTAPI
 READ_PORT_ULONG (PULONG Port)
 {
     return GetPhys((ULONG)Port);
 }
 
-VOID STDCALL
+VOID NTAPI
 WRITE_PORT_BUFFER_UCHAR (PUCHAR Port,
                          PUCHAR Buffer,
                          ULONG Count)
@@ -243,7 +243,7 @@
     while(Count--) { SetPhysByte((ULONG)Port, *Buffer++); }
 }
 
-VOID STDCALL
+VOID NTAPI
 WRITE_PORT_BUFFER_USHORT (PUSHORT Port,
                           PUSHORT Buffer,
                           ULONG Count)
@@ -251,7 +251,7 @@
     while(Count--) { SetPhysWord((ULONG)Port, *Buffer++); }
 }
 
-VOID STDCALL
+VOID NTAPI
 WRITE_PORT_BUFFER_ULONG (PULONG Port,
                          PULONG Buffer,
                          ULONG Count)
@@ -259,21 +259,21 @@
     while(Count--) { SetPhys((ULONG)Port, *Buffer++); }
 }
 
-VOID STDCALL
+VOID NTAPI
 WRITE_PORT_UCHAR (PUCHAR Port,
                   UCHAR Value)
 {
     SetPhysByte((ULONG)Port, Value);
 }
 
-VOID STDCALL
+VOID NTAPI
 WRITE_PORT_USHORT (PUSHORT Port,
                    USHORT Value)
 {
     SetPhysWord((ULONG)Port, Value);
 }
 
-VOID STDCALL
+VOID NTAPI
 WRITE_PORT_ULONG (PULONG Port,
                   ULONG Value)
 {

Modified: trunk/reactos/hal/halppc/generic/processor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/process…
==============================================================================
--- trunk/reactos/hal/halppc/generic/processor.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/generic/processor.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -22,7 +22,7 @@
 
 #define INITIAL_STALL_COUNT 0x10000
 
-VOID STDCALL
+VOID NTAPI
 HalInitializeProcessor(ULONG ProcessorNumber,
                        PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
@@ -30,7 +30,7 @@
     KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT;
 }
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalAllProcessorsStarted (VOID)
 {
   DPRINT("HalAllProcessorsStarted()\n");

Modified: trunk/reactos/hal/halppc/generic/reboot.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/reboot.…
==============================================================================
--- trunk/reactos/hal/halppc/generic/reboot.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/generic/reboot.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -22,7 +22,7 @@
 }
 
 
-VOID STDCALL
+VOID NTAPI
 HalReturnToFirmware (
 	FIRMWARE_REENTRY	Action
 	)

Modified: trunk/reactos/hal/halppc/include/haldma.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/haldma.…
==============================================================================
--- trunk/reactos/hal/halppc/include/haldma.h [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/include/haldma.h [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -367,16 +367,16 @@
 
 #define MAP_BASE_SW_SG 1
 
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
 HalpDmaAllocateMasterAdapter(VOID);
 
-PDMA_ADAPTER STDCALL
+PDMA_ADAPTER NTAPI
 HalpGetDmaAdapter(
    IN PVOID Context,
    IN PDEVICE_DESCRIPTION DeviceDescription,
    OUT PULONG NumberOfMapRegisters);
 
-ULONG STDCALL
+ULONG NTAPI
 HalpDmaGetDmaAlignment(
    PADAPTER_OBJECT AdapterObject);
 

Modified: trunk/reactos/hal/halppc/include/halp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/halp.h?…
==============================================================================
--- trunk/reactos/hal/halppc/include/halp.h [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/include/halp.h [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -36,7 +36,7 @@
     (UCHAR)(((int / 10) << 4) + (int % 10))
 
 /* adapter.c */
-PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN
IsMaster, BOOLEAN Dma32BitAddresses);
+PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster,
BOOLEAN Dma32BitAddresses);
 
 /* bus.c */
 VOID NTAPI HalpInitNonBusHandler (VOID);

Modified: trunk/reactos/hal/halx86/generic/dma.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r…
==============================================================================
--- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -164,7 +164,7 @@
  * by the passed DMA adapter.
  */
 
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
 HalpGetAdapterMaximumPhysicalAddress(
    IN PADAPTER_OBJECT AdapterObject)
 {
@@ -200,7 +200,7 @@
  *        already allocated).
  */
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalpGrowMapBuffers(
    IN PADAPTER_OBJECT AdapterObject,
    IN ULONG SizeOfMapBuffers)
@@ -329,7 +329,7 @@
  * @see HalpInitDma
  */
 
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
 HalpDmaAllocateMasterAdapter(VOID)
 {
    PADAPTER_OBJECT MasterAdapter;
@@ -388,7 +388,7 @@
  * @see HalGetAdapter
  */
 
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
 HalpDmaAllocateChildAdapter(
    ULONG NumberOfMapRegisters,
    PDEVICE_DESCRIPTION DeviceDescription)
@@ -458,7 +458,7 @@
  * Setup DMA modes and extended modes for (E)ISA DMA adapter object.
  */
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalpDmaInitializeEisaAdapter(
    PADAPTER_OBJECT AdapterObject,
    PDEVICE_DESCRIPTION DeviceDescription)
@@ -588,7 +588,7 @@
  * @implemented
  */
 
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
 HalGetAdapter(
    PDEVICE_DESCRIPTION DeviceDescription,
    PULONG NumberOfMapRegisters)
@@ -787,7 +787,7 @@
  * @see HalGetAdapter
  */
 
-PDMA_ADAPTER STDCALL
+PDMA_ADAPTER NTAPI
 HalpGetDmaAdapter(
    IN PVOID Context,
    IN PDEVICE_DESCRIPTION DeviceDescription,
@@ -805,7 +805,7 @@
  * @see HalGetAdapter
  */
 
-VOID STDCALL
+VOID NTAPI
 HalPutDmaAdapter(
    PADAPTER_OBJECT AdapterObject)
 {
@@ -846,7 +846,7 @@
  * @implemented
  */
 
-PVOID STDCALL
+PVOID NTAPI
 HalAllocateCommonBuffer(
    PADAPTER_OBJECT AdapterObject,
    ULONG Length,
@@ -895,7 +895,7 @@
  * @implemented
  */
 
-VOID STDCALL
+VOID NTAPI
 HalFreeCommonBuffer(
    PADAPTER_OBJECT AdapterObject,
    ULONG Length,
@@ -915,7 +915,7 @@
  * @see HalGetAdapter
  */
 
-ULONG STDCALL
+ULONG NTAPI
 HalpDmaGetDmaAlignment(
    PADAPTER_OBJECT AdapterObject)
 {
@@ -930,7 +930,7 @@
  * @implemented
  */
 
-ULONG STDCALL
+ULONG NTAPI
 HalReadDmaCounter(
    PADAPTER_OBJECT AdapterObject)
 {
@@ -1002,7 +1002,7 @@
  * at PASSIVE_LEVEL in work item.
  */
 
-VOID STDCALL
+VOID NTAPI
 HalpGrowMapBufferWorker(PVOID DeferredContext)
 {
    PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext;
@@ -1064,7 +1064,7 @@
  * @implemented
  */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 HalAllocateAdapterChannel(
    PADAPTER_OBJECT AdapterObject,
    PWAIT_CONTEXT_BLOCK WaitContextBlock,
@@ -1235,7 +1235,7 @@
  * @implemented
  */
 
-VOID STDCALL
+VOID NTAPI
 IoFreeAdapterChannel(
    PADAPTER_OBJECT AdapterObject)
 {
@@ -1359,7 +1359,7 @@
  * @implemented
  */
 
-VOID STDCALL
+VOID NTAPI
 IoFreeMapRegisters(
    IN PADAPTER_OBJECT AdapterObject,
    IN PVOID MapRegisterBase,
@@ -1465,7 +1465,7 @@
  * @see IoFlushAdapterBuffers, IoMapTransfer
  */
 
-VOID STDCALL
+VOID NTAPI
 HalpCopyBufferMap(
    PMDL Mdl,
    PROS_MAP_REGISTER_ENTRY MapRegisterBase,
@@ -1554,7 +1554,7 @@
  * @unimplemented.
  */
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 IoFlushAdapterBuffers(
    PADAPTER_OBJECT AdapterObject,
    PMDL Mdl,
@@ -1663,7 +1663,7 @@
  * @implemented
  */
 
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
 IoMapTransfer(
    IN PADAPTER_OBJECT AdapterObject,
    IN PMDL Mdl,

Modified: trunk/reactos/hal/halx86/generic/pci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r…
==============================================================================
--- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -520,7 +520,7 @@
     return STATUS_NOT_IMPLEMENTED;
 }
 
-static ULONG STDCALL
+static ULONG NTAPI
 PciSize(ULONG Base, ULONG Mask)
 {
     ULONG Size = Mask & Base; /* Find the significant bits */

Modified: trunk/reactos/hal/halx86/include/haldma.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/haldma.…
==============================================================================
--- trunk/reactos/hal/halx86/include/haldma.h [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/include/haldma.h [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -367,16 +367,16 @@
 
 #define MAP_BASE_SW_SG 1
 
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
 HalpDmaAllocateMasterAdapter(VOID);
 
-PDMA_ADAPTER STDCALL
+PDMA_ADAPTER NTAPI
 HalpGetDmaAdapter(
    IN PVOID Context,
    IN PDEVICE_DESCRIPTION DeviceDescription,
    OUT PULONG NumberOfMapRegisters);
 
-ULONG STDCALL
+ULONG NTAPI
 HalpDmaGetDmaAlignment(
    PADAPTER_OBJECT AdapterObject);
 

Modified: trunk/reactos/hal/halx86/include/halp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?…
==============================================================================
--- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -30,7 +30,7 @@
     (UCHAR)(((int / 10) << 4) + (int % 10))
 
 /* adapter.c */
-PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN
IsMaster, BOOLEAN Dma32BitAddresses);
+PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster,
BOOLEAN Dma32BitAddresses);
 
 /* bus.c */
 VOID NTAPI HalpInitNonBusHandler (VOID);

Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/ipi_mp.c?rev…
==============================================================================
--- trunk/reactos/hal/halx86/mp/ipi_mp.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/mp/ipi_mp.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -15,7 +15,7 @@
 
 /* FUNCTIONS ****************************************************************/
 
-VOID STDCALL
+VOID NTAPI
 HalRequestIpi(KAFFINITY TargetProcessors)
 {
   /* FIXME: SMP HAL is...very broken */

Modified: trunk/reactos/hal/halx86/mp/mpsirql.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?re…
==============================================================================
--- trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -21,7 +21,7 @@
 /* FUNCTIONS ****************************************************************/
 
 #undef KeGetCurrentIrql
-KIRQL STDCALL KeGetCurrentIrql (VOID)
+KIRQL NTAPI KeGetCurrentIrql (VOID)
 /*
  * PURPOSE: Returns the current irq level
  * RETURNS: The current irq level
@@ -160,7 +160,7 @@
  * NOTES
  */
 #undef KeLowerIrql
-VOID STDCALL
+VOID NTAPI
 KeLowerIrql (KIRQL NewIrql)
 {
   KfLowerIrql (NewIrql);
@@ -234,7 +234,7 @@
  *	Calls KfRaiseIrql
  */
 #undef KeRaiseIrql
-VOID STDCALL
+VOID NTAPI
 KeRaiseIrql (KIRQL	NewIrql,
 	PKIRQL	OldIrql)
 {
@@ -259,7 +259,7 @@
  *	Calls KfRaiseIrql
  */
 
-KIRQL STDCALL
+KIRQL NTAPI
 KeRaiseIrqlToDpcLevel (VOID)
 {
   return KfRaiseIrql (DISPATCH_LEVEL);
@@ -283,14 +283,14 @@
  *	Calls KfRaiseIrql
  */
 
-KIRQL STDCALL
+KIRQL NTAPI
 KeRaiseIrqlToSynchLevel (VOID)
 {
   return KfRaiseIrql (CLOCK2_LEVEL);
 }
 
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalBeginSystemInterrupt (KIRQL Irql,
 			 ULONG Vector,
 			 PKIRQL OldIrql)
@@ -317,7 +317,7 @@
 }
 
 
-VOID STDCALL
+VOID NTAPI
 HalEndSystemInterrupt (KIRQL Irql,
 		       ULONG Unknown2)
 /*
@@ -336,7 +336,7 @@
   HalpLowerIrql (Irql, TRUE);
 }
   
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalDisableSystemInterrupt (ULONG Vector,
 			   KIRQL Irql)
 {
@@ -358,7 +358,7 @@
 }
 
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalEnableSystemInterrupt (ULONG Vector,
 			  KIRQL Irql,
 			  KINTERRUPT_MODE InterruptMode)

Modified: trunk/reactos/hal/halx86/mp/processor_mp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp…
==============================================================================
--- trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -20,7 +20,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
-VOID STDCALL
+VOID NTAPI
 HalInitializeProcessor(ULONG ProcessorNumber,
                        PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
@@ -55,7 +55,7 @@
    //HalpCalibrateStallExecution();
 }
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 HalAllProcessorsStarted (VOID)
 {
     ULONG CPUs = 0, i;

Modified: trunk/reactos/hal/halx86/mp/spinlock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/spinlock.c?r…
==============================================================================
--- trunk/reactos/hal/halx86/mp/spinlock.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/mp/spinlock.c [iso-8859-1] Sat Nov 29 17:16:39 2008
@@ -26,7 +26,7 @@
 /* FUNCTIONS ***************************************************************/
 
 #undef KeAcquireSpinLock
-VOID STDCALL
+VOID NTAPI
 KeAcquireSpinLock (
 	PKSPIN_LOCK	SpinLock,
 	PKIRQL		OldIrql
@@ -55,7 +55,7 @@
 }
 
 #undef KeReleaseSpinLock
-VOID STDCALL
+VOID NTAPI
 KeReleaseSpinLock (
 	PKSPIN_LOCK	SpinLock,
 	KIRQL		NewIrql