From e0463986d3e42de40b2c828bf9ea4f7b1708f43a Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Fri, 17 Jun 2005 12:29:33 +0000 Subject: [PATCH] Build file system drivers w/ W32API headers. svn path=/trunk/; revision=15972 --- reactos/drivers/fs/cdfs/cdfs.h | 2 ++ reactos/drivers/fs/cdfs/cdfs.xml | 1 + reactos/drivers/fs/cdfs/create.c | 1 + reactos/drivers/fs/cdfs/dirctl.c | 1 + reactos/drivers/fs/cdfs/fcb.c | 2 -- reactos/drivers/fs/cdfs/fsctl.c | 1 + reactos/drivers/fs/fs_rec/cdfs.c | 10 +++++----- reactos/drivers/fs/fs_rec/fat.c | 9 ++++----- reactos/drivers/fs/fs_rec/fs_rec.c | 4 ++-- reactos/drivers/fs/fs_rec/fs_rec.xml | 1 + reactos/drivers/fs/fs_rec/ntfs.c | 8 ++++---- reactos/drivers/fs/fs_rec/udfs.c | 10 +++++----- reactos/drivers/fs/ms/create.c | 12 +++++++++--- reactos/drivers/fs/ms/finfo.c | 14 +++++++------- reactos/drivers/fs/ms/fsctrl.c | 2 +- reactos/drivers/fs/ms/msfs.c | 2 +- reactos/drivers/fs/ms/msfs.xml | 1 + reactos/drivers/fs/ms/rw.c | 3 +-- reactos/drivers/fs/mup/create.c | 2 +- reactos/drivers/fs/mup/mup.h | 5 ++--- reactos/drivers/fs/mup/mup.xml | 1 + reactos/drivers/fs/np/create.c | 10 +++++++--- reactos/drivers/fs/np/finfo.c | 2 +- reactos/drivers/fs/np/fsctrl.c | 3 ++- reactos/drivers/fs/np/npfs.c | 6 +++--- reactos/drivers/fs/np/npfs.h | 1 + reactos/drivers/fs/np/npfs.xml | 1 + reactos/drivers/fs/np/rw.c | 2 +- reactos/drivers/fs/np/volume.c | 2 +- reactos/drivers/fs/ntfs/fcb.c | 3 --- reactos/drivers/fs/ntfs/fsctl.c | 6 ++---- reactos/drivers/fs/ntfs/ntfs.h | 4 ++-- reactos/drivers/fs/ntfs/ntfs.xml | 1 + 33 files changed, 73 insertions(+), 60 deletions(-) diff --git a/reactos/drivers/fs/cdfs/cdfs.h b/reactos/drivers/fs/cdfs/cdfs.h index 692912464cf..37f4993ae70 100644 --- a/reactos/drivers/fs/cdfs/cdfs.h +++ b/reactos/drivers/fs/cdfs/cdfs.h @@ -213,7 +213,9 @@ typedef struct _CCB ULONG LastOffset; } CCB, *PCCB; +#ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif #define TAG_CCB TAG('I', 'C', 'C', 'B') diff --git a/reactos/drivers/fs/cdfs/cdfs.xml b/reactos/drivers/fs/cdfs/cdfs.xml index 71de9692500..fd1a486d2d9 100644 --- a/reactos/drivers/fs/cdfs/cdfs.xml +++ b/reactos/drivers/fs/cdfs/cdfs.xml @@ -1,6 +1,7 @@ . + ntoskrnl hal cdfs.c diff --git a/reactos/drivers/fs/cdfs/create.c b/reactos/drivers/fs/cdfs/create.c index 4a96e84c48a..6fcae4d69a9 100644 --- a/reactos/drivers/fs/cdfs/create.c +++ b/reactos/drivers/fs/cdfs/create.c @@ -29,6 +29,7 @@ /* INCLUDES *****************************************************************/ #include +#include #define NDEBUG #include diff --git a/reactos/drivers/fs/cdfs/dirctl.c b/reactos/drivers/fs/cdfs/dirctl.c index de95b9f79b8..6d5eee1e6b6 100644 --- a/reactos/drivers/fs/cdfs/dirctl.c +++ b/reactos/drivers/fs/cdfs/dirctl.c @@ -39,6 +39,7 @@ /* DEFINES ******************************************************************/ #define ROUND_DOWN(N, S) (((N) / (S)) * (S)) +#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) /* FUNCTIONS ****************************************************************/ diff --git a/reactos/drivers/fs/cdfs/fcb.c b/reactos/drivers/fs/cdfs/fcb.c index 8416cfec35c..577f18c22ad 100644 --- a/reactos/drivers/fs/cdfs/fcb.c +++ b/reactos/drivers/fs/cdfs/fcb.c @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include -#include #define NDEBUG #include @@ -39,7 +38,6 @@ /* MACROS *******************************************************************/ -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FCB TAG('I', 'F', 'C', 'B') #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) diff --git a/reactos/drivers/fs/cdfs/fsctl.c b/reactos/drivers/fs/cdfs/fsctl.c index 79c7a4c2015..0b83b98e281 100644 --- a/reactos/drivers/fs/cdfs/fsctl.c +++ b/reactos/drivers/fs/cdfs/fsctl.c @@ -29,6 +29,7 @@ /* INCLUDES *****************************************************************/ #include +#include #include #define NDEBUG diff --git a/reactos/drivers/fs/fs_rec/cdfs.c b/reactos/drivers/fs/fs_rec/cdfs.c index b30615550a2..e2a055329c0 100644 --- a/reactos/drivers/fs/fs_rec/cdfs.c +++ b/reactos/drivers/fs/fs_rec/cdfs.c @@ -27,8 +27,9 @@ /* INCLUDES *****************************************************************/ -#include -#include +#include +#include +#include #define NDEBUG #include @@ -102,7 +103,8 @@ FsRecCdfsFsControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; + static UNICODE_STRING RegistryPath = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Cdfs"); NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -121,8 +123,6 @@ FsRecCdfsFsControl(IN PDEVICE_OBJECT DeviceObject, case IRP_MN_LOAD_FILE_SYSTEM: DPRINT("Cdfs: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlRosInitUnicodeStringFromLiteral(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Cdfs"); Status = ZwLoadDriver(&RegistryPath); if (!NT_SUCCESS(Status)) { diff --git a/reactos/drivers/fs/fs_rec/fat.c b/reactos/drivers/fs/fs_rec/fat.c index a65f86a7e37..ae511399f55 100644 --- a/reactos/drivers/fs/fs_rec/fat.c +++ b/reactos/drivers/fs/fs_rec/fat.c @@ -27,8 +27,8 @@ /* INCLUDES *****************************************************************/ -#include -#include +#include +#include #define NDEBUG #include @@ -186,7 +186,8 @@ FsRecVfatFsControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; + static UNICODE_STRING RegistryPath = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Vfatfs"); NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -205,8 +206,6 @@ FsRecVfatFsControl(IN PDEVICE_OBJECT DeviceObject, case IRP_MN_LOAD_FILE_SYSTEM: DPRINT("FAT: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlRosInitUnicodeStringFromLiteral(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Vfatfs"); Status = ZwLoadDriver(&RegistryPath); if (!NT_SUCCESS(Status)) { diff --git a/reactos/drivers/fs/fs_rec/fs_rec.c b/reactos/drivers/fs/fs_rec/fs_rec.c index 1f7adca4a0a..f8663003575 100644 --- a/reactos/drivers/fs/fs_rec/fs_rec.c +++ b/reactos/drivers/fs/fs_rec/fs_rec.c @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ -#include +#include #define NDEBUG #include @@ -154,7 +154,7 @@ FsRecRegisterFs(PDRIVER_OBJECT DriverObject, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, - OPEN_EXISTING, + FILE_OPEN, 0, NULL, 0); diff --git a/reactos/drivers/fs/fs_rec/fs_rec.xml b/reactos/drivers/fs/fs_rec/fs_rec.xml index 3d3c6927ba8..8e7d4d23e7d 100644 --- a/reactos/drivers/fs/fs_rec/fs_rec.xml +++ b/reactos/drivers/fs/fs_rec/fs_rec.xml @@ -1,5 +1,6 @@ . + ntoskrnl hal blockdev.c diff --git a/reactos/drivers/fs/fs_rec/ntfs.c b/reactos/drivers/fs/fs_rec/ntfs.c index 65959ea8566..4cb3cd923ff 100644 --- a/reactos/drivers/fs/fs_rec/ntfs.c +++ b/reactos/drivers/fs/fs_rec/ntfs.c @@ -27,7 +27,8 @@ /* INCLUDES *****************************************************************/ -#include +#include +#include #define NDEBUG #include @@ -99,7 +100,8 @@ FsRecNtfsFsControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; + static UNICODE_STRING RegistryPath = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ntfs"); NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -119,8 +121,6 @@ FsRecNtfsFsControl(IN PDEVICE_OBJECT DeviceObject, case IRP_MN_LOAD_FILE_SYSTEM: DPRINT("NTFS: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlInitUnicodeString(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ntfs"); Status = ZwLoadDriver(&RegistryPath); if (!NT_SUCCESS(Status)) { diff --git a/reactos/drivers/fs/fs_rec/udfs.c b/reactos/drivers/fs/fs_rec/udfs.c index cc902661843..371b1bc5492 100644 --- a/reactos/drivers/fs/fs_rec/udfs.c +++ b/reactos/drivers/fs/fs_rec/udfs.c @@ -27,8 +27,9 @@ /* INCLUDES *****************************************************************/ -#include -#include +#include +#include +#include #define NDEBUG #include @@ -258,7 +259,8 @@ FsRecUdfsFsControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; + static UNICODE_STRING RegistryPath = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Udfs"); NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -277,8 +279,6 @@ FsRecUdfsFsControl(IN PDEVICE_OBJECT DeviceObject, case IRP_MN_LOAD_FILE_SYSTEM: DPRINT("Udfs: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlRosInitUnicodeStringFromLiteral(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Udfs"); Status = ZwLoadDriver(&RegistryPath); if (!NT_SUCCESS(Status)) { diff --git a/reactos/drivers/fs/ms/create.c b/reactos/drivers/fs/ms/create.c index 2e42c22b43e..85bf9d5bdc7 100644 --- a/reactos/drivers/fs/ms/create.c +++ b/reactos/drivers/fs/ms/create.c @@ -9,8 +9,9 @@ /* INCLUDES ******************************************************************/ -#include -#include /* FIXME: Temporary Until NDK implemented */ +#include +/* FIXME: The headers are broken! */ +#undef CreateMailslot #include "msfs.h" #define NDEBUG @@ -137,7 +138,10 @@ MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, return(STATUS_NO_MEMORY); } - if (!RtlCreateUnicodeString(&Mailslot->Name, FileObject->FileName.Buffer)) + Mailslot->Name.Length = FileObject->FileName.Length; + Mailslot->Name.MaximumLength = Mailslot->Name.Length + sizeof(UNICODE_NULL); + Mailslot->Name.Buffer = ExAllocatePool(NonPagedPool, Mailslot->Name.MaximumLength); + if (Mailslot->Name.Buffer == NULL) { ExFreePool(Mailslot); @@ -149,6 +153,8 @@ MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, return(STATUS_NO_MEMORY); } + RtlCopyUnicodeString(&Mailslot->Name, &FileObject->FileName); + Fcb = ExAllocatePool(NonPagedPool, sizeof(MSFS_FCB)); if (Fcb == NULL) { diff --git a/reactos/drivers/fs/ms/finfo.c b/reactos/drivers/fs/ms/finfo.c index f30277cb6f4..33a5bebd18f 100644 --- a/reactos/drivers/fs/ms/finfo.c +++ b/reactos/drivers/fs/ms/finfo.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include +#include #include "msfs.h" #define NDEBUG @@ -31,19 +31,19 @@ MsfsQueryMailslotInformation(PMSFS_FCB Fcb, Mailslot = Fcb->Mailslot; - Buffer->MaxMessageSize = Mailslot->MaxMessageSize; - Buffer->Timeout = Mailslot->TimeOut; + Buffer->MaximumMessageSize = Mailslot->MaxMessageSize; + Buffer->ReadTimeout = Mailslot->TimeOut; KeAcquireSpinLock(&Mailslot->MessageListLock, &oldIrql); - Buffer->MessageCount = Mailslot->MessageCount; + Buffer->MessagesAvailable = Mailslot->MessageCount; if (Mailslot->MessageCount == 0) { - Buffer->NextSize = 0; + Buffer->NextMessageSize = 0; } else { /* FIXME: read size of first message (head) */ - Buffer->NextSize = 0; + Buffer->NextMessageSize = 0; } KeReleaseSpinLock(&Mailslot->MessageListLock, oldIrql); @@ -61,7 +61,7 @@ MsfsSetMailslotInformation(PMSFS_FCB Fcb, if (*BufferLength < sizeof(FILE_MAILSLOT_SET_INFORMATION)) return(STATUS_BUFFER_OVERFLOW); - Fcb->Mailslot->TimeOut = Buffer->Timeout; + Fcb->Mailslot->TimeOut = Buffer->ReadTimeout; return(STATUS_SUCCESS); } diff --git a/reactos/drivers/fs/ms/fsctrl.c b/reactos/drivers/fs/ms/fsctrl.c index db1490b6f53..8a855ed157e 100644 --- a/reactos/drivers/fs/ms/fsctrl.c +++ b/reactos/drivers/fs/ms/fsctrl.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include +#include #include "msfs.h" //#define NDEBUG diff --git a/reactos/drivers/fs/ms/msfs.c b/reactos/drivers/fs/ms/msfs.c index 7fc5fc8afc9..b79a69be616 100644 --- a/reactos/drivers/fs/ms/msfs.c +++ b/reactos/drivers/fs/ms/msfs.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include +#include #include "msfs.h" #define NDEBUG diff --git a/reactos/drivers/fs/ms/msfs.xml b/reactos/drivers/fs/ms/msfs.xml index 54e4da5d3de..38e9d166e89 100644 --- a/reactos/drivers/fs/ms/msfs.xml +++ b/reactos/drivers/fs/ms/msfs.xml @@ -1,5 +1,6 @@ . + ntoskrnl hal create.c diff --git a/reactos/drivers/fs/ms/rw.c b/reactos/drivers/fs/ms/rw.c index 1a9a1b7a50a..7b4a7f260d1 100644 --- a/reactos/drivers/fs/ms/rw.c +++ b/reactos/drivers/fs/ms/rw.c @@ -9,8 +9,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include #include "msfs.h" #define NDEBUG diff --git a/reactos/drivers/fs/mup/create.c b/reactos/drivers/fs/mup/create.c index 7ca26d31c6c..9b8283e6f6c 100644 --- a/reactos/drivers/fs/mup/create.c +++ b/reactos/drivers/fs/mup/create.c @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ -#include +#include //#define NDEBUG #include diff --git a/reactos/drivers/fs/mup/mup.h b/reactos/drivers/fs/mup/mup.h index 6178b47e1a8..0afa23f0d4e 100644 --- a/reactos/drivers/fs/mup/mup.h +++ b/reactos/drivers/fs/mup/mup.h @@ -1,10 +1,9 @@ #ifndef MUP_H #define MUP_H -#include - - +#ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) diff --git a/reactos/drivers/fs/mup/mup.xml b/reactos/drivers/fs/mup/mup.xml index 761eccee38b..dae76c52217 100644 --- a/reactos/drivers/fs/mup/mup.xml +++ b/reactos/drivers/fs/mup/mup.xml @@ -1,5 +1,6 @@ . + ntoskrnl hal create.c diff --git a/reactos/drivers/fs/np/create.c b/reactos/drivers/fs/np/create.c index 9df3d350adc..68f711ee807 100644 --- a/reactos/drivers/fs/np/create.c +++ b/reactos/drivers/fs/np/create.c @@ -9,8 +9,7 @@ /* INCLUDES ******************************************************************/ -#include - +#include #include "npfs.h" #define NDEBUG @@ -387,7 +386,10 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, return STATUS_NO_MEMORY; } - if (RtlCreateUnicodeString(&Pipe->PipeName, FileObject->FileName.Buffer) == FALSE) + Pipe->PipeName.Length = FileObject->FileName.Length; + Pipe->PipeName.MaximumLength = Pipe->PipeName.Length + sizeof(UNICODE_NULL); + Pipe->PipeName.Buffer = ExAllocatePool(NonPagedPool, Pipe->PipeName.MaximumLength); + if (Pipe->PipeName.Buffer == NULL) { KeUnlockMutex(&DeviceExt->PipeListLock); ExFreePool(Pipe); @@ -398,6 +400,8 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, return STATUS_NO_MEMORY; } + RtlCopyUnicodeString(&Pipe->PipeName, &FileObject->FileName); + InitializeListHead(&Pipe->ServerFcbListHead); InitializeListHead(&Pipe->ClientFcbListHead); InitializeListHead(&Pipe->WaiterListHead); diff --git a/reactos/drivers/fs/np/finfo.c b/reactos/drivers/fs/np/finfo.c index c4fca056106..8a025f871e3 100644 --- a/reactos/drivers/fs/np/finfo.c +++ b/reactos/drivers/fs/np/finfo.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include +#include #include "npfs.h" #define NDEBUG diff --git a/reactos/drivers/fs/np/fsctrl.c b/reactos/drivers/fs/np/fsctrl.c index fb3d656f04d..8d87572be4c 100644 --- a/reactos/drivers/fs/np/fsctrl.c +++ b/reactos/drivers/fs/np/fsctrl.c @@ -10,7 +10,8 @@ /* INCLUDES ******************************************************************/ -#include +#include +#include #include "npfs.h" #define NDEBUG diff --git a/reactos/drivers/fs/np/npfs.c b/reactos/drivers/fs/np/npfs.c index e8c0f1d8a74..3b6fdc8cd01 100644 --- a/reactos/drivers/fs/np/npfs.c +++ b/reactos/drivers/fs/np/npfs.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include +#include #include "npfs.h" #define NDEBUG @@ -28,8 +28,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject, DPRINT("Named Pipe FSD 0.0.2\n"); - ASSERT (sizeof(NPFS_CONTEXT) <= sizeof (((PIRP)NULL)->Tail.Overlay.DriverContext)); - ASSERT (sizeof(NPFS_WAITER_ENTRY) <= sizeof(((PIRP)NULL)->Tail.Overlay.DriverContext)); + ASSERT (sizeof(NPFS_CONTEXT) <= FIELD_OFFSET(IRP, Tail.Overlay.DriverContext)); + ASSERT (sizeof(NPFS_WAITER_ENTRY) <= FIELD_OFFSET(IRP, Tail.Overlay.DriverContext)); DriverObject->MajorFunction[IRP_MJ_CREATE] = NpfsCreate; DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = diff --git a/reactos/drivers/fs/np/npfs.h b/reactos/drivers/fs/np/npfs.h index 052b79f3be8..34874f95c08 100644 --- a/reactos/drivers/fs/np/npfs.h +++ b/reactos/drivers/fs/np/npfs.h @@ -94,6 +94,7 @@ extern NPAGED_LOOKASIDE_LIST NpfsPipeDataLookasideList; #define KeUnlockMutex(x) KeReleaseMutex(x, FALSE); +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS STDCALL NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); diff --git a/reactos/drivers/fs/np/npfs.xml b/reactos/drivers/fs/np/npfs.xml index 8f413928ecb..d2ae1659a88 100644 --- a/reactos/drivers/fs/np/npfs.xml +++ b/reactos/drivers/fs/np/npfs.xml @@ -1,5 +1,6 @@ . + ntoskrnl hal create.c diff --git a/reactos/drivers/fs/np/rw.c b/reactos/drivers/fs/np/rw.c index 8a141f8c559..8339fbd3446 100644 --- a/reactos/drivers/fs/np/rw.c +++ b/reactos/drivers/fs/np/rw.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include +#include #include #include "npfs.h" diff --git a/reactos/drivers/fs/np/volume.c b/reactos/drivers/fs/np/volume.c index 1ea4168cf87..acc35ab9437 100644 --- a/reactos/drivers/fs/np/volume.c +++ b/reactos/drivers/fs/np/volume.c @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ -#include +#include #include #define NDEBUG diff --git a/reactos/drivers/fs/ntfs/fcb.c b/reactos/drivers/fs/ntfs/fcb.c index 9cc4aea34f8..d3b46313f5f 100644 --- a/reactos/drivers/fs/ntfs/fcb.c +++ b/reactos/drivers/fs/ntfs/fcb.c @@ -27,9 +27,6 @@ /* INCLUDES *****************************************************************/ -#include -#include - #include "ntfs.h" #define NDEBUG diff --git a/reactos/drivers/fs/ntfs/fsctl.c b/reactos/drivers/fs/ntfs/fsctl.c index 4ead36ea759..a3c7b4daeb7 100644 --- a/reactos/drivers/fs/ntfs/fsctl.c +++ b/reactos/drivers/fs/ntfs/fsctl.c @@ -28,14 +28,12 @@ /* INCLUDES *****************************************************************/ -#include -#include +#include "ntfs.h" +#include //#define NDEBUG #include -#include "ntfs.h" - /* FUNCTIONS ****************************************************************/ static NTSTATUS diff --git a/reactos/drivers/fs/ntfs/ntfs.h b/reactos/drivers/fs/ntfs/ntfs.h index d5dd6fba01f..c3e87de3679 100644 --- a/reactos/drivers/fs/ntfs/ntfs.h +++ b/reactos/drivers/fs/ntfs/ntfs.h @@ -10,7 +10,9 @@ ((pDeviceExt)->NtfsInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.BytesPerCluster : PAGE_SIZE) +#ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) @@ -128,8 +130,6 @@ typedef struct _CCB ULONG LastOffset; } CCB, *PCCB; -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - #define TAG_CCB TAG('I', 'C', 'C', 'B') typedef struct diff --git a/reactos/drivers/fs/ntfs/ntfs.xml b/reactos/drivers/fs/ntfs/ntfs.xml index de7aa1bd2ca..f0936d30508 100644 --- a/reactos/drivers/fs/ntfs/ntfs.xml +++ b/reactos/drivers/fs/ntfs/ntfs.xml @@ -1,6 +1,7 @@ . + ntoskrnl hal attrib.c