- Allow removable media to be selected as an installation target
- Fix broken unpartitioned space calculation if the first partition starts below the disk's track size (such as a 1MB aligned partition)

svn path=/trunk/; revision=55215
This commit is contained in:
Cameron Gutman 2012-01-26 18:27:21 +00:00
parent f7df1564c3
commit b896ffbf17

View file

@ -374,7 +374,8 @@ ScanForUnpartitionedDiskSpace (PDISKENTRY DiskEntry)
PartEntry->PartInfo[j].StartingOffset.QuadPart -
(LastStartingOffset + LastPartitionLength);
if (LastUnusedPartitionLength >= DiskEntry->CylinderSize)
if (PartEntry->PartInfo[j].StartingOffset.QuadPart > (LastStartingOffset + LastPartitionLength) &&
LastUnusedPartitionLength >= DiskEntry->CylinderSize)
{
DPRINT ("Unpartitioned disk space %I64u\n", LastUnusedPartitionLength);
@ -718,7 +719,8 @@ AddDiskToList (HANDLE FileHandle,
return;
}
if (DiskGeometry.MediaType != FixedMedia)
if (DiskGeometry.MediaType != FixedMedia &&
DiskGeometry.MediaType != RemovableMedia)
{
return;
}