Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VFATLIB]

Browse source 
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.

svn path=/trunk/; revision=70449
This commit is contained in:
Hermès Bélusca-Maïto 2015-12-27 20:01:24 +00:00
parent 8fa0b21364
commit 93d7931412
1 changed files with 77 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
reactos/lib/fslib/vfatlib/fat32.c
View file

@ -103,6 +103,7 @@ Fat32WriteFsInfo(IN HANDLE FileHandle,
NTSTATUS Status;
PFAT32_FSINFO FsInfo;
LARGE_INTEGER FileOffset;
ULONGLONG FirstDataSector;
/* Allocate buffer for new sector */
FsInfo = (PFAT32_FSINFO)RtlAllocateHeap(RtlGetProcessHeap(),
@ -111,16 +112,19 @@ Fat32WriteFsInfo(IN HANDLE FileHandle,
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,
@ -139,6 +143,76 @@ Fat32WriteFsInfo(IN HANDLE FileHandle,
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 */
RtlFreeHeap(RtlGetProcessHeap(), 0, FsInfo);