Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-12 14:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FASTFAT]

Browse source 
Fix a few ugly things.
Both Thomas & cppcheck should be happier now!

svn path=/trunk/; revision=73807
This commit is contained in:
Pierre Schweitzer 2017-02-17 11:08:38 +00:00
parent c607de714c
commit 57ec8a7319
3 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/filesystems/fastfat/finfo.c
View file

@ -97,7 +97,7 @@ VfatGetStandardInformation(
StandardInfo->Directory = FALSE; StandardInfo->Directory = FALSE;
} }
StandardInfo->NumberOfLinks = 1; StandardInfo->NumberOfLinks = 1;
StandardInfo->DeletePending = FCB->Flags & FCB_DELETE_PENDING ? TRUE : FALSE; StandardInfo->DeletePending = BooleanFlagOn(FCB->Flags, FCB_DELETE_PENDING) ? TRUE : FALSE;
*BufferLength -= sizeof(FILE_STANDARD_INFORMATION); *BufferLength -= sizeof(FILE_STANDARD_INFORMATION);
return STATUS_SUCCESS; return STATUS_SUCCESS;

54
reactos/drivers/filesystems/fastfat/rw.c
View file

@ -547,6 +547,7 @@ VfatRead(
LARGE_INTEGER ByteOffset; LARGE_INTEGER ByteOffset;
PVOID Buffer; PVOID Buffer;
ULONG BytesPerSector; ULONG BytesPerSector;
BOOLEAN PagingIo, CanWait;
ASSERT(IrpContext); ASSERT(IrpContext);
@ -583,9 +584,11 @@ VfatRead(
ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset; ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset;
Length = IrpContext->Stack->Parameters.Read.Length; Length = IrpContext->Stack->Parameters.Read.Length;
BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector; BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector;
PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO);
CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT);
/* fail if file is a directory and no paged read */ /* fail if file is a directory and no paged read */
if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO)) if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !PagingIo)
{ {
Status = STATUS_INVALID_PARAMETER; Status = STATUS_INVALID_PARAMETER;
goto ByeBye; goto ByeBye;
@ -628,7 +631,7 @@ VfatRead(
{ {
Resource = &IrpContext->DeviceExt->DirResource; Resource = &IrpContext->DeviceExt->DirResource;
} }
else if (IrpContext->Irp->Flags & IRP_PAGING_IO) else if (PagingIo)
{ {
Resource = &Fcb->PagingIoResource; Resource = &Fcb->PagingIoResource;
} }
@ -637,15 +640,14 @@ VfatRead(
Resource = &Fcb->MainResource; Resource = &Fcb->MainResource;
} }
if (!ExAcquireResourceSharedLite(Resource, if (!ExAcquireResourceSharedLite(Resource, CanWait))
IrpContext->Flags & IRPCONTEXT_CANWAIT ? TRUE : FALSE))
{ {
Resource = NULL; Resource = NULL;
Status = STATUS_PENDING; Status = STATUS_PENDING;
goto ByeBye; goto ByeBye;
} }
if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) && if (!PagingIo &&
FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) FsRtlAreThereCurrentFileLocks(&Fcb->FileLock))
{ {
if (!FsRtlCheckLockForReadAccess(&Fcb->FileLock, IrpContext->Irp)) if (!FsRtlCheckLockForReadAccess(&Fcb->FileLock, IrpContext->Irp))
@ -655,7 +657,7 @@ VfatRead(
} }
} }
Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo);
if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) && if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) &&
!(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME))) !(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME)))
@ -682,11 +684,11 @@ VfatRead(
if (!CcCopyRead(IrpContext->FileObject, if (!CcCopyRead(IrpContext->FileObject,
&ByteOffset, &ByteOffset,
Length, Length,
(IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0, CanWait,
Buffer, Buffer,
&IrpContext->Irp->IoStatus)) &IrpContext->Irp->IoStatus))
{ {
ASSERT((IrpContext->Flags & IRPCONTEXT_CANWAIT) == 0); ASSERT(!CanWait);
Status = STATUS_PENDING; Status = STATUS_PENDING;
goto ByeBye; goto ByeBye;
} }
@ -742,7 +744,7 @@ ByeBye:
{ {
IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Status = Status;
if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO && if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO &&
!(IrpContext->Irp->Flags & IRP_PAGING_IO) && !PagingIo &&
(NT_SUCCESS(Status) || Status == STATUS_END_OF_FILE)) (NT_SUCCESS(Status) || Status == STATUS_END_OF_FILE))
{ {
IrpContext->FileObject->CurrentByteOffset.QuadPart = IrpContext->FileObject->CurrentByteOffset.QuadPart =
@ -768,6 +770,7 @@ VfatWrite(
ULONG Length = 0; ULONG Length = 0;
PVOID Buffer; PVOID Buffer;
ULONG BytesPerSector; ULONG BytesPerSector;
BOOLEAN PagingIo, CanWait;
ASSERT(IrpContext); ASSERT(IrpContext);
@ -801,8 +804,11 @@ VfatWrite(
DPRINT("<%wZ>\n", &Fcb->PathNameU); DPRINT("<%wZ>\n", &Fcb->PathNameU);
PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO);
CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT);
/* fail if file is a directory and no paged read */ /* fail if file is a directory and no paged read */
if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO)) if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !PagingIo)
{ {
Status = STATUS_INVALID_PARAMETER; Status = STATUS_INVALID_PARAMETER;
goto ByeBye; goto ByeBye;
@ -854,7 +860,7 @@ VfatWrite(
goto Metadata; goto Metadata;
} }
if (IrpContext->Irp->Flags & IRP_PAGING_IO) if (PagingIo)
{ {
if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart) if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart)
{ {
@ -872,7 +878,7 @@ VfatWrite(
{ {
Resource = &IrpContext->DeviceExt->DirResource; Resource = &IrpContext->DeviceExt->DirResource;
} }
else if (IrpContext->Irp->Flags & IRP_PAGING_IO) else if (PagingIo)
{ {
Resource = &Fcb->PagingIoResource; Resource = &Fcb->PagingIoResource;
} }
@ -881,10 +887,9 @@ VfatWrite(
Resource = &Fcb->MainResource; Resource = &Fcb->MainResource;
} }
if ((Fcb->Flags & FCB_IS_PAGE_FILE) || (IrpContext->Irp->Flags & IRP_PAGING_IO)) if ((Fcb->Flags & FCB_IS_PAGE_FILE) || PagingIo)
{ {
if (!ExAcquireResourceSharedLite(Resource, if (!ExAcquireResourceSharedLite(Resource, CanWait))
BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)))
{ {
Resource = NULL; Resource = NULL;
Status = STATUS_PENDING; Status = STATUS_PENDING;
@ -893,8 +898,7 @@ VfatWrite(
} }
else else
{ {
if (!ExAcquireResourceExclusiveLite(Resource, if (!ExAcquireResourceExclusiveLite(Resource, CanWait))
BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)))
{ {
Resource = NULL; Resource = NULL;
Status = STATUS_PENDING; Status = STATUS_PENDING;
@ -902,7 +906,7 @@ VfatWrite(
} }
} }
if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) && if (!PagingIo &&
FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) FsRtlAreThereCurrentFileLocks(&Fcb->FileLock))
{ {
if (!FsRtlCheckLockForWriteAccess(&Fcb->FileLock, IrpContext->Irp)) if (!FsRtlCheckLockForWriteAccess(&Fcb->FileLock, IrpContext->Irp))
@ -912,7 +916,7 @@ VfatWrite(
} }
} }
if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT) && !(Fcb->Flags & FCB_IS_VOLUME)) if (!CanWait && !(Fcb->Flags & FCB_IS_VOLUME))
{ {
if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart) if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart)
{ {
@ -921,10 +925,10 @@ VfatWrite(
} }
} }
Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo);
if (!(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)) && if (!(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)) &&
!(IrpContext->Irp->Flags & IRP_PAGING_IO) && !PagingIo &&
ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart) ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart)
{ {
LARGE_INTEGER AllocationSize; LARGE_INTEGER AllocationSize;
@ -961,7 +965,7 @@ VfatWrite(
if (CcCopyWrite(IrpContext->FileObject, if (CcCopyWrite(IrpContext->FileObject,
&ByteOffset, &ByteOffset,
Length, Length,
TRUE /*(IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0*/, TRUE /*CanWait*/,
Buffer)) Buffer))
{ {
IrpContext->Irp->IoStatus.Information = Length; IrpContext->Irp->IoStatus.Information = Length;
@ -969,7 +973,7 @@ VfatWrite(
} }
else else
{ {
ASSERT(FALSE /*(IrpContext->Flags & IRPCONTEXT_CANWAIT) == 0*/); ASSERT(FALSE /*!CanWait*/);
Status = STATUS_UNSUCCESSFUL; Status = STATUS_UNSUCCESSFUL;
} }
} }
@ -1002,7 +1006,7 @@ VfatWrite(
} }
Metadata: Metadata:
if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) && if (!PagingIo &&
!(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME))) !(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)))
{ {
if(!(*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) if(!(*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY))
@ -1064,7 +1068,7 @@ ByeBye:
{ {
IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Status = Status;
if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO && if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO &&
!(IrpContext->Irp->Flags & IRP_PAGING_IO) && NT_SUCCESS(Status)) !PagingIo && NT_SUCCESS(Status))
{ {
IrpContext->FileObject->CurrentByteOffset.QuadPart = IrpContext->FileObject->CurrentByteOffset.QuadPart =
ByteOffset.QuadPart + IrpContext->Irp->IoStatus.Information; ByteOffset.QuadPart + IrpContext->Irp->IoStatus.Information;

6
reactos/drivers/filesystems/fastfat/vfat.h
View file

@ -197,9 +197,9 @@ typedef struct _slot slot;
#define LONGNAME_MAX_LENGTH 256 // max length for a long filename #define LONGNAME_MAX_LENGTH 256 // max length for a long filename
#define ENTRY_DELETED(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) #define ENTRY_DELETED(DeviceExt, DirEntry) (BooleanFlagOn(DeviceExt->Flags, VCB_IS_FATX) ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat)))
#define ENTRY_VOLUME(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) #define ENTRY_VOLUME(DeviceExt, DirEntry) (BooleanFlagOn(DeviceExt->Flags, VCB_IS_FATX) ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat)))
#define ENTRY_END(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) #define ENTRY_END(DeviceExt, DirEntry) (BooleanFlagOn(DeviceExt->Flags, VCB_IS_FATX) ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat)))
#define FAT_ENTRY_DELETED(DirEntry) ((DirEntry)->Filename[0] == 0xe5) #define FAT_ENTRY_DELETED(DirEntry) ((DirEntry)->Filename[0] == 0xe5)
#define FAT_ENTRY_END(DirEntry) ((DirEntry)->Filename[0] == 0) #define FAT_ENTRY_END(DirEntry) ((DirEntry)->Filename[0] == 0)