Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-27 21:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP]

Browse source 
You can install ReactOS on 'unpartitioned space' again. Usetup will create a primary partition that spans the whole unpartitioned space, format the partition and install ReactOS on that partition.

svn path=/trunk/; revision=65923
This commit is contained in:
Eric Kohl 2014-12-31 20:51:56 +00:00
parent c7e2c1e0f8
commit 8235a5df62
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/base/setup/usetup/interface/usetup.c
View file

@ -46,6 +46,7 @@ UNICODE_STRING SourceRootPath;
UNICODE_STRING SourceRootDir;
UNICODE_STRING SourcePath;
BOOLEAN IsUnattendedSetup = FALSE;
BOOLEAN InstallShortcut = FALSE;
LONG UnattendDestinationDiskNumber;
LONG UnattendDestinationPartitionNumber;
LONG UnattendMBRInstallType = -1;
@ -1601,19 +1602,22 @@ SelectPartitionPage(PINPUT_RECORD Ir)
if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType))
continue; //return SELECT_PARTITION_PAGE;
if (!IsDiskSizeValid(PartitionList->CurrentPartition))
{
MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY,
RequiredPartitionDiskSpace);
continue; //return SELECT_PARTITION_PAGE; /* let the user select another partition */
}
if (PartitionList->CurrentPartition == NULL ||
PartitionList->CurrentPartition->IsPartitioned == FALSE)
{
CreatePrimaryPartition(PartitionList,
0ULL,
TRUE);
}
InstallShortcut = TRUE;
if (!IsDiskSizeValid(PartitionList->CurrentPartition))
{
MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY,
RequiredPartitionDiskSpace);
return SELECT_PARTITION_PAGE; /* let the user select another partition */
return SELECT_FILE_SYSTEM_PAGE;
}
DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter;
@ -2875,7 +2879,7 @@ FormatPartitionPage(PINPUT_RECORD Ir)
DestroyFileSystemList(FileSystemList);
FileSystemList = NULL;
if (IsUnattendedSetup)
if (IsUnattendedSetup || InstallShortcut)
return INSTALL_DIRECTORY_PAGE;
else
return SELECT_PARTITION_PAGE;