static USETUP_DATA USetupData;
-/* Partition where to perform the installation */
+/* The 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;
+/*
+ * The system partition we will actually use. It can be different from
+ * PartitionList->SystemPartition in case we don't support it, or we install
+ * on a removable disk.
+ * We may indeed not support the original system partition in case we do not
+ * have write support on it. Please note that this situation is partly a HACK
+ * and MUST NEVER happen on architectures where real system partitions are
+ * mandatory (because then they are formatted in FAT FS and we support write
+ * operation on them).
+ */
+static PPARTENTRY SystemPartition = NULL;
/* OTHER Stuff *****/
PartitionList = CreatePartitionList();
if (PartitionList == NULL)
{
- /* FIXME: show an error dialog */
MUIDisplayError(ERROR_DRIVE_INFORMATION, Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
// FIXME TODO: PartitionList->SystemPartition is not yet initialized!!!!
if (CurrentPartition == PartitionList->SystemPartition ||
- CurrentPartition->BootIndicator)
+ IsPartitionActive(CurrentPartition))
{
return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE;
}
CONSOLE_SetCursorType(TRUE, FALSE);
break;
}
- else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESCAPE */
+ else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */
{
if (Cancel != NULL)
*Cancel = TRUE;
//
return QUIT_PAGE;
}
+ SystemPartition = PartitionList->SystemPartition;
/*
* If the system partition can be created in some
* non-partitioned space, create it now.
*/
- if (!PartitionList->SystemPartition->IsPartitioned)
+ if (!SystemPartition->IsPartitioned)
{
// if (IsUnattendedSetup)
{
CreatePrimaryPartition(PartitionList,
- PartitionList->SystemPartition,
- 0LL, // PartitionList->SystemPartition->SectorCount.QuadPart,
+ SystemPartition,
+ 0LL, // SystemPartition->SectorCount.QuadPart,
TRUE);
- ASSERT(PartitionList->SystemPartition->IsPartitioned);
+ ASSERT(SystemPartition->IsPartitioned);
}
// else
{
* installation partitions.
*/
InstallPartition->NeedsCheck = TRUE;
- if (PartitionList->SystemPartition != InstallPartition)
- PartitionList->SystemPartition->NeedsCheck = TRUE;
+ if (SystemPartition != InstallPartition)
+ SystemPartition->NeedsCheck = TRUE;
/*
* In case we just repair an existing installation, or make
return CHECK_FILE_SYSTEM_PAGE;
}
- // ASSERT(PartitionList->SystemPartition->IsPartitioned);
+ // ASSERT(SystemPartition->IsPartitioned);
/* Reset the filesystem list for each partition that is to be formatted */
ResetFileSystemList();
* and start by formatting the installation partition instead.
*/
- ASSERT(PartitionList->SystemPartition->IsPartitioned);
+ ASSERT(SystemPartition->IsPartitioned);
- if ((PartitionList->SystemPartition != InstallPartition) &&
- (PartitionList->SystemPartition->FormatState == Unformatted))
+ if ((SystemPartition != InstallPartition) &&
+ (SystemPartition->FormatState == Unformatted))
{
- TempPartition = PartitionList->SystemPartition;
+ TempPartition = SystemPartition;
TempPartition->NeedsCheck = TRUE;
// TODO: Should we let the user using a custom file-system,
TempPartition = InstallPartition;
TempPartition->NeedsCheck = TRUE;
- if (PartitionList->SystemPartition != InstallPartition)
+ if (SystemPartition != InstallPartition)
{
/* The system partition is separate, so it had better be formatted! */
- ASSERT((PartitionList->SystemPartition->FormatState == Preformatted) ||
- (PartitionList->SystemPartition->FormatState == Formatted));
+ ASSERT((SystemPartition->FormatState == Preformatted) ||
+ (SystemPartition->FormatState == Formatted));
/* Require a filesystem check on the system partition too */
- PartitionList->SystemPartition->NeedsCheck = TRUE;
+ SystemPartition->NeedsCheck = TRUE;
}
FormatState = FormatInstallPartition;
default:
{
DPRINT1("FormatState: Invalid value %ld\n", FormatState);
- /* FIXME: show an error dialog */
+ ASSERT(FALSE);
return QUIT_PAGE;
}
}
break;
default:
+ ASSERT(FALSE);
break;
}
- CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT));
+ CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED_1),
+ DiskEntry->DiskNumber,
+ DiskSize,
+ DiskUnit,
+ DiskEntry->Port,
+ DiskEntry->Bus,
+ DiskEntry->Id,
+ &DiskEntry->DriverName,
+ DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+ DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+ "RAW");
+
+ CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
}
else
{
* filesystem checks on it, unless it is either the system
* or the installation partition.
*/
- if (TempPartition != PartitionList->SystemPartition &&
+ if (TempPartition != SystemPartition &&
TempPartition != InstallPartition)
{
PartEntry->NeedsCheck = FALSE;
else if (!NT_SUCCESS(Status))
{
DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status);
- // sprintf(Buffer, "Setup failed to verify the selected partition.\n"
- sprintf(Buffer, "ChkDsk detected some disk errors.\n"
- "(Status 0x%08lx).\n", Status);
+ sprintf(Buffer, "ChkDsk detected some disk errors.\n(Status 0x%08lx).\n", Status);
PopupError(Buffer,
- // MUIGetString(STRING_REBOOTCOMPUTER),
MUIGetString(STRING_CONTINUE),
Ir, POPUP_WAIT_ENTER);
-
- // return QUIT_PAGE;
}
PartEntry->NeedsCheck = FALSE;
}
-static NTSTATUS
-BuildInstallPaths(
- IN PCWSTR InstallDir,
- IN PPARTENTRY PartEntry)
-{
- NTSTATUS Status;
-
- Status = InitDestinationPaths(&USetupData, InstallDir, PartEntry);
-
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("InitDestinationPaths() failed with status 0x%08lx\n", Status);
- return Status;
- }
-
- /* Initialize DestinationDriveLetter */
- DestinationDriveLetter = PartEntry->DriveLetter;
-
- return STATUS_SUCCESS;
-}
-
-
static BOOLEAN
IsValidPath(
IN PCWSTR InstallDir)
*/
if ((RepairUpdateFlag || IsUnattendedSetup) && IsValidPath(InstallDir))
{
- Status = BuildInstallPaths(InstallDir, InstallPartition);
+ Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition);
if (!NT_SUCCESS(Status))
{
- DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);
+ DPRINT1("InitDestinationPaths() failed. Status code: 0x%lx", Status);
MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
return INSTALL_DIRECTORY_PAGE;
}
- Status = BuildInstallPaths(InstallDir, InstallPartition);
+ Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition);
if (!NT_SUCCESS(Status))
{
- DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);
+ DPRINT1("InitDestinationPaths() failed. Status code: 0x%lx", Status);
MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
Error = UpdateRegistry(&USetupData,
RepairUpdateFlag,
PartitionList,
- DestinationDriveLetter,
+ InstallPartition->DriveLetter,
SelectedLanguageId,
RegistryStatus);
if (Error != ERROR_SUCCESS)
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
- ASSERT(PartitionList->SystemPartition->IsPartitioned && PartitionList->SystemPartition->PartitionNumber != 0);
+ ASSERT(SystemPartition->IsPartitioned && SystemPartition->PartitionNumber != 0);
RtlFreeUnicodeString(&USetupData.SystemRootPath);
RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer),
L"\\Device\\Harddisk%lu\\Partition%lu\\",
- PartitionList->SystemPartition->DiskEntry->DiskNumber,
- PartitionList->SystemPartition->PartitionNumber);
+ SystemPartition->DiskEntry->DiskNumber,
+ SystemPartition->PartitionNumber);
RtlCreateUnicodeString(&USetupData.SystemRootPath, PathBuffer);
DPRINT1("SystemRootPath: %wZ\n", &USetupData.SystemRootPath);
- PartitionType = PartitionList->SystemPartition->PartitionType;
+ PartitionType = SystemPartition->PartitionType;
/* For unattended setup, skip MBR installation or install on floppy if needed */
if (IsUnattendedSetup)
Status = InstallVBRToPartition(&USetupData.SystemRootPath,
&USetupData.SourceRootPath,
&USetupData.DestinationArcPath,
- PartitionList->SystemPartition->PartitionType);
+ SystemPartition->PartitionType);
if (!NT_SUCCESS(Status))
{
MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER,
- PartitionList->SystemPartition->FileSystem);
+ SystemPartition->FileSystem);
return QUIT_PAGE;
}
Status = InstallVBRToPartition(&USetupData.SystemRootPath,
&USetupData.SourceRootPath,
&USetupData.DestinationArcPath,
- PartitionList->SystemPartition->PartitionType);
+ SystemPartition->PartitionType);
if (!NT_SUCCESS(Status))
{
MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER,
- PartitionList->SystemPartition->FileSystem);
+ SystemPartition->FileSystem);
return QUIT_PAGE;
}
/* Step 2: Write the MBR if the disk containing the system partition is not a super-floppy */
- if (!IsSuperFloppy(PartitionList->SystemPartition->DiskEntry))
+ if (!IsSuperFloppy(SystemPartition->DiskEntry))
{
RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer),
L"\\Device\\Harddisk%d\\Partition0",
- PartitionList->SystemPartition->DiskEntry->DiskNumber);
+ SystemPartition->DiskEntry->DiskNumber);
Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath,
&USetupData.SourceRootPath,
DestinationDevicePathBuffer);
projects / reactos.git / blobdiff