[CDFS]

[reactos.git] / reactos / drivers / filesystems / cdfs / cdfs.h

diff --git a/reactos/drivers/filesystems/cdfs/cdfs.h b/reactos/drivers/filesystems/cdfs/cdfs.h
index 905a34e..78c9b57 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/cdfs.h
+++ b/reactos/drivers/filesystems/cdfs/cdfs.h
@@ -2,7 +2,6 @@
 #define CDFS_H
 
 #include <ntifs.h>
-#include <ntddk.h>
 #include <ntddcdrm.h>
 
 #define CDFS_BASIC_SECTOR 2048
@@ -10,7 +9,6 @@
 #define BLOCKSIZE CDFS_BASIC_SECTOR
 #define CDFS_MAX_NAME_LEN 256
 
-
 /* Volume descriptor types (VdType) */
 #define BOOT_VOLUME_DESCRIPTOR_TYPE            0
 #define PRIMARY_VOLUME_DESCRIPTOR_TYPE         1
@@ -143,7 +141,7 @@ typedef struct _CDINFO
   ULONG RootStart;
   ULONG RootSize;
   WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)];
-  ULONG VolumeLabelLength;
+  USHORT VolumeLabelLength;
   ULONG SerialNumber;
 } CDINFO, *PCDINFO;
 
@@ -191,8 +189,9 @@ typedef struct _FCB
 
   UNICODE_STRING ShortNameU;
 
-  WCHAR *ObjectName;           /* point on filename (250 chars max) in PathName */
-  WCHAR PathName[MAX_PATH];    /* path+filename 260 max */
+  WCHAR *ObjectName;                   /* point on filename (250 chars max) in PathName */
+  UNICODE_STRING PathName;             /* path+filename 260 max */
+  WCHAR PathNameBuffer[MAX_PATH];      /* Buffer for PathName */
   WCHAR ShortNameBuffer[13];
 
   LIST_ENTRY FcbListEntry;
@@ -200,8 +199,8 @@ typedef struct _FCB
 
   ULONG DirIndex;
 
-  LARGE_INTEGER IndexNumber;   /* HighPart: Parent directory start sector */
-                               /* LowPart: Directory record offset in the parent directory file */
+  LARGE_INTEGER IndexNumber;           /* HighPart: Parent directory start sector */
+                                       /* LowPart: Directory record offset in the parent directory file */
 
   LONG RefCount;
   ULONG Flags;
@@ -243,16 +242,22 @@ extern PCDFS_GLOBAL_DATA CdfsGlobalData;
 
 /* cleanup.c */
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsCleanup;
+
+NTSTATUS
+NTAPI
 CdfsCleanup(PDEVICE_OBJECT DeviceObject,
-           PIRP Irp);
+            PIRP Irp);
 
 
 /* close.c */
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsClose;
+
+NTSTATUS
+NTAPI
 CdfsClose(PDEVICE_OBJECT DeviceObject,
-         PIRP Irp);
+          PIRP Irp);
 
 NTSTATUS
 CdfsCloseFile(PDEVICE_EXTENSION DeviceExt,
@@ -279,21 +284,29 @@ CdfsDeviceIoControl (IN PDEVICE_OBJECT DeviceObject,
 
 /* create.c */
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsCreate;
+
+NTSTATUS
+NTAPI
 CdfsCreate(PDEVICE_OBJECT DeviceObject,
-          PIRP Irp);
+           PIRP Irp);
 
 /* devctrl.c */
 
+DRIVER_DISPATCH CdfsDeviceControl;
+
 NTSTATUS NTAPI
 CdfsDeviceControl(PDEVICE_OBJECT DeviceObject,
                   PIRP Irp);
 
 /* dirctl.c */
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsDirectoryControl;
+
+NTSTATUS
+NTAPI
 CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
-                    PIRP Irp);
+                     PIRP Irp);
 
 
 /* fcb.c */
@@ -366,20 +379,28 @@ CdfsGetFCBForFile(PDEVICE_EXTENSION Vcb,
 
 /* finfo.c */
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsQueryInformation;
+
+NTSTATUS
+NTAPI
 CdfsQueryInformation(PDEVICE_OBJECT DeviceObject,
-                    PIRP Irp);
+                     PIRP Irp);
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsSetInformation;
+
+NTSTATUS
+NTAPI
 CdfsSetInformation(PDEVICE_OBJECT DeviceObject,
-                  PIRP Irp);
+                   PIRP Irp);
 
 
 /* fsctl.c */
 
+DRIVER_DISPATCH CdfsFileSystemControl;
+
 NTSTATUS NTAPI
 CdfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
-                     PIRP Irp);
+                      PIRP Irp);
 
 
 /* misc.c */
@@ -406,24 +427,36 @@ CdfsShortNameCacheGet
 
 /* rw.c */
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsRead;
+
+NTSTATUS
+NTAPI
 CdfsRead(PDEVICE_OBJECT DeviceObject,
-       PIRP Irp);
+         PIRP Irp);
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsWrite;
+
+NTSTATUS
+NTAPI
 CdfsWrite(PDEVICE_OBJECT DeviceObject,
-         PIRP Irp);
+          PIRP Irp);
 
 
 /* volinfo.c */
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsQueryVolumeInformation;
+
+NTSTATUS
+NTAPI
 CdfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject,
-                          PIRP Irp);
+                           PIRP Irp);
 
-NTSTATUS NTAPI
+DRIVER_DISPATCH CdfsSetVolumeInformation;
+
+NTSTATUS
+NTAPI
 CdfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject,
-                        PIRP Irp);
+                         PIRP Irp);
 
 /* cdfs.c */
 
@@ -438,4 +471,4 @@ CdfsAcquireForLazyWrite(IN PVOID Context,
 VOID NTAPI
 CdfsReleaseFromLazyWrite(IN PVOID Context);
 
-#endif //CDFS_H
+#endif /* CDFS_H */