- STDCALL -> NTAPI

svn path=/trunk/; revision=37742

diff --git a/reactos/drivers/filesystems/cdfs/cdfs.c b/reactos/drivers/filesystems/cdfs/cdfs.c
index a0c98ba..76f5841 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/cdfs.c
+++ b/reactos/drivers/filesystems/cdfs/cdfs.c
@@ -40,7 +40,7 @@ PCDFS_GLOBAL_DATA CdfsGlobalData;
 
 /* FUNCTIONS ****************************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(PDRIVER_OBJECT DriverObject,
            PUNICODE_STRING RegistryPath)
 /*

diff --git a/reactos/drivers/filesystems/cdfs/cdfs.h b/reactos/drivers/filesystems/cdfs/cdfs.h
index 8f22905..e8b164f 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/cdfs.h
+++ b/reactos/drivers/filesystems/cdfs/cdfs.h
@@ -239,14 +239,14 @@ extern PCDFS_GLOBAL_DATA CdfsGlobalData;
 
 /* cleanup.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsCleanup(PDEVICE_OBJECT DeviceObject,
            PIRP Irp);
 
 
 /* close.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsClose(PDEVICE_OBJECT DeviceObject,
          PIRP Irp);
 
@@ -276,14 +276,14 @@ CdfsDeviceIoControl (IN PDEVICE_OBJECT DeviceObject,
 
 /* create.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsCreate(PDEVICE_OBJECT DeviceObject,
           PIRP Irp);
 
 
 /* dirctl.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
                     PIRP Irp);
 
@@ -358,18 +358,18 @@ CdfsGetFCBForFile(PDEVICE_EXTENSION Vcb,
 
 /* finfo.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsQueryInformation(PDEVICE_OBJECT DeviceObject,
                     PIRP Irp);
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsSetInformation(PDEVICE_OBJECT DeviceObject,
                   PIRP Irp);
 
 
 /* fsctl.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
                      PIRP Irp);
 
@@ -392,28 +392,28 @@ CdfsFileFlagsToAttributes(PFCB Fcb,
 
 /* rw.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsRead(PDEVICE_OBJECT DeviceObject,
        PIRP Irp);
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsWrite(PDEVICE_OBJECT DeviceObject,
          PIRP Irp);
 
 
 /* volinfo.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject,
                           PIRP Irp);
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject,
                         PIRP Irp);
 
 /* cdfs.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(PDRIVER_OBJECT DriverObject,
            PUNICODE_STRING RegistryPath);
 

diff --git a/reactos/drivers/filesystems/cdfs/cleanup.c b/reactos/drivers/filesystems/cdfs/cleanup.c
index c61b1cc..0957648 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/cleanup.c
+++ b/reactos/drivers/filesystems/cdfs/cleanup.c
@@ -57,7 +57,7 @@ CdfsCleanupFile(PDEVICE_EXTENSION DeviceExt,
   return STATUS_SUCCESS;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsCleanup(PDEVICE_OBJECT DeviceObject,
          PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/cdfs/close.c b/reactos/drivers/filesystems/cdfs/close.c
index f7f7c38..175ec03 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/close.c
+++ b/reactos/drivers/filesystems/cdfs/close.c
@@ -76,7 +76,7 @@ CdfsCloseFile(PDEVICE_EXTENSION DeviceExt,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsClose(PDEVICE_OBJECT DeviceObject,
          PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/cdfs/create.c b/reactos/drivers/filesystems/cdfs/create.c
index 244c4bb..ed5fb7f 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/create.c
+++ b/reactos/drivers/filesystems/cdfs/create.c
@@ -259,7 +259,7 @@ CdfsCreateFile(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsCreate(PDEVICE_OBJECT DeviceObject,
           PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/cdfs/dirctl.c b/reactos/drivers/filesystems/cdfs/dirctl.c
index f2f39f8..87d83c6 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/dirctl.c
+++ b/reactos/drivers/filesystems/cdfs/dirctl.c
@@ -760,7 +760,7 @@ CdfsQueryDirectory(PDEVICE_OBJECT DeviceObject,
 
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
                     PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/cdfs/finfo.c b/reactos/drivers/filesystems/cdfs/finfo.c
index 90489ef..929d654 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/finfo.c
+++ b/reactos/drivers/filesystems/cdfs/finfo.c
@@ -326,7 +326,7 @@ CdfsGetAllInformation(PFILE_OBJECT FileObject,
 /*
  * FUNCTION: Retrieve the specified file information
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsQueryInformation(PDEVICE_OBJECT DeviceObject,
                     PIRP Irp)
 {
@@ -444,7 +444,7 @@ CdfsSetPositionInformation(PFILE_OBJECT FileObject,
 /*
  * FUNCTION: Set the specified file information
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsSetInformation(PDEVICE_OBJECT DeviceObject,
                   PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/cdfs/fsctl.c b/reactos/drivers/filesystems/cdfs/fsctl.c
index 547e6d0..bc222a9 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/fsctl.c
+++ b/reactos/drivers/filesystems/cdfs/fsctl.c
@@ -534,7 +534,7 @@ CdfsSetCompression(
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
                      PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/cdfs/rw.c b/reactos/drivers/filesystems/cdfs/rw.c
index d1d1b58..7a53bc1 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/rw.c
+++ b/reactos/drivers/filesystems/cdfs/rw.c
@@ -178,7 +178,7 @@ CdfsReadFile(PDEVICE_EXTENSION DeviceExt,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsRead(PDEVICE_OBJECT DeviceObject,
         PIRP Irp)
 {
@@ -229,7 +229,7 @@ CdfsRead(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsWrite(PDEVICE_OBJECT DeviceObject,
          PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/cdfs/volinfo.c b/reactos/drivers/filesystems/cdfs/volinfo.c
index 76cfc7a..e751216 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/volinfo.c
+++ b/reactos/drivers/filesystems/cdfs/volinfo.c
@@ -162,7 +162,7 @@ CdfsGetFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject,
                           PIRP Irp)
 {
@@ -223,7 +223,7 @@ CdfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CdfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject,
                        PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/ext2/inc/protos.h b/reactos/drivers/filesystems/ext2/inc/protos.h
index 1cb7c13..6c5e755 100644 (file)
--- a/reactos/drivers/filesystems/ext2/inc/protos.h
+++ b/reactos/drivers/filesystems/ext2/inc/protos.h
@@ -22,27 +22,27 @@ typedef PIO_STACK_LOCATION PEXTENDED_IO_STACK_LOCATION;
 /*************************************************************************
 * Prototypes for the file sfsdinit.c
 *************************************************************************/
-extern NTSTATUS STDCALL DriverEntry(
+extern NTSTATUS NTAPI DriverEntry(
        PDRIVER_OBJECT                  DriverObject,           // created by the I/O sub-system
        PUNICODE_STRING                 RegistryPath);          // path to the registry key
 
-extern void STDCALL Ext2FsdInitializeFunctionPointers(
+extern void NTAPI Ext2FsdInitializeFunctionPointers(
        PDRIVER_OBJECT                  DriverObject);          // created by the I/O sub-system
 
 
-extern VOID STDCALL Ext2QueueHandlerThread(
+extern VOID NTAPI Ext2QueueHandlerThread(
        IN PVOID                                StartContext);
                                                                                                
 /*************************************************************************
 * Prototypes for the file fsctrl.c
 *************************************************************************/
 
-extern NTSTATUS STDCALL Ext2FileSystemControl(
+extern NTSTATUS NTAPI Ext2FileSystemControl(
     IN PDEVICE_OBJECT          DeviceObject,
     IN PIRP                                    Irp
     );
 
-extern NTSTATUS STDCALL Ext2VerifyVolume (
+extern NTSTATUS NTAPI Ext2VerifyVolume (
        IN PIRP                                 Irp,
        IN PIO_STACK_LOCATION   IrpSp );
 
@@ -50,16 +50,16 @@ extern NTSTATUS STDCALL Ext2VerifyVolume (
 /*************************************************************************
 * Prototypes for the file create.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2Create(
+extern NTSTATUS NTAPI Ext2Create(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                           Irp);                   // I/O Request Packet
 
-extern NTSTATUS STDCALL Ext2CommonCreate(
+extern NTSTATUS NTAPI Ext2CommonCreate(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp,
 BOOLEAN                                                FirstAttempt );
 
-extern NTSTATUS STDCALL Ext2OpenVolume(
+extern NTSTATUS NTAPI Ext2OpenVolume(
        PtrExt2VCB                              PtrVCB,                         // volume to be opened
        PtrExt2IrpContext               PtrIrpContext,          // IRP context
        PIRP                                    PtrIrp,                         // original/user IRP
@@ -67,7 +67,7 @@ extern NTSTATUS STDCALL Ext2OpenVolume(
        PIO_SECURITY_CONTEXT    PtrSecurityContext,     // caller's context (incl access)
        PFILE_OBJECT                    PtrNewFileObject);      // I/O Mgr. created file object
 
-extern NTSTATUS STDCALL Ext2OpenRootDirectory(
+extern NTSTATUS NTAPI Ext2OpenRootDirectory(
        PtrExt2VCB                              PtrVCB,                                 // volume to be opened
        PtrExt2IrpContext               PtrIrpContext,                  // IRP context
        PIRP                                    PtrIrp,                                 // original/user IRP
@@ -75,90 +75,90 @@ extern NTSTATUS STDCALL Ext2OpenRootDirectory(
        PIO_SECURITY_CONTEXT    PtrSecurityContext,             // caller's context (incl access)
        PFILE_OBJECT                    PtrNewFileObject);              // I/O Mgr. created file object
 
-extern void STDCALL Ext2InitializeFCB(
+extern void NTAPI Ext2InitializeFCB(
        PtrExt2FCB                              PtrNewFCB,              // FCB structure to be initialized
        PtrExt2VCB                              PtrVCB,                 // logical volume (VCB) pointer
        PtrExt2ObjectName               PtrObjectName,  // name of the object
        uint32                                  Flags,                  // is this a file/directory, etc.
        PFILE_OBJECT                    PtrFileObject);// optional file object to be initialized
 
-extern PtrExt2FCB      STDCALL Ext2LocateChildFCBInCore(
+extern PtrExt2FCB      NTAPI Ext2LocateChildFCBInCore(
        PtrExt2VCB                              PtrVCB, 
        PUNICODE_STRING                 PtrName, 
        ULONG                                   ParentInodeNo );
 
-extern PtrExt2FCB      STDCALL Ext2LocateFCBInCore(
+extern PtrExt2FCB      NTAPI Ext2LocateFCBInCore(
        PtrExt2VCB                              PtrVCB, 
        ULONG                                   InodeNo );
 
 
-extern ULONG   STDCALL Ext2LocateFileInDisk(
+extern ULONG   NTAPI Ext2LocateFileInDisk(
        PtrExt2VCB                              PtrVCB,
        PUNICODE_STRING                 PtrCurrentName, 
        PtrExt2FCB                              PtrParentFCB, 
        ULONG                                   *Type );
 
-extern ULONG STDCALL Ext2CreateFile(
+extern ULONG NTAPI Ext2CreateFile(
        PtrExt2IrpContext               PtrIrpContext,
        PtrExt2VCB                              PtrVCB,
        PUNICODE_STRING                 PtrName, 
        PtrExt2FCB                              PtrParentFCB,
        ULONG                                   Type);
 
-extern BOOLEAN STDCALL Ext2OverwriteFile(
+extern BOOLEAN NTAPI Ext2OverwriteFile(
        PtrExt2FCB                              PtrFCB,
        PtrExt2IrpContext               PtrIrpContext);
 
-extern BOOLEAN STDCALL Ext2SupersedeFile(
+extern BOOLEAN NTAPI Ext2SupersedeFile(
        PtrExt2FCB                              PtrFCB,
        PtrExt2IrpContext               PtrIrpContext);
 
 /*************************************************************************
 * Prototypes for the file misc.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2InitializeZones(
+extern NTSTATUS NTAPI Ext2InitializeZones(
 void);
 
-extern void STDCALL Ext2DestroyZones(
+extern void NTAPI Ext2DestroyZones(
 void);
 
-extern BOOLEAN STDCALL Ext2IsIrpTopLevel(
+extern BOOLEAN NTAPI Ext2IsIrpTopLevel(
 PIRP                                                   Irp);                                   // the IRP sent to our dispatch routine
 
-extern long STDCALL Ext2ExceptionFilter(
+extern long NTAPI Ext2ExceptionFilter(
 PtrExt2IrpContext                      PtrIrpContext,
 PEXCEPTION_POINTERS            PtrExceptionPointers);
 
-extern NTSTATUS STDCALL Ext2ExceptionHandler(
+extern NTSTATUS NTAPI Ext2ExceptionHandler(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                                   Irp);
 
-extern void STDCALL Ext2LogEvent(
+extern void NTAPI Ext2LogEvent(
 NTSTATUS                                               Ext2EventLogId, // the Ext2 private message id
 NTSTATUS                                               RC);                                    // any NT error code we wish to log ...
 
-extern PtrExt2ObjectName STDCALL Ext2AllocateObjectName(
+extern PtrExt2ObjectName NTAPI Ext2AllocateObjectName(
 void);
 
-extern void STDCALL Ext2ReleaseObjectName(
+extern void NTAPI Ext2ReleaseObjectName(
 PtrExt2ObjectName                      PtrObjectName);
 
-extern PtrExt2CCB STDCALL Ext2AllocateCCB(
+extern PtrExt2CCB NTAPI Ext2AllocateCCB(
 void );
 
-extern PtrExt2FCB STDCALL Ext2GetUsedFCB( 
+extern PtrExt2FCB NTAPI Ext2GetUsedFCB( 
 PtrExt2VCB                                     PtrVCB );
 
-extern BOOLEAN STDCALL Ext2CloseClosableFCB( 
+extern BOOLEAN NTAPI Ext2CloseClosableFCB( 
 PtrExt2FCB                                     PtrFCB );
 
-extern void STDCALL Ext2ReleaseCCB(
+extern void NTAPI Ext2ReleaseCCB(
 PtrExt2CCB                                     PtrCCB);
 
-extern PtrExt2FCB STDCALL Ext2AllocateFCB(
+extern PtrExt2FCB NTAPI Ext2AllocateFCB(
 void);
 
-extern NTSTATUS STDCALL Ext2CreateNewFCB(
+extern NTSTATUS NTAPI Ext2CreateNewFCB(
 PtrExt2FCB                                     *ReturnedFCB,
 LARGE_INTEGER                          AllocationSize,
 LARGE_INTEGER                          EndOfFile,
@@ -166,106 +166,106 @@ PFILE_OBJECT                            PtrFileObject,
 PtrExt2VCB                                     PtrVCB,
 PtrExt2ObjectName                      PtrObjectName);
 
-extern NTSTATUS STDCALL Ext2CreateNewCCB(
+extern NTSTATUS NTAPI Ext2CreateNewCCB(
 PtrExt2CCB                             *ReturnedCCB,
 PtrExt2FCB                             PtrFCB,
 PFILE_OBJECT                   PtrFileObject);
 
-extern void STDCALL Ext2ReleaseFCB(
+extern void NTAPI Ext2ReleaseFCB(
 PtrExt2FCB                                     PtrFCB);
 
-extern PtrExt2FileLockInfo STDCALL Ext2AllocateByteLocks(
+extern PtrExt2FileLockInfo NTAPI Ext2AllocateByteLocks(
 void);
 
-extern void STDCALL Ext2ReleaseByteLocks(
+extern void NTAPI Ext2ReleaseByteLocks(
 PtrExt2FileLockInfo            PtrByteLocks);
 
-extern PtrExt2IrpContext STDCALL Ext2AllocateIrpContext(
+extern PtrExt2IrpContext NTAPI Ext2AllocateIrpContext(
 PIRP                                                   Irp,
 PDEVICE_OBJECT                         PtrTargetDeviceObject);
 
-extern void STDCALL Ext2ReleaseIrpContext(
+extern void NTAPI Ext2ReleaseIrpContext(
 PtrExt2IrpContext                      PtrIrpContext);
 
-extern NTSTATUS STDCALL Ext2PostRequest(
+extern NTSTATUS NTAPI Ext2PostRequest(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp);
 
-extern void STDCALL Ext2CommonDispatch(
+extern void NTAPI Ext2CommonDispatch(
 void                                           *Context);      // actually an IRPContext structure
 
-extern void STDCALL Ext2InitializeVCB(
+extern void NTAPI Ext2InitializeVCB(
 PDEVICE_OBJECT                         PtrVolumeDeviceObject,
 PDEVICE_OBJECT                         PtrTargetDeviceObject,
 PVPB                                           PtrVPB,
 PLARGE_INTEGER                         AllocationSize);
 
-extern void STDCALL Ext2CompleteRequest(
+extern void NTAPI Ext2CompleteRequest(
     IN PIRP                                    Irp OPTIONAL,
     IN NTSTATUS                                Status
     );
 
-extern NTSTATUS STDCALL Ext2DenyAccess( 
+extern NTSTATUS NTAPI Ext2DenyAccess( 
        IN PIRP Irp 
        );
-extern NTSTATUS STDCALL Ext2GetFCB_CCB_VCB_FromFileObject(
+extern NTSTATUS NTAPI Ext2GetFCB_CCB_VCB_FromFileObject(
        IN PFILE_OBJECT                 PtrFileObject,
        OUT PtrExt2FCB                          *PPtrFCB,
        OUT PtrExt2CCB                          *PPtrCCB,
        OUT PtrExt2VCB                          *PPtrVCB        );
 
-extern void STDCALL Ext2CopyUnicodeString( 
+extern void NTAPI Ext2CopyUnicodeString( 
        IN OUT PUNICODE_STRING  PtrDestinationString, 
        IN PUNICODE_STRING PtrSourceString );
 
-extern void STDCALL Ext2CopyWideCharToUnicodeString( 
+extern void NTAPI Ext2CopyWideCharToUnicodeString( 
        IN OUT PUNICODE_STRING  PtrDestinationString, 
        IN PCWSTR PtrSourceString );
 
-extern void STDCALL Ext2CopyCharToUnicodeString( 
+extern void NTAPI Ext2CopyCharToUnicodeString( 
        IN OUT PUNICODE_STRING  PtrDestinationString, 
        IN PCSTR PtrSourceString,
        IN USHORT SourceStringLength );
 
-extern void STDCALL Ext2CopyZCharToUnicodeString( 
+extern void NTAPI Ext2CopyZCharToUnicodeString( 
        IN OUT PUNICODE_STRING  PtrDestinationString, 
        IN PCSTR PtrSourceString );
 
-extern void STDCALL Ext2DeallocateUnicodeString( 
+extern void NTAPI Ext2DeallocateUnicodeString( 
        PUNICODE_STRING         PtrUnicodeString );
 
-extern void STDCALL Ext2ZerooutUnicodeString(
+extern void NTAPI Ext2ZerooutUnicodeString(
        PUNICODE_STRING         PtrUnicodeString );
 
-extern BOOLEAN STDCALL Ext2SaveBCB(
+extern BOOLEAN NTAPI Ext2SaveBCB(
        PtrExt2IrpContext       PtrIrpContext,
        PBCB                            PtrBCB,
        PFILE_OBJECT            PtrFileObject);
 
-extern BOOLEAN STDCALL Ext2FlushSavedBCBs(
+extern BOOLEAN NTAPI Ext2FlushSavedBCBs(
        PtrExt2IrpContext       PtrIrpContext);
 
-extern BOOLEAN STDCALL AssertBCB(
+extern BOOLEAN NTAPI AssertBCB(
        PBCB                            PtrBCB);
 
-extern ULONG STDCALL Ext2Align(
+extern ULONG NTAPI Ext2Align(
        ULONG                           NumberToBeAligned, 
        ULONG                           Alignment);
 
-extern LONGLONG STDCALL Ext2Align64(
+extern LONGLONG NTAPI Ext2Align64(
        LONGLONG                        NumberToBeAligned, 
        LONGLONG                        Alignment);
 
-extern ULONG STDCALL Ext2GetCurrentTime();
+extern ULONG NTAPI Ext2GetCurrentTime();
 
 /*************************************************************************
 * Prototypes for the file cleanup.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2Cleanup(
+extern NTSTATUS NTAPI Ext2Cleanup(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                                   Irp);                                   // I/O Request Packet
 
-extern NTSTATUS        STDCALL Ext2CommonCleanup(
+extern NTSTATUS        NTAPI Ext2CommonCleanup(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp,
 BOOLEAN                                                FirstAttempt );
@@ -273,11 +273,11 @@ BOOLEAN                                           FirstAttempt );
 /*************************************************************************
 * Prototypes for the file close.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2Close(
+extern NTSTATUS NTAPI Ext2Close(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                                   Irp);                                   // I/O Request Packet
 
-extern NTSTATUS        STDCALL Ext2CommonClose(
+extern NTSTATUS        NTAPI Ext2CommonClose(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp,
 BOOLEAN                                                FirstAttempt );
@@ -285,24 +285,24 @@ BOOLEAN                                           FirstAttempt );
 /*************************************************************************
 * Prototypes for the file read.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2Read(
+extern NTSTATUS NTAPI Ext2Read(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                                   Irp);                                   // I/O Request Packet
 
-extern NTSTATUS        STDCALL Ext2CommonRead(
+extern NTSTATUS        NTAPI Ext2CommonRead(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                   PtrIrp,
 BOOLEAN                                                FirstAttempt );
 
-extern void * STDCALL Ext2GetCallersBuffer(
+extern void * NTAPI Ext2GetCallersBuffer(
 PIRP                                           PtrIrp);
 
-extern NTSTATUS STDCALL Ext2LockCallersBuffer(
+extern NTSTATUS NTAPI Ext2LockCallersBuffer(
 PIRP                                           PtrIrp,
 BOOLEAN                                                IsReadOperation,
 uint32                                         Length);
 
-extern void STDCALL Ext2MdlComplete(
+extern void NTAPI Ext2MdlComplete(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp,
 PIO_STACK_LOCATION                     PtrIoStackLocation,
@@ -311,57 +311,57 @@ BOOLEAN                                           ReadCompletion);
 /*************************************************************************
 * Prototypes for the file write.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2Write(
+extern NTSTATUS NTAPI Ext2Write(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                                   Irp);                                   // I/O Request Packet
 
-extern NTSTATUS        STDCALL Ext2CommonWrite(
+extern NTSTATUS        NTAPI Ext2CommonWrite(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                   PtrIrp);
 
-extern void STDCALL Ext2DeferredWriteCallBack (
+extern void NTAPI Ext2DeferredWriteCallBack (
 void                                                   *Context1,                      // Should be PtrIrpContext
 void                                                   *Context2);                     // Should be PtrIrp
 
 /*************************************************************************
 * Prototypes for the file fileinfo.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2FileInfo(
+extern NTSTATUS NTAPI Ext2FileInfo(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                           Irp);                                   // I/O Request Packet
 
-extern NTSTATUS        STDCALL Ext2CommonFileInfo(
+extern NTSTATUS        NTAPI Ext2CommonFileInfo(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp);
 
-extern NTSTATUS        STDCALL Ext2GetBasicInformation(
+extern NTSTATUS        NTAPI Ext2GetBasicInformation(
        PtrExt2FCB                                      PtrFCB,
        PFILE_BASIC_INFORMATION         PtrBuffer,
        long                                            *PtrReturnedLength);
 
-extern NTSTATUS        STDCALL Ext2GetStandardInformation(
+extern NTSTATUS        NTAPI Ext2GetStandardInformation(
        PtrExt2FCB                                      PtrFCB,
        PFILE_STANDARD_INFORMATION      PtrStdInformation,
        long                                            *PtrReturnedLength);
 
-extern NTSTATUS STDCALL Ext2GetNetworkOpenInformation(
+extern NTSTATUS NTAPI Ext2GetNetworkOpenInformation(
        PtrExt2FCB                                              PtrFCB,
        PFILE_NETWORK_OPEN_INFORMATION  PtrNetworkOpenInformation,
        long                                                    *PtrReturnedLength );
 
-extern NTSTATUS        STDCALL Ext2GetFullNameInformation(
+extern NTSTATUS        NTAPI Ext2GetFullNameInformation(
        PtrExt2FCB                              PtrFCB,
        PtrExt2CCB                              PtrCCB,
        PFILE_NAME_INFORMATION  PtrNameInformation,
        long                                    *PtrReturnedLength);
 
-extern NTSTATUS        STDCALL Ext2SetBasicInformation(
+extern NTSTATUS        NTAPI Ext2SetBasicInformation(
        PtrExt2IrpContext                       PtrIrpContext,
        PtrExt2FCB                                      PtrFCB,
        PFILE_OBJECT                            PtrFileObject,
        PFILE_BASIC_INFORMATION         PtrFileInformation );
 
-extern NTSTATUS        STDCALL Ext2SetDispositionInformation(
+extern NTSTATUS        NTAPI Ext2SetDispositionInformation(
 PtrExt2FCB                                     PtrFCB,
 PtrExt2CCB                                     PtrCCB,
 PtrExt2VCB                                     PtrVCB,
@@ -370,7 +370,7 @@ PtrExt2IrpContext                   PtrIrpContext,
 PIRP                                                   PtrIrp,
 PFILE_DISPOSITION_INFORMATION  PtrBuffer);
 
-extern NTSTATUS        STDCALL Ext2SetAllocationInformation(
+extern NTSTATUS        NTAPI Ext2SetAllocationInformation(
 PtrExt2FCB                                     PtrFCB,
 PtrExt2CCB                                     PtrCCB,
 PtrExt2VCB                                     PtrVCB,
@@ -382,24 +382,24 @@ PFILE_ALLOCATION_INFORMATION      PtrBuffer);
 /*************************************************************************
 * Prototypes for the file flush.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2Flush(
+extern NTSTATUS NTAPI Ext2Flush(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                                   Irp);                                   // I/O Request Packet
 
-extern NTSTATUS        STDCALL Ext2CommonFlush(
+extern NTSTATUS        NTAPI Ext2CommonFlush(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                                   PtrIrp);
 
-extern void STDCALL Ext2FlushAFile(
+extern void NTAPI Ext2FlushAFile(
 PtrExt2NTRequiredFCB           PtrReqdFCB,
 PIO_STATUS_BLOCK                       PtrIoStatus);
 
-extern void STDCALL Ext2FlushLogicalVolume(
+extern void NTAPI Ext2FlushLogicalVolume(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                                   PtrIrp,
 PtrExt2VCB                                     PtrVCB);
 
-extern NTSTATUS STDCALL Ext2FlushCompletion(
+extern NTSTATUS NTAPI Ext2FlushCompletion(
 PDEVICE_OBJECT                         PtrDeviceObject,
 PIRP                                                   PtrIrp,
 PVOID                                                  Context);
@@ -407,15 +407,15 @@ PVOID                                                     Context);
 /*************************************************************************
 * Prototypes for the file dircntrl.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2DirControl(
+extern NTSTATUS NTAPI Ext2DirControl(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                                   Irp);                                   // I/O Request Packet
 
-extern NTSTATUS        STDCALL Ext2CommonDirControl(
+extern NTSTATUS        NTAPI Ext2CommonDirControl(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                                   PtrIrp);
 
-extern NTSTATUS        STDCALL Ext2QueryDirectory(
+extern NTSTATUS        NTAPI Ext2QueryDirectory(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp,
 PEXTENDED_IO_STACK_LOCATION                    PtrIoStackLocation,
@@ -423,7 +423,7 @@ PFILE_OBJECT                                PtrFileObject,
 PtrExt2FCB                                     PtrFCB,
 PtrExt2CCB                                     PtrCCB);
 
-extern NTSTATUS        STDCALL Ext2NotifyChangeDirectory(
+extern NTSTATUS        NTAPI Ext2NotifyChangeDirectory(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp,
 PEXTENDED_IO_STACK_LOCATION            PtrIoStackLocation,
@@ -434,41 +434,41 @@ PtrExt2CCB                                        PtrCCB);
 /*************************************************************************
 * Prototypes for the file devcntrl.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2DeviceControl(
+extern NTSTATUS NTAPI Ext2DeviceControl(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                           Irp);                                   // I/O Request Packet
 
-extern NTSTATUS STDCALL Ext2CommonDeviceControl(
+extern NTSTATUS NTAPI Ext2CommonDeviceControl(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp);
 
-extern NTSTATUS STDCALL Ext2DevIoctlCompletion(
+extern NTSTATUS NTAPI Ext2DevIoctlCompletion(
 PDEVICE_OBJECT                         PtrDeviceObject,
 PIRP                                           PtrIrp,
 void                                           *Context);
 
-extern NTSTATUS STDCALL Ext2HandleQueryPath(
+extern NTSTATUS NTAPI Ext2HandleQueryPath(
 void                                           *BufferPointer);
 
 /*************************************************************************
 * Prototypes for the file shutdown.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2Shutdown(
+extern NTSTATUS NTAPI Ext2Shutdown(
 PDEVICE_OBJECT                         DeviceObject,           // the logical volume device object
 PIRP                                           Irp);                   // I/O Request Packet
 
-extern NTSTATUS        STDCALL Ext2CommonShutdown(
+extern NTSTATUS        NTAPI Ext2CommonShutdown(
 PtrExt2IrpContext                      PtrIrpContext,
 PIRP                                           PtrIrp);
 
 /*************************************************************************
 * Prototypes for the file volinfo.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2QueryVolInfo(
+extern NTSTATUS NTAPI Ext2QueryVolInfo(
 PDEVICE_OBJECT                         DeviceObject,   // the logical volume device object
 PIRP                                           Irp);                   // I/O Request Packet
 
-NTSTATUS STDCALL Ext2SetVolInfo(
+NTSTATUS NTAPI Ext2SetVolInfo(
        IN PDEVICE_OBJECT               DeviceObject,   // the logical volume device object
        IN PIRP                                 Irp);                   // I/O Request Packet
 
@@ -476,7 +476,7 @@ NTSTATUS STDCALL Ext2SetVolInfo(
 /*************************************************************************
 * Prototypes for the file fastio.c
 *************************************************************************/
-extern BOOLEAN STDCALL Ext2FastIoCheckIfPossible(
+extern BOOLEAN NTAPI Ext2FastIoCheckIfPossible(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              FileOffset,
 IN ULONG                                                       Length,
@@ -486,7 +486,7 @@ IN BOOLEAN                                          CheckForReadOperation,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoRead(
+extern BOOLEAN NTAPI Ext2FastIoRead(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              FileOffset,
 IN ULONG                                                       Length,
@@ -496,7 +496,7 @@ OUT PVOID                                           Buffer,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoWrite(
+extern BOOLEAN NTAPI Ext2FastIoWrite(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              FileOffset,
 IN ULONG                                                       Length,
@@ -506,21 +506,21 @@ OUT PVOID                                         Buffer,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoQueryBasicInfo(
+extern BOOLEAN NTAPI Ext2FastIoQueryBasicInfo(
 IN PFILE_OBJECT                                        FileObject,
 IN BOOLEAN                                                     Wait,
 OUT PFILE_BASIC_INFORMATION    Buffer,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                                      DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoQueryStdInfo(
+extern BOOLEAN NTAPI Ext2FastIoQueryStdInfo(
 IN PFILE_OBJECT                                                FileObject,
 IN BOOLEAN                                                             Wait,
 OUT PFILE_STANDARD_INFORMATION         Buffer,
 OUT PIO_STATUS_BLOCK                           IoStatus,
 IN PDEVICE_OBJECT                                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoLock(
+extern BOOLEAN NTAPI Ext2FastIoLock(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              FileOffset,
 IN PLARGE_INTEGER                              Length,
@@ -531,7 +531,7 @@ BOOLEAN                                                     ExclusiveLock,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoUnlockSingle(
+extern BOOLEAN NTAPI Ext2FastIoUnlockSingle(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              FileOffset,
 IN PLARGE_INTEGER                              Length,
@@ -540,50 +540,50 @@ ULONG                                                             Key,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoUnlockAll(
+extern BOOLEAN NTAPI Ext2FastIoUnlockAll(
 IN PFILE_OBJECT                                FileObject,
 PEPROCESS                                              ProcessId,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoUnlockAllByKey(
+extern BOOLEAN NTAPI Ext2FastIoUnlockAllByKey(
 IN PFILE_OBJECT                                FileObject,
 PEPROCESS                                              ProcessId,
 ULONG                                                          Key,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern void STDCALL Ext2FastIoAcqCreateSec(
+extern void NTAPI Ext2FastIoAcqCreateSec(
 IN PFILE_OBJECT                                FileObject);
 
-extern void STDCALL Ext2FastIoRelCreateSec(
+extern void NTAPI Ext2FastIoRelCreateSec(
 IN PFILE_OBJECT                                FileObject);
 
-extern BOOLEAN STDCALL Ext2AcqLazyWrite(
+extern BOOLEAN NTAPI Ext2AcqLazyWrite(
 IN PVOID                                                       Context,
 IN BOOLEAN                                             Wait);
 
-extern void STDCALL Ext2RelLazyWrite(
+extern void NTAPI Ext2RelLazyWrite(
 IN PVOID                                                       Context);
 
-extern BOOLEAN STDCALL Ext2AcqReadAhead(
+extern BOOLEAN NTAPI Ext2AcqReadAhead(
 IN PVOID                                                       Context,
 IN BOOLEAN                                             Wait);
 
-extern void STDCALL Ext2RelReadAhead(
+extern void NTAPI Ext2RelReadAhead(
 IN PVOID                                                       Context);
 
 // the remaining are only valid under NT Version 4.0 and later
 #if(_WIN32_WINNT >= 0x0400)
 
-extern BOOLEAN STDCALL Ext2FastIoQueryNetInfo(
+extern BOOLEAN NTAPI Ext2FastIoQueryNetInfo(
 IN PFILE_OBJECT                                                                        FileObject,
 IN BOOLEAN                                                                                     Wait,
 OUT PFILE_NETWORK_OPEN_INFORMATION                     Buffer,
 OUT PIO_STATUS_BLOCK                                                   IoStatus,
 IN PDEVICE_OBJECT                                                                      DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoMdlRead(
+extern BOOLEAN NTAPI Ext2FastIoMdlRead(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              FileOffset,
 IN ULONG                                                       Length,
@@ -592,12 +592,12 @@ OUT PMDL                                                  *MdlChain,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoMdlReadComplete(
+extern BOOLEAN NTAPI Ext2FastIoMdlReadComplete(
 IN PFILE_OBJECT                                FileObject,
 OUT PMDL                                                       MdlChain,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoPrepareMdlWrite(
+extern BOOLEAN NTAPI Ext2FastIoPrepareMdlWrite(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              FileOffset,
 IN ULONG                                                       Length,
@@ -606,28 +606,28 @@ OUT PMDL                                                  *MdlChain,
 OUT PIO_STATUS_BLOCK                   IoStatus,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern BOOLEAN STDCALL Ext2FastIoMdlWriteComplete(
+extern BOOLEAN NTAPI Ext2FastIoMdlWriteComplete(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              FileOffset,
 OUT PMDL                                                       MdlChain,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern NTSTATUS STDCALL Ext2FastIoAcqModWrite(
+extern NTSTATUS NTAPI Ext2FastIoAcqModWrite(
 IN PFILE_OBJECT                                FileObject,
 IN PLARGE_INTEGER                              EndingOffset,
 OUT PERESOURCE                                 *ResourceToRelease,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern NTSTATUS STDCALL Ext2FastIoRelModWrite(
+extern NTSTATUS NTAPI Ext2FastIoRelModWrite(
 IN PFILE_OBJECT                                FileObject,
 IN PERESOURCE                                  ResourceToRelease,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern NTSTATUS STDCALL Ext2FastIoAcqCcFlush(
+extern NTSTATUS NTAPI Ext2FastIoAcqCcFlush(
 IN PFILE_OBJECT                                FileObject,
 IN PDEVICE_OBJECT                              DeviceObject);
 
-extern NTSTATUS STDCALL Ext2FastIoRelCcFlush(
+extern NTSTATUS NTAPI Ext2FastIoRelCcFlush(
 IN PFILE_OBJECT                                FileObject,
 IN PDEVICE_OBJECT                              DeviceObject);
 
@@ -636,13 +636,13 @@ IN PDEVICE_OBJECT                         DeviceObject);
 /*************************************************************************
 * Prototypes for the file DiskIO.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2ReadLogicalBlocks(
+extern NTSTATUS NTAPI Ext2ReadLogicalBlocks(
 PDEVICE_OBJECT         PtrTargetDeviceObject,  //      the Target Device Object
 VOID                           *Buffer,                                //      The Buffer that takes the data read in
 LARGE_INTEGER          StartLogicalBlock,              //      The logical block from which reading is to start
 unsigned int           NoOfLogicalBlocks);             //      The no. of logical blocks to be read
 
-extern NTSTATUS STDCALL Ext2ReadPhysicalBlocks(
+extern NTSTATUS NTAPI Ext2ReadPhysicalBlocks(
        PDEVICE_OBJECT          PtrTargetDeviceObject,  //      the Target Device Object
        VOID                            *Buffer,                                //      The Buffer that takes the data read in
        LARGE_INTEGER           StartBlock,             //      The Physical block from which reading is to start
@@ -652,32 +652,32 @@ extern NTSTATUS STDCALL Ext2ReadPhysicalBlocks(
 * Prototypes for the file metadata.c
 *************************************************************************/
 
-extern void STDCALL Ext2InitializeFCBInodeInfo (
+extern void NTAPI Ext2InitializeFCBInodeInfo (
        PtrExt2FCB      PtrFCB );
 
-extern NTSTATUS STDCALL Ext2ReadInode(
+extern NTSTATUS NTAPI Ext2ReadInode(
        PtrExt2VCB                      PtrVcb,                 //      the Volume Control Block
        uint32                          InodeNo,                //      The Inode no
        PEXT2_INODE                     PtrInode );             //      The Inode Buffer
 
-extern NTSTATUS STDCALL Ext2WriteInode(
+extern NTSTATUS NTAPI Ext2WriteInode(
        PtrExt2IrpContext       PtrIrpContext,
        PtrExt2VCB                      PtrVcb,                 //      the Volume Control Block
        uint32                          InodeNo,                //      The Inode no
        PEXT2_INODE                     PtrInode                //      The Inode Buffer
        );                                      
 
-extern ULONG STDCALL Ext2AllocInode( 
+extern ULONG NTAPI Ext2AllocInode( 
        PtrExt2IrpContext       PtrIrpContext,
        PtrExt2VCB                      PtrVCB,
        ULONG                           ParentINodeNo );
 
-extern BOOLEAN STDCALL Ext2DeallocInode( 
+extern BOOLEAN NTAPI Ext2DeallocInode( 
        PtrExt2IrpContext       PtrIrpContext,
        PtrExt2VCB                      PtrVCB,
        ULONG                           INodeNo );
 
-extern BOOLEAN STDCALL Ext2MakeNewDirectoryEntry( 
+extern BOOLEAN NTAPI Ext2MakeNewDirectoryEntry( 
        PtrExt2IrpContext       PtrIrpContext,          //      The Irp context
        PtrExt2FCB                      PtrParentFCB,           //      Parent Folder FCB
        PFILE_OBJECT            PtrFileObject,          //      Parent Folder Object
@@ -685,54 +685,54 @@ extern BOOLEAN STDCALL Ext2MakeNewDirectoryEntry(
        ULONG                           Type,                           //      The type of the new entry
        ULONG                           NewInodeNo);            //      The inode no of the new entry...
 
-extern BOOLEAN STDCALL Ext2FreeDirectoryEntry(
+extern BOOLEAN NTAPI Ext2FreeDirectoryEntry(
        PtrExt2IrpContext       PtrIrpContext,
        PtrExt2FCB                      PtrParentFCB,
        PUNICODE_STRING         PtrName);
 
-extern BOOLEAN STDCALL Ext2AddBlockToFile(
+extern BOOLEAN NTAPI Ext2AddBlockToFile(
        PtrExt2IrpContext       PtrIrpContext,
        PtrExt2VCB                      PtrVCB,
        PtrExt2FCB                      PtrFCB,
        PFILE_OBJECT            PtrFileObject,
        BOOLEAN                         UpdateFileSize);
 
-extern BOOLEAN STDCALL Ext2ReleaseDataBlocks(
+extern BOOLEAN NTAPI Ext2ReleaseDataBlocks(
        PtrExt2FCB                      PtrFCB,
        PtrExt2IrpContext       PtrIrpContext);
 
-extern BOOLEAN STDCALL Ext2TruncateFileAllocationSize(
+extern BOOLEAN NTAPI Ext2TruncateFileAllocationSize(
        PtrExt2IrpContext       PtrIrpContext,
        PtrExt2FCB                      PtrFCB,
        PFILE_OBJECT            PtrFileObject,
        PLARGE_INTEGER          PtrAllocationSize );
 
-extern ULONG STDCALL Ext2AllocBlock( 
+extern ULONG NTAPI Ext2AllocBlock( 
        PtrExt2IrpContext       PtrIrpContext,
        PtrExt2VCB                      PtrVCB,
        ULONG                           Count);
 
-extern BOOLEAN STDCALL Ext2DeallocBlock( 
+extern BOOLEAN NTAPI Ext2DeallocBlock( 
        PtrExt2IrpContext       PtrIrpContext,
        PtrExt2VCB                      PtrVCB,
        ULONG                           BlockNo);
 
-extern BOOLEAN STDCALL Ext2UpdateFileSize(
+extern BOOLEAN NTAPI Ext2UpdateFileSize(
        PtrExt2IrpContext       PtrIrpContext,
        PFILE_OBJECT            PtrFileObject,
        PtrExt2FCB                      PtrFCB);
 
 
-extern BOOLEAN STDCALL Ext2DeleteFile(
+extern BOOLEAN NTAPI Ext2DeleteFile(
        PtrExt2FCB                      PtrFCB,
        PtrExt2IrpContext       PtrIrpContext);
 
-extern BOOLEAN STDCALL Ext2IsDirectoryEmpty(
+extern BOOLEAN NTAPI Ext2IsDirectoryEmpty(
        PtrExt2FCB                      PtrFCB,
        PtrExt2CCB                      PtrCCB,
        PtrExt2IrpContext       PtrIrpContext);
 
-extern NTSTATUS STDCALL Ext2RenameOrLinkFile( 
+extern NTSTATUS NTAPI Ext2RenameOrLinkFile( 
        PtrExt2FCB                                      PtrSourceFCB, 
        PFILE_OBJECT                            PtrSourceFileObject,    
        PtrExt2IrpContext                       PtrIrpContext,
@@ -741,7 +741,7 @@ extern NTSTATUS STDCALL Ext2RenameOrLinkFile(
 /*************************************************************************
 * Prototypes for the file io.c
 *************************************************************************/
-extern NTSTATUS STDCALL Ext2PassDownSingleReadWriteIRP(
+extern NTSTATUS NTAPI Ext2PassDownSingleReadWriteIRP(
        PtrExt2IrpContext       PtrIrpContext,
        PIRP                            PtrIrp, 
        PtrExt2VCB                      PtrVCB,
@@ -749,7 +749,7 @@ extern NTSTATUS STDCALL Ext2PassDownSingleReadWriteIRP(
        uint32                          ReadWriteLength, 
        BOOLEAN                         SynchronousIo);
 
-extern NTSTATUS STDCALL Ext2PassDownMultiReadWriteIRP( 
+extern NTSTATUS NTAPI Ext2PassDownMultiReadWriteIRP( 
        PEXT2_IO_RUN                    PtrIoRuns, 
        UINT                                    Count, 
        ULONG                                   TotalReadWriteLength,
@@ -757,24 +757,24 @@ extern NTSTATUS STDCALL Ext2PassDownMultiReadWriteIRP(
        PtrExt2FCB                              PtrFCB,
        BOOLEAN                                 SynchronousIo);
 
-extern NTSTATUS STDCALL Ext2SingleSyncCompletionRoutine(
+extern NTSTATUS NTAPI Ext2SingleSyncCompletionRoutine(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
     IN PVOID Contxt
     );
 
-extern NTSTATUS STDCALL Ext2SingleAsyncCompletionRoutine (
+extern NTSTATUS NTAPI Ext2SingleAsyncCompletionRoutine (
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
     IN PVOID Contxt
     );
 
-extern NTSTATUS STDCALL Ext2MultiSyncCompletionRoutine(
+extern NTSTATUS NTAPI Ext2MultiSyncCompletionRoutine(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
     IN PVOID Contxt);
 
-extern NTSTATUS STDCALL Ext2MultiAsyncCompletionRoutine(
+extern NTSTATUS NTAPI Ext2MultiAsyncCompletionRoutine(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
     IN PVOID Contxt);

diff --git a/reactos/drivers/filesystems/fs_rec/fs_rec.c b/reactos/drivers/filesystems/fs_rec/fs_rec.c
index 76ec238..a74d808 100644 (file)
--- a/reactos/drivers/filesystems/fs_rec/fs_rec.c
+++ b/reactos/drivers/filesystems/fs_rec/fs_rec.c
@@ -76,7 +76,7 @@ FsRecLoadFileSystem(IN PDEVICE_OBJECT DeviceObject,
 
 DRIVER_DISPATCH FsRecCreate;
 NTSTATUS
-STDCALL
+NTAPI
 FsRecCreate(IN PDEVICE_OBJECT DeviceObject,
             IN PIRP Irp)
 {
@@ -105,7 +105,7 @@ FsRecCreate(IN PDEVICE_OBJECT DeviceObject,
 
 DRIVER_DISPATCH FsRecClose;
 NTSTATUS
-STDCALL
+NTAPI
 FsRecClose(IN PDEVICE_OBJECT DeviceObject,
            IN PIRP Irp)
 {
@@ -118,7 +118,7 @@ FsRecClose(IN PDEVICE_OBJECT DeviceObject,
 
 DRIVER_DISPATCH FsRecFsControl;
 NTSTATUS
-STDCALL
+NTAPI
 FsRecFsControl(IN PDEVICE_OBJECT DeviceObject,
                IN PIRP Irp)
 {
@@ -173,7 +173,7 @@ FsRecFsControl(IN PDEVICE_OBJECT DeviceObject,
 
 DRIVER_UNLOAD FsRecUnload;
 VOID
-STDCALL
+NTAPI
 FsRecUnload(IN PDRIVER_OBJECT DriverObject)
 {
     PAGED_CODE();
@@ -190,7 +190,7 @@ FsRecUnload(IN PDRIVER_OBJECT DriverObject)
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 FsRecRegisterFs(IN PDRIVER_OBJECT DriverObject,
                 IN PDEVICE_OBJECT ParentObject OPTIONAL,
                 OUT PDEVICE_OBJECT *NewDeviceObject OPTIONAL,

diff --git a/reactos/drivers/filesystems/mup/create.c b/reactos/drivers/filesystems/mup/create.c
index 9b8283e..20da445 100644 (file)
--- a/reactos/drivers/filesystems/mup/create.c
+++ b/reactos/drivers/filesystems/mup/create.c
@@ -37,7 +37,7 @@
 
 /* FUNCTIONS ****************************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MupCreate(PDEVICE_OBJECT DeviceObject,
          PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/mup/mup.c b/reactos/drivers/filesystems/mup/mup.c
index 507b9ef..20c3955 100644 (file)
--- a/reactos/drivers/filesystems/mup/mup.c
+++ b/reactos/drivers/filesystems/mup/mup.c
@@ -40,7 +40,7 @@
 
 /* FUNCTIONS ****************************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(PDRIVER_OBJECT DriverObject,
            PUNICODE_STRING RegistryPath)
 /*

diff --git a/reactos/drivers/filesystems/mup/mup.h b/reactos/drivers/filesystems/mup/mup.h
index af69070..e1162fb 100644 (file)
--- a/reactos/drivers/filesystems/mup/mup.h
+++ b/reactos/drivers/filesystems/mup/mup.h
@@ -19,13 +19,13 @@ typedef struct
 
 /* create.c */
 DRIVER_DISPATCH MupCreate;
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 MupCreate(PDEVICE_OBJECT DeviceObject,
          PIRP Irp);
 
 /* mup.c */
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(PDRIVER_OBJECT DriverObject,
            PUNICODE_STRING RegistryPath);
 

diff --git a/reactos/drivers/filesystems/npfs/create.c b/reactos/drivers/filesystems/npfs/create.c
index b662512..d27a1da 100644 (file)
--- a/reactos/drivers/filesystems/npfs/create.c
+++ b/reactos/drivers/filesystems/npfs/create.c
@@ -103,7 +103,7 @@ NpfsSignalAndRemoveListeningServerInstance(PNPFS_FCB Fcb,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsCreate(PDEVICE_OBJECT DeviceObject,
                   PIRP Irp)
 {
@@ -308,7 +308,7 @@ NpfsCreate(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject,
                                        PIRP Irp)
 {
@@ -555,7 +555,7 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsCleanup(PDEVICE_OBJECT DeviceObject,
                        PIRP Irp)
 {
@@ -691,7 +691,7 @@ NpfsCleanup(PDEVICE_OBJECT DeviceObject,
        return STATUS_SUCCESS;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsClose(PDEVICE_OBJECT DeviceObject,
                  PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/npfs/finfo.c b/reactos/drivers/filesystems/npfs/finfo.c
index 7c49652..55298e3 100644 (file)
--- a/reactos/drivers/filesystems/npfs/finfo.c
+++ b/reactos/drivers/filesystems/npfs/finfo.c
@@ -152,7 +152,7 @@ NpfsQueryLocalPipeInformation(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsQueryInformation(PDEVICE_OBJECT DeviceObject,
                                         PIRP Irp)
 {
@@ -222,7 +222,7 @@ NpfsQueryInformation(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsSetInformation(PDEVICE_OBJECT DeviceObject,
                                   PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/npfs/fsctrl.c b/reactos/drivers/filesystems/npfs/fsctrl.c
index 5a1751e..9cdb141 100644 (file)
--- a/reactos/drivers/filesystems/npfs/fsctrl.c
+++ b/reactos/drivers/filesystems/npfs/fsctrl.c
@@ -17,7 +17,7 @@
 /* FUNCTIONS *****************************************************************/
 
 static DRIVER_CANCEL NpfsListeningCancelRoutine;
-static VOID STDCALL
+static VOID NTAPI
 NpfsListeningCancelRoutine(IN PDEVICE_OBJECT DeviceObject,
                                                   IN PIRP Irp)
 {
@@ -406,7 +406,7 @@ NpfsPeekPipe(PIRP Irp,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
                                          PIRP Irp)
 {
@@ -523,7 +523,7 @@ NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject,
                                 PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/npfs/npfs.c b/reactos/drivers/filesystems/npfs/npfs.c
index 042979e..b0d578d 100644 (file)
--- a/reactos/drivers/filesystems/npfs/npfs.c
+++ b/reactos/drivers/filesystems/npfs/npfs.c
@@ -15,7 +15,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(PDRIVER_OBJECT DriverObject,
                        PUNICODE_STRING RegistryPath)
 {

diff --git a/reactos/drivers/filesystems/npfs/npfs.h b/reactos/drivers/filesystems/npfs/npfs.h
index eb5a70b..e61ca7d 100644 (file)
--- a/reactos/drivers/filesystems/npfs/npfs.h
+++ b/reactos/drivers/filesystems/npfs/npfs.h
@@ -99,39 +99,39 @@ extern NPAGED_LOOKASIDE_LIST NpfsPipeDataLookasideList;
 #define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) )
 
 DRIVER_DISPATCH NpfsCreate;
-NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsCreateNamedPipe;
-NTSTATUS STDCALL NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsCleanup;
-NTSTATUS STDCALL NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsClose;
-NTSTATUS STDCALL NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsRead;
-NTSTATUS STDCALL NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsWrite;
-NTSTATUS STDCALL NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsFlushBuffers;
-NTSTATUS STDCALL NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsFileSystemControl;
-NTSTATUS STDCALL NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsQueryInformation;
-NTSTATUS STDCALL NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsSetInformation;
-NTSTATUS STDCALL NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
 DRIVER_DISPATCH NpfsQueryVolumeInformation;
-NTSTATUS STDCALL NpfsQueryVolumeInformation (PDEVICE_OBJECT DeviceObject, PIRP Irp);
+NTSTATUS NTAPI NpfsQueryVolumeInformation (PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(PDRIVER_OBJECT DriverObject,
                        PUNICODE_STRING RegistryPath);
 

diff --git a/reactos/drivers/filesystems/npfs/rw.c b/reactos/drivers/filesystems/npfs/rw.c
index f3fdde9..65a8743 100644 (file)
--- a/reactos/drivers/filesystems/npfs/rw.c
+++ b/reactos/drivers/filesystems/npfs/rw.c
@@ -44,7 +44,7 @@ VOID HexDump(PUCHAR Buffer, ULONG Length)
 #endif
 
 static DRIVER_CANCEL NpfsReadWriteCancelRoutine;
-static VOID STDCALL
+static VOID NTAPI
 NpfsReadWriteCancelRoutine(IN PDEVICE_OBJECT DeviceObject,
                                                   IN PIRP Irp)
 {
@@ -92,7 +92,7 @@ NpfsReadWriteCancelRoutine(IN PDEVICE_OBJECT DeviceObject,
        }
 }
 
-static VOID STDCALL
+static VOID NTAPI
 NpfsWaiterThread(PVOID InitContext)
 {
        PNPFS_THREAD_CONTEXT ThreadContext = (PNPFS_THREAD_CONTEXT) InitContext;
@@ -288,7 +288,7 @@ NpfsAddWaitingReadWriteRequest(IN PDEVICE_OBJECT DeviceObject,
        return Status;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsRead(IN PDEVICE_OBJECT DeviceObject,
                 IN PIRP Irp)
 {
@@ -599,7 +599,7 @@ done:
        return Status;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsWrite(PDEVICE_OBJECT DeviceObject,
                  PIRP Irp)
 {

diff --git a/reactos/drivers/filesystems/npfs/volume.c b/reactos/drivers/filesystems/npfs/volume.c
index 7231d0d..4f3d80e 100644 (file)
--- a/reactos/drivers/filesystems/npfs/volume.c
+++ b/reactos/drivers/filesystems/npfs/volume.c
@@ -59,7 +59,7 @@ NpfsQueryFsAttributeInformation(PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 NpfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject,
                                                   PIRP Irp)
 {