ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP]

Browse Source 
Fix broken filesystem detection.
- Treat FAT32 filesystems like FAT filesystems because we do not provide a FAT32 entry in the filesystemlist.
- HACK: Do not try to check an unidentified filesystem.

CORE-9815 #resolve

svn path=/trunk/; revision=68156
This commit is contained in:
Eric Kohl
2015-06-15 20:47:30 +00:00
parent aa4376498d
commit e8fdb27bd1
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/setup/usetup/interface/usetup.c
+14 -8
View File
@@ -2938,20 +2938,17 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
CurrentFileSystem = PartEntry->FileSystem;
if (CurrentFileSystem->FileSystemName == NULL)
if (CurrentFileSystem == NULL || CurrentFileSystem->FileSystemName == NULL)
{
if ((PartEntry->PartitionType == PARTITION_FAT_12) ||
(PartEntry->PartitionType == PARTITION_FAT_16) ||
(PartEntry->PartitionType == PARTITION_HUGE) ||
(PartEntry->PartitionType == PARTITION_XINT13))
(PartEntry->PartitionType == PARTITION_XINT13) ||
(PartEntry->PartitionType == PARTITION_FAT32) ||
(PartEntry->PartitionType == PARTITION_FAT32_XINT13))
{
FileSystemName = L"FAT";
}
else if ((PartEntry->PartitionType == PARTITION_FAT32) ||
(PartEntry->PartitionType == PARTITION_FAT32_XINT13))
{
FileSystemName = L"FAT32";
}
else if (PartEntry->PartitionType == PARTITION_EXT2)
{
FileSystemName = L"EXT2";
@@ -2961,12 +2958,21 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */
}
DPRINT("FileSystemName: %S\n", FileSystemName);
if (FileSystemName != NULL)
CurrentFileSystem = GetFileSystemByName(FileSystemList,
FileSystemName);
}
if (CurrentFileSystem == NULL || CurrentFileSystem->ChkdskFunc == NULL)
/* HACK: Do not try to check a partition with an unknown filesytem */
if (CurrentFileSystem == NULL)
{
PartEntry->NeedsCheck = FALSE;
return CHECK_FILE_SYSTEM_PAGE;
}
if (CurrentFileSystem->ChkdskFunc == NULL)
{
sprintf(Buffer,
"Setup is currently unable to check a partition formatted in %S.\n"