Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[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

[reactos] 01/01: [NET] Display the country along with the users country code.
by Eric Kohl 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08d30403777c2db122f22… commit 08d30403777c2db122f2292657a46f42d9f59aa2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 22:00:41 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 22:01:40 2019 +0100 [NET] Display the country along with the users country code. --- base/applications/network/net/cmdUser.c | 80 ++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 0cb5dacc8f..a2d092613f 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -10,7 +10,41 @@ #include "net.h" +typedef struct _COUNTY_TABLE +{ + DWORD dwCountryCode; + DWORD dwMessageId; +} COUNTRY_TABLE, *PCOUNTRY_TABLE; + + static WCHAR szPasswordChars[] = L"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@#$%_-+:"; +static COUNTRY_TABLE CountryTable[] = +{ { 0, 5080}, // System Default + { 1, 5081}, // United States + { 2, 5082}, // Canada (French) + { 3, 5083}, // Latin America + { 31, 5084}, // Netherlands + { 32, 5085}, // Belgium + { 33, 5086}, // France + { 34, 5090}, // Spain + { 39, 5087}, // Italy + { 41, 5088}, // Switzerland + { 44, 5089}, // United Kingdom + { 45, 5091}, // Denmark + { 46, 5092}, // Sweden + { 47, 5093}, // Norway + { 49, 5094}, // Germany + { 61, 5095}, // Australia + { 81, 5096}, // Japan + { 82, 5097}, // Korea + { 86, 5098}, // China (PRC) + { 88, 5099}, // Taiwan + { 99, 5100}, // Asia + {351, 5101}, // Portugal + {358, 5102}, // Finland + {785, 5103}, // Arabic + {972, 5104} }; // Hebrew + static int @@ -130,6 +164,38 @@ GetTimeInSeconds(VOID) } +static +BOOL +GetCountryFromCountryCode( + _In_ DWORD dwCountryCode, + _In_ DWORD dwCountryLength, + _Out_ PWSTR szCountryBuffer) +{ + DWORD i; + + for (i = 0; i < ARRAYSIZE(CountryTable); i++) + { + if (CountryTable[i].dwCountryCode == dwCountryCode) + { + if (szCountryBuffer != NULL && dwCountryLength > 0) + { + FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS, + hModuleNetMsg, + CountryTable[i].dwMessageId, + LANG_USER_DEFAULT, + szCountryBuffer, + dwCountryLength, + NULL); + } + + return TRUE; + } + } + + return FALSE; +} + + static NET_API_STATUS DisplayUser(LPWSTR lpUserName) @@ -142,6 +208,7 @@ DisplayUser(LPWSTR lpUserName) DWORD dwGroupRead, dwGroupTotal; DWORD dwLastSet; DWORD i; + WCHAR szCountry[40]; INT nPaddedLength = 29; NET_API_STATUS Status; @@ -193,7 +260,9 @@ DisplayUser(LPWSTR lpUserName) ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_usr_comment); PrintPaddedResourceString(IDS_USER_COUNTRY_CODE, nPaddedLength); - ConPrintf(StdOut, L"%03ld ()\n", pUserInfo->usri4_country_code); + GetCountryFromCountryCode(pUserInfo->usri4_country_code, + ARRAYSIZE(szCountry), szCountry); + ConPrintf(StdOut, L"%03ld (%s)\n", pUserInfo->usri4_country_code, szCountry); PrintPaddedResourceString(IDS_USER_ACCOUNT_ACTIVE, nPaddedLength); if (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE) @@ -770,9 +839,9 @@ cmdUser( goto done; } - /* FIXME: verify the country code */ - - pUserInfo->usri4_country_code = value; + /* Verify the country code */ + if (GetCountryFromCountryCode(value, 0, NULL)) + pUserInfo->usri4_country_code = value; } else if (_wcsnicmp(argv[j], L"/expires:", 9) == 0) { @@ -786,9 +855,6 @@ cmdUser( ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/EXPIRES"); result = 1; goto done; - - /* FIXME: Parse the date */ -// ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/EXPIRES"); } } else if (_wcsnicmp(argv[j], L"/fullname:", 10) == 0)

1 0

[reactos] 01/01: [TRANSLATION] Update Hebrew translations (#1408)
by Shy Zedaka 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b94d222acbd69a625da6… commit 5b94d222acbd69a625da6722ada8226bf6149689 Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Sun Mar 10 20:21:57 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 10 19:21:57 2019 +0100 [TRANSLATION] Update Hebrew translations (#1408) --- base/applications/mplay32/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/shutdown/lang/he-IL.rc | 6 +++--- base/applications/taskmgr/lang/he-IL.rc | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/mplay32/lang/he-IL.rc b/base/applications/mplay32/lang/he-IL.rc index e64972cebb..fd4586a7d0 100644 --- a/base/applications/mplay32/lang/he-IL.rc +++ b/base/applications/mplay32/lang/he-IL.rc @@ -14,7 +14,7 @@ BEGIN MENUITEM "נגינה/&השהייה\tCtrl+P", IDC_PLAY MENUITEM "&עצירה\tCtrl+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "&חזרה\tCtrl+T", IDM_REPEAT + MENUITEM "&ניגון חוזר\tCtrl+T", IDM_REPEAT END POPUP "&תצוגה" BEGIN diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index cc8b08e720..d1ead45e0e 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -218,6 +218,6 @@ BEGIN IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." - IDS_LOADERRORTEXT, "The file %s could not be loaded." + IDS_LOADERRORTEXT, ".%s לא היה ניתן לטעון את הקובץ" IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" END diff --git a/base/applications/shutdown/lang/he-IL.rc b/base/applications/shutdown/lang/he-IL.rc index 7b654f98af..b790da17c3 100644 --- a/base/applications/shutdown/lang/he-IL.rc +++ b/base/applications/shutdown/lang/he-IL.rc @@ -22,7 +22,7 @@ BEGIN LTEXT "שניה/ות", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 GROUPBOX "מעקב אירועי כיבוי", IDC_STATIC, 5, 114, 224, 114 LTEXT "סיבה:", IDC_STATIC, 16, 130, 27, 8 - CHECKBOX "מתוכנן...", IDC_PLANNED, 175, 130, 43, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "מתוכנן", IDC_PLANNED, 175, 130, 43, 12, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_REASON_CODE, 17, 142, 198, 13, WS_TABSTOP | CBS_DROPDOWN LTEXT "הערה:", IDC_COMMENT_CAPTION, 16, 159, 38, 8 EDITTEXT IDC_COMMENT_TEXT, 17, 171, 198, 50, WS_VSCROLL @@ -75,7 +75,7 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ IDS_ERROR_HIBERNATE "ERROR: Unable to send system into hibernation mode.\n" IDS_ERROR_HIBERNATE_LOCAL "ERROR: Hibernation mode cannot be started remotely.\n" IDS_ERROR_HIBERNATE_ENABLED "ERROR: Hibernation mode is not enabled.\n" - IDS_ERROR_DIALOG_CAPTION "Remote Shutdown" + IDS_ERROR_DIALOG_CAPTION "כיבוי מרחוק" IDS_ERROR_DIALOG_INIT "Unable to display the graphical user interface." END @@ -100,5 +100,5 @@ BEGIN IDS_REASON_APP_UNRESPONSIVE "יישום: לא מגיב" IDS_REASON_APP_UNSTABLE "יישום: לא יציב" IDS_REASON_SECURITY "בעיית בטיחות" - IDS_REASON_NETWORK "איבוד קישוריות רשת" + IDS_REASON_NETWORK "החיבור לרשת אבד" END diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index 9893bde208..6244f6178d 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -186,7 +186,7 @@ BEGIN GROUPBOX "שימוש בזיכרון", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "סך הכל", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "זכרון פיזי (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "זיכרון פיזי (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "זיכרון ליבה (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT LTEXT "מזהים יחודיים", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 LTEXT "תהליכי משנה", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 @@ -225,11 +225,11 @@ BEGIN EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "היסטורית שימוש במעבד", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "היסטורית שימוש בזכרון", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "היסטורית שימוש בזיכרון", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT PUSHBUTTON "CPU Usage Display", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "MEM Usage Display", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "היסטורית שימוש במעבד", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "היסטורית שימוש בזכרון", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "היסטורית שימוש בזיכרון", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210

1 0

[reactos] 03/03: [USETUP] Improve the formatter & check-disk state machine. CORE-7749
by Hermès Bélusca-Maïto 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5431030681038941cff3… commit a5431030681038941cff3037a6b48c35e1ac1b2a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Feb 25 20:29:16 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 10 15:41:25 2019 +0100 [USETUP] Improve the formatter & check-disk state machine. CORE-7749 - Find or set the active system partition only once, when we start the formatting stage. If the system partition is to be created in some non-partitioned space, we create it. - A file-system check is always scheduled for both the system and the installation partitions. - If the system partition was already formatted (which usually means that it already existed on the system), don't ask for formatting it. CORE-13205 - For each partition to be formatted, the file-system menu list is re-created, in order to display only the FSes that are compatible with the selected partition, and allow to give the user the choice to keep the existing file-system only if the selected partition was already formatted. - Check whether the user attempts to delete the partition on which the installation source is present, only if it is not "new" and is formatted. - Check first whether the current partition is the system partition, before displaying the CONFIRM_DELETE_SYSTEM_PARTITION_PAGE. --- base/setup/usetup/partlist.c | 3 +- base/setup/usetup/partlist.h | 11 +- base/setup/usetup/usetup.c | 419 ++++++++++++++++++++++++++++--------------- 3 files changed, 287 insertions(+), 146 deletions(-) diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index 7ad044c1c6..2c0cd5a55a 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/partlist.c * PURPOSE: Partition list functions diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index c07b993497..87c9959854 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/partlist.h * PURPOSE: Partition list functions @@ -34,10 +35,10 @@ typedef enum _FORMATMACHINESTATE FormatInstallPartition, FormatOtherPartition, FormatDone, - CheckSystemPartition, - CheckInstallPartition, - CheckOtherPartition, - CheckDone + // CheckSystemPartition, + // CheckInstallPartition, + // CheckOtherPartition, + // CheckDone } FORMATMACHINESTATE, *PFORMATMACHINESTATE; typedef struct _PARTLIST_UI diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 555d37e83a..c030d07ff3 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -57,9 +57,14 @@ static WCHAR DefaultKBLayout[20]; // Copy of string inside KeyboardList static BOOLEAN RepairUpdateFlag = FALSE; +/* Global partition list on the system */ static PPARTLIST PartitionList = NULL; -static PPARTENTRY TempPartition = NULL; + +/* List of currently supported file systems for the partition to be formatted */ static PFILE_SYSTEM_LIST FileSystemList = NULL; + +/* Machine state for the formatter */ +static PPARTENTRY TempPartition = NULL; static FORMATMACHINESTATE FormatState = Start; /*****************************************************/ @@ -798,7 +803,7 @@ RepairIntroPage(PINPUT_RECORD Ir) { MUIDisplayPage(REPAIR_INTRO_PAGE); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -858,6 +863,7 @@ UpgradeRepairPage(PINPUT_RECORD Ir) return QUIT_PAGE; } + /* Reset the formatter machine state */ TempPartition = NULL; FormatState = Start; } @@ -1461,6 +1467,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) return QUIT_PAGE; } + /* Reset the formatter machine state */ TempPartition = NULL; FormatState = Start; } @@ -1690,8 +1697,8 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { - WCHAR PathBuffer[MAX_PATH]; UNICODE_STRING CurrentPartition; + WCHAR PathBuffer[MAX_PATH]; if (PartitionList->CurrentPartition->IsPartitioned == FALSE) { @@ -1699,27 +1706,34 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; } - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu\\", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartitionNumber); - RtlInitUnicodeString(&CurrentPartition, 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)) +// TODO: Do something similar before trying to format the partition? + if (!PartitionList->CurrentPartition->New && + PartitionList->CurrentPartition->FormatState != Unformatted) { - PopupError("You cannot delete the partition containing the installation source!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); - return SELECT_PARTITION_PAGE; + ASSERT(PartitionList->CurrentPartition->PartitionNumber != 0); + + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + PartitionList->CurrentDisk->DiskNumber, + PartitionList->CurrentPartition->PartitionNumber); + RtlInitUnicodeString(&CurrentPartition, 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)) + { + PopupError("You cannot delete the partition containing the installation source!", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + return SELECT_PARTITION_PAGE; + } } - if (PartitionList->CurrentPartition->BootIndicator || - PartitionList->CurrentPartition == PartitionList->SystemPartition) + if (PartitionList->CurrentPartition == PartitionList->SystemPartition || + PartitionList->CurrentPartition->BootIndicator) { return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; } @@ -1733,7 +1747,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) #define PARTITION_SIZE_INPUT_FIELD_LENGTH 9 -/* Restriction for MaxSize: pow(10, (PARTITION_SIZE_INPUT_FIELD_LENGTH - 1)) - 1 */ +/* Restriction for MaxSize */ #define PARTITION_MAXSIZE (pow(10, (PARTITION_SIZE_INPUT_FIELD_LENGTH - 1)) - 1) static VOID @@ -2485,6 +2499,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) MUIDisplayPage(DELETE_PARTITION_PAGE); + /* Adjust partition type */ GetPartTypeStringFromPartitionType(PartEntry->PartitionType, PartTypeString, ARRAYSIZE(PartTypeString)); @@ -2596,7 +2611,6 @@ DeletePartitionPage(PINPUT_RECORD Ir) else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { DeleteCurrentPartition(PartitionList); - return SELECT_PARTITION_PAGE; } } @@ -2605,6 +2619,16 @@ DeletePartitionPage(PINPUT_RECORD Ir) } +static VOID +ResetFileSystemList(VOID) +{ + if (!FileSystemList) + return; + + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; +} + /* * Displays the SelectFileSystemPage. * @@ -2634,6 +2658,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PCHAR PartUnit; CHAR PartTypeString[32]; FORMATMACHINESTATE PreviousFormatState; + PCWSTR DefaultFs; DPRINT("SelectFileSystemPage()\n"); @@ -2645,31 +2670,101 @@ SelectFileSystemPage(PINPUT_RECORD Ir) return QUIT_PAGE; } - /* Find or set the active system partition */ - CheckActiveSystemPartition(PartitionList); - if (PartitionList->SystemPartition == NULL) + /* Find or set the active system partition when starting formatting */ + if (FormatState == Start) { - /* FIXME: show an error dialog */ - // - // Error dialog should say that we cannot find a suitable - // system partition and create one on the system. At this point, - // it may be nice to ask the user whether he wants to continue, - // or use an external drive as the system drive/partition - // (e.g. floppy, USB drive, etc...) - // - return QUIT_PAGE; + /* Find or set the active system partition */ + CheckActiveSystemPartition(PartitionList); + if (PartitionList->SystemPartition == NULL) + { + /* FIXME: show an error dialog */ + // + // Error dialog should say that we cannot find a suitable + // system partition and create one on the system. At this point, + // it may be nice to ask the user whether he wants to continue, + // or use an external drive as the system drive/partition + // (e.g. floppy, USB drive, etc...) + // + return QUIT_PAGE; + } + + /* + * If the system partition can be created in some + * non-partitioned space, create it now. + */ + if (!PartitionList->SystemPartition->IsPartitioned) + { + // if (IsUnattendedSetup) + { + CreatePrimaryPartition(PartitionList, + PartitionList->SystemPartition, + 0LL, // PartitionList->SystemPartition->SectorCount.QuadPart, + TRUE); + ASSERT(PartitionList->SystemPartition->IsPartitioned); + } + // else + { + } + } + + /* Commit all partition changes to all the disks */ + if (!WritePartitionsToDisk(PartitionList)) + { + DPRINT("WritePartitionsToDisk() failed\n"); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + /* + * In all cases, whether or not we are going to perform a formatting, + * we must perform a filesystem check of both the system and the + * installation partitions. + */ + PartitionList->CurrentPartition->NeedsCheck = TRUE; + if (PartitionList->SystemPartition != PartitionList->CurrentPartition) + PartitionList->SystemPartition->NeedsCheck = TRUE; + + /* + * In case we just repair an existing installation, or make + * an unattended setup without formatting, just go to the + * filesystem check step. + */ + if (RepairUpdateFlag) + return CHECK_FILE_SYSTEM_PAGE; + + if (IsUnattendedSetup && !USetupData.FormatPartition) + return CHECK_FILE_SYSTEM_PAGE; } + // ASSERT(PartitionList->SystemPartition->IsPartitioned); + + /* Reset the filesystem list for each partition that is to be formatted */ + ResetFileSystemList(); + PreviousFormatState = FormatState; switch (FormatState) { case Start: { - if (PartitionList->CurrentPartition != PartitionList->SystemPartition) + /* + * We start by formatting the system partition in case it is new + * (it didn't exist before) and is not the same as the installation + * partition. Otherwise we just require a filesystem check on it, + * and start by formatting the installation partition instead. + */ + + ASSERT(PartitionList->SystemPartition->IsPartitioned); + + if ((PartitionList->SystemPartition != PartitionList->CurrentPartition) && + (PartitionList->SystemPartition->FormatState == Unformatted)) { TempPartition = PartitionList->SystemPartition; TempPartition->NeedsCheck = TRUE; + // TODO: Should we let the user using a custom file-system, + // or should we always use FAT(32) for it? + // For "compatibility", FAT(32) would be best indeed. + FormatState = FormatSystemPartition; DPRINT1("FormatState: Start --> FormatSystemPartition\n"); } @@ -2678,6 +2773,16 @@ SelectFileSystemPage(PINPUT_RECORD Ir) TempPartition = PartitionList->CurrentPartition; TempPartition->NeedsCheck = TRUE; + if (PartitionList->SystemPartition != PartitionList->CurrentPartition) + { + /* The system partition is separate, so it had better be formatted! */ + ASSERT((PartitionList->SystemPartition->FormatState == Preformatted) || + (PartitionList->SystemPartition->FormatState == Formatted)); + + /* Require a filesystem check on the system partition too */ + PartitionList->SystemPartition->NeedsCheck = TRUE; + } + FormatState = FormatInstallPartition; DPRINT1("FormatState: Start --> FormatInstallPartition\n"); } @@ -2695,6 +2800,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) } case FormatInstallPartition: + case FormatOtherPartition: { if (GetNextUnformattedPartition(PartitionList, NULL, @@ -2702,34 +2808,30 @@ SelectFileSystemPage(PINPUT_RECORD Ir) { FormatState = FormatOtherPartition; TempPartition->NeedsCheck = TRUE; - DPRINT1("FormatState: FormatInstallPartition --> FormatOtherPartition\n"); + + if (FormatState == FormatInstallPartition) + DPRINT1("FormatState: FormatInstallPartition --> FormatOtherPartition\n"); + else + DPRINT1("FormatState: FormatOtherPartition --> FormatOtherPartition\n"); } else { FormatState = FormatDone; - DPRINT1("FormatState: FormatInstallPartition --> FormatDone\n"); + + if (FormatState == FormatInstallPartition) + DPRINT1("FormatState: FormatInstallPartition --> FormatDone\n"); + else + DPRINT1("FormatState: FormatOtherPartition --> FormatDone\n"); + return CHECK_FILE_SYSTEM_PAGE; } break; } - case FormatOtherPartition: + case FormatDone: { - if (GetNextUnformattedPartition(PartitionList, - NULL, - &TempPartition)) - { - FormatState = FormatOtherPartition; - TempPartition->NeedsCheck = TRUE; - DPRINT1("FormatState: FormatOtherPartition --> FormatOtherPartition\n"); - } - else - { - FormatState = FormatDone; - DPRINT1("FormatState: FormatOtherPartition --> FormatDone\n"); - return CHECK_FILE_SYSTEM_PAGE; - } - break; + DPRINT1("FormatState: FormatDone\n"); + return CHECK_FILE_SYSTEM_PAGE; } default: @@ -2866,54 +2968,47 @@ SelectFileSystemPage(PINPUT_RECORD Ir) "RAW"); } - if (FileSystemList == NULL) + ASSERT(FileSystemList == NULL); + + if (IsUnattendedSetup) { - PWSTR DefaultFs; + ASSERT(USetupData.FormatPartition); - if (IsUnattendedSetup) + switch (USetupData.FsType) { - switch (USetupData.FsType) - { - /* 1 is for BtrFS */ - case 1: - DefaultFs = L"BTRFS"; - break; - - /* If we don't understand input, default to FAT */ - default: - DefaultFs = L"FAT"; - break; - } - } - else - { - /* By default select the "FAT" file system */ - DefaultFs = L"FAT"; - } + /* 1 is for BtrFS */ + case 1: + DefaultFs = L"BTRFS"; + break; - /* Create the file system list */ - FileSystemList = CreateFileSystemList(6, 26, PartEntry->New, DefaultFs); - if (FileSystemList == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; + /* If we don't understand input, default to FAT */ + default: + DefaultFs = L"FAT"; + break; } } + else + { + /* By default select the "FAT" file system */ + DefaultFs = L"FAT"; + } - if (RepairUpdateFlag) + /* Create the file system list */ + // TODO: Display only the FSes compatible with the selected partition! + FileSystemList = CreateFileSystemList(6, 26, + PartEntry->New || + PartEntry->FormatState == Unformatted, + DefaultFs); + if (FileSystemList == NULL) { - return CHECK_FILE_SYSTEM_PAGE; - //return SELECT_PARTITION_PAGE; + /* FIXME: show an error dialog */ + return QUIT_PAGE; } if (IsUnattendedSetup) { - if (USetupData.FormatPartition) - { - return FORMAT_PARTITION_PAGE; - } - - return CHECK_FILE_SYSTEM_PAGE; + ASSERT(USetupData.FormatPartition); + return FORMAT_PARTITION_PAGE; } DrawFileSystemList(FileSystemList); @@ -2926,14 +3021,24 @@ SelectFileSystemPage(PINPUT_RECORD Ir) (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { if (ConfirmQuit(Ir)) + { + /* Reset the filesystem list */ + ResetFileSystemList(); return QUIT_PAGE; + } break; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { + /* Reset the formatter machine state */ + TempPartition = NULL; FormatState = Start; + + /* Reset the filesystem list */ + ResetFileSystemList(); + return SELECT_PARTITION_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -2949,9 +3054,27 @@ SelectFileSystemPage(PINPUT_RECORD Ir) else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { if (!FileSystemList->Selected->FileSystem) + { + ASSERT(!TempPartition->New && TempPartition->FormatState != Unformatted); + + /* + * Skip formatting this partition. We will also ignore + * filesystem checks on it, unless it is either the system + * or the installation partition. + */ + if (TempPartition != PartitionList->SystemPartition && + TempPartition != PartitionList->CurrentPartition) + { + PartEntry->NeedsCheck = FALSE; + } + return SELECT_FILE_SYSTEM_PAGE; + } else + { + /* Format this partition */ return FORMAT_PARTITION_PAGE; + } } } @@ -3014,15 +3137,17 @@ FormatPartitionPage(PINPUT_RECORD Ir) while (TRUE) { if (!IsUnattendedSetup) - { CONSOLE_ConInKey(Ir); - } if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { if (ConfirmQuit(Ir)) + { + /* Reset the filesystem list */ + ResetFileSystemList(); return QUIT_PAGE; + } break; } @@ -3033,6 +3158,10 @@ FormatPartitionPage(PINPUT_RECORD Ir) if (!PreparePartitionForFormatting(PartEntry, SelectedFileSystem->FileSystem)) { /* FIXME: show an error dialog */ + + /* Reset the filesystem list */ + ResetFileSystemList(); + return QUIT_PAGE; } @@ -3064,10 +3193,17 @@ FormatPartitionPage(PINPUT_RECORD Ir) #endif /* Commit the partition changes to the disk */ - if (!WritePartitionsToDisk(PartitionList)) + Status = WritePartitions(DiskEntry); + if (!NT_SUCCESS(Status)) { - DPRINT("WritePartitionsToDisk() failed\n"); + DPRINT1("WritePartitions(disk %lu) failed, Status 0x%08lx\n", + DiskEntry->DiskNumber, Status); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + + /* Reset the filesystem list */ + ResetFileSystemList(); + return QUIT_PAGE; } @@ -3080,54 +3216,65 @@ FormatPartitionPage(PINPUT_RECORD Ir) DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); /* Format the partition */ - if (SelectedFileSystem->FileSystem) + Status = FormatPartition(&PartitionRootPath, + SelectedFileSystem->FileSystem, + SelectedFileSystem->QuickFormat); + if (Status == STATUS_NOT_SUPPORTED) { - Status = FormatPartition(&PartitionRootPath, - SelectedFileSystem->FileSystem, - SelectedFileSystem->QuickFormat); - if (Status == STATUS_NOT_SUPPORTED) + sprintf(Buffer, + "Setup is currently unable to format a partition in %S.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + SelectedFileSystem->FileSystem); + + PopupError(Buffer, + MUIGetString(STRING_QUITCONTINUE), + NULL, POPUP_WAIT_NONE); + + while (TRUE) { - sprintf(Buffer, - "Setup is currently unable to format a partition in %S.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - SelectedFileSystem->FileSystem); - - PopupError(Buffer, - MUIGetString(STRING_QUITCONTINUE), - NULL, POPUP_WAIT_NONE); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); + CONSOLE_ConInKey(Ir); - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x00 && - Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3) /* F3 */ + if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x00 && + Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3) /* F3 */ + { + if (ConfirmQuit(Ir)) { - if (ConfirmQuit(Ir)) - return QUIT_PAGE; - else - return SELECT_FILE_SYSTEM_PAGE; + /* Reset the filesystem list */ + ResetFileSystemList(); + return QUIT_PAGE; } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ + else { return SELECT_FILE_SYSTEM_PAGE; } } + else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ + { + return SELECT_FILE_SYSTEM_PAGE; + } } - else if (!NT_SUCCESS(Status)) - { - DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); - MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); - return QUIT_PAGE; - } + } + else if (!NT_SUCCESS(Status)) + { + DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); + MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); + + /* Reset the filesystem list */ + ResetFileSystemList(); - PartEntry->FormatState = Formatted; - // PartEntry->FileSystem = FileSystem; - PartEntry->New = FALSE; + return QUIT_PAGE; } +// +// TODO: Here, call a partlist.c function that update the actual FS name +// and the label fields of the volume. +// + PartEntry->FormatState = Formatted; + // PartEntry->FileSystem = FileSystem; + PartEntry->New = FALSE; + #ifndef NDEBUG CONSOLE_SetStatusText(" Done. Press any key ..."); CONSOLE_ConInKey(Ir); @@ -3234,7 +3381,6 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ { - PartEntry->NeedsCheck = FALSE; return CHECK_FILE_SYSTEM_PAGE; } } @@ -3347,11 +3493,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) NTSTATUS Status; /* We do not need the filesystem list anymore */ - if (FileSystemList != NULL) - { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - } + ResetFileSystemList(); if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -4511,15 +4653,12 @@ QuitPage(PINPUT_RECORD Ir) PartitionList = NULL; } + /* Reset the formatter machine state */ TempPartition = NULL; FormatState = Start; /* Destroy the filesystem list */ - if (FileSystemList != NULL) - { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - } + ResetFileSystemList(); CONSOLE_SetStatusText(MUIGetString(STRING_REBOOTCOMPUTER2));

1 0

[reactos] 02/03: [SETUPLIB][USETUP] Minor improvements.
by Hermès Bélusca-Maïto 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29cc1843d074106649aa6… commit 29cc1843d074106649aa6b0155f9ff347c7abb45 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 24 19:04:57 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 10 15:41:20 2019 +0100 [SETUPLIB][USETUP] Minor improvements. - Make some partitioning functions not dependent on the selected "CurrentPartition". - Add some sanity checks. - Improve some of the "is-partitioned" checks. --- base/setup/lib/setuplib.c | 2 + base/setup/lib/utils/osdetect.c | 2 + base/setup/lib/utils/partlist.c | 201 +++++++++++++++++++++++----------------- base/setup/lib/utils/partlist.h | 18 +++- base/setup/usetup/usetup.c | 26 +++++- 5 files changed, 155 insertions(+), 94 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 9e4d22ee37..0501fe72ef 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -630,6 +630,8 @@ InitDestinationPaths( WCHAR PathBuffer[MAX_PATH]; NTSTATUS Status; + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + /* Create 'pSetupData->DestinationRootPath' string */ RtlFreeUnicodeString(&pSetupData->DestinationRootPath); Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index 8dd35cd55b..d191c58998 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -697,6 +697,8 @@ FindNTOSInstallations( ULONG Version; WCHAR PathBuffer[MAX_PATH]; + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + /* Set PartitionRootPath */ RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 5c20c4bf36..269bb99b2f 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -342,9 +342,10 @@ AssignDriveLetters( if (PartEntry->IsPartitioned && !IsContainerPartition(PartEntry->PartitionType)) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + if (IsRecognizedPartition(PartEntry->PartitionType) || - (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && - PartEntry->SectorCount.QuadPart != 0LL)) + PartEntry->SectorCount.QuadPart != 0LL) { if (Letter <= L'Z') { @@ -373,9 +374,10 @@ AssignDriveLetters( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + if (IsRecognizedPartition(PartEntry->PartitionType) || - (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && - PartEntry->SectorCount.QuadPart != 0LL)) + PartEntry->SectorCount.QuadPart != 0LL) { if (Letter <= L'Z') { @@ -903,6 +905,7 @@ AddPartitionToDisk( else if (IsRecognizedPartition(PartEntry->PartitionType)) { ASSERT(PartitionInfo->RecognizedPartition); + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); /* Open the volume, ignore any errors */ RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), @@ -2384,7 +2387,7 @@ UpdateDiskLayout( if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { - DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); return; } @@ -2405,14 +2408,16 @@ UpdateDiskLayout( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; PartEntry->PartitionIndex = Index; - /* Reset the current partition number only for newly-created partitions */ + /* Reset the current partition number only for newly-created (unmounted) partitions */ if (PartEntry->New) PartEntry->PartitionNumber = 0; - PartEntry->OnDiskPartitionNumber = (!IsContainerPartition(PartEntry->PartitionType)) ? PartitionNumber : 0; + PartEntry->OnDiskPartitionNumber = (!IsContainerPartition(PartEntry->PartitionType) ? PartitionNumber : 0); if (!IsSamePrimaryLayoutEntry(PartitionInfo, DiskEntry, PartEntry)) { @@ -2447,17 +2452,19 @@ UpdateDiskLayout( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; PartEntry->PartitionIndex = Index; - DPRINT1("Updating logical partition entry %lu\n", Index); - - /* Reset the current partition number only for newly-created partitions */ + /* Reset the current partition number only for newly-created (unmounted) partitions */ if (PartEntry->New) PartEntry->PartitionNumber = 0; PartEntry->OnDiskPartitionNumber = PartitionNumber; + DPRINT1("Updating logical partition entry %lu\n", Index); + PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->HiddenSectors = DiskEntry->SectorAlignment; @@ -2569,7 +2576,10 @@ GetPrevUnpartitionedEntry( PARTENTRY, ListEntry); if (PrevPartEntry->IsPartitioned == FALSE) + { + ASSERT(PrevPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); return PrevPartEntry; + } } return NULL; @@ -2601,7 +2611,10 @@ GetNextUnpartitionedEntry( PARTENTRY, ListEntry); if (NextPartEntry->IsPartitioned == FALSE) + { + ASSERT(NextPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); return NextPartEntry; + } } return NULL; @@ -2610,39 +2623,36 @@ GetNextUnpartitionedEntry( BOOLEAN CreatePrimaryPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate) { ERROR_NUMBER Error; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; DPRINT1("CreatePrimaryPartition(%I64u)\n", SectorCount); if (List == NULL || - List->CurrentDisk == NULL || - List->CurrentPartition == NULL || - List->CurrentPartition->IsPartitioned) + SelectedEntry == NULL || + SelectedEntry->DiskEntry == NULL || + SelectedEntry->IsPartitioned) { return FALSE; } - Error = PrimaryPartitionCreationChecks(List); + Error = PrimaryPartitionCreationChecks(SelectedEntry); if (Error != NOT_AN_ERROR) { DPRINT1("PrimaryPartitionCreationChecks() failed with error %lu\n", Error); return FALSE; } - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; - /* Convert the current entry, or insert and initialize a new partition entry */ - PartEntry = InitializePartitionEntry(DiskEntry, PartEntry, SectorCount, AutoCreate); + PartEntry = InitializePartitionEntry(SelectedEntry->DiskEntry, SelectedEntry, SectorCount, AutoCreate); if (PartEntry == NULL) return FALSE; - UpdateDiskLayout(DiskEntry); + UpdateDiskLayout(PartEntry->DiskEntry); AssignDriveLetters(List); @@ -2681,34 +2691,31 @@ AddLogicalDiskSpace( BOOLEAN CreateExtendedPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount) { ERROR_NUMBER Error; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; DPRINT1("CreateExtendedPartition(%I64u)\n", SectorCount); if (List == NULL || - List->CurrentDisk == NULL || - List->CurrentPartition == NULL || - List->CurrentPartition->IsPartitioned) + SelectedEntry == NULL || + SelectedEntry->DiskEntry == NULL || + SelectedEntry->IsPartitioned) { return FALSE; } - Error = ExtendedPartitionCreationChecks(List); + Error = ExtendedPartitionCreationChecks(SelectedEntry); if (Error != NOT_AN_ERROR) { DPRINT1("ExtendedPartitionCreationChecks() failed with error %lu\n", Error); return FALSE; } - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; - /* Convert the current entry, or insert and initialize a new partition entry */ - PartEntry = InitializePartitionEntry(DiskEntry, PartEntry, SectorCount, FALSE); + PartEntry = InitializePartitionEntry(SelectedEntry->DiskEntry, SelectedEntry, SectorCount, FALSE); if (PartEntry == NULL) return FALSE; @@ -2727,11 +2734,11 @@ CreateExtendedPartition( PartEntry->New = FALSE; PartEntry->FormatState = Formatted; - DiskEntry->ExtendedPartition = PartEntry; + PartEntry->DiskEntry->ExtendedPartition = PartEntry; - AddLogicalDiskSpace(DiskEntry); + AddLogicalDiskSpace(PartEntry->DiskEntry); - UpdateDiskLayout(DiskEntry); + UpdateDiskLayout(PartEntry->DiskEntry); AssignDriveLetters(List); @@ -2741,41 +2748,38 @@ CreateExtendedPartition( BOOLEAN CreateLogicalPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate) { ERROR_NUMBER Error; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; DPRINT1("CreateLogicalPartition(%I64u)\n", SectorCount); if (List == NULL || - List->CurrentDisk == NULL || - List->CurrentPartition == NULL || - List->CurrentPartition->IsPartitioned) + SelectedEntry == NULL || + SelectedEntry->DiskEntry == NULL || + SelectedEntry->IsPartitioned) { return FALSE; } - Error = LogicalPartitionCreationChecks(List); + Error = LogicalPartitionCreationChecks(SelectedEntry); if (Error != NOT_AN_ERROR) { DPRINT1("LogicalPartitionCreationChecks() failed with error %lu\n", Error); return FALSE; } - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; - /* Convert the current entry, or insert and initialize a new partition entry */ - PartEntry = InitializePartitionEntry(DiskEntry, PartEntry, SectorCount, AutoCreate); + PartEntry = InitializePartitionEntry(SelectedEntry->DiskEntry, SelectedEntry, SectorCount, AutoCreate); if (PartEntry == NULL) return FALSE; PartEntry->LogicalPartition = TRUE; - UpdateDiskLayout(DiskEntry); + UpdateDiskLayout(PartEntry->DiskEntry); AssignDriveLetters(List); @@ -2795,11 +2799,10 @@ DismountVolume( HANDLE PartitionHandle; WCHAR Buffer[MAX_PATH]; - /* Check whether the partition is valid and may have been mounted in the system */ + /* Check whether the partition is valid and was mounted by the system */ if (!PartEntry->IsPartitioned || - PartEntry->PartitionType == PARTITION_ENTRY_UNUSED || - IsContainerPartition(PartEntry->PartitionType) || - !IsRecognizedPartition(PartEntry->PartitionType) || + IsContainerPartition(PartEntry->PartitionType) || + !IsRecognizedPartition(PartEntry->PartitionType) || PartEntry->FormatState == Unformatted /* || PartEntry->FormatState == UnknownFormat */ || !*PartEntry->FileSystem || PartEntry->PartitionNumber == 0) @@ -2808,6 +2811,8 @@ DismountVolume( return STATUS_SUCCESS; } + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + /* Open the volume */ RtlStringCchPrintfW(Buffer, ARRAYSIZE(Buffer), L"\\Device\\Harddisk%lu\\Partition%lu", @@ -2888,32 +2893,37 @@ DismountVolume( } VOID -DeleteCurrentPartition( - IN PPARTLIST List) +DeletePartition( + IN PPARTLIST List, + IN PPARTENTRY PartEntry) { PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; PPARTENTRY PrevPartEntry; PPARTENTRY NextPartEntry; PPARTENTRY LogicalPartEntry; PLIST_ENTRY Entry; if (List == NULL || - List->CurrentDisk == NULL || - List->CurrentPartition == NULL || - List->CurrentPartition->IsPartitioned == FALSE) + PartEntry == NULL || + PartEntry->DiskEntry == NULL || + PartEntry->IsPartitioned == FALSE) { return; } - /* Clear the system disk and partition pointers if the system partition is being deleted */ - if (List->SystemPartition == List->CurrentPartition) + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + /* Clear the system partition pointers if it is being deleted */ + if (List->SystemPartition == PartEntry) { + ASSERT(List->SystemPartition); + + if (List->SystemPartition == List->OriginalSystemPartition) + List->OriginalSystemPartition = NULL; List->SystemPartition = NULL; } - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; + DiskEntry = PartEntry->DiskEntry; /* Check which type of partition (primary/logical or extended) is being deleted */ if (DiskEntry->ExtendedPartition == PartEntry) @@ -2961,7 +2971,11 @@ DeleteCurrentPartition( RtlFreeHeap(ProcessHeap, 0, NextPartEntry); /* Update current partition */ - List->CurrentPartition = PrevPartEntry; + if (List->CurrentPartition == PartEntry || + List->CurrentPartition == NextPartEntry) + { + List->CurrentPartition = PrevPartEntry; + } } else if (PrevPartEntry != NULL && NextPartEntry == NULL) { @@ -2975,7 +2989,10 @@ DeleteCurrentPartition( RtlFreeHeap(ProcessHeap, 0, PartEntry); /* Update current partition */ - List->CurrentPartition = PrevPartEntry; + if (List->CurrentPartition == PartEntry) + { + List->CurrentPartition = PrevPartEntry; + } } else if (PrevPartEntry == NULL && NextPartEntry != NULL) { @@ -2990,7 +3007,10 @@ DeleteCurrentPartition( RtlFreeHeap(ProcessHeap, 0, PartEntry); /* Update current partition */ - List->CurrentPartition = NextPartEntry; + if (List->CurrentPartition == PartEntry) + { + List->CurrentPartition = NextPartEntry; + } } else { @@ -3010,6 +3030,13 @@ DeleteCurrentPartition( AssignDriveLetters(List); } +VOID +DeleteCurrentPartition( + IN PPARTLIST List) +{ + DeletePartition(List, List->CurrentPartition); +} + static BOOLEAN IsSupportedActivePartition( @@ -3292,10 +3319,8 @@ SetSystemPartition: List->SystemPartition->DiskEntry->Dirty = TRUE; } -static NTSTATUS WritePartitions( - IN PPARTLIST List, IN PDISKENTRY DiskEntry) { NTSTATUS Status; @@ -3312,6 +3337,10 @@ WritePartitions( DPRINT("WritePartitions() Disk: %lu\n", DiskEntry->DiskNumber); + /* If the disk is not dirty, there is nothing to do */ + if (!DiskEntry->Dirty) + return STATUS_SUCCESS; + RtlStringCchPrintfW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Harddisk%lu\\Partition0", DiskEntry->DiskNumber); @@ -3394,6 +3423,7 @@ WritePartitions( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex]; PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; } @@ -3408,6 +3438,7 @@ WritePartitions( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex]; PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; } @@ -3423,7 +3454,8 @@ WritePartitions( // DiskEntry->NoMbr was TRUE (instead of NewDisk). // - // DiskEntry->Dirty = FALSE; + /* The layout has been successfully updated, the disk is not dirty anymore */ + DiskEntry->Dirty = FALSE; return Status; } @@ -3432,6 +3464,7 @@ BOOLEAN WritePartitionsToDisk( IN PPARTLIST List) { + NTSTATUS Status; PLIST_ENTRY Entry; PDISKENTRY DiskEntry; @@ -3452,8 +3485,12 @@ WritePartitionsToDisk( if (DiskEntry->Dirty != FALSE) { - WritePartitions(List, DiskEntry); - DiskEntry->Dirty = FALSE; + Status = WritePartitions(DiskEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WritePartitionsToDisk() failed to update disk %lu, Status 0x%08lx\n", + DiskEntry->DiskNumber, Status); + } } } @@ -3553,8 +3590,10 @@ SetMountedDeviceValues( Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned) + if (PartEntry->IsPartitioned) // && !IsContainerPartition(PartEntry->PartitionType) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { @@ -3574,8 +3613,10 @@ SetMountedDeviceValues( Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned) + if (PartEntry->IsPartitioned) // && !IsContainerPartition(PartEntry->PartitionType) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { @@ -3611,13 +3652,9 @@ SetPartitionType( ERROR_NUMBER PrimaryPartitionCreationChecks( - IN PPARTLIST List) + IN PPARTENTRY PartEntry) { - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { @@ -3638,13 +3675,9 @@ PrimaryPartitionCreationChecks( ERROR_NUMBER ExtendedPartitionCreationChecks( - IN PPARTLIST List) + IN PPARTENTRY PartEntry) { - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { @@ -3669,13 +3702,9 @@ ExtendedPartitionCreationChecks( ERROR_NUMBER LogicalPartitionCreationChecks( - IN PPARTLIST List) + IN PPARTENTRY PartEntry) { - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { @@ -3778,7 +3807,7 @@ GetNextUncheckedPartition( Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry->NeedsCheck == TRUE) + if (PartEntry->IsPartitioned && PartEntry->NeedsCheck) { ASSERT(DiskEntry == PartEntry->DiskEntry); if (pDiskEntry) *pDiskEntry = DiskEntry; @@ -3792,7 +3821,7 @@ GetNextUncheckedPartition( Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry->NeedsCheck == TRUE) + if (PartEntry->IsPartitioned && PartEntry->NeedsCheck) { ASSERT(DiskEntry == PartEntry->DiskEntry); if (pDiskEntry) *pDiskEntry = DiskEntry; diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index 57873a444e..ab4905a6d1 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -292,20 +292,28 @@ GetPrevPartition( BOOLEAN CreatePrimaryPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate); BOOLEAN CreateExtendedPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount); BOOLEAN CreateLogicalPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate); +VOID +DeletePartition( + IN PPARTLIST List, + IN PPARTENTRY PartEntry); + VOID DeleteCurrentPartition( IN PPARTLIST List); @@ -314,6 +322,10 @@ VOID CheckActiveSystemPartition( IN PPARTLIST List); +NTSTATUS +WritePartitions( + IN PDISKENTRY DiskEntry); + BOOLEAN WritePartitionsToDisk( IN PPARTLIST List); @@ -335,15 +347,15 @@ SetPartitionType( ERROR_NUMBER PrimaryPartitionCreationChecks( - IN PPARTLIST List); + IN PPARTENTRY PartEntry); ERROR_NUMBER ExtendedPartitionCreationChecks( - IN PPARTLIST List); + IN PPARTENTRY PartEntry); ERROR_NUMBER LogicalPartitionCreationChecks( - IN PPARTLIST List); + IN PPARTENTRY PartEntry); BOOLEAN GetNextUnformattedPartition( diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index b8df7c9261..555d37e83a 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1499,12 +1499,14 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (PartitionList->CurrentPartition->LogicalPartition) { CreateLogicalPartition(PartitionList, + PartitionList->CurrentPartition, PartitionList->CurrentPartition->SectorCount.QuadPart, TRUE); } else { CreatePrimaryPartition(PartitionList, + PartitionList->CurrentPartition, PartitionList->CurrentPartition->SectorCount.QuadPart, TRUE); } @@ -1607,7 +1609,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (PartitionList->CurrentPartition->LogicalPartition) { - Error = LogicalPartitionCreationChecks(PartitionList); + Error = LogicalPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1615,12 +1617,13 @@ SelectPartitionPage(PINPUT_RECORD Ir) } CreateLogicalPartition(PartitionList, + PartitionList->CurrentPartition, 0ULL, TRUE); } else { - Error = PrimaryPartitionCreationChecks(PartitionList); + Error = PrimaryPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1628,6 +1631,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) } CreatePrimaryPartition(PartitionList, + PartitionList->CurrentPartition, 0ULL, TRUE); } @@ -1646,7 +1650,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (PartitionList->CurrentPartition->LogicalPartition == FALSE) { - Error = PrimaryPartitionCreationChecks(PartitionList); + Error = PrimaryPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1660,7 +1664,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (PartitionList->CurrentPartition->LogicalPartition == FALSE) { - Error = ExtendedPartitionCreationChecks(PartitionList); + Error = ExtendedPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1674,7 +1678,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (PartitionList->CurrentPartition->LogicalPartition) { - Error = LogicalPartitionCreationChecks(PartitionList); + Error = LogicalPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -2068,6 +2072,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DPRINT ("Partition size: %I64u bytes\n", PartSize); CreatePrimaryPartition(PartitionList, + PartitionList->CurrentPartition, SectorCount, FALSE); @@ -2231,6 +2236,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DPRINT ("Partition size: %I64u bytes\n", PartSize); CreateExtendedPartition(PartitionList, + PartitionList->CurrentPartition, SectorCount); return SELECT_PARTITION_PAGE; @@ -2393,6 +2399,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DPRINT("Partition size: %I64u bytes\n", PartSize); CreateLogicalPartition(PartitionList, + PartitionList->CurrentPartition, SectorCount, FALSE); @@ -2736,6 +2743,8 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PartEntry = TempPartition; DiskEntry = PartEntry->DiskEntry; + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + /* Adjust disk size */ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; if (DiskSize >= 10 * GB) /* 10 GB */ @@ -2997,7 +3006,10 @@ FormatPartitionPage(PINPUT_RECORD Ir) PartEntry = TempPartition; DiskEntry = PartEntry->DiskEntry; + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + SelectedFileSystem = FileSystemList->Selected; + ASSERT(SelectedFileSystem && SelectedFileSystem->FileSystem); while (TRUE) { @@ -3163,6 +3175,8 @@ CheckFileSystemPage(PINPUT_RECORD Ir) return INSTALL_DIRECTORY_PAGE; } + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -3930,6 +3944,8 @@ BootLoaderPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); + ASSERT(PartitionList->SystemPartition->IsPartitioned && PartitionList->SystemPartition->PartitionNumber != 0); + RtlFreeUnicodeString(&USetupData.SystemRootPath); RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\",

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2019