[fireball] 28365: - Merge 28364.

Author: fireball
Date: Thu Aug 16 00:08:25 2007
New Revision: 28365

URL: http://svn.reactos.org/svn/reactos?rev=28365&view=rev
Log:
- Merge 28364.

Modified:
    branches/winldr/fs/ntfs.c

Modified: branches/winldr/fs/ntfs.c
URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/ntfs.c?rev=28365&r...
==============================================================================
--- branches/winldr/fs/ntfs.c (original)
+++ branches/winldr/fs/ntfs.c Thu Aug 16 00:08:25 2007
@@ -184,7 +184,7 @@
     ULONGLONG CurrentOffset;
     ULONGLONG ReadLength;
     ULONGLONG AlreadyRead;
-
+ 
     DbgPrint((DPRINT_FILESYSTEM, "NtfsReadAttribute() - Context: %p Offset: %I64d Length %I64d\n",
         Context, Offset, Length));

@@ -197,16 +197,18 @@
         RtlCopyMemory(Buffer, (PCHAR)&Context->Record + Context->Record.Resident.ValueOffset + Offset, Length);
         return Length;
     }
-
+ 
     /*
      * Non-resident attribute
      */
-
+ 
     /*
      * 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;
         LastLCN = Context->CacheRunLastLCN;
@@ -219,7 +221,7 @@
         LastLCN = 0;
         DataRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset;
         CurrentOffset = 0;
-
+ 
         while (1)
         {
             DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength);
@@ -234,70 +236,97 @@
                 /* Sparse data run. */
                 DataRunStartLCN = -1;
             }
-
+ 
             if (Offset >= CurrentOffset &&
                 Offset < CurrentOffset + (DataRunLength * NtfsClusterSize))
             {
                 break;
             }
-
+ 
             if (*DataRun == 0)
             {
-                return 0;
-            }
-
+                return AlreadyRead;
+            }
+ 
             CurrentOffset += DataRunLength * NtfsClusterSize;
         }
     }
-
+ 
     /*
      * II. Go through the run list and read the data
      */
-
-    AlreadyRead = 0;
-    while (Length > 0)
-    {
-        ReadLength = min(DataRunLength * NtfsClusterSize, Length);
-        if (DataRunStartLCN == -1)
-            RtlZeroMemory(Buffer, ReadLength);
-	else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize + Offset - CurrentOffset, ReadLength, Buffer))
-	    break;
-	Length -= ReadLength;
-	Buffer += ReadLength;
-	AlreadyRead += ReadLength;
-
-	/* We finished this request, but there still data in this data run. */
-	if (Length == 0 && ReadLength != DataRunLength * NtfsClusterSize)
-	    break;
-
-	/*
-	 * Go to next run in the list.
-         */
-
-	if (*DataRun == 0)
-	    break;
-        DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength);
-        if (DataRunOffset != -1)
-        {
-            /* Normal data run. */
-            DataRunStartLCN = LastLCN + DataRunOffset;
-            LastLCN = DataRunStartLCN;
-        }
-        else
-        {
-            /* Sparse data run. */
-            DataRunStartLCN = -1;
-        }
-        CurrentOffset += DataRunLength * NtfsClusterSize;
-    }
-
+ 
+    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)
+        {
+            ReadLength = min(DataRunLength * NtfsClusterSize, Length);
+            if (DataRunStartLCN == -1)
+                RtlZeroMemory(Buffer, ReadLength);
+            else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize, ReadLength, Buffer))
+                break;
+ 
+            Length -= ReadLength;
+            Buffer += ReadLength;
+            AlreadyRead += ReadLength;
+ 
+            /* We finished this request, but there still data in this data run. */
+            if (Length == 0 && ReadLength != DataRunLength * NtfsClusterSize)
+                break;
+ 
+            /*
+             * Go to next run in the list.
+             */
+ 
+            if (*DataRun == 0)
+                break;
+            CurrentOffset += DataRunLength * NtfsClusterSize;
+            DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength);
+            if (DataRunOffset != -1)
+            {
+                /* Normal data run. */
+                DataRunStartLCN = LastLCN + DataRunOffset;
+                LastLCN = DataRunStartLCN;
+            }
+            else
+            {
+                /* Sparse data run. */
+                DataRunStartLCN = -1;
+            }
+        } /* while */
+ 
+    } /* if Disk */
+ 
     Context->CacheRun = DataRun;
     Context->CacheRunOffset = Offset + AlreadyRead;
     Context->CacheRunStartLCN = DataRunStartLCN;
     Context->CacheRunLength = DataRunLength;
     Context->CacheRunLastLCN = LastLCN;
     Context->CacheRunCurrentOffset = CurrentOffset;
-
+ 
     return AlreadyRead;
 }