Author: ekohl
Date: Sun Jun 8 19:05:03 2014
New Revision: 63570
URL: http://svn.reactos.org/svn/reactos?rev=63570&view=rev
Log:
[USETUP]
- Add status text for logical partition entries in the partition list.
- Add logical partition creation page dummy.
Modified:
trunk/reactos/base/setup/usetup/interface/usetup.c
trunk/reactos/base/setup/usetup/lang/bg-BG.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/mui.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/usetup.c?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Jun 8
19:05:03 2014
@@ -1550,18 +1550,38 @@
while (TRUE)
{
/* Update status text */
- if (PartitionList->CurrentPartition == NULL ||
- PartitionList->CurrentPartition->IsPartitioned == FALSE)
+ if (PartitionList->CurrentPartition == NULL)
{
CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION));
}
- else if
(IsContainerPartition(PartitionList->CurrentPartition->PartitionType))
- {
- CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION));
+ else if (PartitionList->CurrentPartition->LogicalPartition)
+ {
+ if (PartitionList->CurrentPartition->IsPartitioned)
+ {
+ CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION));
+ }
+ else
+ {
+
CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATELOGICAL));
+ }
}
else
{
- CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION));
+ if (PartitionList->CurrentPartition->IsPartitioned)
+ {
+ if
(IsContainerPartition(PartitionList->CurrentPartition->PartitionType))
+ {
+
CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION));
+ }
+ else
+ {
+
CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION));
+ }
+ }
+ else
+ {
+
CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION));
+ }
}
CONSOLE_ConInKey(Ir);
@@ -1616,25 +1636,45 @@
}
else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */
{
- Error = PrimaryPartitionCreationChecks(PartitionList);
- if (Error != NOT_AN_ERROR)
- {
- MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
- return SELECT_PARTITION_PAGE;
- }
-
- return CREATE_PRIMARY_PARTITION_PAGE;
+ if (PartitionList->CurrentPartition->LogicalPartition == FALSE)
+ {
+ Error = PrimaryPartitionCreationChecks(PartitionList);
+ if (Error != NOT_AN_ERROR)
+ {
+ MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
+ return SELECT_PARTITION_PAGE;
+ }
+
+ return CREATE_PRIMARY_PARTITION_PAGE;
+ }
}
else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'E') /* E */
{
- Error = ExtendedPartitionCreationChecks(PartitionList);
- if (Error != NOT_AN_ERROR)
- {
- MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
- return SELECT_PARTITION_PAGE;
- }
-
- return CREATE_EXTENDED_PARTITION_PAGE;
+ if (PartitionList->CurrentPartition->LogicalPartition == FALSE)
+ {
+ Error = ExtendedPartitionCreationChecks(PartitionList);
+ if (Error != NOT_AN_ERROR)
+ {
+ MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
+ return SELECT_PARTITION_PAGE;
+ }
+
+ return CREATE_EXTENDED_PARTITION_PAGE;
+ }
+ }
+ else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L') /* L */
+ {
+ if (PartitionList->CurrentPartition->LogicalPartition == TRUE)
+ {
+ Error = LogicalPartitionCreationChecks(PartitionList);
+ if (Error != NOT_AN_ERROR)
+ {
+ MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
+ return SELECT_PARTITION_PAGE;
+ }
+
+ return CREATE_LOGICAL_PARTITION_PAGE;
+ }
}
else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */
{
@@ -2085,6 +2125,14 @@
}
return CREATE_EXTENDED_PARTITION_PAGE;
+}
+
+
+static PAGE_NUMBER
+CreateLogicalPartitionPage(PINPUT_RECORD Ir)
+{
+
+ return SELECT_PARTITION_PAGE;
}
@@ -4029,6 +4077,10 @@
Page = CreateExtendedPartitionPage(&Ir);
break;
+ case CREATE_LOGICAL_PARTITION_PAGE:
+ Page = CreateLogicalPartitionPage(&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-BG.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1651,6 +1651,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = « £ ¥ C = ꧤ ¢ ¥ ¤ï« F3 = §å®¤"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = « £ ¥ D = §âਢ ¥ ¤ï« F3 = §å®¤"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-CZ.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1647,6 +1647,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Instalovat C = Vytvoýit odd¡l F3 = Ukonit"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Instalovat D = Odstranit odd¡l F3 = Ukonit"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-DE.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1642,6 +1642,8 @@
" Bitte warten..."},
{STRING_INSTALLCREATEPARTITION,
" EINGABETASTE = Installieren P = Primre E = Erweiterte F3 =
Installation abbr."},
+ {STRING_INSTALLCREATELOGICAL,
+ " EINGABETASTE = Installieren L = Logisches Laufwerk F3 = Installation
abbr."},
{STRING_INSTALLDELETEPARTITION,
" EINGABETASTE = Installieren D = Partition lschen F3 = Installation
abbr."},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-GR.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1663,6 +1663,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = ¡«á©«© C = £ ¦¬¨å Partition F3 = §¦®é¨©"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = ¡«á©«© D = ¨ã Partition F3 = §¦®é¨©"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-US.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1636,6 +1636,8 @@
" Please wait..."},
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Install D = Delete Partition F3 = Quit"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-ES.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1645,6 +1645,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Instalar C = Crear Partici¢n F3 = Salir"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_DELETEPARTITION,
" D = Borrar Partici¢n F3 = Salir"},
{STRING_INSTALLDELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-EE.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1636,6 +1636,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Paigalda C = Loo partitsioon F3 = Vlju"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Paigalda D = Kustuta partitsioon F3 = Vlju"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-FR.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1650,6 +1650,8 @@
" Veuillez patienter..."},
{STRING_INSTALLCREATEPARTITION,
" ENTRE = Installer P/E = Crer Partition Primaire/tendue F3 =
Quitter"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTRE = Installer D = Supprimer Partition F3 = Quitter"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-IL.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1638,6 +1638,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = C =
F3 = "},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = D = F3 = "},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-IT.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1640,6 +1640,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " INVIO = Installa C = Crea Partizione F3 = Esci"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" INVIO = Installa D = Rimuovi Partizione F3 = Esci"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-JP.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1639,6 +1639,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = ²Ý½Ä°Ù C = Ê߰è¼®Ý »¸¾² F3 = Á³¼"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = ²Ý½Ä°Ù D = Ê߰è¼®Ý »¸¼Þ® F3 = Á³¼"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-LT.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1647,6 +1647,8 @@
" Please wait..."},
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Install D = Delete Partition F3 = Quit"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-NL.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1684,6 +1684,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Installeren C = Partitie aanmaken F3 = Afsluiten"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Installeren D = Partitie verwijderen F3 = Afsluiten"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-PL.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1648,6 +1648,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Instalacja C = Utworzenie Partycji F3 = Wyjcie"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Instalacja D = Skasowanie Partycji F3 = Wyjcie"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-BR.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1675,6 +1675,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER=Instalar C=Criar partiÆo F3=Sair"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER=Instalar D=Apagar partiÆo F3=Sair"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-RO.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1716,6 +1716,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Instalare C = Creare partiîie F3 = Ieire"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Instalare D = ¸tergere partiîie F3 = Ieire"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-RU.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1640,6 +1640,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = áâ ®¢¨âì C = ®§¤ âì à §¤¥« F3 = ë室"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = áâ ®¢¨âì D = ¤ «¨âì à §¤¥« F3 = ë室"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-SK.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1650,6 +1650,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Inçtalova C = Vytvori oblas F3 = Skoni"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Inçtalova D = Odstr ni oblas F3 = Skoni"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-AL.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1642,6 +1642,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Instalo C = Krijo Particion F3 = Dil"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Instalo D = Fshi Particion F3 = Dil"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-SE.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1645,6 +1645,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = Installera C = Skapa Partition F3 = Avsluta"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Installera D = Ta bort Partition F3 = Avsluta"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-TR.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1613,6 +1613,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " Giri = Kur C = Blm Olutur F3 = k"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" Giri = Kur D = Blm Sil F3 = k"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-UA.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- 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 Jun 8
19:05:03 2014
@@ -1645,6 +1645,8 @@
{STRING_INSTALLCREATEPARTITION,
" ENTER = Install P = Create Primary E = Create Extended F3 =
Quit"},
// " ENTER = áâ ®¢¨â¨ C = ⢮à¨â¨ ®§¤i« F3 = ¨©â¨"},
+ {STRING_INSTALLCREATELOGICAL,
+ " ENTER = Install L = Create Logical Partition F3 = Quit"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = áâ ®¢¨â¨ D = ¨¤ «¨â¨ ®§¤i« F3 = ¨©â¨"},
{STRING_DELETEPARTITION,
Modified: trunk/reactos/base/setup/usetup/mui.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sun Jun 8
19:05:03 2014
@@ -99,6 +99,7 @@
#define STRING_PLEASEWAIT 1
#define STRING_INSTALLCREATEPARTITION 2
+#define STRING_INSTALLCREATELOGICAL 60
#define STRING_INSTALLDELETEPARTITION 3
#define STRING_DELETEPARTITION 59
#define STRING_PARTITIONSIZE 4
Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.c?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jun 8
19:05:03 2014
@@ -3088,4 +3088,22 @@
return ERROR_SUCCESS;
}
+
+ULONG
+LogicalPartitionCreationChecks(
+ IN PPARTLIST List)
+{
+// PDISKENTRY DiskEntry;
+ PPARTENTRY PartEntry;
+
+// DiskEntry = List->CurrentDisk;
+ PartEntry = List->CurrentPartition;
+
+ /* Fail if partition is already in use */
+ if (PartEntry->IsPartitioned == TRUE)
+ return ERROR_NEW_PARTITION;
+
+ return ERROR_SUCCESS;
+}
+
/* EOF */
Modified: trunk/reactos/base/setup/usetup/partlist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Jun 8
19:05:03 2014
@@ -254,4 +254,8 @@
ExtendedPartitionCreationChecks(
IN PPARTLIST List);
+ULONG
+LogicalPartitionCreationChecks(
+ IN PPARTLIST List);
+
/* EOF */
Modified: trunk/reactos/base/setup/usetup/usetup.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Jun 8
19:05:03 2014
@@ -130,6 +130,7 @@
SELECT_PARTITION_PAGE,
CREATE_PRIMARY_PARTITION_PAGE,
CREATE_EXTENDED_PARTITION_PAGE,
+ CREATE_LOGICAL_PARTITION_PAGE,
DELETE_PARTITION_PAGE,
SELECT_FILE_SYSTEM_PAGE,
