[ros-diffs] [hbelusca] 70449: [VFATLIB] Now, the fix: the FAT disk checker expected that the free cluster count member of the FAT32 FSInfo sector be really initialized (not to 0xFFFFFFFF), and it expected the ...

Author: hbelusca
Date: Sun Dec 27 20:01:24 2015
New Revision: 70449

URL: http://svn.reactos.org/svn/reactos?rev=70449&view=rev
Log:
[VFATLIB]
Now, the fix: the FAT disk checker expected that the free cluster count member of the
FAT32 FSInfo sector be really initialized (not to 0xFFFFFFFF), and it expected the
presence of the backup of the FSInfo sector as well as the free sector following the
FSInfo sector.

Modified:
    trunk/reactos/lib/fslib/vfatlib/fat32.c

Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?…
==============================================================================
--- trunk/reactos/lib/fslib/vfatlib/fat32.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/fslib/vfatlib/fat32.c	[iso-8859-1] Sun Dec 27 20:01:24 2015
@@ -103,6 +103,7 @@
     NTSTATUS Status;
     PFAT32_FSINFO FsInfo;
     LARGE_INTEGER FileOffset;
+    ULONGLONG FirstDataSector;
 
     /* Allocate buffer for new sector */
     FsInfo = (PFAT32_FSINFO)RtlAllocateHeap(RtlGetProcessHeap(),
@@ -111,16 +112,19 @@
     if (FsInfo == NULL)
         return STATUS_INSUFFICIENT_RESOURCES;
 
-    /* Zero the new sector */
+    /* Zero the first FsInfo sector */
     RtlZeroMemory(FsInfo, BootSector->BytesPerSector);
+
+    FirstDataSector = BootSector->ReservedSectors +
+        (BootSector->FATCount * BootSector->FATSectors32) + 0 /* RootDirSectors
*/;
 
     FsInfo->LeadSig   = FSINFO_SECTOR_BEGIN_SIGNATURE;
     FsInfo->StrucSig  = FSINFO_SIGNATURE;
-    FsInfo->FreeCount = 0xffffffff;
+    FsInfo->FreeCount = (BootSector->SectorsHuge - FirstDataSector) /
BootSector->SectorsPerCluster - 1;
     FsInfo->NextFree  = 0xffffffff;
     FsInfo->TrailSig  = FSINFO_SECTOR_END_SIGNATURE;
 
-    /* Write sector */
+    /* Write the first FsInfo sector */
     FileOffset.QuadPart = BootSector->FSInfoSector * BootSector->BytesPerSector;
     Status = NtWriteFile(FileHandle,
                          NULL,
@@ -138,6 +142,76 @@
     }
 
     UpdateProgress(Context, 1);
+
+    /* Write backup of the first FsInfo sector */
+    if (BootSector->BootBackup != 0x0000)
+    {
+        /* Reset the free cluster count for the backup */
+        FsInfo->FreeCount = 0xffffffff;
+
+        FileOffset.QuadPart = (ULONGLONG)(((ULONG)BootSector->BootBackup +
(ULONG)BootSector->FSInfoSector) * BootSector->BytesPerSector);
+        Status = NtWriteFile(FileHandle,
+                             NULL,
+                             NULL,
+                             NULL,
+                             &IoStatusBlock,
+                             FsInfo,
+                             BootSector->BytesPerSector,
+                             &FileOffset,
+                             NULL);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT("NtWriteFile() failed (Status %lx)\n", Status);
+            goto done;
+        }
+
+        UpdateProgress(Context, 1);
+    }
+
+    /* Zero the second FsInfo sector */
+    RtlZeroMemory(FsInfo, BootSector->BytesPerSector);
+    FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE;
+
+    /* Write the second FsInfo sector */
+    FileOffset.QuadPart = (BootSector->FSInfoSector + 1) *
BootSector->BytesPerSector;
+    Status = NtWriteFile(FileHandle,
+                         NULL,
+                         NULL,
+                         NULL,
+                         &IoStatusBlock,
+                         FsInfo,
+                         BootSector->BytesPerSector,
+                         &FileOffset,
+                         NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT("NtWriteFile() failed (Status %lx)\n", Status);
+        goto done;
+    }
+
+    UpdateProgress(Context, 1);
+
+    /* Write backup of the second FsInfo sector */
+    if (BootSector->BootBackup != 0x0000)
+    {
+        FileOffset.QuadPart = (ULONGLONG)(((ULONG)BootSector->BootBackup +
(ULONG)BootSector->FSInfoSector + 1) * BootSector->BytesPerSector);
+        Status = NtWriteFile(FileHandle,
+                             NULL,
+                             NULL,
+                             NULL,
+                             &IoStatusBlock,
+                             FsInfo,
+                             BootSector->BytesPerSector,
+                             &FileOffset,
+                             NULL);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT("NtWriteFile() failed (Status %lx)\n", Status);
+            goto done;
+        }
+
+        UpdateProgress(Context, 1);
+    }
 
 done:
     /* Free the buffer */