Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 06/09: [USBPORT] Correctly find interface descriptor in USBPORT_ParseConfigurationDescriptor
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36c1cb09106eab6cebab2… commit 36c1cb09106eab6cebab2e6722c1907ca12bfa19 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 09:22:55 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:53 2019 +0100 [USBPORT] Correctly find interface descriptor in USBPORT_ParseConfigurationDescriptor There can be other descriptors between the config descriptor and the first interface descriptor, so we specifically need to check for the interface descriptor type and skip anything before that. We also need to guard against bLength == 0, which would cause an infinite loop, instead of doing a second bDescriptorType check. --- drivers/usb/usbport/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index b28d9ef015..5662a6141a 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -201,7 +201,7 @@ USBPORT_ParseConfigurationDescriptor(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc *OutAlternate = 0; for (TmpDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)((ULONG_PTR)ConfigDescriptor + ConfigDescriptor->bLength); - TmpDescriptor->bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE && TmpDescriptor->bDescriptorType > 0; + TmpDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE && TmpDescriptor->bLength > 0; TmpDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)((ULONG_PTR)TmpDescriptor + TmpDescriptor->bLength)) ;

1 0

[reactos] 05/09: [USBPORT] Acquire EndpointSpinLock in addition to MiniportSpinLock in USBPORT_ReopenPipe.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1946f6bb251aba0e10943… commit 1946f6bb251aba0e10943989e23cf2d151977d3f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 09:23:26 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:52 2019 +0100 [USBPORT] Acquire EndpointSpinLock in addition to MiniportSpinLock in USBPORT_ReopenPipe. --- drivers/usb/usbport/endpoint.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index c1624ec297..40efddf165 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -1186,13 +1186,15 @@ USBPORT_ReopenPipe(IN PDEVICE_OBJECT FdoDevice, USBPORT_Wait(FdoDevice, 1); } - KeAcquireSpinLock(&FdoExtension->MiniportSpinLock, &MiniportOldIrql); + KeAcquireSpinLock(&Endpoint->EndpointSpinLock, &Endpoint->EndpointOldIrql); + KeAcquireSpinLockAtDpcLevel(&FdoExtension->MiniportSpinLock); Packet->SetEndpointState(FdoExtension->MiniPortExt, Endpoint + 1, USBPORT_ENDPOINT_REMOVE); - KeReleaseSpinLock(&FdoExtension->MiniportSpinLock, MiniportOldIrql); + KeReleaseSpinLockFromDpcLevel(&FdoExtension->MiniportSpinLock); + KeReleaseSpinLock(&Endpoint->EndpointSpinLock, Endpoint->EndpointOldIrql); USBPORT_Wait(FdoDevice, 2);

1 0

[reactos] 04/09: [USBPORT] Release StateChangeSpinLock before acquiring MiniportSpinLock.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e47240fb371b65ff76d3e… commit e47240fb371b65ff76d3e1176110d288da8bf944 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 5 22:27:15 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:50 2019 +0100 [USBPORT] Release StateChangeSpinLock before acquiring MiniportSpinLock. Found by Driver Verifier. --- drivers/usb/usbport/endpoint.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index 385206a0c8..c1624ec297 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -1252,6 +1252,7 @@ USBPORT_ReopenPipe(IN PDEVICE_OBJECT FdoDevice, if (Endpoint->StateLast == USBPORT_ENDPOINT_ACTIVE) { + KeReleaseSpinLockFromDpcLevel(&Endpoint->StateChangeSpinLock); KeAcquireSpinLockAtDpcLevel(&FdoExtension->MiniportSpinLock); Packet->SetEndpointState(FdoExtension->MiniPortExt, @@ -1260,8 +1261,11 @@ USBPORT_ReopenPipe(IN PDEVICE_OBJECT FdoDevice, KeReleaseSpinLockFromDpcLevel(&FdoExtension->MiniportSpinLock); } + else + { + KeReleaseSpinLockFromDpcLevel(&Endpoint->StateChangeSpinLock); + } - KeReleaseSpinLockFromDpcLevel(&Endpoint->StateChangeSpinLock); KeReleaseSpinLock(&Endpoint->EndpointSpinLock, Endpoint->EndpointOldIrql); }

1 0

[reactos] 03/09: [USBPORT] Leave IRP status untouched for unhandled interfaces.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=267f5633ee5530df52aac… commit 267f5633ee5530df52aac0569789796545acdd0c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 5 22:23:46 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:49 2019 +0100 [USBPORT] Leave IRP status untouched for unhandled interfaces. Found by Driver Verifier. --- drivers/usb/usbport/iface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/usbport/iface.c b/drivers/usb/usbport/iface.c index 7897528da6..1061915797 100644 --- a/drivers/usb/usbport/iface.c +++ b/drivers/usb/usbport/iface.c @@ -804,7 +804,7 @@ USBPORT_PdoQueryInterface(IN PDEVICE_OBJECT FdoDevice, DPRINT1("USB_BUS_INTERFACE_HUB_GUID version %x not supported!\n", IoStack->Parameters.QueryInterface.Version); - return STATUS_NOT_SUPPORTED; // Version not supported + return Irp->IoStatus.Status; // Version not supported } /* Interface version 0 */ @@ -864,7 +864,7 @@ USBPORT_PdoQueryInterface(IN PDEVICE_OBJECT FdoDevice, DPRINT1("USB_BUS_INTERFACE_USBDI_GUID version %x not supported!\n", IoStack->Parameters.QueryInterface.Version); - return STATUS_NOT_SUPPORTED; // Version not supported + return Irp->IoStatus.Status; // Version not supported } /* Interface version 0 */ @@ -904,5 +904,5 @@ USBPORT_PdoQueryInterface(IN PDEVICE_OBJECT FdoDevice, } } - return STATUS_NOT_SUPPORTED; + return Irp->IoStatus.Status; }

1 0

[reactos] 02/09: [USBPORT] Don't change the status of IRP_MJ_SYSTEM_CONTROL requests.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12a66769fc3702fd3e4cd… commit 12a66769fc3702fd3e4cd75c55614ffe4bad5361 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 5 17:28:20 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:47 2019 +0100 [USBPORT] Don't change the status of IRP_MJ_SYSTEM_CONTROL requests. Found by Driver Verifier. --- drivers/usb/usbport/usbport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbport/usbport.c b/drivers/usb/usbport/usbport.c index f37adb85b0..226bc6815a 100644 --- a/drivers/usb/usbport/usbport.c +++ b/drivers/usb/usbport/usbport.c @@ -2711,7 +2711,7 @@ USBPORT_Dispatch(IN PDEVICE_OBJECT DeviceObject, IoStack->MajorFunction, IoStack->MinorFunction); - Irp->IoStatus.Status = Status; + Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); } else

1 0

[reactos] 01/09: [USBHUB_NEW] Don't leak IRP_MJ_SYSTEM_CONTROL requests.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e10e6a85fbb779e50d967… commit e10e6a85fbb779e50d967ce584dfa41fec3b5674 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 09:21:39 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:45 2019 +0100 [USBHUB_NEW] Don't leak IRP_MJ_SYSTEM_CONTROL requests. Found by Driver Verifier. --- drivers/usb/usbhub_new/usbhub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/usbhub_new/usbhub.c b/drivers/usb/usbhub_new/usbhub.c index aa3029edbe..b14529d201 100644 --- a/drivers/usb/usbhub_new/usbhub.c +++ b/drivers/usb/usbhub_new/usbhub.c @@ -4795,7 +4795,9 @@ USBH_PdoDispatch(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, case IRP_MJ_SYSTEM_CONTROL: DPRINT1("USBH_PdoDispatch: USBH_SystemControl() UNIMPLEMENTED. FIXME\n"); - Status = STATUS_NOT_SUPPORTED;//USBH_PortSystemControl(PortExtension, Irp); + //USBH_PortSystemControl(PortExtension, Irp); + Status = Irp->IoStatus.Status; + USBH_CompleteIrp(Irp, Status); break; default:

1 0

[reactos] 01/01: [NTOS:IO] Enable privilege check in NtLoadDriver.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=938f0e469d197ad12ba27… commit 938f0e469d197ad12ba2714971e02dc26120202e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 5 12:33:12 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:30:14 2019 +0100 [NTOS:IO] Enable privilege check in NtLoadDriver. --- ntoskrnl/io/iomgr/driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index c9fa6116c4..9bbbb2cda7 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -2092,15 +2092,11 @@ NtLoadDriver(IN PUNICODE_STRING DriverServiceName) /* * Check security privileges */ - - /* FIXME: Uncomment when privileges will be correctly implemented. */ -#if 0 if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, PreviousMode)) { DPRINT("Privilege not held\n"); return STATUS_PRIVILEGE_NOT_HELD; } -#endif Status = ProbeAndCaptureUnicodeString(&CapturedDriverServiceName, PreviousMode,

1 0

[reactos] 03/03: [USETUP] Use for-loops; simplify the code.
by Hermès Bélusca-Maïto 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d51b568825de869e4fc1… commit 1d51b568825de869e4fc15503a95231f9d66bef5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 5 02:00:13 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 11 00:05:37 2019 +0100 [USETUP] Use for-loops; simplify the code. --- base/setup/usetup/partlist.c | 68 +++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index db3de29a85..c35ffed1a4 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -394,8 +394,9 @@ PrintDiskData( PrintEmptyLine(ListUi); /* Print partition lines */ - PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink; - while (PrimaryEntry != &DiskEntry->PrimaryPartListHead) + for (PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink; + PrimaryEntry != &DiskEntry->PrimaryPartListHead; + PrimaryEntry = PrimaryEntry->Flink) { PrimaryPartEntry = CONTAINING_RECORD(PrimaryEntry, PARTENTRY, ListEntry); @@ -405,20 +406,17 @@ PrintDiskData( if (IsContainerPartition(PrimaryPartEntry->PartitionType)) { - LogicalEntry = DiskEntry->LogicalPartListHead.Flink; - while (LogicalEntry != &DiskEntry->LogicalPartListHead) + for (LogicalEntry = DiskEntry->LogicalPartListHead.Flink; + LogicalEntry != &DiskEntry->LogicalPartListHead; + LogicalEntry = LogicalEntry->Flink) { LogicalPartEntry = CONTAINING_RECORD(LogicalEntry, PARTENTRY, ListEntry); PrintPartitionData(ListUi, DiskEntry, LogicalPartEntry); - - LogicalEntry = LogicalEntry->Flink; } } - - PrimaryEntry = PrimaryEntry->Flink; } /* Print separator line */ @@ -435,6 +433,8 @@ DrawPartitionList( PPARTENTRY PartEntry = NULL; COORD coPos; ULONG Written; + USHORT Width; + USHORT Height; SHORT i; SHORT CurrentDiskLine; SHORT CurrentPartLine; @@ -442,13 +442,17 @@ DrawPartitionList( BOOLEAN CurrentPartLineFound = FALSE; BOOLEAN CurrentDiskLineFound = FALSE; + Width = ListUi->Right - ListUi->Left - 1; + Height = ListUi->Bottom - ListUi->Top - 2; + /* Calculate the line of the current disk and partition */ CurrentDiskLine = 0; CurrentPartLine = 0; LastLine = 0; - Entry = List->DiskListHead.Flink; - while (Entry != &List->DiskListHead) + for (Entry = List->DiskListHead.Flink; + Entry != &List->DiskListHead; + Entry = Entry->Flink) { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); @@ -458,8 +462,9 @@ DrawPartitionList( CurrentPartLine += 2; } - Entry2 = DiskEntry->PrimaryPartListHead.Flink; - while (Entry2 != &DiskEntry->PrimaryPartListHead) + for (Entry2 = DiskEntry->PrimaryPartListHead.Flink; + Entry2 != &DiskEntry->PrimaryPartListHead; + Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); if (PartEntry == ListUi->CurrentPartition) @@ -467,7 +472,6 @@ DrawPartitionList( CurrentPartLineFound = TRUE; } - Entry2 = Entry2->Flink; if (CurrentPartLineFound == FALSE) { CurrentPartLine++; @@ -478,8 +482,9 @@ DrawPartitionList( if (CurrentPartLineFound == FALSE) { - Entry2 = DiskEntry->LogicalPartListHead.Flink; - while (Entry2 != &DiskEntry->LogicalPartListHead) + for (Entry2 = DiskEntry->LogicalPartListHead.Flink; + Entry2 != &DiskEntry->LogicalPartListHead; + Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); if (PartEntry == ListUi->CurrentPartition) @@ -487,7 +492,6 @@ DrawPartitionList( CurrentPartLineFound = TRUE; } - Entry2 = Entry2->Flink; if (CurrentPartLineFound == FALSE) { CurrentPartLine++; @@ -502,12 +506,11 @@ DrawPartitionList( CurrentDiskLineFound = TRUE; } - Entry = Entry->Flink; - if (Entry != &List->DiskListHead) + if (Entry->Flink != &List->DiskListHead) { if (CurrentDiskLineFound == FALSE) { - CurrentPartLine ++; + CurrentPartLine++; CurrentDiskLine = CurrentPartLine; } @@ -524,12 +527,12 @@ DrawPartitionList( { ListUi->Offset = CurrentPartLine; } - else if (CurrentPartLine - ListUi->Offset > ListUi->Bottom - ListUi->Top - 2) + else if (CurrentPartLine - ListUi->Offset > Height) { - ListUi->Offset = CurrentPartLine - (ListUi->Bottom - ListUi->Top - 2); + ListUi->Offset = CurrentPartLine - Height; } - if (CurrentDiskLine < ListUi->Offset && CurrentPartLine - CurrentDiskLine < ListUi->Bottom - ListUi->Top - 2) + if (CurrentDiskLine < ListUi->Offset && CurrentPartLine - CurrentDiskLine < Height) { ListUi->Offset = CurrentDiskLine; } @@ -550,7 +553,7 @@ DrawPartitionList( { FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, + Width, coPos, &Written); } @@ -558,7 +561,7 @@ DrawPartitionList( { FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', - ListUi->Right - ListUi->Left - 5, + Width - 4, coPos, &Written); coPos.X = ListUi->Right - 5; @@ -615,11 +618,11 @@ DrawPartitionList( /* Draw lower edge */ coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Bottom; - if (LastLine - ListUi->Offset <= ListUi->Bottom - ListUi->Top - 2) + if (LastLine - ListUi->Offset <= Height) { FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, + Width, coPos, &Written); } @@ -627,7 +630,7 @@ DrawPartitionList( { FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', - ListUi->Right - ListUi->Left - 5, + Width - 4, coPos, &Written); coPos.X = ListUi->Right - 5; @@ -653,18 +656,17 @@ DrawPartitionList( coPos, &Written); - /* print list entries */ - ListUi->Line = - ListUi->Offset; + /* Print list entries */ + ListUi->Line = -ListUi->Offset; - Entry = List->DiskListHead.Flink; - while (Entry != &List->DiskListHead) + for (Entry = List->DiskListHead.Flink; + Entry != &List->DiskListHead; + Entry = Entry->Flink) { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); /* Print disk entry */ PrintDiskData(ListUi, DiskEntry); - - Entry = Entry->Flink; } }

1 0

[reactos] 02/03: [SETUPLIB][USETUP] Remove CurrentDisk/Partition from the partlist lib code, and move these into the UI code.
by Hermès Bélusca-Maïto 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84f3e2df5dc4527e950fd… commit 84f3e2df5dc4527e950fd922155e7599733ca0b1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 5 01:42:33 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 11 00:05:37 2019 +0100 [SETUPLIB][USETUP] Remove CurrentDisk/Partition from the partlist lib code, and move these into the UI code. - Add also some validation ASSERTs and simplify the code here and there. - The installation partition is called "InstallPartition", while the global "CurrentPartition" is the disk region currently selected in the partition UI list, on which prtitioning operations are effectued. - Extend CheckActiveSystemPartition() to use an optional alternative disk or partition in case the actual system partition (present in the first disk) cannot be used, e.g. because we don't support writes on it. --- base/setup/lib/setuplib.c | 4 +- base/setup/lib/setuplib.h | 1 - base/setup/lib/utils/partlist.c | 369 ++++++++++++++++++---------------------- base/setup/lib/utils/partlist.h | 36 ++-- base/setup/reactos/drivepage.c | 3 +- base/setup/usetup/partlist.c | 58 ++++++- base/setup/usetup/partlist.h | 11 ++ base/setup/usetup/usetup.c | 257 +++++++++++++++------------- 8 files changed, 383 insertions(+), 356 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 0501fe72ef..fff627215b 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -624,11 +624,11 @@ NTSTATUS InitDestinationPaths( IN OUT PUSETUP_DATA pSetupData, IN PCWSTR InstallationDir, - IN PDISKENTRY DiskEntry, // FIXME: HACK! IN PPARTENTRY PartEntry) // FIXME: HACK! { - WCHAR PathBuffer[MAX_PATH]; NTSTATUS Status; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + WCHAR PathBuffer[MAX_PATH]; ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 658054fac2..97eac01236 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -159,7 +159,6 @@ NTSTATUS InitDestinationPaths( IN OUT PUSETUP_DATA pSetupData, IN PCWSTR InstallationDir, - IN PDISKENTRY DiskEntry, // FIXME: HACK! IN PPARTENTRY PartEntry); // FIXME: HACK! // NTSTATUS diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 32adeda7c0..90dfe7ca8d 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -1407,6 +1407,8 @@ AddDiskToList( return; } + DiskEntry->PartList = List; + // DiskEntry->Checksum = Checksum; // DiskEntry->Signature = Signature; DiskEntry->BiosFound = FALSE; @@ -1670,9 +1672,6 @@ CreatePartitionList(VOID) if (List == NULL) return NULL; - List->CurrentDisk = NULL; - List->CurrentPartition = NULL; - List->SystemPartition = NULL; List->OriginalSystemPartition = NULL; @@ -1727,30 +1726,6 @@ CreatePartitionList(VOID) AssignDriveLetters(List); - /* Search for first usable disk and partition */ - if (IsListEmpty(&List->DiskListHead)) - { - List->CurrentDisk = NULL; - List->CurrentPartition = NULL; - } - else - { - List->CurrentDisk = CONTAINING_RECORD(List->DiskListHead.Flink, - DISKENTRY, - ListEntry); - - if (IsListEmpty(&List->CurrentDisk->PrimaryPartListHead)) - { - List->CurrentPartition = NULL; - } - else - { - List->CurrentPartition = CONTAINING_RECORD(List->CurrentDisk->PrimaryPartListHead.Flink, - PARTENTRY, - ListEntry); - } - } - return List; } @@ -2006,7 +1981,7 @@ GetDiskOrPartition( // // NOTE: Was introduced broken in r6258 by Casper // -BOOLEAN +PPARTENTRY SelectPartition( IN PPARTLIST List, IN ULONG DiskNumber, @@ -2017,59 +1992,55 @@ SelectPartition( DiskEntry = GetDiskByNumber(List, DiskNumber); if (!DiskEntry) - return FALSE; + return NULL; PartEntry = GetPartition(/*List,*/ DiskEntry, PartitionNumber); if (!PartEntry) - return FALSE; + return NULL; ASSERT(PartEntry->DiskEntry == DiskEntry); ASSERT(DiskEntry->DiskNumber == DiskNumber); ASSERT(PartEntry->PartitionNumber == PartitionNumber); - List->CurrentDisk = DiskEntry; - List->CurrentPartition = PartEntry; - return TRUE; + return PartEntry; } PPARTENTRY GetNextPartition( - IN PPARTLIST List) + IN PPARTLIST List, + IN PPARTENTRY CurrentPart OPTIONAL) { PLIST_ENTRY DiskListEntry; PLIST_ENTRY PartListEntry; - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; + PDISKENTRY CurrentDisk; /* Fail if no disks are available */ if (IsListEmpty(&List->DiskListHead)) return NULL; - /* Check for next usable entry on current disk */ - if (List->CurrentPartition != NULL) + /* Check for the next usable entry on the current partition's disk */ + if (CurrentPart != NULL) { - if (List->CurrentPartition->LogicalPartition) + CurrentDisk = CurrentPart->DiskEntry; + + if (CurrentPart->LogicalPartition) { /* Logical partition */ - PartListEntry = List->CurrentPartition->ListEntry.Flink; - if (PartListEntry != &List->CurrentDisk->LogicalPartListHead) + PartListEntry = CurrentPart->ListEntry.Flink; + if (PartListEntry != &CurrentDisk->LogicalPartListHead) { /* Next logical partition */ - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + return CurrentPart; } else { - PartListEntry = List->CurrentDisk->ExtendedPartition->ListEntry.Flink; - if (PartListEntry != &List->CurrentDisk->PrimaryPartListHead) + PartListEntry = CurrentDisk->ExtendedPartition->ListEntry.Flink; + if (PartListEntry != &CurrentDisk->PrimaryPartListHead) { - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + return CurrentPart; } } } @@ -2077,55 +2048,49 @@ GetNextPartition( { /* Primary or extended partition */ - if (List->CurrentPartition->IsPartitioned && - IsContainerPartition(List->CurrentPartition->PartitionType)) + if (CurrentPart->IsPartitioned && + IsContainerPartition(CurrentPart->PartitionType)) { /* First logical partition */ - PartListEntry = List->CurrentDisk->LogicalPartListHead.Flink; - if (PartListEntry != &List->CurrentDisk->LogicalPartListHead) + PartListEntry = CurrentDisk->LogicalPartListHead.Flink; + if (PartListEntry != &CurrentDisk->LogicalPartListHead) { - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + return CurrentPart; } } else { /* Next primary partition */ - PartListEntry = List->CurrentPartition->ListEntry.Flink; - if (PartListEntry != &List->CurrentDisk->PrimaryPartListHead) + PartListEntry = CurrentPart->ListEntry.Flink; + if (PartListEntry != &CurrentDisk->PrimaryPartListHead) { - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + return CurrentPart; } } } } /* Search for the first partition entry on the next disk */ - for (DiskListEntry = List->CurrentDisk->ListEntry.Flink; + for (DiskListEntry = (CurrentPart ? CurrentDisk->ListEntry.Flink + : List->DiskListHead.Flink); DiskListEntry != &List->DiskListHead; DiskListEntry = DiskListEntry->Flink) { - DiskEntry = CONTAINING_RECORD(DiskListEntry, DISKENTRY, ListEntry); + CurrentDisk = CONTAINING_RECORD(DiskListEntry, DISKENTRY, ListEntry); - if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + if (CurrentDisk->DiskStyle == PARTITION_STYLE_GPT) { DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); continue; } - PartListEntry = DiskEntry->PrimaryPartListHead.Flink; - if (PartListEntry != &DiskEntry->PrimaryPartListHead) + PartListEntry = CurrentDisk->PrimaryPartListHead.Flink; + if (PartListEntry != &CurrentDisk->PrimaryPartListHead) { - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - - List->CurrentDisk = DiskEntry; - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + return CurrentPart; } } @@ -2134,96 +2099,92 @@ GetNextPartition( PPARTENTRY GetPrevPartition( - IN PPARTLIST List) + IN PPARTLIST List, + IN PPARTENTRY CurrentPart OPTIONAL) { PLIST_ENTRY DiskListEntry; PLIST_ENTRY PartListEntry; - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; + PDISKENTRY CurrentDisk; /* Fail if no disks are available */ if (IsListEmpty(&List->DiskListHead)) return NULL; - /* Check for previous usable entry on current disk */ - if (List->CurrentPartition != NULL) + /* Check for the previous usable entry on the current partition's disk */ + if (CurrentPart != NULL) { - if (List->CurrentPartition->LogicalPartition) + CurrentDisk = CurrentPart->DiskEntry; + + if (CurrentPart->LogicalPartition) { /* Logical partition */ - PartListEntry = List->CurrentPartition->ListEntry.Blink; - if (PartListEntry != &List->CurrentDisk->LogicalPartListHead) + + PartListEntry = CurrentPart->ListEntry.Blink; + if (PartListEntry != &CurrentDisk->LogicalPartListHead) { /* Previous logical partition */ - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); } else { /* Extended partition */ - PartEntry = List->CurrentDisk->ExtendedPartition; + CurrentPart = CurrentDisk->ExtendedPartition; } - - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + return CurrentPart; } else { /* Primary or extended partition */ - PartListEntry = List->CurrentPartition->ListEntry.Blink; - if (PartListEntry != &List->CurrentDisk->PrimaryPartListHead) + PartListEntry = CurrentPart->ListEntry.Blink; + if (PartListEntry != &CurrentDisk->PrimaryPartListHead) { - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned && - IsContainerPartition(PartEntry->PartitionType)) + if (CurrentPart->IsPartitioned && + IsContainerPartition(CurrentPart->PartitionType)) { - PartListEntry = List->CurrentDisk->LogicalPartListHead.Blink; - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + PartListEntry = CurrentDisk->LogicalPartListHead.Blink; + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); } - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + return CurrentPart; } } } /* Search for the last partition entry on the previous disk */ - for (DiskListEntry = List->CurrentDisk->ListEntry.Blink; + for (DiskListEntry = (CurrentPart ? CurrentDisk->ListEntry.Blink + : List->DiskListHead.Blink); DiskListEntry != &List->DiskListHead; DiskListEntry = DiskListEntry->Blink) { - DiskEntry = CONTAINING_RECORD(DiskListEntry, DISKENTRY, ListEntry); + CurrentDisk = CONTAINING_RECORD(DiskListEntry, DISKENTRY, ListEntry); - if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + if (CurrentDisk->DiskStyle == PARTITION_STYLE_GPT) { DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); continue; } - PartListEntry = DiskEntry->PrimaryPartListHead.Blink; - if (PartListEntry != &DiskEntry->PrimaryPartListHead) + PartListEntry = CurrentDisk->PrimaryPartListHead.Blink; + if (PartListEntry != &CurrentDisk->PrimaryPartListHead) { - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned && - IsContainerPartition(PartEntry->PartitionType)) + if (CurrentPart->IsPartitioned && + IsContainerPartition(CurrentPart->PartitionType)) { - PartListEntry = DiskEntry->LogicalPartListHead.Blink; - if (PartListEntry != &DiskEntry->LogicalPartListHead) + PartListEntry = CurrentDisk->LogicalPartListHead.Blink; + if (PartListEntry != &CurrentDisk->LogicalPartListHead) { - PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - - List->CurrentDisk = DiskEntry; - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + CurrentPart = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); + return CurrentPart; } } else { - List->CurrentDisk = DiskEntry; - List->CurrentPartition = PartEntry; - return List->CurrentPartition; + return CurrentPart; } } } @@ -2553,9 +2514,9 @@ UpdateDiskLayout( static PPARTENTRY GetPrevUnpartitionedEntry( - IN PDISKENTRY DiskEntry, IN PPARTENTRY PartEntry) { + PDISKENTRY DiskEntry = PartEntry->DiskEntry; PPARTENTRY PrevPartEntry; PLIST_ENTRY ListHead; @@ -2575,7 +2536,7 @@ GetPrevUnpartitionedEntry( PrevPartEntry = CONTAINING_RECORD(PartEntry->ListEntry.Blink, PARTENTRY, ListEntry); - if (PrevPartEntry->IsPartitioned == FALSE) + if (!PrevPartEntry->IsPartitioned) { ASSERT(PrevPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); return PrevPartEntry; @@ -2588,9 +2549,9 @@ GetPrevUnpartitionedEntry( static PPARTENTRY GetNextUnpartitionedEntry( - IN PDISKENTRY DiskEntry, IN PPARTENTRY PartEntry) { + PDISKENTRY DiskEntry = PartEntry->DiskEntry; PPARTENTRY NextPartEntry; PLIST_ENTRY ListHead; @@ -2610,7 +2571,7 @@ GetNextUnpartitionedEntry( NextPartEntry = CONTAINING_RECORD(PartEntry->ListEntry.Flink, PARTENTRY, ListEntry); - if (NextPartEntry->IsPartitioned == FALSE) + if (!NextPartEntry->IsPartitioned) { ASSERT(NextPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); return NextPartEntry; @@ -2892,10 +2853,11 @@ DismountVolume( return Status; } -VOID +BOOLEAN DeletePartition( IN PPARTLIST List, - IN PPARTENTRY PartEntry) + IN PPARTENTRY PartEntry, + OUT PPARTENTRY* FreeRegion OPTIONAL) { PDISKENTRY DiskEntry; PPARTENTRY PrevPartEntry; @@ -2908,7 +2870,7 @@ DeletePartition( PartEntry->DiskEntry == NULL || PartEntry->IsPartitioned == FALSE) { - return; + return FALSE; } ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); @@ -2949,56 +2911,49 @@ DeletePartition( DismountVolume(PartEntry); } - /* Adjust unpartitioned disk space entries */ + /* Adjust the unpartitioned disk space entries */ /* Get pointer to previous and next unpartitioned entries */ - PrevPartEntry = GetPrevUnpartitionedEntry(DiskEntry, PartEntry); - NextPartEntry = GetNextUnpartitionedEntry(DiskEntry, PartEntry); + PrevPartEntry = GetPrevUnpartitionedEntry(PartEntry); + NextPartEntry = GetNextUnpartitionedEntry(PartEntry); if (PrevPartEntry != NULL && NextPartEntry != NULL) { - /* Merge previous, current and next unpartitioned entry */ + /* Merge the previous, current and next unpartitioned entries */ - /* Adjust the previous entries length */ + /* Adjust the previous entry length */ PrevPartEntry->SectorCount.QuadPart += (PartEntry->SectorCount.QuadPart + NextPartEntry->SectorCount.QuadPart); - /* Remove the current entry */ + /* Remove the current and next entries */ RemoveEntryList(&PartEntry->ListEntry); RtlFreeHeap(ProcessHeap, 0, PartEntry); - - /* Remove the next entry */ RemoveEntryList(&NextPartEntry->ListEntry); RtlFreeHeap(ProcessHeap, 0, NextPartEntry); - /* Update current partition */ - if (List->CurrentPartition == PartEntry || - List->CurrentPartition == NextPartEntry) - { - List->CurrentPartition = PrevPartEntry; - } + /* Optionally return the freed region */ + if (FreeRegion) + *FreeRegion = PrevPartEntry; } else if (PrevPartEntry != NULL && NextPartEntry == NULL) { - /* Merge current and previous unpartitioned entry */ + /* Merge the current and the previous unpartitioned entries */ - /* Adjust the previous entries length */ + /* Adjust the previous entry length */ PrevPartEntry->SectorCount.QuadPart += PartEntry->SectorCount.QuadPart; /* Remove the current entry */ RemoveEntryList(&PartEntry->ListEntry); RtlFreeHeap(ProcessHeap, 0, PartEntry); - /* Update current partition */ - if (List->CurrentPartition == PartEntry) - { - List->CurrentPartition = PrevPartEntry; - } + /* Optionally return the freed region */ + if (FreeRegion) + *FreeRegion = PrevPartEntry; } else if (PrevPartEntry == NULL && NextPartEntry != NULL) { - /* Merge current and next unpartitioned entry */ + /* Merge the current and the next unpartitioned entries */ - /* Adjust the next entries offset and length */ + /* Adjust the next entry offset and length */ NextPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; NextPartEntry->SectorCount.QuadPart += PartEntry->SectorCount.QuadPart; @@ -3006,15 +2961,13 @@ DeletePartition( RemoveEntryList(&PartEntry->ListEntry); RtlFreeHeap(ProcessHeap, 0, PartEntry); - /* Update current partition */ - if (List->CurrentPartition == PartEntry) - { - List->CurrentPartition = NextPartEntry; - } + /* Optionally return the freed region */ + if (FreeRegion) + *FreeRegion = NextPartEntry; } else { - /* Nothing to merge but change current entry */ + /* Nothing to merge but change the current entry */ PartEntry->IsPartitioned = FALSE; PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Unformatted; @@ -3023,18 +2976,17 @@ DeletePartition( PartEntry->OnDiskPartitionNumber = 0; PartEntry->PartitionNumber = 0; // PartEntry->PartitionIndex = 0; + + /* Optionally return the freed region */ + if (FreeRegion) + *FreeRegion = PartEntry; } UpdateDiskLayout(DiskEntry); AssignDriveLetters(List); -} -VOID -DeleteCurrentPartition( - IN PPARTLIST List) -{ - DeletePartition(List, List->CurrentPartition); + return TRUE; } /* @@ -3185,7 +3137,10 @@ IsSupportedActivePartition( VOID CheckActiveSystemPartition( - IN PPARTLIST List) + IN PPARTLIST List, + IN BOOLEAN ForceSelect, + IN PDISKENTRY AlternateDisk OPTIONAL, + IN PPARTENTRY AlternatePart OPTIONAL) { PLIST_ENTRY ListEntry; PDISKENTRY DiskEntry; @@ -3199,7 +3154,7 @@ CheckActiveSystemPartition( /* No system partition! */ List->SystemPartition = NULL; List->OriginalSystemPartition = NULL; - return; + goto NoSystemPartition; } if (List->SystemPartition != NULL) @@ -3216,11 +3171,21 @@ CheckActiveSystemPartition( List->SystemPartition = NULL; List->OriginalSystemPartition = NULL; + /* Adjust the optional alternate disk if needed */ + if (!AlternateDisk && AlternatePart) + AlternateDisk = AlternatePart->DiskEntry; + + /* Ensure that the alternate partition is on the alternate disk */ + if (AlternatePart) + ASSERT(AlternateDisk && (AlternatePart->DiskEntry == AlternateDisk)); + + /* Ensure that the alternate disk is in the list */ + if (AlternateDisk) + ASSERT(AlternateDisk->PartList == List); // -// Pass == 1 : Checking the first disk. +// Pass == 1 : Check the first (system) disk. // - DPRINT("We are here (1)!\n"); /* * First, check whether the first disk (the one that will be booted @@ -3230,13 +3195,11 @@ CheckActiveSystemPartition( DiskEntry = CONTAINING_RECORD(List->DiskListHead.Flink, DISKENTRY, ListEntry); - // if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) - // { - // DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); - // continue; - // } - - DPRINT("We are here (1a)!\n"); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("First (system) disk -- GPT-partitioned disk detected, not currently supported by SETUP!\n"); + goto UseAlternateDisk; + } ActivePartition = GetActiveDiskPartition(DiskEntry); if (ActivePartition) @@ -3252,14 +3215,13 @@ CheckActiveSystemPartition( } } - DPRINT("We are here (1b)!\n"); - - /* If this first disk is not the current installation disk, do the minimal checks */ - if (DiskEntry != List->CurrentDisk) + /* If this first disk is not the optional alternate disk, perform the minimal checks */ + if (DiskEntry != AlternateDisk) { /* - * We don't. Enumerate all the (primary) partitions in the first disk, - * excluding the current active partition, to find a candidate new one. + * No active partition has been recognized. Enumerate all the (primary) + * partitions in the first disk, excluding the possible current active + * partition, to find a new candidate. */ for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; ListEntry != &DiskEntry->PrimaryPartListHead; @@ -3336,26 +3298,24 @@ CheckActiveSystemPartition( } - /**** Case where we don't have an active partition on the first disk ****/ - // -// Pass == 2 : Checking the CurrentDisk on which we install. +// Pass == 2 : No active partition found: Check the alternate disk if specified. // - DPRINT("We are here (2)!\n"); - if (DiskEntry != List->CurrentDisk) - { - /* Choose the currently selected disk */ - DiskEntry = List->CurrentDisk; +UseAlternateDisk: + if (!AlternateDisk || (!ForceSelect && (DiskEntry != AlternateDisk))) + goto NoSystemPartition; - if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) - { - DPRINT1("Current disk?! -- GPT-partitioned disk detected, not currently supported by SETUP!\n"); - DPRINT1("No supported active partition found on this system!\n"); - return; - } + if (AlternateDisk->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("Alternate disk -- GPT-partitioned disk detected, not currently supported by SETUP!\n"); + goto NoSystemPartition; + } - DPRINT("We are here (2x)!\n"); + if (DiskEntry != AlternateDisk) + { + /* Choose the alternate disk */ + DiskEntry = AlternateDisk; ActivePartition = GetActiveDiskPartition(DiskEntry); if (ActivePartition) @@ -3369,19 +3329,16 @@ CheckActiveSystemPartition( } } - - /**** Here, we either don't have an active partition, or we have one BUT it is not supported ****/ + /* We now may have an unsupported active partition, or none */ /*** *** TODO: Improve the selection: *** - If we want a really separate system partition from the partition where *** we install, do something similar to what's done below in the code. *** - Otherwise if we allow for the system partition to be also the partition - *** where we install, just directly fall down to List->CurrentPartition. + *** where we install, just directly fall down to using AlternatePart. ***/ - DPRINT("We are here (2a)!\n"); - /* Retrieve the first partition of the disk */ PartEntry = CONTAINING_RECORD(DiskEntry->PrimaryPartListHead.Flink, PARTENTRY, ListEntry); @@ -3416,8 +3373,6 @@ CheckActiveSystemPartition( DPRINT1("NewDisk TRUE but first partition is used?\n"); } - DPRINT("We are here (3)!\n"); - /* * The disk is not new, check if any partition is initialized; * if not, the first one becomes the system partition. @@ -3455,20 +3410,27 @@ CheckActiveSystemPartition( goto SetSystemPartition; } - DPRINT("We are here (4)!\n"); - /* * The disk is not new, we did not find any actual active partition, * or the one we found was not supported, or any possible other canditate - * is not supported. We then use the current (installation) partition. + * is not supported. We then use the alternate partition if specified. */ - /* Nothing, use the alternative system partition */ - DPRINT1("No system partition found, use the alternative partition!\n"); - CandidatePartition = List->CurrentPartition; - goto UseAlternativeSystemPartition; + if (AlternatePart) + { + DPRINT1("No system partition found, use the alternative partition!\n"); + CandidatePartition = AlternatePart; + goto UseAlternativeSystemPartition; + } + else + { +NoSystemPartition: + DPRINT1("No valid or supported system partition has been found on this system!\n"); + return; + } SystemPartitionFound: + ASSERT(CandidatePartition); List->SystemPartition = CandidatePartition; DPRINT1("Use existing active system partition %lu in disk %lu, drive letter %C\n", @@ -3498,6 +3460,7 @@ FindAndUseAlternativeSystemPartition: } UseAlternativeSystemPartition: + ASSERT(CandidatePartition); List->SystemPartition = CandidatePartition; DPRINT1("Use alternative active system partition %lu in disk %lu, drive letter %C\n", diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index ab4905a6d1..2ed7f583e8 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -89,6 +89,9 @@ typedef struct _DISKENTRY { LIST_ENTRY ListEntry; + /* The list of disks/partitions this disk belongs to */ + struct _PARTLIST *PartList; + /* Disk geometry */ ULONGLONG Cylinders; @@ -138,17 +141,6 @@ typedef struct _DISKENTRY typedef struct _PARTLIST { - /* - * Disk & Partition iterators. - * - * NOTE that when CurrentPartition != NULL, then CurrentPartition->DiskEntry - * must be the same as CurrentDisk. We should however keep the two members - * separated as we can have a current (selected) disk without any current - * partition, if the former does not contain any. - */ - PDISKENTRY CurrentDisk; - PPARTENTRY CurrentPartition; - /* * The system partition where the boot manager resides. * The corresponding system disk is obtained via: @@ -275,7 +267,7 @@ GetDiskOrPartition( OUT PDISKENTRY* pDiskEntry, OUT PPARTENTRY* pPartEntry OPTIONAL); -BOOLEAN +PPARTENTRY SelectPartition( IN PPARTLIST List, IN ULONG DiskNumber, @@ -283,11 +275,13 @@ SelectPartition( PPARTENTRY GetNextPartition( - IN PPARTLIST List); + IN PPARTLIST List, + IN PPARTENTRY CurrentPart OPTIONAL); PPARTENTRY GetPrevPartition( - IN PPARTLIST List); + IN PPARTLIST List, + IN PPARTENTRY CurrentPart OPTIONAL); BOOLEAN CreatePrimaryPartition( @@ -309,18 +303,18 @@ CreateLogicalPartition( IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate); -VOID +BOOLEAN DeletePartition( IN PPARTLIST List, - IN PPARTENTRY PartEntry); - -VOID -DeleteCurrentPartition( - IN PPARTLIST List); + IN PPARTENTRY PartEntry, + OUT PPARTENTRY* FreeRegion OPTIONAL); VOID CheckActiveSystemPartition( - IN PPARTLIST List); + IN PPARTLIST List, + IN BOOLEAN ForceSelect, + IN PDISKENTRY AlternateDisk OPTIONAL, + IN PPARTENTRY AlternatePart OPTIONAL); NTSTATUS WritePartitions( diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index b5f07b21d3..216f887659 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -792,12 +792,13 @@ DisableWizNext: PARTENTRY PartEntry; DiskEntry.DiskNumber = 0; DiskEntry.BiosDiskNumber = 0; + PartEntry.DiskEntry = &DiskEntry; PartEntry.PartitionNumber = 1; // 4; /****/ Status = InitDestinationPaths(&pSetupData->USetupData, NULL, // pSetupData->USetupData.InstallationDirectory, - &DiskEntry, &PartEntry); + &PartEntry); if (!NT_SUCCESS(Status)) { diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index 2c0cd5a55a..db3de29a85 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -73,6 +73,7 @@ VOID InitPartitionListUi( IN OUT PPARTLIST_UI ListUi, IN PPARTLIST List, + IN PPARTENTRY CurrentEntry OPTIONAL, IN SHORT Left, IN SHORT Top, IN SHORT Right, @@ -91,6 +92,37 @@ InitPartitionListUi( ListUi->Offset = 0; // ListUi->Redraw = TRUE; + + /* Search for first usable disk and partition */ + if (!CurrentEntry) + { + ListUi->CurrentDisk = NULL; + ListUi->CurrentPartition = NULL; + + if (!IsListEmpty(&List->DiskListHead)) + { + ListUi->CurrentDisk = CONTAINING_RECORD(List->DiskListHead.Flink, + DISKENTRY, ListEntry); + + if (!IsListEmpty(&ListUi->CurrentDisk->PrimaryPartListHead)) + { + ListUi->CurrentPartition = CONTAINING_RECORD(ListUi->CurrentDisk->PrimaryPartListHead.Flink, + PARTENTRY, ListEntry); + } + } + } + else + { + /* + * The CurrentEntry must belong to the associated partition list, + * and the latter must therefore not be empty. + */ + ASSERT(!IsListEmpty(&List->DiskListHead)); + ASSERT(CurrentEntry->DiskEntry->PartList == List); + + ListUi->CurrentPartition = CurrentEntry; + ListUi->CurrentDisk = CurrentEntry->DiskEntry; + } } static @@ -134,7 +166,6 @@ PrintPartitionData( IN PDISKENTRY DiskEntry, IN PPARTENTRY PartEntry) { - PPARTLIST List = ListUi->List; CHAR LineBuffer[128]; COORD coPos; ULONG Written; @@ -226,8 +257,8 @@ PrintPartitionData( } } - Attribute = (List->CurrentDisk == DiskEntry && - List->CurrentPartition == PartEntry) ? + Attribute = (ListUi->CurrentDisk == DiskEntry && + ListUi->CurrentPartition == PartEntry) ? FOREGROUND_BLUE | BACKGROUND_WHITE : FOREGROUND_WHITE | BACKGROUND_BLUE; @@ -269,7 +300,6 @@ PrintDiskData( IN PPARTLIST_UI ListUi, IN PDISKENTRY DiskEntry) { - // PPARTLIST List = ListUi->List; PPARTENTRY PrimaryPartEntry, LogicalPartEntry; PLIST_ENTRY PrimaryEntry, LogicalEntry; CHAR LineBuffer[128]; @@ -432,7 +462,7 @@ DrawPartitionList( while (Entry2 != &DiskEntry->PrimaryPartListHead) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry == List->CurrentPartition) + if (PartEntry == ListUi->CurrentPartition) { CurrentPartLineFound = TRUE; } @@ -452,7 +482,7 @@ DrawPartitionList( while (Entry2 != &DiskEntry->LogicalPartListHead) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry == List->CurrentPartition) + if (PartEntry == ListUi->CurrentPartition) { CurrentPartLineFound = TRUE; } @@ -467,7 +497,7 @@ DrawPartitionList( } } - if (DiskEntry == List->CurrentDisk) + if (DiskEntry == ListUi->CurrentDisk) { CurrentDiskLineFound = TRUE; } @@ -642,16 +672,26 @@ VOID ScrollDownPartitionList( IN PPARTLIST_UI ListUi) { - if (GetNextPartition(ListUi->List)) + PPARTENTRY NextPart = GetNextPartition(ListUi->List, ListUi->CurrentPartition); + if (NextPart) + { + ListUi->CurrentPartition = NextPart; + ListUi->CurrentDisk = NextPart->DiskEntry; DrawPartitionList(ListUi); + } } VOID ScrollUpPartitionList( IN PPARTLIST_UI ListUi) { - if (GetPrevPartition(ListUi->List)) + PPARTENTRY PrevPart = GetPrevPartition(ListUi->List, ListUi->CurrentPartition); + if (PrevPart) + { + ListUi->CurrentPartition = PrevPart; + ListUi->CurrentDisk = PrevPart->DiskEntry; DrawPartitionList(ListUi); + } } /* EOF */ diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index 87c9959854..ea92e756c1 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -45,6 +45,16 @@ typedef struct _PARTLIST_UI { PPARTLIST List; + /* + * Selected partition. + * + * NOTE that when CurrentPartition != NULL, then CurrentPartition->DiskEntry + * must be the same as CurrentDisk. We should however keep the two members + * separated as we can have a selected disk without any partition. + */ + PDISKENTRY CurrentDisk; + PPARTENTRY CurrentPartition; + // PLIST_ENTRY FirstShown; // PLIST_ENTRY LastShown; @@ -70,6 +80,7 @@ VOID InitPartitionListUi( IN OUT PPARTLIST_UI ListUi, IN PPARTLIST List, + IN PPARTENTRY CurrentEntry OPTIONAL, IN SHORT Left, IN SHORT Top, IN SHORT Right, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index c030d07ff3..43673613a3 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -45,6 +45,10 @@ BOOLEAN IsUnattendedSetup = FALSE; static USETUP_DATA USetupData; +/* Partition where to perform the installation */ +static PPARTENTRY InstallPartition = NULL; +// static PPARTENTRY SystemPartition = NULL; // The system partition we will actually use (can be different from PartitionList->SystemPartition in case we install on removable disk) + // FIXME: Is it really useful?? Just used for SetDefaultPagefile... static WCHAR DestinationDriveLetter; @@ -60,7 +64,10 @@ static BOOLEAN RepairUpdateFlag = FALSE; /* Global partition list on the system */ static PPARTLIST PartitionList = NULL; -/* List of currently supported file systems for the partition to be formatted */ +/* Currently selected partition entry in the list */ +static PPARTENTRY CurrentPartition = NULL; + +/* List of supported file systems for the partition to be formatted */ static PFILE_SYSTEM_LIST FileSystemList = NULL; /* Machine state for the formatter */ @@ -1474,14 +1481,18 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (RepairUpdateFlag) { + ASSERT(CurrentInstallation); + /* Determine the selected installation disk & partition */ - if (!SelectPartition(PartitionList, - CurrentInstallation->DiskNumber, - CurrentInstallation->PartitionNumber)) + InstallPartition = SelectPartition(PartitionList, + CurrentInstallation->DiskNumber, + CurrentInstallation->PartitionNumber); + if (!InstallPartition) { DPRINT1("RepairUpdateFlag == TRUE, SelectPartition() returned FALSE, assert!\n"); ASSERT(FALSE); } + ASSERT(!IsContainerPartition(InstallPartition->PartitionType)); return SELECT_FILE_SYSTEM_PAGE; } @@ -1489,52 +1500,62 @@ SelectPartitionPage(PINPUT_RECORD Ir) MUIDisplayPage(SELECT_PARTITION_PAGE); InitPartitionListUi(&ListUi, PartitionList, - 2, - 23, + CurrentPartition, + 2, 23, xScreen - 3, yScreen - 3); DrawPartitionList(&ListUi); if (IsUnattendedSetup) { - if (!SelectPartition(PartitionList, - USetupData.DestinationDiskNumber, - USetupData.DestinationPartitionNumber)) + /* Determine the selected installation disk & partition */ + InstallPartition = SelectPartition(PartitionList, + USetupData.DestinationDiskNumber, + USetupData.DestinationPartitionNumber); + if (!InstallPartition) { + CurrentPartition = ListUi.CurrentPartition; + if (USetupData.AutoPartition) { - if (PartitionList->CurrentPartition->LogicalPartition) + ASSERT(CurrentPartition != NULL); + ASSERT(!IsContainerPartition(CurrentPartition->PartitionType)); + + if (CurrentPartition->LogicalPartition) { CreateLogicalPartition(PartitionList, - PartitionList->CurrentPartition, - PartitionList->CurrentPartition->SectorCount.QuadPart, + CurrentPartition, + CurrentPartition->SectorCount.QuadPart, TRUE); } else { CreatePrimaryPartition(PartitionList, - PartitionList->CurrentPartition, - PartitionList->CurrentPartition->SectorCount.QuadPart, + CurrentPartition, + CurrentPartition->SectorCount.QuadPart, TRUE); } // FIXME?? Aren't we going to enter an infinite loop, if this test fails?? - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + if (!IsDiskSizeValid(CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } + InstallPartition = CurrentPartition; return SELECT_FILE_SYSTEM_PAGE; } } else { - DrawPartitionList(&ListUi); + ASSERT(!IsContainerPartition(InstallPartition->PartitionType)); + + DrawPartitionList(&ListUi); // FIXME: Doesn't make much sense... // FIXME?? Aren't we going to enter an infinite loop, if this test fails?? - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + if (!IsDiskSizeValid(InstallPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); @@ -1547,14 +1568,16 @@ SelectPartitionPage(PINPUT_RECORD Ir) while (TRUE) { + CurrentPartition = ListUi.CurrentPartition; + /* Update status text */ - if (PartitionList->CurrentPartition == NULL) + if (CurrentPartition == NULL) { CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); } - else if (PartitionList->CurrentPartition->LogicalPartition) + else if (CurrentPartition->LogicalPartition) { - if (PartitionList->CurrentPartition->IsPartitioned) + if (CurrentPartition->IsPartitioned) { CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); } @@ -1565,9 +1588,9 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else { - if (PartitionList->CurrentPartition->IsPartitioned) + if (CurrentPartition->IsPartitioned) { - if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) + if (IsContainerPartition(CurrentPartition->PartitionType)) { CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); } @@ -1608,15 +1631,16 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { - if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) + ASSERT(CurrentPartition != NULL); + + if (IsContainerPartition(CurrentPartition->PartitionType)) continue; // return SELECT_PARTITION_PAGE; - if (PartitionList->CurrentPartition == NULL || - PartitionList->CurrentPartition->IsPartitioned == FALSE) + if (CurrentPartition->IsPartitioned == FALSE) { - if (PartitionList->CurrentPartition->LogicalPartition) + if (CurrentPartition->LogicalPartition) { - Error = LogicalPartitionCreationChecks(PartitionList->CurrentPartition); + Error = LogicalPartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1624,13 +1648,13 @@ SelectPartitionPage(PINPUT_RECORD Ir) } CreateLogicalPartition(PartitionList, - PartitionList->CurrentPartition, + CurrentPartition, 0ULL, TRUE); } else { - Error = PrimaryPartitionCreationChecks(PartitionList->CurrentPartition); + Error = PrimaryPartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1638,26 +1662,29 @@ SelectPartitionPage(PINPUT_RECORD Ir) } CreatePrimaryPartition(PartitionList, - PartitionList->CurrentPartition, + CurrentPartition, 0ULL, TRUE); } } - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + if (!IsDiskSizeValid(CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } + InstallPartition = CurrentPartition; return SELECT_FILE_SYSTEM_PAGE; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ { - if (PartitionList->CurrentPartition->LogicalPartition == FALSE) + ASSERT(CurrentPartition != NULL); + + if (CurrentPartition->LogicalPartition == FALSE) { - Error = PrimaryPartitionCreationChecks(PartitionList->CurrentPartition); + Error = PrimaryPartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1669,9 +1696,11 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'E') /* E */ { - if (PartitionList->CurrentPartition->LogicalPartition == FALSE) + ASSERT(CurrentPartition != NULL); + + if (CurrentPartition->LogicalPartition == FALSE) { - Error = ExtendedPartitionCreationChecks(PartitionList->CurrentPartition); + Error = ExtendedPartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1683,9 +1712,11 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L') /* L */ { - if (PartitionList->CurrentPartition->LogicalPartition) + ASSERT(CurrentPartition != NULL); + + if (CurrentPartition->LogicalPartition) { - Error = LogicalPartitionCreationChecks(PartitionList->CurrentPartition); + Error = LogicalPartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1697,33 +1728,36 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { - UNICODE_STRING CurrentPartition; + UNICODE_STRING CurrentPartitionU; WCHAR PathBuffer[MAX_PATH]; - if (PartitionList->CurrentPartition->IsPartitioned == FALSE) + ASSERT(CurrentPartition != NULL); + + if (CurrentPartition->IsPartitioned == FALSE) { MUIDisplayError(ERROR_DELETE_SPACE, Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } // TODO: Do something similar before trying to format the partition? - if (!PartitionList->CurrentPartition->New && - PartitionList->CurrentPartition->FormatState != Unformatted) + if (!CurrentPartition->New && + !IsContainerPartition(CurrentPartition->PartitionType) && + CurrentPartition->FormatState != Unformatted) { - ASSERT(PartitionList->CurrentPartition->PartitionNumber != 0); + ASSERT(CurrentPartition->PartitionNumber != 0); RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartitionNumber); - RtlInitUnicodeString(&CurrentPartition, PathBuffer); + CurrentPartition->DiskEntry->DiskNumber, + CurrentPartition->PartitionNumber); + RtlInitUnicodeString(&CurrentPartitionU, PathBuffer); /* * Check whether the user attempts to delete the partition on which * the installation source is present. If so, fail with an error. */ // &USetupData.SourceRootPath - if (RtlPrefixUnicodeString(&CurrentPartition, &USetupData.SourcePath, TRUE)) + if (RtlPrefixUnicodeString(&CurrentPartitionU, &USetupData.SourcePath, TRUE)) { PopupError("You cannot delete the partition containing the installation source!", MUIGetString(STRING_CONTINUE), @@ -1732,8 +1766,9 @@ SelectPartitionPage(PINPUT_RECORD Ir) } } - if (PartitionList->CurrentPartition == PartitionList->SystemPartition || - PartitionList->CurrentPartition->BootIndicator) +// FIXME TODO: PartitionList->SystemPartition is not yet initialized!!!! + if (CurrentPartition == PartitionList->SystemPartition || + CurrentPartition->BootIndicator) { return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; } @@ -1947,8 +1982,8 @@ ShowPartitionSizeInputBox(SHORT Left, static PAGE_NUMBER CreatePrimaryPartitionPage(PINPUT_RECORD Ir) { - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; + PDISKENTRY DiskEntry; BOOLEAN Quit; BOOLEAN Cancel; WCHAR InputBuffer[50]; @@ -1958,16 +1993,14 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) ULONGLONG SectorCount; PCHAR Unit; - if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) + if (PartitionList == NULL || CurrentPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; + PartEntry = CurrentPartition; + DiskEntry = CurrentPartition->DiskEntry; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -2024,12 +2057,12 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); + CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); #endif CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); - PartEntry = PartitionList->CurrentPartition; + PartEntry = CurrentPartition; while (TRUE) { MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ @@ -2086,7 +2119,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DPRINT ("Partition size: %I64u bytes\n", PartSize); CreatePrimaryPartition(PartitionList, - PartitionList->CurrentPartition, + CurrentPartition, SectorCount, FALSE); @@ -2111,8 +2144,8 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) static PAGE_NUMBER CreateExtendedPartitionPage(PINPUT_RECORD Ir) { - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; + PDISKENTRY DiskEntry; BOOLEAN Quit; BOOLEAN Cancel; WCHAR InputBuffer[50]; @@ -2122,16 +2155,14 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) ULONGLONG SectorCount; PCHAR Unit; - if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) + if (PartitionList == NULL || CurrentPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; + PartEntry = CurrentPartition; + DiskEntry = CurrentPartition->DiskEntry; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -2188,12 +2219,12 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); + CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); #endif CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); - PartEntry = PartitionList->CurrentPartition; + PartEntry = CurrentPartition; while (TRUE) { MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ @@ -2250,7 +2281,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DPRINT ("Partition size: %I64u bytes\n", PartSize); CreateExtendedPartition(PartitionList, - PartitionList->CurrentPartition, + CurrentPartition, SectorCount); return SELECT_PARTITION_PAGE; @@ -2274,8 +2305,8 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) static PAGE_NUMBER CreateLogicalPartitionPage(PINPUT_RECORD Ir) { - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; + PDISKENTRY DiskEntry; BOOLEAN Quit; BOOLEAN Cancel; WCHAR InputBuffer[50]; @@ -2285,16 +2316,14 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) ULONGLONG SectorCount; PCHAR Unit; - if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) + if (PartitionList == NULL || CurrentPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; + PartEntry = CurrentPartition; + DiskEntry = CurrentPartition->DiskEntry; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -2351,12 +2380,12 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); + CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); #endif CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); - PartEntry = PartitionList->CurrentPartition; + PartEntry = CurrentPartition; while (TRUE) { MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ @@ -2413,7 +2442,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DPRINT("Partition size: %I64u bytes\n", PartSize); CreateLogicalPartition(PartitionList, - PartitionList->CurrentPartition, + CurrentPartition, SectorCount, FALSE); @@ -2479,23 +2508,21 @@ ConfirmDeleteSystemPartitionPage(PINPUT_RECORD Ir) static PAGE_NUMBER DeletePartitionPage(PINPUT_RECORD Ir) { - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; + PDISKENTRY DiskEntry; ULONGLONG DiskSize; ULONGLONG PartSize; PCHAR Unit; CHAR PartTypeString[32]; - if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) + if (PartitionList == NULL || CurrentPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; + PartEntry = CurrentPartition; + DiskEntry = CurrentPartition->DiskEntry; MUIDisplayPage(DELETE_PARTITION_PAGE); @@ -2610,7 +2637,9 @@ DeletePartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { - DeleteCurrentPartition(PartitionList); + DeletePartition(PartitionList, + CurrentPartition, + &CurrentPartition); return SELECT_PARTITION_PAGE; } } @@ -2650,8 +2679,8 @@ ResetFileSystemList(VOID) static PAGE_NUMBER SelectFileSystemPage(PINPUT_RECORD Ir) { - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; + PDISKENTRY DiskEntry; ULONGLONG DiskSize; ULONGLONG PartSize; PCHAR DiskUnit; @@ -2662,9 +2691,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) DPRINT("SelectFileSystemPage()\n"); - if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) + if (PartitionList == NULL || InstallPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; @@ -2674,7 +2701,10 @@ SelectFileSystemPage(PINPUT_RECORD Ir) if (FormatState == Start) { /* Find or set the active system partition */ - CheckActiveSystemPartition(PartitionList); + CheckActiveSystemPartition(PartitionList, + FALSE, + InstallPartition->DiskEntry, + InstallPartition); if (PartitionList->SystemPartition == NULL) { /* FIXME: show an error dialog */ @@ -2720,8 +2750,8 @@ SelectFileSystemPage(PINPUT_RECORD Ir) * we must perform a filesystem check of both the system and the * installation partitions. */ - PartitionList->CurrentPartition->NeedsCheck = TRUE; - if (PartitionList->SystemPartition != PartitionList->CurrentPartition) + InstallPartition->NeedsCheck = TRUE; + if (PartitionList->SystemPartition != InstallPartition) PartitionList->SystemPartition->NeedsCheck = TRUE; /* @@ -2755,7 +2785,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) ASSERT(PartitionList->SystemPartition->IsPartitioned); - if ((PartitionList->SystemPartition != PartitionList->CurrentPartition) && + if ((PartitionList->SystemPartition != InstallPartition) && (PartitionList->SystemPartition->FormatState == Unformatted)) { TempPartition = PartitionList->SystemPartition; @@ -2770,10 +2800,10 @@ SelectFileSystemPage(PINPUT_RECORD Ir) } else { - TempPartition = PartitionList->CurrentPartition; + TempPartition = InstallPartition; TempPartition->NeedsCheck = TRUE; - if (PartitionList->SystemPartition != PartitionList->CurrentPartition) + if (PartitionList->SystemPartition != InstallPartition) { /* The system partition is separate, so it had better be formatted! */ ASSERT((PartitionList->SystemPartition->FormatState == Preformatted) || @@ -2791,7 +2821,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) case FormatSystemPartition: { - TempPartition = PartitionList->CurrentPartition; + TempPartition = InstallPartition; TempPartition->NeedsCheck = TRUE; FormatState = FormatInstallPartition; @@ -2843,7 +2873,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) } PartEntry = TempPartition; - DiskEntry = PartEntry->DiskEntry; + DiskEntry = TempPartition->DiskEntry; ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); @@ -3063,7 +3093,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) * or the installation partition. */ if (TempPartition != PartitionList->SystemPartition && - TempPartition != PartitionList->CurrentPartition) + TempPartition != InstallPartition) { PartEntry->NeedsCheck = FALSE; } @@ -3093,7 +3123,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) * QuitPage * * SIDEEFFECTS - * Sets PartitionList->CurrentPartition->FormatState + * Sets InstallPartition->FormatState * Sets USetupData.DestinationRootPath * * RETURNS @@ -3103,8 +3133,8 @@ static PAGE_NUMBER FormatPartitionPage(PINPUT_RECORD Ir) { NTSTATUS Status; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; + PDISKENTRY DiskEntry; PFILE_SYSTEM_ITEM SelectedFileSystem; UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; @@ -3127,7 +3157,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) } PartEntry = TempPartition; - DiskEntry = PartEntry->DiskEntry; + DiskEntry = TempPartition->DiskEntry; ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); @@ -3405,13 +3435,13 @@ CheckFileSystemPage(PINPUT_RECORD Ir) static NTSTATUS -BuildInstallPaths(PWSTR InstallDir, - PDISKENTRY DiskEntry, - PPARTENTRY PartEntry) +BuildInstallPaths( + IN PCWSTR InstallDir, + IN PPARTENTRY PartEntry) { NTSTATUS Status; - Status = InitDestinationPaths(&USetupData, InstallDir, DiskEntry, PartEntry); + Status = InitDestinationPaths(&USetupData, InstallDir, PartEntry); if (!NT_SUCCESS(Status)) { @@ -3485,27 +3515,20 @@ IsValidPath( static PAGE_NUMBER InstallDirectoryPage(PINPUT_RECORD Ir) { - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - WCHAR InstallDir[MAX_PATH]; - WCHAR c; - ULONG Length, Pos; NTSTATUS Status; + ULONG Length, Pos; + WCHAR c; + WCHAR InstallDir[MAX_PATH]; /* We do not need the filesystem list anymore */ ResetFileSystemList(); - if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) + if (PartitionList == NULL || InstallPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; - // if (IsUnattendedSetup) if (RepairUpdateFlag) wcscpy(InstallDir, CurrentInstallation->PathComponent); // SystemNtPath @@ -3523,9 +3546,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) */ if ((RepairUpdateFlag || IsUnattendedSetup) && IsValidPath(InstallDir)) { - Status = BuildInstallPaths(InstallDir, - DiskEntry, - PartEntry); + Status = BuildInstallPaths(InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) { DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status); @@ -3633,9 +3654,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) return INSTALL_DIRECTORY_PAGE; } - Status = BuildInstallPaths(InstallDir, - DiskEntry, - PartEntry); + Status = BuildInstallPaths(InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) { DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);

1 0

[reactos] 01/03: [SETUPLIB] Improve the discovery of the active system partition.
by Hermès Bélusca-Maïto 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d9ebb67ce6a762f8f3f2… commit 0d9ebb67ce6a762f8f3f29db9ec39c2aaee3dc3a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Feb 25 23:43:20 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 11 00:05:36 2019 +0100 [SETUPLIB] Improve the discovery of the active system partition. CORE-7749, CORE-6305, CORE-13205 --- base/setup/lib/utils/partlist.c | 354 +++++++++++++++++++++++++++++++--------- 1 file changed, 274 insertions(+), 80 deletions(-) diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 269bb99b2f..32adeda7c0 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -3037,6 +3037,74 @@ DeleteCurrentPartition( DeletePartition(List, List->CurrentPartition); } +/* + * Retrieve the actual "active" partition of the given disk. + * On MBR disks, partition with the Active/Boot flag set; + * on GPT disks, partition with the correct GUID. + */ +static +PPARTENTRY +GetActiveDiskPartition( + IN PDISKENTRY DiskEntry) +{ + PLIST_ENTRY ListEntry; + PPARTENTRY PartEntry; + PPARTENTRY ActivePartition = NULL; + + /* Check for empty disk list */ + // ASSERT(DiskEntry); + if (!DiskEntry) + return NULL; + + /* Check for empty partition list */ + if (IsListEmpty(&DiskEntry->PrimaryPartListHead)) + return NULL; + + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return NULL; + } + + /* Scan all (primary) partitions to find the active disk partition */ + for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; + ListEntry != &DiskEntry->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + /* Retrieve the partition */ + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + // TODO: Support for GPT disks! + + /* Check if the partition is partitioned, used and active */ + if (PartEntry->IsPartitioned && + // !IsContainerPartition(PartEntry->PartitionType) && + PartEntry->BootIndicator) + { + /* Yes, we found it */ + ASSERT(DiskEntry == PartEntry->DiskEntry); + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + ActivePartition = PartEntry; + + DPRINT1("Found active system partition %lu in disk %lu, drive letter %C\n", + PartEntry->PartitionNumber, DiskEntry->DiskNumber, + (PartEntry->DriveLetter == 0) ? L'-' : PartEntry->DriveLetter); + break; + } + } + + /* Check if the disk is new and if so, use its first partition as the active system partition */ + if (DiskEntry->NewDisk && ActivePartition != NULL) + { + // FIXME: What to do?? + DPRINT1("NewDisk TRUE but already existing active partition?\n"); + } + + /* Return the active partition found (or none) */ + return ActivePartition; +} + static BOOLEAN IsSupportedActivePartition( @@ -3119,24 +3187,16 @@ VOID CheckActiveSystemPartition( IN PPARTLIST List) { + PLIST_ENTRY ListEntry; PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - PLIST_ENTRY ListEntry; + PPARTENTRY ActivePartition; + PPARTENTRY CandidatePartition = NULL; /* Check for empty disk list */ if (IsListEmpty(&List->DiskListHead)) { - List->SystemPartition = NULL; - List->OriginalSystemPartition = NULL; - return; - } - - /* Choose the currently selected disk */ - DiskEntry = List->CurrentDisk; - - /* Check for empty partition list */ - if (IsListEmpty(&DiskEntry->PrimaryPartListHead)) - { + /* No system partition! */ List->SystemPartition = NULL; List->OriginalSystemPartition = NULL; return; @@ -3152,17 +3212,182 @@ CheckActiveSystemPartition( return; } - DPRINT("We are here (1)!\n"); - + /* Start fresh */ List->SystemPartition = NULL; List->OriginalSystemPartition = NULL; + +// +// Pass == 1 : Checking the first disk. +// + DPRINT("We are here (1)!\n"); + + /* + * First, check whether the first disk (the one that will be booted + * by default by the hardware) contains an active partition. If so + * this should be our system partition. + */ + DiskEntry = CONTAINING_RECORD(List->DiskListHead.Flink, + DISKENTRY, ListEntry); + + // if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + // { + // DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + // continue; + // } + + DPRINT("We are here (1a)!\n"); + + ActivePartition = GetActiveDiskPartition(DiskEntry); + if (ActivePartition) + { + /* Save the actual system partition */ + List->OriginalSystemPartition = ActivePartition; + + /* If we get a candidate active partition in the first disk, validate it */ + if (IsSupportedActivePartition(ActivePartition)) + { + CandidatePartition = ActivePartition; + goto SystemPartitionFound; + } + } + + DPRINT("We are here (1b)!\n"); + + /* If this first disk is not the current installation disk, do the minimal checks */ + if (DiskEntry != List->CurrentDisk) + { + /* + * We don't. Enumerate all the (primary) partitions in the first disk, + * excluding the current active partition, to find a candidate new one. + */ + for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; + ListEntry != &DiskEntry->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + /* Retrieve the partition */ + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + /* Skip the current active partition */ + if (/* ActivePartition != NULL && */ PartEntry == ActivePartition) + continue; + + /* Check if the partition is partitioned and used */ + if (PartEntry->IsPartitioned && + !IsContainerPartition(PartEntry->PartitionType)) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + /* If we get a candidate active partition in the first disk, validate it */ + if (IsSupportedActivePartition(PartEntry)) + { + CandidatePartition = PartEntry; + goto FindAndUseAlternativeSystemPartition; + } + } + +#if 0 + /* Check if the partition is partitioned and used */ + if (!PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType == PARTITION_ENTRY_UNUSED); + + // TODO: Check for minimal size!! + CandidatePartition = PartEntry; + goto FindAndUseAlternativeSystemPartition; + } +#endif + } + + /* + * Still nothing, look whether there is some free space that we can use + * for the new system partition. We must be sure that the total number + * of partition is less than the maximum allowed, and that the minimal + * size is fine. + */ +// +// TODO: Fix the handling of system partition being created in unpartitioned space!! +// --> When to partition it? etc... +// + if (GetPrimaryPartitionCount(DiskEntry) < 4) + { + for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; + ListEntry != &DiskEntry->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + /* Retrieve the partition */ + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + /* Skip the current active partition */ + if (/* ActivePartition != NULL && */ PartEntry == ActivePartition) + continue; + + /* Check for unpartitioned space */ + if (!PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType == PARTITION_ENTRY_UNUSED); + + // TODO: Check for minimal size!! + CandidatePartition = PartEntry; + goto FindAndUseAlternativeSystemPartition; + } + } + } + } + + + /**** Case where we don't have an active partition on the first disk ****/ + +// +// Pass == 2 : Checking the CurrentDisk on which we install. +// + DPRINT("We are here (2)!\n"); + + if (DiskEntry != List->CurrentDisk) + { + /* Choose the currently selected disk */ + DiskEntry = List->CurrentDisk; + + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("Current disk?! -- GPT-partitioned disk detected, not currently supported by SETUP!\n"); + DPRINT1("No supported active partition found on this system!\n"); + return; + } + + DPRINT("We are here (2x)!\n"); + + ActivePartition = GetActiveDiskPartition(DiskEntry); + if (ActivePartition) + { + /* If we get a candidate active partition, validate it */ + if (IsSupportedActivePartition(ActivePartition)) + { + CandidatePartition = ActivePartition; + goto FindAndUseAlternativeSystemPartition; + } + } + } + + + /**** Here, we either don't have an active partition, or we have one BUT it is not supported ****/ + +/*** + *** TODO: Improve the selection: + *** - If we want a really separate system partition from the partition where + *** we install, do something similar to what's done below in the code. + *** - Otherwise if we allow for the system partition to be also the partition + *** where we install, just directly fall down to List->CurrentPartition. + ***/ + + DPRINT("We are here (2a)!\n"); + /* Retrieve the first partition of the disk */ PartEntry = CONTAINING_RECORD(DiskEntry->PrimaryPartListHead.Flink, - PARTENTRY, - ListEntry); + PARTENTRY, ListEntry); ASSERT(DiskEntry == PartEntry->DiskEntry); - List->SystemPartition = PartEntry; + + CandidatePartition = PartEntry; // // See: https://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlis… @@ -3171,11 +3396,12 @@ CheckActiveSystemPartition( /* Check if the disk is new and if so, use its first partition as the active system partition */ if (DiskEntry->NewDisk) { - if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED || PartEntry->BootIndicator == FALSE) + // !IsContainerPartition(PartEntry->PartitionType); + if (!CandidatePartition->IsPartitioned || !CandidatePartition->BootIndicator) /* CandidatePartition != ActivePartition */ { - ASSERT(DiskEntry == PartEntry->DiskEntry); - List->SystemPartition = PartEntry; + ASSERT(DiskEntry == CandidatePartition->DiskEntry); + List->SystemPartition = CandidatePartition; List->OriginalSystemPartition = List->SystemPartition; DPRINT1("Use new first active system partition %lu in disk %lu, drive letter %C\n", @@ -3190,7 +3416,7 @@ CheckActiveSystemPartition( DPRINT1("NewDisk TRUE but first partition is used?\n"); } - DPRINT("We are here (2)!\n"); + DPRINT("We are here (3)!\n"); /* * The disk is not new, check if any partition is initialized; @@ -3201,12 +3427,12 @@ CheckActiveSystemPartition( ListEntry = ListEntry->Flink) { /* Retrieve the partition */ - PartEntry = CONTAINING_RECORD(ListEntry, - PARTENTRY, - ListEntry); + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); /* Check if the partition is partitioned and is used */ - if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED || PartEntry->BootIndicator != FALSE) + // !IsContainerPartition(PartEntry->PartitionType); + if (/* PartEntry->IsPartitioned && */ + PartEntry->PartitionType != PARTITION_ENTRY_UNUSED || PartEntry->BootIndicator) { break; } @@ -3217,8 +3443,9 @@ CheckActiveSystemPartition( * OK we haven't encountered any used and active partition, * so use the first one as the system partition. */ - ASSERT(DiskEntry == List->SystemPartition->DiskEntry); - List->OriginalSystemPartition = List->SystemPartition; // First PartEntry + ASSERT(DiskEntry == CandidatePartition->DiskEntry); + List->SystemPartition = CandidatePartition; // The first PartEntry + List->OriginalSystemPartition = List->SystemPartition; DPRINT1("Use first active system partition %lu in disk %lu, drive letter %C\n", List->SystemPartition->PartitionNumber, @@ -3228,57 +3455,21 @@ CheckActiveSystemPartition( goto SetSystemPartition; } - List->SystemPartition = NULL; - List->OriginalSystemPartition = NULL; - - DPRINT("We are here (3)!\n"); - - /* The disk is not new, scan all partitions to find the (active) system partition */ - for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; - ListEntry != &DiskEntry->PrimaryPartListHead; - ListEntry = ListEntry->Flink) - { - /* Retrieve the partition */ - PartEntry = CONTAINING_RECORD(ListEntry, - PARTENTRY, - ListEntry); - - /* Check if the partition is partitioned and used */ - if (PartEntry->IsPartitioned && - PartEntry->PartitionType != PARTITION_ENTRY_UNUSED) - { - /* Check if the partition is active */ - if (PartEntry->BootIndicator) - { - /* Yes, we found it */ - ASSERT(DiskEntry == PartEntry->DiskEntry); - List->SystemPartition = PartEntry; - - DPRINT1("Found active system partition %lu in disk %lu, drive letter %C\n", - PartEntry->PartitionNumber, - DiskEntry->DiskNumber, - (PartEntry->DriveLetter == 0) ? L'-' : PartEntry->DriveLetter); - break; - } - } - } + DPRINT("We are here (4)!\n"); - /* Check if we have found the system partition */ - if (List->SystemPartition == NULL) - { - /* Nothing, use the alternative system partition */ - DPRINT1("No system partition found, use the alternative partition!\n"); - goto UseAlternativeSystemPartition; - } + /* + * The disk is not new, we did not find any actual active partition, + * or the one we found was not supported, or any possible other canditate + * is not supported. We then use the current (installation) partition. + */ + /* Nothing, use the alternative system partition */ + DPRINT1("No system partition found, use the alternative partition!\n"); + CandidatePartition = List->CurrentPartition; + goto UseAlternativeSystemPartition; - /* Save it */ - List->OriginalSystemPartition = List->SystemPartition; - /* If we get a candidate active partition, validate it */ - if (!IsSupportedActivePartition(List->OriginalSystemPartition)) - { - goto FindAndUseAlternativeSystemPartition; - } +SystemPartitionFound: + List->SystemPartition = CandidatePartition; DPRINT1("Use existing active system partition %lu in disk %lu, drive letter %C\n", List->SystemPartition->PartitionNumber, @@ -3298,13 +3489,16 @@ FindAndUseAlternativeSystemPartition: */ /* Unset the old system partition */ - List->SystemPartition->BootIndicator = FALSE; - List->SystemPartition->DiskEntry->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = FALSE; - List->SystemPartition->DiskEntry->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; - List->SystemPartition->DiskEntry->Dirty = TRUE; + if (List->OriginalSystemPartition) + { + List->OriginalSystemPartition->BootIndicator = FALSE; + List->OriginalSystemPartition->DiskEntry->LayoutBuffer->PartitionEntry[List->OriginalSystemPartition->PartitionIndex].BootIndicator = FALSE; + List->OriginalSystemPartition->DiskEntry->LayoutBuffer->PartitionEntry[List->OriginalSystemPartition->PartitionIndex].RewritePartition = TRUE; + List->OriginalSystemPartition->DiskEntry->Dirty = TRUE; + } UseAlternativeSystemPartition: - List->SystemPartition = List->CurrentPartition; + List->SystemPartition = CandidatePartition; DPRINT1("Use alternative active system partition %lu in disk %lu, drive letter %C\n", List->SystemPartition->PartitionNumber,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs