Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-15 05:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP]

Browse source 
- Set the type of the install partition even if it was not created by usetup.
This fixes bug #4368.

svn path=/trunk/; revision=47751
This commit is contained in:
Eric Kohl 2010-06-11 04:13:29 +00:00
parent 09d662004d
commit 9291284ade
1 changed files with 38 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
reactos/base/setup/usetup/interface/usetup.c
View file

@ -2310,56 +2310,53 @@ FormatPartitionPage (PINPUT_RECORD Ir)
{ {
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
if (PartEntry->PartInfo[PartNum].PartitionType == PARTITION_ENTRY_UNUSED) if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0)
{ {
if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (4200LL * 1024LL))
{ {
if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (4200LL * 1024LL)) /* FAT12 CHS partition (disk is smaller than 4.1MB) */
{ PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT_12;
/* FAT12 CHS partition (disk is smaller than 4.1MB) */ }
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT_12; else if (PartEntry->PartInfo[PartNum].StartingOffset.QuadPart < (1024LL * 255LL * 63LL * 512LL))
} {
else if (PartEntry->PartInfo[PartNum].StartingOffset.QuadPart < (1024LL * 255LL * 63LL * 512LL)) /* Partition starts below the 8.4GB boundary ==> CHS partition */
{
/* Partition starts below the 8.4GB boundary ==> CHS partition */
if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (32LL * 1024LL * 1024LL)) if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (32LL * 1024LL * 1024LL))
{ {
/* FAT16 CHS partition (partiton size < 32MB) */ /* FAT16 CHS partition (partiton size < 32MB) */
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT_16; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT_16;
} }
else if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (512LL * 1024LL * 1024LL)) else if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (512LL * 1024LL * 1024LL))
{ {
/* FAT16 CHS partition (partition size < 512MB) */ /* FAT16 CHS partition (partition size < 512MB) */
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_HUGE; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_HUGE;
}
else
{
/* FAT32 CHS partition (partition size >= 512MB) */
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT32;
}
} }
else else
{ {
/* Partition starts above the 8.4GB boundary ==> LBA partition */ /* FAT32 CHS partition (partition size >= 512MB) */
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT32;
if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (512LL * 1024LL * 1024LL)) }
{ }
/* FAT16 LBA partition (partition size < 512MB) */ else
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_XINT13; {
} /* Partition starts above the 8.4GB boundary ==> LBA partition */
else
{ if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (512LL * 1024LL * 1024LL))
/* FAT32 LBA partition (partition size >= 512MB) */ {
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT32_XINT13; /* FAT16 LBA partition (partition size < 512MB) */
} PartEntry->PartInfo[PartNum].PartitionType = PARTITION_XINT13;
}
else
{
/* FAT32 LBA partition (partition size >= 512MB) */
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT32_XINT13;
} }
} }
else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0)
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_EXT2;
else if (!FileSystemList->Selected->FormatFunc)
return QUIT_PAGE;
} }
else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0)
PartEntry->PartInfo[PartNum].PartitionType = PARTITION_EXT2;
else if (!FileSystemList->Selected->FormatFunc)
return QUIT_PAGE;
CheckActiveBootPartition (PartitionList); CheckActiveBootPartition (PartitionList);