Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]

Browse source 
- Merge r55212 and 55215
- Add a temporary hack to allow testing installation on a device not bootable by the BIOS (like USB drives in VirtualBox)
- USB devices now show up as installation targets during setup but attempting to install onto them results in setup hanging due to bugs in the USB code

svn path=/branches/usb-bringup-trunk/; revision=55217
This commit is contained in:
Cameron Gutman 2012-01-26 18:49:50 +00:00
parent d2da1fb8a7
commit a565eb2d37
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
base/setup/usetup/partlist.c
View file

@ -88,12 +88,12 @@ AssignDriverLetters (PPARTLIST List)
PARTENTRY, PARTENTRY,
ListEntry); ListEntry);
for (i=0; i<3; i++) for (i=0; i<4; i++)
PartEntry->DriveLetter[i] = 0; PartEntry->DriveLetter[i] = 0;
if (PartEntry->Unpartitioned == FALSE) if (PartEntry->Unpartitioned == FALSE)
{ {
for (i=0; i<3; i++) for (i=0; i<4; i++)
{ {
if (IsContainerPartition (PartEntry->PartInfo[i].PartitionType)) if (IsContainerPartition (PartEntry->PartInfo[i].PartitionType))
continue; continue;
@ -374,7 +374,8 @@ ScanForUnpartitionedDiskSpace (PDISKENTRY DiskEntry)
PartEntry->PartInfo[j].StartingOffset.QuadPart - PartEntry->PartInfo[j].StartingOffset.QuadPart -
(LastStartingOffset + LastPartitionLength); (LastStartingOffset + LastPartitionLength);
if (LastUnusedPartitionLength >= DiskEntry->CylinderSize) if (PartEntry->PartInfo[j].StartingOffset.QuadPart > (LastStartingOffset + LastPartitionLength) &&
LastUnusedPartitionLength >= DiskEntry->CylinderSize)
{ {
DPRINT ("Unpartitioned disk space %I64u\n", LastUnusedPartitionLength); DPRINT ("Unpartitioned disk space %I64u\n", LastUnusedPartitionLength);
@ -718,7 +719,8 @@ AddDiskToList (HANDLE FileHandle,
return; return;
} }
if (DiskGeometry.MediaType != FixedMedia) if (DiskGeometry.MediaType != FixedMedia &&
DiskGeometry.MediaType != RemovableMedia)
{ {
return; return;
} }
@ -836,8 +838,12 @@ AddDiskToList (HANDLE FileHandle,
if (!DiskEntry->BiosFound) if (!DiskEntry->BiosFound)
{ {
#if 0
RtlFreeHeap(ProcessHeap, 0, DiskEntry); RtlFreeHeap(ProcessHeap, 0, DiskEntry);
return; return;
#else
DPRINT1("WARNING: Setup could not find a matching BIOS disk entry. Disk %d is not be bootable by the BIOS!\n", DiskNumber);
#endif
} }
InitializeListHead (&DiskEntry->PartListHead); InitializeListHead (&DiskEntry->PartListHead);