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

[USETUP]

Browse source 
Change the partition creation workflow, so that the user is forced to choose a file system type and format a partition after it has been created.

svn path=/trunk/; revision=65899
This commit is contained in:
Eric Kohl 2014-12-29 21:23:30 +00:00
parent 33f089b6ae
commit ac0ac23b55
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1618,7 +1618,7 @@ SelectPartitionPage(PINPUT_RECORD Ir)
DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter;
return SELECT_FILE_SYSTEM_PAGE;
return INSTALL_DIRECTORY_PAGE;
}
else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */
{
@ -1969,7 +1969,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
return QUIT_PAGE;
}
return SELECT_PARTITION_PAGE;
return SELECT_FILE_SYSTEM_PAGE;
}
}
@ -2279,7 +2279,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
return QUIT_PAGE;
}
return SELECT_PARTITION_PAGE;
return SELECT_FILE_SYSTEM_PAGE;
}
}
@ -2868,7 +2868,11 @@ FormatPartitionPage(PINPUT_RECORD Ir)
DestroyFileSystemList(FileSystemList);
FileSystemList = NULL;
return INSTALL_DIRECTORY_PAGE;
if (IsUnattendedSetup)
return INSTALL_DIRECTORY_PAGE;
else
return SELECT_PARTITION_PAGE;
}
}

4
reactos/base/setup/usetup/partlist.c
View file

@ -2426,6 +2426,8 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart;
PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart);
List->CurrentPartition = NewPartEntry;
}
UpdateDiskLayout(DiskEntry);
@ -2568,6 +2570,8 @@ DPRINT1("Add new partition entry\n");
DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1);
DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
List->CurrentPartition = NewPartEntry;
}
AddLogicalDiskSpace(DiskEntry);