[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 

svn path=/trunk/; revision=68339

reactos/base/setup/usetup/interface/usetup.c

@@ -1454,7 +1454,7 @@ SelectPartitionPage(PINPUT_RECORD Ir)
     if (PartitionList == NULL)
     {
         PartitionList = CreatePartitionList(2,
-                                            21,
+                                            23,
                                             xScreen - 3,
                                             yScreen - 3);
         if (PartitionList == NULL)
@@ -1476,10 +1476,19 @@ SelectPartitionPage(PINPUT_RECORD Ir)
         if (!SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber))
         {
             if (AutoPartition)
+            {
+                if (PartitionList->CurrentPartition->LogicalPartition)
+                {
+                    CreateLogicalPartition(PartitionList,
+                                           PartitionList->CurrentPartition->SectorCount.QuadPart,
+                                           TRUE);
+                }
+                else
                 {
                     CreatePrimaryPartition(PartitionList,
                                            PartitionList->CurrentPartition->SectorCount.QuadPart,
                                            TRUE);
+                }
 
                 if (!IsDiskSizeValid(PartitionList->CurrentPartition))
                 {
@@ -1578,11 +1587,20 @@ SelectPartitionPage(PINPUT_RECORD Ir)
 
             if (PartitionList->CurrentPartition == NULL ||
                 PartitionList->CurrentPartition->IsPartitioned == FALSE)
+            {
+                if (PartitionList->CurrentPartition->LogicalPartition)
+                {
+                    CreateLogicalPartition(PartitionList,
+                                           0ULL,
+                                           TRUE);
+                }
+                else
                 {
                     CreatePrimaryPartition(PartitionList,
                                            0ULL,
                                            TRUE);
                 }
+            }
 
             if (!IsDiskSizeValid(PartitionList->CurrentPartition))
             {
@@ -2203,7 +2221,8 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
             DPRINT("Partition size: %I64u bytes\n", PartSize);
 
             CreateLogicalPartition(PartitionList,
-                                   SectorCount);
+                                   SectorCount,
+                                   FALSE);
 
             return SELECT_PARTITION_PAGE;
         }

reactos/base/setup/usetup/lang/bg-BG.h

@@ -811,6 +811,12 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  <20> â¨á­¥â¥ D §  ¨§âਢ ­¥ ­  áêé¥áâ¢ã¢ é ¤ï«.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/bn-BD.h

@@ -801,6 +801,12 @@ static MUI_ENTRY bnBDSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/cs-CZ.h

@@ -809,6 +809,12 @@ static MUI_ENTRY csCZSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/de-DE.h

@@ -796,6 +796,12 @@ static MUI_ENTRY deDESelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  L erstellt eine logische Partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  D l”scht eine vorhandene Partition.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/el-GR.h

@@ -814,6 +814,12 @@ static MUI_ENTRY elGRSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  <20>˜«ã©«œ D š ˜ ¤˜ › ˜š¨á¯œ«œ ⤘ ¬§á¨®¦¤ › ˜£â¨ ©£˜.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/en-US.h

@@ -801,6 +801,12 @@ static MUI_ENTRY enUSSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/es-ES.h

@@ -809,6 +809,12 @@ static MUI_ENTRY esESSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/et-EE.h

@@ -802,6 +802,12 @@ static MUI_ENTRY etEESelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/fr-FR.h

@@ -814,6 +814,12 @@ static MUI_ENTRY frFRSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/he-IL.h

@@ -802,6 +802,12 @@ static MUI_ENTRY heILSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/it-IT.h

@@ -809,6 +809,12 @@ static MUI_ENTRY itITSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/ja-JP.h

@@ -803,6 +803,12 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  ·¿ÝÉ Ê߰輮ݦ »¸¼Þ® ½ÙÆÊ D ·°¦ µ¼Ã ¸ÀÞ»²¡",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/lt-LT.h

@@ -811,6 +811,12 @@ static MUI_ENTRY ltLTSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/nl-NL.h

@@ -831,6 +831,12 @@ static MUI_ENTRY nlNLSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/pl-PL.h

@@ -811,6 +811,12 @@ static MUI_ENTRY plPLSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  Naci<63>nij D, by skasowa† istniejĄcĄ partycj©.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/pt-BR.h

@@ -821,6 +821,12 @@ static MUI_ENTRY ptBRSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/ro-RO.h

@@ -857,6 +857,12 @@ static MUI_ENTRY roROSelectPartitionEntries[] =
     {
         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
     },

reactos/base/setup/usetup/lang/ru-RU.h

@@ -802,6 +802,12 @@ static MUI_ENTRY ruRUSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  <20> ¦¬¨â¥ D ¤«ï 㤠«¥­¨ï áãé¥áâ¢ãî饣® à §¤¥« .",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/sk-SK.h

@@ -810,6 +810,12 @@ static MUI_ENTRY skSKSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  Stlaźte D pre vymazanie existujŁcej oblasti.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/sq-AL.h

@@ -806,6 +806,12 @@ static MUI_ENTRY sqALSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  Kliko D p‰r t‰ fshir‰ nj‰ particion ekzistues.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/sv-SE.h

@@ -809,6 +809,12 @@ static MUI_ENTRY svSESelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  Tryck D f”r att ta bort en befintlig partititon.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/tr-TR.h

@@ -795,6 +795,12 @@ static MUI_ENTRY trTRSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  Var olan bir b”l<E2809D>m silmek i‡in D'ye bas<61>n<EFBFBD>z.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/lang/uk-UA.h

@@ -808,6 +808,12 @@ static MUI_ENTRY ukUASelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  <20> â¨á­iâì D 鮡 ¢¨¤ «¨â¨ iá­ãî稩 ஧¤i«.",
         TEXT_STYLE_NORMAL
     },

reactos/base/setup/usetup/partlist.c

@@ -2762,7 +2762,8 @@ CreateExtendedPartition(
 VOID
 CreateLogicalPartition(
     PPARTLIST List,
-    ULONGLONG SectorCount)
+    ULONGLONG SectorCount,
+    BOOLEAN AutoCreate)
 {
     PDISKENTRY DiskEntry;
     PPARTENTRY PartEntry;
@@ -2783,7 +2784,8 @@ CreateLogicalPartition(
 
     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");
 

reactos/base/setup/usetup/partlist.h

@@ -253,7 +253,8 @@ CreateExtendedPartition(
 VOID
 CreateLogicalPartition(
     PPARTLIST List,
-    ULONGLONG SectorCount);
+    ULONGLONG SectorCount,
+    BOOLEAN AutoCreate);
 
 VOID
 DeleteCurrentPartition(