Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 18:35:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Merge misaligned reads support (35998, 36834 by Art) from arty-newcc branch.

Browse source 
svn path=/trunk/; revision=37488
This commit is contained in:
Aleksey Bragin 2008-11-20 20:02:36 +00:00
parent eb41cde3fa
commit 7dcc2be045
1 changed files with 67 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

53
reactos/drivers/filesystems/cdfs/rw.c
View file

@ -76,14 +76,23 @@ CdfsReadFile(PDEVICE_EXTENSION DeviceExt,
{ {
LARGE_INTEGER FileOffset; LARGE_INTEGER FileOffset;
IO_STATUS_BLOCK IoStatus; IO_STATUS_BLOCK IoStatus;
CC_FILE_SIZES FileSizes;
if (ReadOffset + Length > Fcb->Entry.DataLengthL) if (ReadOffset + Length > Fcb->Entry.DataLengthL)
Length = Fcb->Entry.DataLengthL - ReadOffset; Length = Fcb->Entry.DataLengthL - ReadOffset;
if (FileObject->PrivateCacheMap == NULL) if (FileObject->PrivateCacheMap == NULL)
{ {
FileSizes.AllocationSize = Fcb->RFCB.AllocationSize;
FileSizes.FileSize = Fcb->RFCB.FileSize;
FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength;
DPRINT("Attach FCB to File: Size %08x%08x\n",
Fcb->RFCB.ValidDataLength.HighPart,
Fcb->RFCB.ValidDataLength.LowPart);
CcInitializeCacheMap(FileObject, CcInitializeCacheMap(FileObject,
(PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), &FileSizes,
FALSE, FALSE,
&(CdfsGlobalData->CacheMgrCallbacks), &(CdfsGlobalData->CacheMgrCallbacks),
Fcb); Fcb);
@ -103,9 +112,48 @@ CdfsReadFile(PDEVICE_EXTENSION DeviceExt,
if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0) if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0)
{ {
return STATUS_INVALID_PARAMETER; /* Then we need to do a partial or misaligned read ... */
PVOID PageBuf = ExAllocatePool(NonPagedPool, BLOCKSIZE);
PCHAR ReadInPage = (PCHAR)PageBuf + (ReadOffset & (BLOCKSIZE - 1));
PCHAR TargetRead = (PCHAR)Buffer;
ULONG ActualReadOffset, EndOfExtent, ReadLen;
if (!PageBuf)
{
return STATUS_NO_MEMORY;
} }
ActualReadOffset = ReadOffset & ~(BLOCKSIZE - 1);
EndOfExtent = ReadOffset + Length;
while (ActualReadOffset < EndOfExtent)
{
Status = CdfsReadSectors
(DeviceExt->StorageDevice,
Fcb->Entry.ExtentLocationL + (ActualReadOffset / BLOCKSIZE),
1,
PageBuf,
FALSE);
if (!NT_SUCCESS(Status))
break;
ReadLen = BLOCKSIZE - (ActualReadOffset & (BLOCKSIZE - 1));
if (ReadLen > EndOfExtent - ActualReadOffset)
{
ReadLen = EndOfExtent - ActualReadOffset;
}
RtlCopyMemory(TargetRead, ReadInPage, ReadLen);
ActualReadOffset += ReadLen;
TargetRead += ReadLen;
}
ExFreePool(PageBuf);
}
else
{
if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE))
Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset;
@ -124,6 +172,7 @@ CdfsReadFile(PDEVICE_EXTENSION DeviceExt,
Length + ReadOffset - Fcb->Entry.DataLengthL); Length + ReadOffset - Fcb->Entry.DataLengthL);
} }
} }
}
return Status; return Status;
} }