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

Feng Yuning <fengyuning1984@gmail.com>:

Browse source 
- Fix ntfs reading problem (occurs when trying to load Windows from an NTFS partition, reading always failed).

svn path=/trunk/; revision=28364
This commit is contained in:
Aleksey Bragin 2007-08-15 20:04:50 +00:00
parent 85c976b666
commit 0364357251
1 changed files with 75 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

41
reactos/boot/freeldr/freeldr/fs/ntfs.c
View file

@ -195,7 +195,9 @@ static ULONGLONG NtfsReadAttribute(PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset,
* I. Find the corresponding start data run. * I. Find the corresponding start data run.
*/ */
if (Context->CacheRunOffset == Offset) AlreadyRead = 0;
if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * NtfsClusterSize)
{ {
DataRun = Context->CacheRun; DataRun = Context->CacheRun;
LastLCN = Context->CacheRunLastLCN; LastLCN = Context->CacheRunLastLCN;
@ -232,7 +234,7 @@ static ULONGLONG NtfsReadAttribute(PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset,
if (*DataRun == 0) if (*DataRun == 0)
{ {
return 0; return AlreadyRead;
} }
CurrentOffset += DataRunLength * NtfsClusterSize; CurrentOffset += DataRunLength * NtfsClusterSize;
@ -243,14 +245,39 @@ static ULONGLONG NtfsReadAttribute(PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset,
* II. Go through the run list and read the data * II. Go through the run list and read the data
*/ */
AlreadyRead = 0; ReadLength = min(DataRunLength * NtfsClusterSize - (Offset - CurrentOffset), Length);
if (DataRunStartLCN == -1)
RtlZeroMemory(Buffer, ReadLength);
if (NtfsDiskRead(DataRunStartLCN * NtfsClusterSize + Offset - CurrentOffset, ReadLength, Buffer))
{
Length -= ReadLength;
Buffer += ReadLength;
AlreadyRead += ReadLength;
if (ReadLength == DataRunLength * NtfsClusterSize - (Offset - CurrentOffset))
{
CurrentOffset += DataRunLength * NtfsClusterSize;
DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength);
if (DataRunLength != -1)
{
DataRunStartLCN = LastLCN + DataRunOffset;
LastLCN = DataRunStartLCN;
}
else
DataRunStartLCN = -1;
if (*DataRun == 0)
return AlreadyRead;
}
while (Length > 0) while (Length > 0)
{ {
ReadLength = min(DataRunLength * NtfsClusterSize, Length); ReadLength = min(DataRunLength * NtfsClusterSize, Length);
if (DataRunStartLCN == -1) if (DataRunStartLCN == -1)
RtlZeroMemory(Buffer, ReadLength); RtlZeroMemory(Buffer, ReadLength);
else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize, ReadLength, Buffer))
break; break;
Length -= ReadLength; Length -= ReadLength;
Buffer += ReadLength; Buffer += ReadLength;
AlreadyRead += ReadLength; AlreadyRead += ReadLength;
@ -265,6 +292,7 @@ static ULONGLONG NtfsReadAttribute(PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset,
if (*DataRun == 0) if (*DataRun == 0)
break; break;
CurrentOffset += DataRunLength * NtfsClusterSize;
DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength);
if (DataRunOffset != -1) if (DataRunOffset != -1)
{ {
@ -277,8 +305,9 @@ static ULONGLONG NtfsReadAttribute(PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset,
/* Sparse data run. */ /* Sparse data run. */
DataRunStartLCN = -1; DataRunStartLCN = -1;
} }
CurrentOffset += DataRunLength * NtfsClusterSize; } /* while */
}
} /* if Disk */
Context->CacheRun = DataRun; Context->CacheRun = DataRun;
Context->CacheRunOffset = Offset + AlreadyRead; Context->CacheRunOffset = Offset + AlreadyRead;