Replace STDCALL by NTAPI Little changes in vfat.h to be able to compile with MSVC Modified: trunk/reactos/drivers/fs/vfat/blockdev.c Modified: trunk/reactos/drivers/fs/vfat/fastio.c Modified: trunk/reactos/drivers/fs/vfat/iface.c Modified: trunk/reactos/drivers/fs/vfat/misc.c Modified: trunk/reactos/drivers/fs/vfat/shutdown.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____
Modified: trunk/reactos/drivers/fs/vfat/blockdev.c --- trunk/reactos/drivers/fs/vfat/blockdev.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/blockdev.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -15,7 +15,7 @@
/* FUNCTIONS ***************************************************************/
-static NTSTATUS STDCALL +static NTSTATUS NTAPI VfatReadWritePartialCompletion (IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) _____
Modified: trunk/reactos/drivers/fs/vfat/fastio.c --- trunk/reactos/drivers/fs/vfat/fastio.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/fastio.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -3,14 +3,14 @@
* PURPOSE: Fast IO routines. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * PROGRAMMER: Herve Poussineau (reactos@poussine.freesurf.fr) + * PROGRAMMER: Herve Poussineau (hpoussin@reactos.org) * Hartmut Birr */
#define NDEBUG #include "vfat.h"
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoCheckIfPossible(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Lenght, @@ -25,7 +25,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoRead(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -39,13 +39,13 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoWrite(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, - IN ULONG Length, + IN ULONG Length, IN BOOLEAN Wait, IN ULONG LockKey, - OUT PVOID Buffer, + OUT PVOID Buffer, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { @@ -53,18 +53,18 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoQueryBasicInfo(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_BASIC_INFORMATION Buffer, - OUT PIO_STATUS_BLOCK IoStatus, + OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatFastIoQueryBasicInfo()\n"); return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoQueryStandardInfo(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_STANDARD_INFORMATION Buffer, @@ -75,7 +75,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoLock(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -90,7 +90,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoUnlockSingle(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -103,7 +103,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoUnlockAll(IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, OUT PIO_STATUS_BLOCK IoStatus, @@ -113,7 +113,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoUnlockAllByKey(IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, ULONG Key, @@ -124,7 +124,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoDeviceControl(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, IN PVOID InputBuffer OPTIONAL, @@ -139,26 +139,26 @@ return FALSE; }
-VOID STDCALL +VOID NTAPI VfatAcquireFileForNtCreateSection(IN PFILE_OBJECT FileObject) { DPRINT("VfatAcquireFileForNtCreateSection\n"); }
-VOID STDCALL +VOID NTAPI VfatReleaseFileForNtCreateSection(IN PFILE_OBJECT FileObject) { DPRINT("VfatReleaseFileForNtCreateSection\n"); }
-VOID STDCALL +VOID NTAPI VfatFastIoDetachDevice(IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice) { DPRINT("VfatFastIoDetachDevice\n"); }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoQueryNetworkOpenInfo(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, @@ -169,7 +169,7 @@ return FALSE; }
-NTSTATUS STDCALL +NTSTATUS NTAPI VfatAcquireForModWrite(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, OUT PERESOURCE* ResourceToRelease, @@ -179,7 +179,7 @@ return STATUS_UNSUCCESSFUL; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlRead(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -192,7 +192,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlReadComplete(IN PFILE_OBJECT FileObject, IN PMDL MdlChain, IN PDEVICE_OBJECT DeviceObject) @@ -201,7 +201,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatPrepareMdlWrite(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -214,7 +214,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlWriteComplete(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PMDL MdlChain, @@ -224,7 +224,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoReadCompressed(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -240,10 +240,10 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoWriteCompressed(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, - IN ULONG Length, + IN ULONG Length, IN ULONG LockKey, IN PVOID Buffer, OUT PMDL* MdlChain, @@ -256,7 +256,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlReadCompleteCompressed(IN PFILE_OBJECT FileObject, IN PMDL MdlChain, IN PDEVICE_OBJECT DeviceObject) @@ -265,7 +265,7 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlWriteCompleteCompressed(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PMDL MdlChain, @@ -275,16 +275,16 @@ return FALSE; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoQueryOpen(IN PIRP Irp, OUT PFILE_NETWORK_OPEN_INFORMATION NetworkInformation, - IN PDEVICE_OBJECT DeviceObject) + IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatFastIoQueryOpen\n"); return FALSE; }
-NTSTATUS STDCALL +NTSTATUS NTAPI VfatReleaseForModWrite(IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, IN PDEVICE_OBJECT DeviceObject) @@ -293,7 +293,7 @@ return STATUS_UNSUCCESSFUL; }
-NTSTATUS STDCALL +NTSTATUS NTAPI VfatAcquireForCcFlush(IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { @@ -301,7 +301,7 @@ return STATUS_UNSUCCESSFUL; }
-NTSTATUS STDCALL +NTSTATUS NTAPI VfatReleaseForCcFlush(IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { @@ -309,11 +309,11 @@ return STATUS_UNSUCCESSFUL; }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatAcquireForLazyWrite(IN PVOID Context, IN BOOLEAN Wait) { - PVFATFCB Fcb = (PVFATFCB)Context; + PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); DPRINT("VfatAcquireForLazyWrite(): Fcb %p\n", Fcb); @@ -325,21 +325,21 @@ return TRUE; }
-VOID STDCALL +VOID NTAPI VfatReleaseFromLazyWrite(IN PVOID Context) { - PVFATFCB Fcb = (PVFATFCB)Context; + PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); DPRINT("VfatReleaseFromLazyWrite(): Fcb %p\n", Fcb); ExReleaseResourceLite(&(Fcb->MainResource)); }
-BOOLEAN STDCALL +BOOLEAN NTAPI VfatAcquireForReadAhead(IN PVOID Context, IN BOOLEAN Wait) { - PVFATFCB Fcb = (PVFATFCB)Context; + PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); DPRINT("VfatAcquireForReadAhead(): Fcb %p\n", Fcb); @@ -349,12 +349,12 @@ return FALSE; } return TRUE; -} +}
-VOID STDCALL +VOID NTAPI VfatReleaseFromReadAhead(IN PVOID Context) { - PVFATFCB Fcb = (PVFATFCB)Context; + PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); DPRINT("VfatReleaseFromReadAhead(): Fcb %p\n", Fcb); @@ -394,4 +394,3 @@ FastIoDispatch->ReleaseForCcFlush = VfatReleaseForCcFlush; }
- _____
Modified: trunk/reactos/drivers/fs/vfat/iface.c --- trunk/reactos/drivers/fs/vfat/iface.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/iface.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -35,7 +35,7 @@
/* FUNCTIONS ****************************************************************/
-NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* _____
Modified: trunk/reactos/drivers/fs/vfat/misc.c --- trunk/reactos/drivers/fs/vfat/misc.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/misc.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -136,7 +136,7 @@
} }
-NTSTATUS STDCALL VfatBuildRequest ( +NTSTATUS NTAPI VfatBuildRequest ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -222,7 +222,7 @@ return IrpContext; }
-VOID STDCALL VfatDoRequest (PVOID IrpContext) +VOID NTAPI VfatDoRequest (PVOID IrpContext) { InterlockedDecrement(&QueueCount); DPRINT ("VfatDoRequest (IrpContext %x), MajorFunction %x, %d\n", IrpContext, ((PVFAT_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); _____
Modified: trunk/reactos/drivers/fs/vfat/shutdown.c --- trunk/reactos/drivers/fs/vfat/shutdown.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/shutdown.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -41,7 +41,7 @@
return Status; }
-NTSTATUS STDCALL +NTSTATUS NTAPI VfatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp) { NTSTATUS Status; _____
Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-10-03 07:15:12 UTC (rev 18236) @@ -1,14 +1,18 @@
-/* $Id$ */ +#include <debug.h> +#include <ntifs.h> +#include <ntdddisk.h>
-#include <ddk/ntifs.h> -#include <ddk/ntdddisk.h> +#ifdef __GNUC__ #include <ndk/ntndk.h> -#include <reactos/helper.h> #include <ccros.h> -#include <limits.h> -#include <debug.h>
#define USE_ROS_CC_AND_FS +#else +#define KEBUGCHECK KeBugCheck +#define KEBUGCHECKEX KeBugCheckEx +#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) +#define ROUND_UP(N, S) ROUND_DOWN((N) + (S) - 1, (S)) +#endif
#include <pshpack1.h> struct _BootSector @@ -419,7 +423,7 @@
/* ------------------------------------------------------ shutdown.c */
-NTSTATUS STDCALL VfatShutdown (PDEVICE_OBJECT DeviceObject, +NTSTATUS NTAPI VfatShutdown (PDEVICE_OBJECT DeviceObject, PIRP Irp);
/* -------------------------------------------------------- volume.c */ @@ -538,7 +542,7 @@
/* --------------------------------------------------------- iface.c */
-NTSTATUS STDCALL DriverEntry (PDRIVER_OBJECT DriverObject, +NTSTATUS NTAPI DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath);
/* --------------------------------------------------------- dirwr.c */ @@ -722,7 +726,7 @@
VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT IrpContext);
-NTSTATUS STDCALL VfatBuildRequest (PDEVICE_OBJECT DeviceObject, +NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject, PIRP Irp);
PVOID VfatGetUserBuffer(IN PIRP);