- if partition cannot be selected, let user create partition themselves

- autopartitioning still needs to be done
See issue #2593 for more details.

svn path=/trunk/; revision=28576
This commit is contained in:
Johannes Anderwald 2007-08-26 18:19:23 +00:00
parent aad59dfc19
commit 6085c5e625
3 changed files with 11 additions and 10 deletions

View file

@ -1387,10 +1387,10 @@ SelectPartitionPage(PINPUT_RECORD Ir)
if (IsUnattendedSetup) if (IsUnattendedSetup)
{ {
SelectPartition(PartitionList, if (SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber))
UnattendDestinationDiskNumber, {
UnattendDestinationPartitionNumber); return(SELECT_FILE_SYSTEM_PAGE);
return(SELECT_FILE_SYSTEM_PAGE); }
} }
while(TRUE) while(TRUE)

View file

@ -1543,7 +1543,7 @@ DrawPartitionList (PPARTLIST List)
} }
VOID DWORD
SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber) SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber)
{ {
PDISKENTRY DiskEntry; PDISKENTRY DiskEntry;
@ -1554,7 +1554,7 @@ SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber)
/* Check for empty disks */ /* Check for empty disks */
if (IsListEmpty (&List->DiskListHead)) if (IsListEmpty (&List->DiskListHead))
return; return FALSE;
/* Check for first usable entry on next disk */ /* Check for first usable entry on next disk */
Entry1 = List->CurrentDisk->ListEntry.Flink; Entry1 = List->CurrentDisk->ListEntry.Flink;
@ -1575,16 +1575,17 @@ SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber)
{ {
List->CurrentDisk = DiskEntry; List->CurrentDisk = DiskEntry;
List->CurrentPartition = PartEntry; List->CurrentPartition = PartEntry;
DrawPartitionList (List); DrawPartitionList (List);
return; return TRUE;
} }
} }
Entry2 = Entry2->Flink; Entry2 = Entry2->Flink;
} }
return; return FALSE;
} }
Entry1 = Entry1->Flink; Entry1 = Entry1->Flink;
} }
return FALSE;
} }

View file

@ -188,7 +188,7 @@ DestroyPartitionList (PPARTLIST List);
VOID VOID
DrawPartitionList (PPARTLIST List); DrawPartitionList (PPARTLIST List);
VOID DWORD
SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber); SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber);
BOOL BOOL