From b9ec75f36e0495cafcab3a8deb5d0dd6cf5fe679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 11 Feb 2008 16:42:10 +0000 Subject: [PATCH] Fix ext2 driver compilation. NOT TESTED YET! svn path=/trunk/; revision=32293 --- reactos/drivers/filesystems/directory.rbuild | 3 + reactos/drivers/filesystems/ext2/ext2.rbuild | 31 ++++++++ .../drivers/filesystems/ext2/inc/ext2fsd.h | 3 +- reactos/drivers/filesystems/ext2/inc/struct.h | 26 +++---- reactos/drivers/filesystems/ext2/src/DiskIO.c | 4 +- .../drivers/filesystems/ext2/src/cleanup.c | 4 +- reactos/drivers/filesystems/ext2/src/close.c | 4 +- reactos/drivers/filesystems/ext2/src/create.c | 20 ++--- .../drivers/filesystems/ext2/src/devcntrl.c | 6 +- .../drivers/filesystems/ext2/src/dircntrl.c | 8 +- .../drivers/filesystems/ext2/src/ext2init.c | 6 +- reactos/drivers/filesystems/ext2/src/fastio.c | 48 ++++++------ .../drivers/filesystems/ext2/src/fileinfo.c | 18 ++--- reactos/drivers/filesystems/ext2/src/flush.c | 10 +-- reactos/drivers/filesystems/ext2/src/fsctrl.c | 4 +- reactos/drivers/filesystems/ext2/src/io.c | 12 +-- .../drivers/filesystems/ext2/src/metadata.c | 32 ++++---- reactos/drivers/filesystems/ext2/src/misc.c | 74 +++++++++---------- reactos/drivers/filesystems/ext2/src/read.c | 10 +-- .../drivers/filesystems/ext2/src/shutdown.c | 4 +- .../drivers/filesystems/ext2/src/volinfo.c | 4 +- reactos/drivers/filesystems/ext2/src/write.c | 6 +- 22 files changed, 185 insertions(+), 152 deletions(-) create mode 100644 reactos/drivers/filesystems/ext2/ext2.rbuild diff --git a/reactos/drivers/filesystems/directory.rbuild b/reactos/drivers/filesystems/directory.rbuild index cae4ae48136..441b63d9c88 100644 --- a/reactos/drivers/filesystems/directory.rbuild +++ b/reactos/drivers/filesystems/directory.rbuild @@ -4,6 +4,9 @@ + + + diff --git a/reactos/drivers/filesystems/ext2/ext2.rbuild b/reactos/drivers/filesystems/ext2/ext2.rbuild new file mode 100644 index 00000000000..3e3807a535b --- /dev/null +++ b/reactos/drivers/filesystems/ext2/ext2.rbuild @@ -0,0 +1,31 @@ + + + + + inc + -lgcc + ntoskrnl + hal + + cleanup.c + close.c + create.c + devcntrl.c + dircntrl.c + DiskIO.c + ext2init.c + fastio.c + fileinfo.c + flush.c + fsctrl.c + io.c + metadata.c + misc.c + read.c + shutdown.c + volinfo.c + write.c + + ext2fs.rc + inc/ext2fsd.h + diff --git a/reactos/drivers/filesystems/ext2/inc/ext2fsd.h b/reactos/drivers/filesystems/ext2/inc/ext2fsd.h index 81c246d43d5..19cd84e2a4a 100644 --- a/reactos/drivers/filesystems/ext2/inc/ext2fsd.h +++ b/reactos/drivers/filesystems/ext2/inc/ext2fsd.h @@ -185,7 +185,7 @@ extern Ext2Data Ext2GlobalData; { \ if( ( TYPE ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ { \ - DbgPrint("\n "); \ + DbgPrint(" "); \ DbgPrint(X,Y); \ if( ( DEBUG_TRACE_IRQL ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ { \ @@ -195,6 +195,7 @@ extern Ext2Data Ext2GlobalData; { \ DbgPrint( " [%s] Line No = %ld", __FILE__, __LINE__ ); \ } \ + DbgPrint("\n"); \ } \ } diff --git a/reactos/drivers/filesystems/ext2/inc/struct.h b/reactos/drivers/filesystems/ext2/inc/struct.h index 1b4e83d6516..7524049a48a 100644 --- a/reactos/drivers/filesystems/ext2/inc/struct.h +++ b/reactos/drivers/filesystems/ext2/inc/struct.h @@ -21,25 +21,23 @@ /************************************************************************** some useful definitions **************************************************************************/ -#ifdef _CPU_X86_ -typedef char int8; -typedef short int16; -typedef int int32; +typedef CHAR int8; +typedef SHORT int16; +typedef LONG int32; -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef unsigned int uint32; +typedef UCHAR uint8; +typedef USHORT uint16; +typedef ULONG uint32; -typedef PVOID PBCB; +typedef PVOID PBCB; + +#define try if (1) +#define except(x) if (0 && (x)) +#define finally if (1) +#define GetExceptionInformation() 0 // we will use the LARGE_INTEGER structure as defined by NT -#else // Please define appropriate types here - -!!!! You must define your types here for compilation to proceed !!!! - -#endif // if _CPU_X86_ - /************************************************************************** some empty typedefs defined here so we can reference them easily **************************************************************************/ diff --git a/reactos/drivers/filesystems/ext2/src/DiskIO.c b/reactos/drivers/filesystems/ext2/src/DiskIO.c index 81ca894f8e4..1d6c4a84e5f 100644 --- a/reactos/drivers/filesystems/ext2/src/DiskIO.c +++ b/reactos/drivers/filesystems/ext2/src/DiskIO.c @@ -38,7 +38,7 @@ * Return Value: The Status of the Read IO * *************************************************************************/ -NTSTATUS Ext2ReadLogicalBlocks ( +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 @@ -108,7 +108,7 @@ NTSTATUS Ext2ReadLogicalBlocks ( * Return Value: The Status of the Read IO * *************************************************************************/ -NTSTATUS Ext2ReadPhysicalBlocks ( +NTSTATUS NTAPI Ext2ReadPhysicalBlocks ( PDEVICE_OBJECT PtrTargetDeviceObject, // the Target Device Object VOID *Buffer, // The Buffer that takes the data read in LARGE_INTEGER StartPhysicalBlock, // The block from which reading is to start diff --git a/reactos/drivers/filesystems/ext2/src/cleanup.c b/reactos/drivers/filesystems/ext2/src/cleanup.c index 50a2ab07305..9f488c070e3 100644 --- a/reactos/drivers/filesystems/ext2/src/cleanup.c +++ b/reactos/drivers/filesystems/ext2/src/cleanup.c @@ -37,7 +37,7 @@ * Return Value: Does not matter! * *************************************************************************/ -NTSTATUS Ext2Cleanup( +NTSTATUS NTAPI Ext2Cleanup( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -99,7 +99,7 @@ PIRP Irp) // I/O Request Packet * Return Value: Does not matter! * *************************************************************************/ -NTSTATUS Ext2CommonCleanup( +NTSTATUS NTAPI Ext2CommonCleanup( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ) diff --git a/reactos/drivers/filesystems/ext2/src/close.c b/reactos/drivers/filesystems/ext2/src/close.c index 8b83497b64d..165932af058 100644 --- a/reactos/drivers/filesystems/ext2/src/close.c +++ b/reactos/drivers/filesystems/ext2/src/close.c @@ -38,7 +38,7 @@ * Return Value: Does not matter! * *************************************************************************/ -NTSTATUS Ext2Close( +NTSTATUS NTAPI Ext2Close( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -102,7 +102,7 @@ PIRP Irp) // I/O Request Packet * Return Value: Does not matter! * *************************************************************************/ -NTSTATUS Ext2CommonClose( +NTSTATUS NTAPI Ext2CommonClose( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ) diff --git a/reactos/drivers/filesystems/ext2/src/create.c b/reactos/drivers/filesystems/ext2/src/create.c index 13fe4e13b49..c22cf3934cb 100644 --- a/reactos/drivers/filesystems/ext2/src/create.c +++ b/reactos/drivers/filesystems/ext2/src/create.c @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2Create( +NTSTATUS NTAPI Ext2Create( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -124,7 +124,7 @@ PIRP Irp) // I/O Request Packet * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonCreate( +NTSTATUS NTAPI Ext2CommonCreate( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt) @@ -986,7 +986,7 @@ BOOLEAN FirstAttempt) * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2OpenVolume( +NTSTATUS NTAPI Ext2OpenVolume( PtrExt2VCB PtrVCB, // volume to be opened PtrExt2IrpContext PtrIrpContext, // IRP context PIRP PtrIrp, // original/user IRP @@ -1121,7 +1121,7 @@ PFILE_OBJECT PtrFileObject) // optional file object to be initialized * Return Value: None * *************************************************************************/ -NTSTATUS Ext2OpenRootDirectory( +NTSTATUS NTAPI Ext2OpenRootDirectory( PtrExt2VCB PtrVCB, // volume PtrExt2IrpContext PtrIrpContext, // IRP context PIRP PtrIrp, // original/user IRP @@ -1156,7 +1156,7 @@ NTSTATUS Ext2OpenRootDirectory( -PtrExt2FCB Ext2LocateChildFCBInCore( +PtrExt2FCB NTAPI Ext2LocateChildFCBInCore( PtrExt2VCB PtrVCB, PUNICODE_STRING PtrName, ULONG ParentInodeNo ) @@ -1187,7 +1187,7 @@ PtrExt2FCB Ext2LocateChildFCBInCore( return NULL; } -PtrExt2FCB Ext2LocateFCBInCore( +PtrExt2FCB NTAPI Ext2LocateFCBInCore( PtrExt2VCB PtrVCB, ULONG InodeNo ) { @@ -1215,7 +1215,7 @@ PtrExt2FCB Ext2LocateFCBInCore( } -ULONG Ext2LocateFileInDisk ( +ULONG NTAPI Ext2LocateFileInDisk ( PtrExt2VCB PtrVCB, PUNICODE_STRING PtrCurrentName, PtrExt2FCB PtrParentFCB, @@ -1439,7 +1439,7 @@ ULONG Ext2LocateFileInDisk ( * Return Value: None * *************************************************************************/ -ULONG Ext2CreateFile( +ULONG NTAPI Ext2CreateFile( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, PUNICODE_STRING PtrName, @@ -1568,7 +1568,7 @@ ULONG Ext2CreateFile( * Return Value: None * *************************************************************************/ -BOOLEAN Ext2OverwriteFile( +BOOLEAN NTAPI Ext2OverwriteFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext) { @@ -1631,7 +1631,7 @@ BOOLEAN Ext2OverwriteFile( * Return Value: None * *************************************************************************/ -BOOLEAN Ext2SupersedeFile( +BOOLEAN NTAPI Ext2SupersedeFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext) { diff --git a/reactos/drivers/filesystems/ext2/src/devcntrl.c b/reactos/drivers/filesystems/ext2/src/devcntrl.c index 02389865f6c..37c96defb78 100644 --- a/reactos/drivers/filesystems/ext2/src/devcntrl.c +++ b/reactos/drivers/filesystems/ext2/src/devcntrl.c @@ -52,7 +52,7 @@ typedef struct _QUERY_PATH_RESPONSE * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2DeviceControl( +NTSTATUS NTAPI Ext2DeviceControl( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -113,7 +113,7 @@ PIRP Irp) // I/O Request Packet * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonDeviceControl( +NTSTATUS NTAPI Ext2CommonDeviceControl( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -197,7 +197,7 @@ PIRP PtrIrp) * Return Value: STATUS_SUCCESS * *************************************************************************/ -NTSTATUS Ext2DevIoctlCompletion( +NTSTATUS NTAPI Ext2DevIoctlCompletion( PDEVICE_OBJECT PtrDeviceObject, PIRP PtrIrp, void *Context) diff --git a/reactos/drivers/filesystems/ext2/src/dircntrl.c b/reactos/drivers/filesystems/ext2/src/dircntrl.c index 759f2c25212..72ec83dbbfe 100644 --- a/reactos/drivers/filesystems/ext2/src/dircntrl.c +++ b/reactos/drivers/filesystems/ext2/src/dircntrl.c @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2DirControl( +NTSTATUS NTAPI Ext2DirControl( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -100,7 +100,7 @@ PIRP Irp) // I/O Request Packet * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonDirControl( +NTSTATUS NTAPI Ext2CommonDirControl( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -176,7 +176,7 @@ PIRP PtrIrp) * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2QueryDirectory( +NTSTATUS NTAPI Ext2QueryDirectory( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, #ifdef _GNU_NTIFS_ @@ -814,7 +814,7 @@ PtrExt2CCB PtrCCB) * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2NotifyChangeDirectory( +NTSTATUS NTAPI Ext2NotifyChangeDirectory( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, #ifdef _GNU_NTIFS_ diff --git a/reactos/drivers/filesystems/ext2/src/ext2init.c b/reactos/drivers/filesystems/ext2/src/ext2init.c index 3df67efc60f..96ff05d458a 100644 --- a/reactos/drivers/filesystems/ext2/src/ext2init.c +++ b/reactos/drivers/filesystems/ext2/src/ext2init.c @@ -43,7 +43,7 @@ Ext2Data Ext2GlobalData; * Return Value: STATUS_SUCCESS/Error (will cause driver to be unloaded). * *************************************************************************/ -NTSTATUS DriverEntry( +NTSTATUS NTAPI DriverEntry( PDRIVER_OBJECT DriverObject, // created by the I/O sub-system PUNICODE_STRING RegistryPath) // path to the registry key { @@ -232,7 +232,7 @@ PUNICODE_STRING RegistryPath) // path to the registry key * Return Value: None * *************************************************************************/ -void Ext2FsdInitializeFunctionPointers( +void NTAPI Ext2FsdInitializeFunctionPointers( PDRIVER_OBJECT DriverObject) // created by the I/O sub-system { PFAST_IO_DISPATCH PtrFastIoDispatch = NULL; @@ -347,7 +347,7 @@ PDRIVER_OBJECT DriverObject) // created by the I/O sub-system } -VOID Ext2QueueHandlerThread( +VOID NTAPI Ext2QueueHandlerThread( IN PVOID StartContext ) { diff --git a/reactos/drivers/filesystems/ext2/src/fastio.c b/reactos/drivers/filesystems/ext2/src/fastio.c index 39d87839d92..d0d96e9900a 100644 --- a/reactos/drivers/filesystems/ext2/src/fastio.c +++ b/reactos/drivers/filesystems/ext2/src/fastio.c @@ -35,7 +35,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoCheckIfPossible( +BOOLEAN NTAPI Ext2FastIoCheckIfPossible( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -134,7 +134,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoRead( +BOOLEAN NTAPI Ext2FastIoRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -218,7 +218,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoWrite( +BOOLEAN NTAPI Ext2FastIoWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -287,7 +287,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoQueryBasicInfo( +BOOLEAN NTAPI Ext2FastIoQueryBasicInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_BASIC_INFORMATION Buffer, @@ -350,7 +350,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoQueryStdInfo( +BOOLEAN NTAPI Ext2FastIoQueryStdInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_STANDARD_INFORMATION Buffer, @@ -413,7 +413,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoLock( +BOOLEAN NTAPI Ext2FastIoLock( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -482,7 +482,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoUnlockSingle( +BOOLEAN NTAPI Ext2FastIoUnlockSingle( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -549,7 +549,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoUnlockAll( +BOOLEAN NTAPI Ext2FastIoUnlockAll( IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, OUT PIO_STATUS_BLOCK IoStatus, @@ -612,7 +612,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoUnlockAllByKey( +BOOLEAN NTAPI Ext2FastIoUnlockAllByKey( IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, ULONG Key, @@ -676,7 +676,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: None (we must be prepared to handle VMM initiated calls) * *************************************************************************/ -void Ext2FastIoAcqCreateSec( +void NTAPI Ext2FastIoAcqCreateSec( IN PFILE_OBJECT FileObject) { PtrExt2FCB PtrFCB = NULL; @@ -745,7 +745,7 @@ IN PFILE_OBJECT FileObject) * Return Value: None * *************************************************************************/ -void Ext2FastIoRelCreateSec( +void NTAPI Ext2FastIoRelCreateSec( IN PFILE_OBJECT FileObject) { @@ -813,7 +813,7 @@ IN PFILE_OBJECT FileObject) * Return Value: TRUE/FALSE (Cache Manager does not tolerate FALSE well) * *************************************************************************/ -BOOLEAN Ext2AcqLazyWrite( +BOOLEAN NTAPI Ext2AcqLazyWrite( IN PVOID Context, IN BOOLEAN Wait) { @@ -927,7 +927,7 @@ IN BOOLEAN Wait) * Return Value: None * *************************************************************************/ -void Ext2RelLazyWrite( +void NTAPI Ext2RelLazyWrite( IN PVOID Context) { @@ -1024,7 +1024,7 @@ IN PVOID Context) * Return Value: TRUE/FALSE (Cache Manager does not tolerate FALSE well) * *************************************************************************/ -BOOLEAN Ext2AcqReadAhead( +BOOLEAN NTAPI Ext2AcqReadAhead( IN PVOID Context, IN BOOLEAN Wait) { @@ -1102,7 +1102,7 @@ IN BOOLEAN Wait) * Return Value: None * *************************************************************************/ -void Ext2RelReadAhead( +void NTAPI Ext2RelReadAhead( IN PVOID Context) { BOOLEAN ReturnedStatus = TRUE; @@ -1175,7 +1175,7 @@ IN PVOID Context) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoQueryNetInfo( +BOOLEAN NTAPI Ext2FastIoQueryNetInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, @@ -1240,7 +1240,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoMdlRead( +BOOLEAN NTAPI Ext2FastIoMdlRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -1309,7 +1309,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoMdlReadComplete( +BOOLEAN NTAPI Ext2FastIoMdlReadComplete( IN PFILE_OBJECT FileObject, OUT PMDL MdlChain, IN PDEVICE_OBJECT DeviceObject) @@ -1374,7 +1374,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoPrepareMdlWrite( +BOOLEAN NTAPI Ext2FastIoPrepareMdlWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -1442,7 +1442,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoMdlWriteComplete( +BOOLEAN NTAPI Ext2FastIoMdlWriteComplete( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, OUT PMDL MdlChain, @@ -1506,7 +1506,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: STATUS_SUCCESS/Error (try not to return an error, will 'ya ? :-) * *************************************************************************/ -NTSTATUS Ext2FastIoAcqModWrite( +NTSTATUS NTAPI Ext2FastIoAcqModWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, OUT PERESOURCE *ResourceToRelease, @@ -1586,7 +1586,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: STATUS_SUCCESS/Error (an error returned here is really not expected!) * *************************************************************************/ -NTSTATUS Ext2FastIoRelModWrite( +NTSTATUS NTAPI Ext2FastIoRelModWrite( IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, IN PDEVICE_OBJECT DeviceObject) @@ -1652,7 +1652,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2FastIoAcqCcFlush( +NTSTATUS NTAPI Ext2FastIoAcqCcFlush( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { @@ -1712,7 +1712,7 @@ IN PDEVICE_OBJECT DeviceObject) * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2FastIoRelCcFlush( +NTSTATUS NTAPI Ext2FastIoRelCcFlush( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { diff --git a/reactos/drivers/filesystems/ext2/src/fileinfo.c b/reactos/drivers/filesystems/ext2/src/fileinfo.c index 0047d50f23f..6467caacbad 100644 --- a/reactos/drivers/filesystems/ext2/src/fileinfo.c +++ b/reactos/drivers/filesystems/ext2/src/fileinfo.c @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2FileInfo( +NTSTATUS NTAPI Ext2FileInfo( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -101,7 +101,7 @@ PIRP Irp) // I/O Request Packet * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonFileInfo( +NTSTATUS NTAPI Ext2CommonFileInfo( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -586,7 +586,7 @@ PIRP PtrIrp) * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2GetBasicInformation( +NTSTATUS NTAPI Ext2GetBasicInformation( PtrExt2FCB PtrFCB, PFILE_BASIC_INFORMATION PtrBuffer, long *PtrReturnedLength ) @@ -646,7 +646,7 @@ long *PtrReturnedLength ) return(RC); } -NTSTATUS Ext2GetStandardInformation( +NTSTATUS NTAPI Ext2GetStandardInformation( PtrExt2FCB PtrFCB, PFILE_STANDARD_INFORMATION PtrStdInformation, @@ -686,7 +686,7 @@ long *PtrReturnedLength ) return(RC); } -NTSTATUS Ext2GetNetworkOpenInformation( +NTSTATUS NTAPI Ext2GetNetworkOpenInformation( PtrExt2FCB PtrFCB, PFILE_NETWORK_OPEN_INFORMATION PtrNetworkOpenInformation, long *PtrReturnedLength ) @@ -748,7 +748,7 @@ NTSTATUS Ext2GetNetworkOpenInformation( } -NTSTATUS Ext2GetFullNameInformation( +NTSTATUS NTAPI Ext2GetFullNameInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PFILE_NAME_INFORMATION PtrNameInformation, @@ -811,7 +811,7 @@ NTSTATUS Ext2GetFullNameInformation( * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2SetBasicInformation( +NTSTATUS NTAPI Ext2SetBasicInformation( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject, @@ -919,7 +919,7 @@ NTSTATUS Ext2SetBasicInformation( * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2SetDispositionInformation( +NTSTATUS NTAPI Ext2SetDispositionInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2VCB PtrVCB, @@ -1011,7 +1011,7 @@ PFILE_DISPOSITION_INFORMATION PtrBuffer) * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2SetAllocationInformation( +NTSTATUS NTAPI Ext2SetAllocationInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2VCB PtrVCB, diff --git a/reactos/drivers/filesystems/ext2/src/flush.c b/reactos/drivers/filesystems/ext2/src/flush.c index fd25fa33899..d28b830cd60 100644 --- a/reactos/drivers/filesystems/ext2/src/flush.c +++ b/reactos/drivers/filesystems/ext2/src/flush.c @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2Flush( +NTSTATUS NTAPI Ext2Flush( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -98,7 +98,7 @@ NTSTATUS Ext2Flush( * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonFlush( +NTSTATUS NTAPI Ext2CommonFlush( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -254,7 +254,7 @@ PIRP PtrIrp) * Return Value: None * *************************************************************************/ -void Ext2FlushAFile( +void NTAPI Ext2FlushAFile( PtrExt2NTRequiredFCB PtrReqdFCB, PIO_STATUS_BLOCK PtrIoStatus) { @@ -276,7 +276,7 @@ PIO_STATUS_BLOCK PtrIoStatus) * Return Value: None * *************************************************************************/ -void Ext2FlushLogicalVolume( +void NTAPI Ext2FlushLogicalVolume( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PtrExt2VCB PtrVCB) @@ -330,7 +330,7 @@ PtrExt2VCB PtrVCB) * Return Value: None * *************************************************************************/ -NTSTATUS Ext2FlushCompletion( +NTSTATUS NTAPI Ext2FlushCompletion( PDEVICE_OBJECT PtrDeviceObject, PIRP PtrIrp, PVOID Context) diff --git a/reactos/drivers/filesystems/ext2/src/fsctrl.c b/reactos/drivers/filesystems/ext2/src/fsctrl.c index b25eed32ff6..a4f204be5ab 100644 --- a/reactos/drivers/filesystems/ext2/src/fsctrl.c +++ b/reactos/drivers/filesystems/ext2/src/fsctrl.c @@ -79,7 +79,7 @@ NTSTATUS Ext2UserFileSystemRequest( * NTSTATUS - The FSD status for the IRP * *************************************************************************/ -NTSTATUS +NTSTATUS NTAPI Ext2FileSystemControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -907,7 +907,7 @@ NTSTATUS Ext2UserFileSystemRequest ( -NTSTATUS Ext2VerifyVolume ( +NTSTATUS NTAPI Ext2VerifyVolume ( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp ) { diff --git a/reactos/drivers/filesystems/ext2/src/io.c b/reactos/drivers/filesystems/ext2/src/io.c index 9991cc1593d..682e0fd5f68 100644 --- a/reactos/drivers/filesystems/ext2/src/io.c +++ b/reactos/drivers/filesystems/ext2/src/io.c @@ -31,7 +31,7 @@ * Return Value: STATUS_SUCCESS / STATUS_PENDING / Error * *************************************************************************/ -NTSTATUS Ext2PassDownMultiReadWriteIRP( +NTSTATUS NTAPI Ext2PassDownMultiReadWriteIRP( PEXT2_IO_RUN PtrIoRuns, UINT Count, ULONG TotalReadWriteLength, @@ -230,7 +230,7 @@ NTSTATUS Ext2PassDownMultiReadWriteIRP( return(RC); } -NTSTATUS Ext2PassDownSingleReadWriteIRP( +NTSTATUS NTAPI Ext2PassDownSingleReadWriteIRP( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PtrExt2VCB PtrVCB, @@ -374,7 +374,7 @@ NTSTATUS Ext2PassDownSingleReadWriteIRP( * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2SingleSyncCompletionRoutine( +NTSTATUS NTAPI Ext2SingleSyncCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt @@ -409,7 +409,7 @@ NTSTATUS Ext2SingleSyncCompletionRoutine( * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2SingleAsyncCompletionRoutine( +NTSTATUS NTAPI Ext2SingleAsyncCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt @@ -443,7 +443,7 @@ NTSTATUS Ext2SingleAsyncCompletionRoutine( * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2MultiSyncCompletionRoutine ( +NTSTATUS NTAPI Ext2MultiSyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt @@ -500,7 +500,7 @@ NTSTATUS Ext2MultiSyncCompletionRoutine ( * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2MultiAsyncCompletionRoutine ( +NTSTATUS NTAPI Ext2MultiAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt diff --git a/reactos/drivers/filesystems/ext2/src/metadata.c b/reactos/drivers/filesystems/ext2/src/metadata.c index 1369b58fc2c..9614b8e14ab 100644 --- a/reactos/drivers/filesystems/ext2/src/metadata.c +++ b/reactos/drivers/filesystems/ext2/src/metadata.c @@ -42,7 +42,7 @@ extern Ext2Data Ext2GlobalData; * *************************************************************************/ -NTSTATUS Ext2ReadInode ( +NTSTATUS NTAPI Ext2ReadInode ( PtrExt2VCB PtrVcb, // the Volume Control Block uint32 InodeNo, // The Inode no PEXT2_INODE PtrInode // The Inode Buffer @@ -174,7 +174,7 @@ NTSTATUS Ext2ReadInode ( * Return Value: None * *************************************************************************/ -void Ext2InitializeFCBInodeInfo ( +void NTAPI Ext2InitializeFCBInodeInfo ( PtrExt2FCB PtrFCB ) { PtrExt2VCB PtrVCB = NULL; @@ -262,7 +262,7 @@ void Ext2InitializeFCBInodeInfo ( * Return Value: The new i-node no or zero * *************************************************************************/ -ULONG Ext2AllocInode( +ULONG NTAPI Ext2AllocInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG ParentINodeNo ) @@ -502,7 +502,7 @@ ULONG Ext2AllocInode( * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2DeallocInode( +BOOLEAN NTAPI Ext2DeallocInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG INodeNo ) @@ -701,7 +701,7 @@ BOOLEAN Ext2DeallocInode( * Return Value: Success / Failure... * *************************************************************************/ -NTSTATUS Ext2WriteInode( +NTSTATUS NTAPI Ext2WriteInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVcb, // the Volume Control Block uint32 InodeNo, // The Inode no @@ -823,7 +823,7 @@ NTSTATUS Ext2WriteInode( * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2MakeNewDirectoryEntry( +BOOLEAN NTAPI Ext2MakeNewDirectoryEntry( PtrExt2IrpContext PtrIrpContext, // The Irp context PtrExt2FCB PtrParentFCB, // Parent Folder FCB PFILE_OBJECT PtrFileObject, // Parent Folder Object @@ -1062,7 +1062,7 @@ BOOLEAN Ext2MakeNewDirectoryEntry( } -BOOLEAN Ext2FreeDirectoryEntry( +BOOLEAN NTAPI Ext2FreeDirectoryEntry( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrParentFCB, PUNICODE_STRING PtrName) @@ -1193,7 +1193,7 @@ BOOLEAN Ext2FreeDirectoryEntry( * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2AddBlockToFile( +BOOLEAN NTAPI Ext2AddBlockToFile( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, PtrExt2FCB PtrFCB, @@ -1664,7 +1664,7 @@ BOOLEAN Ext2AddBlockToFile( * Return Value: Success / Failure... * *************************************************************************/ -ULONG Ext2AllocBlock( +ULONG NTAPI Ext2AllocBlock( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG Count) @@ -1895,7 +1895,7 @@ ULONG Ext2AllocBlock( * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2DeallocBlock( +BOOLEAN NTAPI Ext2DeallocBlock( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG BlockNo ) @@ -2076,7 +2076,7 @@ BOOLEAN Ext2DeallocBlock( return RC; } -BOOLEAN Ext2UpdateFileSize( +BOOLEAN NTAPI Ext2UpdateFileSize( PtrExt2IrpContext PtrIrpContext, PFILE_OBJECT PtrFileObject, PtrExt2FCB PtrFCB) @@ -2122,7 +2122,7 @@ BOOLEAN Ext2UpdateFileSize( * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2DeleteFile( +BOOLEAN NTAPI Ext2DeleteFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext) { @@ -2208,7 +2208,7 @@ BOOLEAN Ext2DeleteFile( * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2ReleaseDataBlocks( +BOOLEAN NTAPI Ext2ReleaseDataBlocks( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext) { @@ -2440,7 +2440,7 @@ BOOLEAN Ext2ReleaseDataBlocks( } -BOOLEAN Ext2TruncateFileAllocationSize( +BOOLEAN NTAPI Ext2TruncateFileAllocationSize( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject, @@ -2550,7 +2550,7 @@ BOOLEAN Ext2TruncateFileAllocationSize( return TRUE; } -BOOLEAN Ext2IsDirectoryEmpty( +BOOLEAN NTAPI Ext2IsDirectoryEmpty( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2IrpContext PtrIrpContext) @@ -2650,7 +2650,7 @@ BOOLEAN Ext2IsDirectoryEmpty( } -NTSTATUS Ext2RenameOrLinkFile( +NTSTATUS NTAPI Ext2RenameOrLinkFile( PtrExt2FCB PtrSourceFCB, PFILE_OBJECT PtrSourceFileObject, PtrExt2IrpContext PtrIrpContext, diff --git a/reactos/drivers/filesystems/ext2/src/misc.c b/reactos/drivers/filesystems/ext2/src/misc.c index fd9c98099f0..d5fd68e84f2 100644 --- a/reactos/drivers/filesystems/ext2/src/misc.c +++ b/reactos/drivers/filesystems/ext2/src/misc.c @@ -34,7 +34,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2InitializeZones( +NTSTATUS NTAPI Ext2InitializeZones( void) { NTSTATUS RC = STATUS_SUCCESS; @@ -186,7 +186,7 @@ void) * Return Value: None * *************************************************************************/ -void Ext2DestroyZones( +void NTAPI Ext2DestroyZones( void) { try { @@ -238,7 +238,7 @@ void) * Return Value: TRUE/FALSE (TRUE if top level was NULL when routine invoked) * *************************************************************************/ -BOOLEAN Ext2IsIrpTopLevel( +BOOLEAN NTAPI Ext2IsIrpTopLevel( PIRP Irp) // the IRP sent to our dispatch routine { BOOLEAN ReturnCode = FALSE; @@ -278,7 +278,7 @@ PIRP Irp) // the IRP sent to our dispatch routine * Return Value: EXCEPTION_EXECUTE_HANDLER/EXECEPTION_CONTINUE_SEARCH * *************************************************************************/ -long Ext2ExceptionFilter( +long NTAPI Ext2ExceptionFilter( PtrExt2IrpContext PtrIrpContext, PEXCEPTION_POINTERS PtrExceptionPointers ) { @@ -341,7 +341,7 @@ PEXCEPTION_POINTERS PtrExceptionPointers ) * Return Value: Error code * *************************************************************************/ -NTSTATUS Ext2ExceptionHandler( +NTSTATUS NTAPI Ext2ExceptionHandler( PtrExt2IrpContext PtrIrpContext, PIRP Irp) { @@ -387,7 +387,7 @@ PIRP Irp) * Return Value: None * *************************************************************************/ -void Ext2LogEvent( +void NTAPI Ext2LogEvent( NTSTATUS Ext2EventLogId, // the Ext2 private message id NTSTATUS RC) // any NT error code we wish to log ... { @@ -424,7 +424,7 @@ NTSTATUS RC) // any NT error code we wish to log ... * Return Value: A pointer to the ObjectName structure OR NULL. * *************************************************************************/ -PtrExt2ObjectName Ext2AllocateObjectName( +PtrExt2ObjectName NTAPI Ext2AllocateObjectName( void) { PtrExt2ObjectName PtrObjectName = NULL; @@ -488,7 +488,7 @@ void) * Return Value: None * *************************************************************************/ -void Ext2ReleaseObjectName( +void NTAPI Ext2ReleaseObjectName( PtrExt2ObjectName PtrObjectName) { KIRQL CurrentIrql; @@ -535,7 +535,7 @@ PtrExt2ObjectName PtrObjectName) * Return Value: A pointer to the CCB structure OR NULL. * *************************************************************************/ -PtrExt2CCB Ext2AllocateCCB( +PtrExt2CCB NTAPI Ext2AllocateCCB( void) { PtrExt2CCB PtrCCB = NULL; @@ -605,7 +605,7 @@ void) * Return Value: None * *************************************************************************/ -void Ext2ReleaseCCB( +void NTAPI Ext2ReleaseCCB( PtrExt2CCB PtrCCB) { KIRQL CurrentIrql; @@ -660,7 +660,7 @@ PtrExt2CCB PtrCCB) * Return Value: A pointer to the FCB structure OR NULL. * *************************************************************************/ -PtrExt2FCB Ext2AllocateFCB( +PtrExt2FCB NTAPI Ext2AllocateFCB( void) { PtrExt2FCB PtrFCB = NULL; @@ -735,7 +735,7 @@ void) * Return Value: A pointer to the FCB structure OR NULL. * *************************************************************************/ -NTSTATUS Ext2CreateNewFCB( +NTSTATUS NTAPI Ext2CreateNewFCB( PtrExt2FCB *ReturnedFCB, LARGE_INTEGER AllocationSize, LARGE_INTEGER EndOfFile, @@ -859,7 +859,7 @@ PtrExt2ObjectName PtrObjectName) * Return Value: None * *************************************************************************/ -void Ext2ReleaseFCB( +void NTAPI Ext2ReleaseFCB( PtrExt2FCB PtrFCB) { KIRQL CurrentIrql; @@ -919,7 +919,7 @@ PtrExt2FCB PtrFCB) * Return Value: A pointer to the Ext2ByteLocks structure OR NULL. * *************************************************************************/ -PtrExt2FileLockInfo Ext2AllocateByteLocks( +PtrExt2FileLockInfo NTAPI Ext2AllocateByteLocks( void) { PtrExt2FileLockInfo PtrByteLocks = NULL; @@ -978,7 +978,7 @@ void) * Return Value: None * *************************************************************************/ -void Ext2ReleaseByteLocks( +void NTAPI Ext2ReleaseByteLocks( PtrExt2FileLockInfo PtrByteLocks) { KIRQL CurrentIrql; @@ -1019,7 +1019,7 @@ PtrExt2FileLockInfo PtrByteLocks) * Return Value: A pointer to the IrpContext structure OR NULL. * *************************************************************************/ -PtrExt2IrpContext Ext2AllocateIrpContext( +PtrExt2IrpContext NTAPI Ext2AllocateIrpContext( PIRP Irp, PDEVICE_OBJECT PtrTargetDeviceObject) { @@ -1136,7 +1136,7 @@ PDEVICE_OBJECT PtrTargetDeviceObject) * Return Value: None * *************************************************************************/ -void Ext2ReleaseIrpContext( +void NTAPI Ext2ReleaseIrpContext( PtrExt2IrpContext PtrIrpContext) { KIRQL CurrentIrql; @@ -1178,7 +1178,7 @@ PtrExt2IrpContext PtrIrpContext) * Return Value: STATUS_PENDING * *************************************************************************/ -NTSTATUS Ext2PostRequest( +NTSTATUS NTAPI Ext2PostRequest( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -1226,7 +1226,7 @@ PIRP PtrIrp) * Return Value: None * *************************************************************************/ -void Ext2CommonDispatch( +void NTAPI Ext2CommonDispatch( void *Context ) // actually an IRPContext structure { NTSTATUS RC = STATUS_SUCCESS; @@ -1345,7 +1345,7 @@ void Ext2CommonDispatch( * Return Value: None * *************************************************************************/ -void Ext2InitializeVCB( +void NTAPI Ext2InitializeVCB( PDEVICE_OBJECT PtrVolumeDeviceObject, PDEVICE_OBJECT PtrTargetDeviceObject, PVPB PtrVPB, @@ -1466,7 +1466,7 @@ PLARGE_INTEGER AllocationSize ) * Return Value: none * *************************************************************************/ -void Ext2CompleteRequest( +void NTAPI Ext2CompleteRequest( IN PIRP Irp OPTIONAL, IN NTSTATUS Status ) @@ -1512,7 +1512,7 @@ void Ext2CompleteRequest( * Return Value: A pointer to the CCB structure OR NULL. * *************************************************************************/ -NTSTATUS Ext2CreateNewCCB( +NTSTATUS NTAPI Ext2CreateNewCCB( PtrExt2CCB *ReturnedCCB, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject ) @@ -1575,7 +1575,7 @@ NTSTATUS Ext2CreateNewCCB( * Return Value: NTSTATUS - STATUS_ACCESS_DENIED (always) * *************************************************************************/ -NTSTATUS Ext2DenyAccess( IN PIRP Irp ) +NTSTATUS NTAPI Ext2DenyAccess( IN PIRP Irp ) { ASSERT( Irp ); @@ -1605,7 +1605,7 @@ NTSTATUS Ext2DenyAccess( IN PIRP Irp ) * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2GetFCB_CCB_VCB_FromFileObject ( +NTSTATUS NTAPI Ext2GetFCB_CCB_VCB_FromFileObject ( IN PFILE_OBJECT PtrFileObject, OUT PtrExt2FCB *PPtrFCB, OUT PtrExt2CCB *PPtrCCB, @@ -1669,7 +1669,7 @@ NTSTATUS Ext2GetFCB_CCB_VCB_FromFileObject ( } -void Ext2CopyUnicodeString( PUNICODE_STRING PtrDestinationString, PUNICODE_STRING PtrSourceString ) +void NTAPI Ext2CopyUnicodeString( PUNICODE_STRING PtrDestinationString, PUNICODE_STRING PtrSourceString ) { int Count; // Allcating space for Destination... @@ -1687,7 +1687,7 @@ void Ext2CopyUnicodeString( PUNICODE_STRING PtrDestinationString, PUNICODE_STRI } -void Ext2CopyWideCharToUnicodeString( +void NTAPI Ext2CopyWideCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCWSTR PtrSourceString ) { @@ -1712,7 +1712,7 @@ void Ext2CopyWideCharToUnicodeString( } -void Ext2CopyCharToUnicodeString( +void NTAPI Ext2CopyCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCSTR PtrSourceString, USHORT SourceStringLength ) @@ -1732,7 +1732,7 @@ void Ext2CopyCharToUnicodeString( } -void Ext2CopyZCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCSTR PtrSourceString ) +void NTAPI Ext2CopyZCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCSTR PtrSourceString ) { int Count; @@ -1754,14 +1754,14 @@ void Ext2CopyZCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCSTR } } -void Ext2ZerooutUnicodeString( PUNICODE_STRING PtrUnicodeString ) +void NTAPI Ext2ZerooutUnicodeString( PUNICODE_STRING PtrUnicodeString ) { PtrUnicodeString->Length = 0; PtrUnicodeString->MaximumLength =0; PtrUnicodeString->Buffer = 0; } -void Ext2DeallocateUnicodeString( PUNICODE_STRING PtrUnicodeString ) +void NTAPI Ext2DeallocateUnicodeString( PUNICODE_STRING PtrUnicodeString ) { if( PtrUnicodeString && PtrUnicodeString->Buffer ) { @@ -1773,7 +1773,7 @@ void Ext2DeallocateUnicodeString( PUNICODE_STRING PtrUnicodeString ) PtrUnicodeString->Buffer = 0; } -PtrExt2FCB Ext2GetUsedFCB( +PtrExt2FCB NTAPI Ext2GetUsedFCB( PtrExt2VCB PtrVCB ) { @@ -1838,7 +1838,7 @@ PtrExt2FCB Ext2GetUsedFCB( return PtrFCB; } -BOOLEAN Ext2CloseClosableFCB( +BOOLEAN NTAPI Ext2CloseClosableFCB( PtrExt2FCB PtrFCB) { KIRQL Irql = 0; @@ -1917,7 +1917,7 @@ BOOLEAN Ext2CloseClosableFCB( } -BOOLEAN Ext2SaveBCB( +BOOLEAN NTAPI Ext2SaveBCB( PtrExt2IrpContext PtrIrpContext, PBCB PtrBCB, PFILE_OBJECT PtrFileObject) @@ -1984,7 +1984,7 @@ BOOLEAN Ext2SaveBCB( } -BOOLEAN Ext2FlushSavedBCBs( +BOOLEAN NTAPI Ext2FlushSavedBCBs( PtrExt2IrpContext PtrIrpContext ) { @@ -2045,7 +2045,7 @@ BOOLEAN Ext2FlushSavedBCBs( return RC; } -BOOLEAN AssertBCB( PBCB PtrBCB ) +BOOLEAN NTAPI AssertBCB( PBCB PtrBCB ) { PFILE_OBJECT PtrFileObject = NULL; @@ -2069,7 +2069,7 @@ BOOLEAN AssertBCB( PBCB PtrBCB ) } -ULONG Ext2Align( ULONG NumberToBeAligned, ULONG Alignment ) +ULONG NTAPI Ext2Align( ULONG NumberToBeAligned, ULONG Alignment ) { if( Alignment & ( Alignment - 1 ) ) { @@ -2087,7 +2087,7 @@ ULONG Ext2Align( ULONG NumberToBeAligned, ULONG Alignment ) return NumberToBeAligned; } -LONGLONG Ext2Align64( LONGLONG NumberToBeAligned, LONGLONG Alignment ) +LONGLONG NTAPI Ext2Align64( LONGLONG NumberToBeAligned, LONGLONG Alignment ) { if( Alignment & ( Alignment - 1 ) ) { diff --git a/reactos/drivers/filesystems/ext2/src/read.c b/reactos/drivers/filesystems/ext2/src/read.c index e4b47de045c..1335f09495c 100644 --- a/reactos/drivers/filesystems/ext2/src/read.c +++ b/reactos/drivers/filesystems/ext2/src/read.c @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2Read( +NTSTATUS NTAPI Ext2Read( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -101,7 +101,7 @@ PIRP Irp) // I/O Request Packet * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonRead( +NTSTATUS NTAPI Ext2CommonRead( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ) @@ -1329,7 +1329,7 @@ BOOLEAN FirstAttempt ) * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -void * Ext2GetCallersBuffer ( +void * NTAPI Ext2GetCallersBuffer ( PIRP PtrIrp ) { void * ReturnedBuffer = NULL; @@ -1363,7 +1363,7 @@ void * Ext2GetCallersBuffer ( * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2LockCallersBuffer( +NTSTATUS NTAPI Ext2LockCallersBuffer( PIRP PtrIrp, BOOLEAN IsReadOperation, uint32 Length) @@ -1436,7 +1436,7 @@ uint32 Length) * Return Value: None. * *************************************************************************/ -void Ext2MdlComplete( +void NTAPI Ext2MdlComplete( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PIO_STACK_LOCATION PtrIoStackLocation, diff --git a/reactos/drivers/filesystems/ext2/src/shutdown.c b/reactos/drivers/filesystems/ext2/src/shutdown.c index 0ec7d2f36b8..99833b5550e 100644 --- a/reactos/drivers/filesystems/ext2/src/shutdown.c +++ b/reactos/drivers/filesystems/ext2/src/shutdown.c @@ -40,7 +40,7 @@ * Return Value: Irrelevant. * *************************************************************************/ -NTSTATUS Ext2Shutdown( +NTSTATUS NTAPI Ext2Shutdown( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -102,7 +102,7 @@ NTSTATUS Ext2Shutdown( * Return Value: Irrelevant * *************************************************************************/ -NTSTATUS Ext2CommonShutdown( +NTSTATUS NTAPI Ext2CommonShutdown( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { diff --git a/reactos/drivers/filesystems/ext2/src/volinfo.c b/reactos/drivers/filesystems/ext2/src/volinfo.c index 2e341626e03..fad3fd8c30c 100644 --- a/reactos/drivers/filesystems/ext2/src/volinfo.c +++ b/reactos/drivers/filesystems/ext2/src/volinfo.c @@ -49,7 +49,7 @@ * NTSTATUS - The FSD status for the IRP * *************************************************************************/ -NTSTATUS Ext2QueryVolInfo ( +NTSTATUS NTAPI Ext2QueryVolInfo ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -192,7 +192,7 @@ NTSTATUS Ext2QueryVolInfo ( -NTSTATUS Ext2SetVolInfo( +NTSTATUS NTAPI Ext2SetVolInfo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { diff --git a/reactos/drivers/filesystems/ext2/src/write.c b/reactos/drivers/filesystems/ext2/src/write.c index 1596ecd95eb..154904a263c 100644 --- a/reactos/drivers/filesystems/ext2/src/write.c +++ b/reactos/drivers/filesystems/ext2/src/write.c @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2Write( +NTSTATUS NTAPI Ext2Write( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -97,7 +97,7 @@ PIRP Irp) // I/O Request Packet * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonWrite( +NTSTATUS NTAPI Ext2CommonWrite( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -1471,7 +1471,7 @@ NTSTATUS Ext2CommonWrite( * Return Value: None * *************************************************************************/ -void Ext2DeferredWriteCallBack ( +void NTAPI Ext2DeferredWriteCallBack ( void *Context1, // Should be PtrIrpContext void *Context2 ) // Should be PtrIrp {