- Add DDK alignment macros and move/rename the ones in the NDK for user-mode only...

[reactos.git] / reactos / drivers / fs / vfat / vfat.h

diff --git a/reactos/drivers/fs/vfat/vfat.h b/reactos/drivers/fs/vfat/vfat.h
index c1aff51..d1f8f1d 100644 (file)
--- a/reactos/drivers/fs/vfat/vfat.h
+++ b/reactos/drivers/fs/vfat/vfat.h
@@ -1,30 +1,19 @@
-/* $Id$ */
-
-#include <ddk/ntifs.h>
-#include <ddk/ntdddisk.h>
-#include <limits.h>
 #include <debug.h>
+#include <ntifs.h>
+#include <ntdddisk.h>
+#include <reactos/helper.h>
 
-#define USE_ROS_CC_AND_FS
+#ifdef __GNUC__
+#include <ndk/ntndk.h>
+#include <ccros.h>
 
-/* FIXME */
-#ifdef __USE_W32API
-NTSTATUS NTAPI RtlOemStringToUnicodeString(PUNICODE_STRING, CONST STRING *, BOOLEAN);
-NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN);
-NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN);
-#undef DeleteFile /* FIXME */
-#define VOLUME_IS_DIRTY 0x00000001 /* FIXME */
-#endif
-
-#ifdef USE_ROS_CC_AND_FS
-NTSTATUS STDCALL CcRosInitializeFileCache(PFILE_OBJECT, ULONG);
-NTSTATUS STDCALL CcRosReleaseFileCache(PFILE_OBJECT);
-#define FSCTL_ROS_QUERY_LCN_MAPPING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
-typedef struct _ROS_QUERY_LCN_MAPPING { LARGE_INTEGER LcnDiskOffset; } ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING;
-#endif
-
-#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
+#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
@@ -435,7 +424,7 @@ typedef struct _VFAT_DIRENTRY_CONTEXT
 
 /*  ------------------------------------------------------  shutdown.c  */
 
-NTSTATUS STDCALL VfatShutdown (PDEVICE_OBJECT DeviceObject,
+NTSTATUS NTAPI VfatShutdown (PDEVICE_OBJECT DeviceObject,
                                PIRP Irp);
 
 /*  --------------------------------------------------------  volume.c  */
@@ -490,10 +479,6 @@ BOOLEAN FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt,
 
 NTSTATUS VfatCreate (PVFAT_IRP_CONTEXT IrpContext);
 
-NTSTATUS VfatOpenFile (PDEVICE_EXTENSION DeviceExt,
-                       PFILE_OBJECT FileObject,
-                      PVFATFCB* parentFcb);
-
 NTSTATUS FindFile (PDEVICE_EXTENSION DeviceExt,
                    PVFATFCB Parent,
                    PUNICODE_STRING FileToFindU,
@@ -554,7 +539,7 @@ VfatSetAllocationSizeInformation(PFILE_OBJECT FileObject,
 
 /*  ---------------------------------------------------------  iface.c  */
 
-NTSTATUS STDCALL DriverEntry (PDRIVER_OBJECT DriverObject,
+NTSTATUS NTAPI DriverEntry (PDRIVER_OBJECT DriverObject,
                               PUNICODE_STRING RegistryPath);
 
 /*  ---------------------------------------------------------  dirwr.c  */
@@ -738,7 +723,7 @@ PVFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject,
 
 VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT IrpContext);
 
-NTSTATUS STDCALL VfatBuildRequest (PDEVICE_OBJECT DeviceObject,
+NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject,
                                    PIRP Irp);
 
 PVOID VfatGetUserBuffer(IN PIRP);