BytesPerSector = DeviceExt->FatInfo.BytesPerSector;
BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster;
- ASSERT(ReadOffset.QuadPart + Length <= ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector));
+ ASSERT(ReadOffset.QuadPart + Length <= ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector));
ASSERT(ReadOffset.u.LowPart % BytesPerSector == 0);
ASSERT(Length % BytesPerSector == 0);
/* Is this a read of the FAT? */
- if (Fcb->Flags & FCB_IS_FAT)
+ if (BooleanFlagOn(Fcb->Flags, FCB_IS_FAT))
{
ReadOffset.QuadPart += DeviceExt->FatInfo.FATStart * BytesPerSector;
Status = VfatReadDiskPartial(IrpContext, &ReadOffset, Length, 0, TRUE);
}
/* Is this a read of the Volume ? */
- if (Fcb->Flags & FCB_IS_VOLUME)
+ if (BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME))
{
Status = VfatReadDiskPartial(IrpContext, &ReadOffset, Length, 0, TRUE);
if (NT_SUCCESS(Status))
ASSERT(Length % BytesPerSector == 0);
/* Is this a write of the volume? */
- if (Fcb->Flags & FCB_IS_VOLUME)
+ if (BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME))
{
Status = VfatWriteDiskPartial(IrpContext, &WriteOffset, Length, 0, TRUE);
if (!NT_SUCCESS(Status))
}
/* Is this a write to the FAT? */
- if (Fcb->Flags & FCB_IS_FAT)
+ if (BooleanFlagOn(Fcb->Flags, FCB_IS_FAT))
{
WriteOffset.u.LowPart += DeviceExt->FatInfo.FATStart * BytesPerSector;
IrpContext->RefCount = 1;
LARGE_INTEGER ByteOffset;
PVOID Buffer;
ULONG BytesPerSector;
+ BOOLEAN PagingIo, CanWait, IsVolume, NoCache;
ASSERT(IrpContext);
ASSERT(IrpContext->DeviceObject);
+ PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO);
+ CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT);
+ NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE);
+
// This request is not allowed on the main device object
if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject)
{
Fcb = IrpContext->FileObject->FsContext;
ASSERT(Fcb);
- if (Fcb->Flags & FCB_IS_PAGE_FILE)
+ IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME);
+
+ if (BooleanFlagOn(Fcb->Flags, FCB_IS_PAGE_FILE))
{
PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo;
IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector;
BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector;
/* fail if file is a directory and no paged read */
- if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO))
+ if (vfatFCBIsDirectory(Fcb) && !PagingIo)
{
Status = STATUS_INVALID_PARAMETER;
goto ByeBye;
DPRINT("'%wZ', Offset: %u, Length %u\n", &Fcb->PathNameU, ByteOffset.u.LowPart, Length);
- if (ByteOffset.u.HighPart && !(Fcb->Flags & FCB_IS_VOLUME))
+ if (ByteOffset.u.HighPart && !IsVolume)
{
Status = STATUS_INVALID_PARAMETER;
goto ByeBye;
goto ByeBye;
}
- if (IrpContext->Irp->Flags & (IRP_PAGING_IO | IRP_NOCACHE) || (Fcb->Flags & FCB_IS_VOLUME))
+ if (NoCache || PagingIo || IsVolume)
{
if (ByteOffset.u.LowPart % BytesPerSector != 0 || Length % BytesPerSector != 0)
{
}
}
- if (Fcb->Flags & FCB_IS_VOLUME)
+ if (IsVolume)
{
Resource = &IrpContext->DeviceExt->DirResource;
}
- else if (IrpContext->Irp->Flags & IRP_PAGING_IO)
+ else if (PagingIo)
{
Resource = &Fcb->PagingIoResource;
}
Resource = &Fcb->MainResource;
}
- if (!ExAcquireResourceSharedLite(Resource,
- IrpContext->Flags & IRPCONTEXT_CANWAIT ? TRUE : FALSE))
+ if (!ExAcquireResourceSharedLite(Resource, CanWait))
{
Resource = NULL;
Status = STATUS_PENDING;
goto ByeBye;
}
- if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
+ if (!PagingIo &&
FsRtlAreThereCurrentFileLocks(&Fcb->FileLock))
{
if (!FsRtlCheckLockForReadAccess(&Fcb->FileLock, IrpContext->Irp))
}
}
- Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO));
- if (!Buffer && IrpContext->Irp->MdlAddress)
- {
- Status = STATUS_INVALID_USER_BUFFER;
- goto ByeBye;
- }
+ Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo);
- if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) &&
- !(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME)))
+ if (!PagingIo && !NoCache && !IsVolume)
{
// cached read
Status = STATUS_SUCCESS;
if (!CcCopyRead(IrpContext->FileObject,
&ByteOffset,
Length,
- (IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0,
+ CanWait,
Buffer,
&IrpContext->Irp->IoStatus))
{
- ASSERT((IrpContext->Flags & IRPCONTEXT_CANWAIT) == 0);
+ ASSERT(!CanWait);
Status = STATUS_PENDING;
goto ByeBye;
}
else
{
// non cached read
- if (ByteOffset.QuadPart + Length > ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector))
- {
- Length = (ULONG)(ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart);
- }
-
Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess);
if (!NT_SUCCESS(Status))
{
goto ByeBye;
}
+ if (ByteOffset.QuadPart + Length > ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector))
+ {
+ Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart);
+ }
+
Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength);
if (NT_SUCCESS(Status))
{
else
{
IrpContext->Irp->IoStatus.Status = Status;
- if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO &&
- !(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
+ if (BooleanFlagOn(IrpContext->FileObject->Flags, FO_SYNCHRONOUS_IO) &&
+ !PagingIo &&
(NT_SUCCESS(Status) || Status == STATUS_END_OF_FILE))
{
IrpContext->FileObject->CurrentByteOffset.QuadPart =
ULONG Length = 0;
PVOID Buffer;
ULONG BytesPerSector;
+ BOOLEAN PagingIo, CanWait, IsVolume, IsFAT, NoCache;
ASSERT(IrpContext);
ASSERT(IrpContext->DeviceObject);
+ PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO);
+ CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT);
+ NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE);
+
// This request is not allowed on the main device object
if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject)
{
Fcb = IrpContext->FileObject->FsContext;
ASSERT(Fcb);
- if (Fcb->Flags & FCB_IS_PAGE_FILE)
+ IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME);
+ IsFAT = BooleanFlagOn(Fcb->Flags, FCB_IS_FAT);
+
+ if (BooleanFlagOn(Fcb->Flags, FCB_IS_PAGE_FILE))
{
PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo;
IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector;
DPRINT("<%wZ>\n", &Fcb->PathNameU);
/* fail if file is a directory and no paged read */
- if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO))
+ if (vfatFCBIsDirectory(Fcb) && !PagingIo)
{
Status = STATUS_INVALID_PARAMETER;
goto ByeBye;
Length = IrpContext->Stack->Parameters.Write.Length;
BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector;
- if (ByteOffset.u.HighPart && !(Fcb->Flags & FCB_IS_VOLUME))
+ if (ByteOffset.u.HighPart && !IsVolume)
{
Status = STATUS_INVALID_PARAMETER;
goto ByeBye;
}
- if (Fcb->Flags & (FCB_IS_FAT | FCB_IS_VOLUME) ||
+ if (IsFAT || IsVolume ||
vfatDirEntryGetFirstCluster(IrpContext->DeviceExt, &Fcb->entry) == 1)
{
if (ByteOffset.QuadPart + Length > Fcb->RFCB.FileSize.QuadPart)
}
}
- if (IrpContext->Irp->Flags & (IRP_PAGING_IO|IRP_NOCACHE) || (Fcb->Flags & FCB_IS_VOLUME))
+ if (PagingIo || NoCache || IsVolume)
{
if (ByteOffset.u.LowPart % BytesPerSector != 0 || Length % BytesPerSector != 0)
{
}
}
+ OldFileSize = Fcb->RFCB.FileSize;
+
if (Length == 0)
{
- /* FIXME: Update last write time */
+ /* Update last write time */
IrpContext->Irp->IoStatus.Information = 0;
Status = STATUS_SUCCESS;
- goto ByeBye;
+ goto Metadata;
}
- if (IrpContext->Irp->Flags & IRP_PAGING_IO)
+ if (PagingIo)
{
if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart)
{
}
}
- if (Fcb->Flags & FCB_IS_VOLUME)
+ if (IsVolume)
{
Resource = &IrpContext->DeviceExt->DirResource;
}
- else if (IrpContext->Irp->Flags & IRP_PAGING_IO)
+ else if (PagingIo)
{
Resource = &Fcb->PagingIoResource;
}
Resource = &Fcb->MainResource;
}
- if (Fcb->Flags & FCB_IS_PAGE_FILE)
+ if (PagingIo)
{
- if (!ExAcquireResourceSharedLite(Resource,
- BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)))
+ if (!ExAcquireResourceSharedLite(Resource, CanWait))
{
Resource = NULL;
Status = STATUS_PENDING;
}
else
{
- if (!ExAcquireResourceExclusiveLite(Resource,
- BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)))
+ if (!ExAcquireResourceExclusiveLite(Resource, CanWait))
{
Resource = NULL;
Status = STATUS_PENDING;
}
}
- if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
+ if (!PagingIo &&
FsRtlAreThereCurrentFileLocks(&Fcb->FileLock))
{
if (!FsRtlCheckLockForWriteAccess(&Fcb->FileLock, IrpContext->Irp))
}
}
- if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT) && !(Fcb->Flags & FCB_IS_VOLUME))
+ if (!CanWait && !IsVolume)
{
if (ByteOffset.u.LowPart + Length > Fcb->RFCB.AllocationSize.u.LowPart)
{
}
}
- OldFileSize = Fcb->RFCB.FileSize;
+ Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo);
- Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO));
- if (!Buffer && IrpContext->Irp->MdlAddress)
- {
- Status = STATUS_INVALID_USER_BUFFER;
- goto ByeBye;
- }
-
-
- if (!(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)) &&
- !(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
+ if (!IsFAT && !IsVolume && !PagingIo &&
ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart)
{
LARGE_INTEGER AllocationSize;
}
}
- if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) &&
- !(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME)))
+ if (!NoCache && !PagingIo && !IsVolume)
{
// cached write
if (CcCopyWrite(IrpContext->FileObject,
&ByteOffset,
Length,
- TRUE /*(IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0*/,
+ TRUE /*CanWait*/,
Buffer))
{
IrpContext->Irp->IoStatus.Information = Length;
}
else
{
- ASSERT(FALSE /*(IrpContext->Flags & IRPCONTEXT_CANWAIT) == 0*/);
+ ASSERT(FALSE /*!CanWait*/);
Status = STATUS_UNSUCCESSFUL;
}
}
else
{
// non cached write
-
- if (ByteOffset.QuadPart > OldFileSize.QuadPart)
- {
- CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE);
- }
-
Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess);
if (!NT_SUCCESS(Status))
{
+ Status = STATUS_INVALID_USER_BUFFER;
goto ByeBye;
}
+ if (ByteOffset.QuadPart > OldFileSize.QuadPart)
+ {
+ CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE);
+ }
+
Status = VfatWriteFileData(IrpContext, Length, ByteOffset);
if (NT_SUCCESS(Status))
{
}
}
- if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
- !(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)))
+Metadata:
+ if (!PagingIo && !IsFAT && !IsVolume)
{
- if(!(*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY))
+ if(!vfatFCBIsDirectory(Fcb))
{
LARGE_INTEGER SystemTime;
ULONG Filter;
// set dates and times
KeQuerySystemTime (&SystemTime);
- if (Fcb->Flags & FCB_IS_FATX_ENTRY)
+ if (vfatVolumeIsFatX(IrpContext->DeviceExt))
{
FsdSystemTimeToDosDateTime(IrpContext->DeviceExt,
&SystemTime, &Fcb->entry.FatX.UpdateDate,
else
{
IrpContext->Irp->IoStatus.Status = Status;
- if (IrpContext->FileObject->Flags & FO_SYNCHRONOUS_IO &&
- !(IrpContext->Irp->Flags & IRP_PAGING_IO) && NT_SUCCESS(Status))
+ if (BooleanFlagOn(IrpContext->FileObject->Flags, FO_SYNCHRONOUS_IO) &&
+ !PagingIo && NT_SUCCESS(Status))
{
IrpContext->FileObject->CurrentByteOffset.QuadPart =
ByteOffset.QuadPart + IrpContext->Irp->IoStatus.Information;
projects / reactos.git / blobdiff