[ekohl] 68652: Show a warning page, when a user tries to delete an active partition. CORE-9996 #resolve
Author: ekohl Date: Sun Aug 9 13:14:00 2015 New Revision: 68652
URL: http://svn.reactos.org/svn/reactos?rev=68652&view=rev Log: Show a warning page, when a user tries to delete an active partition. CORE-9996 #resolve
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.h
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface... ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -1663,6 +1663,9 @@ return SELECT_PARTITION_PAGE; }
+ if (PartitionList->CurrentPartition->BootIndicator) + return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; + return DELETE_PARTITION_PAGE; } } @@ -2229,6 +2232,39 @@ }
return CREATE_LOGICAL_PARTITION_PAGE; +} + + +static PAGE_NUMBER +ConfirmDeleteSystemPartitionPage(PINPUT_RECORD Ir) +{ + MUIDisplayPage(CONFIRM_DELETE_SYSTEM_PARTITION_PAGE); + + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ + { + if (ConfirmQuit(Ir) == TRUE) + { + return QUIT_PAGE; + } + + break; + } + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ + { + return DELETE_PARTITION_PAGE; + } + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ + { + return SELECT_PARTITION_PAGE; + } + } + + return SELECT_PARTITION_PAGE; }
@@ -4417,6 +4453,10 @@ Page = CreateLogicalPartitionPage(&Ir); break;
+ case CONFIRM_DELETE_SYSTEM_PARTITION_PAGE: + Page = ConfirmDeleteSystemPartitionPage(&Ir); + break; + case DELETE_PARTITION_PAGE: Page = DeletePartitionPage(&Ir); break;
Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-B... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -825,6 +825,100 @@ 0, " ®ç ª ©â¥...", /* ¥¤êâ ¤ ¥ ᥠ¯à¥¢¥¦¤ , § é®â® ᯨáêªêâ á ¤ï«®¢¥â¥ é¥ á¥ à §¬¥á⨠*/ TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bgBGConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1563,6 +1657,10 @@ { SELECT_PARTITION_PAGE, bgBGSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + bgBGConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-B... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -814,6 +814,100 @@ 0, 0, "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1549,6 +1643,10 @@ { SELECT_PARTITION_PAGE, bnBDSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + bnBDConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-C... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -822,6 +822,100 @@ 0, 0, "Cekejte, prosim...", //MUSI ZUSTAT BEZ DIAKRITIKY! + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY csCZConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1558,6 +1652,10 @@ { SELECT_PARTITION_PAGE, csCZSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + csCZConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-D... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -809,6 +809,100 @@ 0, 0, "Bitte warten...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY deDEConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1554,6 +1648,10 @@ { SELECT_PARTITION_PAGE, deDESelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + deDEConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-G... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -828,6 +828,100 @@ 0, " ¨¡¢é §¨ £â¤«...", TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY elGRConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1567,6 +1661,10 @@ { SELECT_PARTITION_PAGE, elGRSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + elGRConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-U... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -823,6 +823,101 @@ 0 } }; + +static MUI_ENTRY enUSConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; +
static MUI_ENTRY enUSFormatPartitionEntries[] = { @@ -1549,6 +1644,10 @@ { SELECT_PARTITION_PAGE, enUSSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + enUSConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-E... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -822,6 +822,100 @@ 0, 0, "Espere un momento...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1557,6 +1651,10 @@ { SELECT_PARTITION_PAGE, esESSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + esESConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-E... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -815,6 +815,100 @@ 0, 0, "Palun oota...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1548,6 +1642,10 @@ { SELECT_PARTITION_PAGE, etEESelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + etEEConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-F... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -827,6 +827,100 @@ 0, 0, "Patienter...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1563,6 +1657,10 @@ { SELECT_PARTITION_PAGE, frFRSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + frFRConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-I... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -815,6 +815,100 @@ 0, 0, " ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1550,6 +1644,10 @@ { SELECT_PARTITION_PAGE, heILSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + heILConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-I... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -823,6 +823,100 @@ 0, " Attendere...", TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1558,6 +1652,10 @@ { SELECT_PARTITION_PAGE, itITSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + itITConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-J... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -816,6 +816,100 @@ 0, 0, "µÏÁ ¸ÀÞ»²...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1551,6 +1645,10 @@ { SELECT_PARTITION_PAGE, jaJPSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + jaJPConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-L... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -824,6 +824,100 @@ 0, 0, "PraÕome palaukti...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1560,6 +1654,10 @@ { SELECT_PARTITION_PAGE, ltLTSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + ltLTConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-N... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -844,6 +844,100 @@ 0, 0, "Een ogenblik geduld...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY nlNLConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1590,6 +1684,10 @@ { SELECT_PARTITION_PAGE, nlNLSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + nlNLConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-P... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -825,6 +825,100 @@ 0, 0, "Prosz© czeka...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1560,6 +1654,10 @@ { SELECT_PARTITION_PAGE, plPLSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + plPLConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-B... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -834,6 +834,100 @@ 0, 0, "Por favor, aguarde...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1587,6 +1681,10 @@ { SELECT_PARTITION_PAGE, ptBRSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + ptBRConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-R... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -870,6 +870,100 @@ 0, 0, "Ateptaîi...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1620,6 +1714,10 @@ { SELECT_PARTITION_PAGE, roROSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + roROConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-R... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -815,6 +815,100 @@ 0, 0, "®¦ «ã©áâ , ¯®¤®¦¤¨â¥...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ruRUConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1551,6 +1645,10 @@ { SELECT_PARTITION_PAGE, ruRUSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + ruRUConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-S... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -823,6 +823,100 @@ 0, 0, "Pokajte, pros¡m ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1562,6 +1656,10 @@ { SELECT_PARTITION_PAGE, skSKSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + skSKConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-A... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -819,6 +819,100 @@ 0, 0, "Ju luttem prisni...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY sqALConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1554,6 +1648,10 @@ { SELECT_PARTITION_PAGE, sqALSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + sqALConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-S... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -823,6 +823,100 @@ 0, " Var Vnlig Vnta...", TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1557,6 +1651,10 @@ { SELECT_PARTITION_PAGE, svSESelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + svSEConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-T... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -808,6 +808,100 @@ 0, 0, "Ltfen bekleyiniz...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1537,6 +1631,10 @@ { SELECT_PARTITION_PAGE, trTRSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + trTRConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-U... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -821,6 +821,100 @@ 0, 0, "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUAConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1557,6 +1651,10 @@ { SELECT_PARTITION_PAGE, ukUASelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + ukUAConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,
Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.... ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -68,7 +68,7 @@
ULONGLONG -Align( +AlignDown( IN ULONGLONG Value, IN ULONG Alignment) { @@ -79,6 +79,22 @@ return Temp * Alignment; }
+ +ULONGLONG +AlignUp( + IN ULONGLONG Value, + IN ULONG Alignment) +{ + ULONGLONG Temp, Result; + + Temp = Value / Alignment; + + Result = Temp * Alignment; + if (Value % Alignment) + Result += Alignment; + + return Result; +}
ULONGLONG RoundingDivide( @@ -608,7 +624,7 @@
NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = (ULONGLONG)DiskEntry->SectorAlignment; - NewPartEntry->SectorCount.QuadPart = Align(DiskEntry->SectorCount.QuadPart, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(DiskEntry->SectorCount.QuadPart, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart;
DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -654,7 +670,7 @@
NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart;
DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -678,7 +694,7 @@ /* Check for trailing unpartitioned disk space */ if ((LastStartSector + LastSectorCount) < DiskEntry->SectorCount.QuadPart) { - LastUnusedSectorCount = Align(DiskEntry->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); + LastUnusedSectorCount = AlignDown(DiskEntry->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment);
if (LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) { @@ -694,7 +710,7 @@
NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart;
DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -773,7 +789,7 @@
NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart;
DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -797,7 +813,7 @@ /* Check for trailing unpartitioned disk space */ if ((LastStartSector + LastSectorCount) < DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart) { - LastUnusedSectorCount = Align(DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); + LastUnusedSectorCount = AlignDown(DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment);
if (LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) { @@ -814,7 +830,7 @@
NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart;
DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -1090,6 +1106,8 @@ (ULONGLONG)DiskGeometry.SectorsPerTrack;
DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; + DiskEntry->CylinderAlignment = DiskGeometry.TracksPerCylinder * + DiskGeometry.SectorsPerTrack;
DPRINT("SectorCount %I64u\n", DiskEntry->SectorCount); DPRINT("SectorAlignment %lu\n", DiskEntry->SectorAlignment); @@ -2559,7 +2577,7 @@ DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart);
if (AutoCreate == TRUE || - Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { DPRINT1("Convert existing partition entry\n");
@@ -2594,7 +2612,7 @@
NewPartEntry->IsPartitioned = TRUE; NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED;
@@ -2676,7 +2694,7 @@
DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart);
- if (Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + if (AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { DPRINT1("Convert existing partition entry\n");
@@ -2723,7 +2741,7 @@
NewPartEntry->IsPartitioned = TRUE; NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart;
NewPartEntry->New = FALSE; @@ -2787,7 +2805,7 @@ DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart);
if (AutoCreate == TRUE || - Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { DPRINT1("Convert existing partition entry\n");
@@ -2823,7 +2841,7 @@
NewPartEntry->IsPartitioned = TRUE; NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED;
Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.... ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -112,6 +112,7 @@
ULARGE_INTEGER SectorCount; ULONG SectorAlignment; + ULONG CylinderAlignment;
BOOLEAN BiosFound; ULONG BiosDiskNumber;
Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h?... ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -132,6 +132,7 @@ CREATE_PRIMARY_PARTITION_PAGE, CREATE_EXTENDED_PARTITION_PAGE, CREATE_LOGICAL_PARTITION_PAGE, + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, DELETE_PARTITION_PAGE,
SELECT_FILE_SYSTEM_PAGE,
-
ekohl＠svn.reactos.org