Author: ekohl
Date: Sat Jul 4 16:04:09 2015
New Revision: 68339
URL:
http://svn.reactos.org/svn/reactos?rev=68339&view=rev
Log:
[USETUP]
- Add description of the 'L' key to the partition selection page.
- Make the 'ENTER' key work for logical partitions too. Selected unpartitioned
space will be converted to a logical partition.
Patch by Gerhard Gruber (sparhawk).
CORE-9641 #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
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jul 4 16:04:09
2015
@@ -1454,7 +1454,7 @@
if (PartitionList == NULL)
{
PartitionList = CreatePartitionList(2,
- 21,
+ 23,
xScreen - 3,
yScreen - 3);
if (PartitionList == NULL)
@@ -1477,9 +1477,18 @@
{
if (AutoPartition)
{
- CreatePrimaryPartition(PartitionList,
-
PartitionList->CurrentPartition->SectorCount.QuadPart,
- TRUE);
+ if (PartitionList->CurrentPartition->LogicalPartition)
+ {
+ CreateLogicalPartition(PartitionList,
+
PartitionList->CurrentPartition->SectorCount.QuadPart,
+ TRUE);
+ }
+ else
+ {
+ CreatePrimaryPartition(PartitionList,
+
PartitionList->CurrentPartition->SectorCount.QuadPart,
+ TRUE);
+ }
if (!IsDiskSizeValid(PartitionList->CurrentPartition))
{
@@ -1579,9 +1588,18 @@
if (PartitionList->CurrentPartition == NULL ||
PartitionList->CurrentPartition->IsPartitioned == FALSE)
{
- CreatePrimaryPartition(PartitionList,
- 0ULL,
- TRUE);
+ if (PartitionList->CurrentPartition->LogicalPartition)
+ {
+ CreateLogicalPartition(PartitionList,
+ 0ULL,
+ TRUE);
+ }
+ else
+ {
+ CreatePrimaryPartition(PartitionList,
+ 0ULL,
+ TRUE);
+ }
}
if (!IsDiskSizeValid(PartitionList->CurrentPartition))
@@ -2203,7 +2221,8 @@
DPRINT("Partition size: %I64u bytes\n", PartSize);
CreateLogicalPartition(PartitionList,
- SectorCount);
+ SectorCount,
+ FALSE);
return SELECT_PARTITION_PAGE;
}
Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -811,6 +811,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 â¨á¥â¥ D § ¨§âਢ ¥ áêé¥áâ¢ã¢ é ¤ï«.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -801,6 +801,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Press D to delete an existing partition.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -809,6 +809,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Stisknut¡m D umo§n¡te smaz n¡ existuj¡c¡ho odd¡lu.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -796,6 +796,12 @@
{
8,
19,
+ "\x07 L erstellt eine logische Partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 D lscht eine vorhandene Partition.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -814,6 +814,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 «ã©« D ¤ ¨á¯« ⤠¬§á¨®¦¤ £â¨ ©£.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -801,6 +801,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Press D to delete an existing partition.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -809,6 +809,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Presione D para borrar una partici¢n existente.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -802,6 +802,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Vajuta D, et kustutada olemasolev partitsioon.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -814,6 +814,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Appuyer sur D pour effacer une partition.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -802,6 +802,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Press D to delete an existing partition.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -809,6 +809,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Premere D per cancellare una partizione esistente.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -803,6 +803,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 ·¿ÝÉ Ê߰輮ݦ »¸¼Þ® ½ÙÆÊ D ·°¦ µ¼Ã ¸ÀÞ»²¡",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -811,6 +811,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Press D to delete an existing partition.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -831,6 +831,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Druk op D om een bestaande partitie te verwijderen.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -811,6 +811,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Nacinij D, by skasowa istniej¥c¥ partycj©.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -821,6 +821,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Para excluir a partiÆo selecionada, pressione D.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -857,6 +857,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Tastaîi D pentru a terge o partiîie existentÇ.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -802,6 +802,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 ¦¬¨â¥ D ¤«ï 㤠«¥¨ï áãé¥áâ¢ãî饣® à §¤¥« .",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -810,6 +810,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Stlate D pre vymazanie existuj£cej oblasti.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -806,6 +806,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Kliko D pr t fshir nj particion ekzistues.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -809,6 +809,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Tryck D fr att ta bort en befintlig partititon.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -795,6 +795,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 Var olan bir blm silmek iin D'ye basnz.",
TEXT_STYLE_NORMAL
},
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-…
==============================================================================
--- 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] Sat Jul 4 16:04:09 2015
@@ -808,6 +808,12 @@
{
8,
19,
+ "\x07 Press L to create a logical partition.",
+ TEXT_STYLE_NORMAL
+ },
+ {
+ 8,
+ 21,
"\x07 â¨áiâì D 鮡 ¢¨¤ «¨â¨ iáãî稩 ஧¤i«.",
TEXT_STYLE_NORMAL
},
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] Sat Jul 4 16:04:09 2015
@@ -2762,7 +2762,8 @@
VOID
CreateLogicalPartition(
PPARTLIST List,
- ULONGLONG SectorCount)
+ ULONGLONG SectorCount,
+ BOOLEAN AutoCreate)
{
PDISKENTRY DiskEntry;
PPARTENTRY PartEntry;
@@ -2783,7 +2784,8 @@
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 (AutoCreate == TRUE ||
+ Align(PartEntry->StartSector.QuadPart + SectorCount,
DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart ==
PartEntry->SectorCount.QuadPart)
{
DPRINT1("Convert existing partition entry\n");
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] Sat Jul 4 16:04:09 2015
@@ -253,7 +253,8 @@
VOID
CreateLogicalPartition(
PPARTLIST List,
- ULONGLONG SectorCount);
+ ULONGLONG SectorCount,
+ BOOLEAN AutoCreate);
VOID
DeleteCurrentPartition(