[ekohl] 63403: [USETUP] Display logical partitions. They cannot be selected or modified yet.
21 May
2014
21 May
'14
8:20 p.m.
Author: ekohl
Date: Wed May 21 20:20:18 2014
New Revision: 63403
URL: http://svn.reactos.org/svn/reactos?rev=63403&view=rev
Log:
[USETUP]
Display logical partitions. They cannot be selected or modified yet.
Modified:
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/partlist.c
trunk/reactos/base/setup/usetup/partlist.h
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] Wed May 21 20:20:18 2014
@@ -1733,7 +1733,7 @@
{STRING_HDINFOPARTEXISTS,
" â¢êठ¤¨áª %lu (%I64u %s), §¢®¤=%hu, ¨ =%hu, =%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c ¢¨¤ %-3u %6lu %s"},
+ "%c%c %s¢¨¤ %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s â¢êठ¤¨áª %lu (§¢®¤=%hu, ¨ =%hu, =%hu) %S"},
{STRING_HDDINFOUNK6,
@@ -1741,7 +1741,7 @@
{STRING_NEWPARTITION,
"¥ áꧤ ¤¥ ®¢ ¤ï« "},
{STRING_UNPSPACE,
- " ¥à §¯à¥¤¥«¥® ¬ïáâ® %6lu %s"},
+ " %s¥à §¯à¥¤¥«¥® ¬ïáâ®%s %6lu %s"},
{STRING_MAXSIZE,
" (¤® %lu )"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1729,7 +1729,7 @@
{STRING_HDINFOPARTEXISTS,
"na harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Typ %-3u %6lu %s"},
+ "%c%c %sTyp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %S"},
{STRING_HDDINFOUNK6,
@@ -1737,7 +1737,7 @@
{STRING_NEWPARTITION,
"Instalace vytvoýila novì odd¡l na"},
{STRING_UNPSPACE,
- " M¡sto bez odd¡l
%6lu %s"},
+ " %sM¡sto bez odd¡l
%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1723,7 +1723,7 @@
{STRING_HDINFOPARTEXISTS,
"auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Typ %-3u %6lu %s"},
+ "%c%c %sTyp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %S"},
{STRING_HDDINFOUNK6,
@@ -1731,7 +1731,7 @@
{STRING_NEWPARTITION,
"Setup erstellte eine neue Partition auf"},
{STRING_UNPSPACE,
- " Unpartitionierter Speicher %6lu %s"},
+ " %sUnpartitionierter Speicher%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1745,7 +1745,7 @@
{STRING_HDINFOPARTEXISTS,
"©«¦ ©¡¢¨æ å©¡¦ %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s ¡¢¨æª å©¡¦ª %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
@@ -1753,7 +1753,7 @@
{STRING_NEWPARTITION,
" ¡«á©«© £ ¦ç¨© ⤠¤â¦ partition ©«¦"},
{STRING_UNPSPACE,
- " Unpartitioned space %6lu %s"},
+ " %sUnpartitioned space%s %6lu %s"},
{STRING_MAXSIZE,
"MB (£. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1717,7 +1717,7 @@
{STRING_HDINFOPARTEXISTS,
"on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
@@ -1725,7 +1725,7 @@
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " Unpartitioned space %6lu %s"},
+ " %sUnpartitioned space%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1727,7 +1727,7 @@
{STRING_HDINFOPARTEXISTS,
"en Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tipo %-3u %6lu %s"},
+ "%c%c %sTipo %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %S"},
{STRING_HDDINFOUNK6,
@@ -1735,7 +1735,7 @@
{STRING_NEWPARTITION,
"El instalador a creado una nueva partici¢n en"},
{STRING_UNPSPACE,
- " Espacio sin particionar %6lu %s"},
+ " %sEspacio sin particionar%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1718,7 +1718,7 @@
{STRING_HDINFOPARTEXISTS,
"Kävaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tp %-3u %6lu %s"},
+ "%c%c %sTp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Kävaketas %lu (Port=%hu, Siin=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
@@ -1726,7 +1726,7 @@
{STRING_NEWPARTITION,
"Loodi uus partitsioon"},
{STRING_UNPSPACE,
- " Kasutamata kettaruum %6lu %s"},
+ " %sKasutamata kettaruum%s %6lu %s"},
{STRING_MAXSIZE,
"MB (maks. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1731,7 +1731,7 @@
{STRING_HDINFOPARTEXISTS,
"sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %S"},
{STRING_HDDINFOUNK6,
@@ -1739,7 +1739,7 @@
{STRING_NEWPARTITION,
"Setup a cr une nouvelle partition sur"},
{STRING_UNPSPACE,
- " Espace non partitionn %6lu %s"},
+ " %sEspace non partitionn%s %6lu %s"},
{STRING_MAXSIZE,
"Mo (max. %lu Mo)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1719,7 +1719,7 @@
{STRING_HDINFOPARTEXISTS,
"on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
@@ -1727,7 +1727,7 @@
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " Unpartitioned space %6lu %s"},
+ " %sUnpartitioned space%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1722,7 +1722,7 @@
{STRING_HDINFOPARTEXISTS,
"su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tipo %-3u %6lu %s"},
+ "%c%c %sTipo %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %S"},
{STRING_HDDINFOUNK6,
@@ -1730,7 +1730,7 @@
{STRING_NEWPARTITION,
"Setup ha creato una nuova partizione su"},
{STRING_UNPSPACE,
- " Spazio non partizionato %6lu %s"},
+ " %sSpazio non partizionato%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_UNFORMATTED,
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] Wed May 21 20:20:18 2014
@@ -1721,7 +1721,7 @@
{STRING_HDINFOPARTEXISTS,
"on Ê°ÄÞÃÞ¨½¸ %lu (%I64u %s), Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c ¼Ù² %-3u %6lu %s"},
+ "%c%c %s¼Ù² %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Ê°ÄÞÃÞ¨½¸ %lu (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
@@ -1729,7 +1729,7 @@
{STRING_NEWPARTITION,
"¾¯Ä±¯ÌßÊ ±À×¼² Ê߰輮ݦ ·ÞÆ »¸¾²¼Ï¼À:"},
{STRING_UNPSPACE,
- " ÐÌÞݶÂÉ ½Íß°½ %6lu %s"},
+ " %sÐÌÞݶÂÉ ½Íß°½%s %6lu %s"},
{STRING_MAXSIZE,
"MB (»²ÀÞ². %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1728,7 +1728,7 @@
{STRING_HDINFOPARTEXISTS,
"on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
@@ -1736,7 +1736,7 @@
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " Unpartitioned space %6lu %s"},
+ " %sUnpartitioned space%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1766,7 +1766,7 @@
{STRING_HDINFOPARTEXISTS,
"op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %S"},
{STRING_HDDINFOUNK6,
@@ -1774,7 +1774,7 @@
{STRING_NEWPARTITION,
"Setup heeft een nieuwe partitie aangemaakt op"},
{STRING_UNPSPACE,
- " Niet gepartitioneerde ruimte %6lu %s"},
+ " %sNiet gepartitioneerde ruimte%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1730,7 +1730,7 @@
{STRING_HDINFOPARTEXISTS,
"na Dysku Twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c 09Typ %-3u %6lu %s"},
+ "%c%c %s09Typ %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Dysk Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %S"},
{STRING_HDDINFOUNK6,
@@ -1738,7 +1738,7 @@
{STRING_NEWPARTITION,
"Instalator utworzy now¥ partycj©"},
{STRING_UNPSPACE,
- " Miejsce poza partycjami %6lu %s"},
+ " %sMiejsce poza partycjami%s %6lu %s"},
{STRING_MAXSIZE,
"MB (maks. %lu MB)"},
{STRING_UNFORMATTED,
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] Wed May 21 20:20:18 2014
@@ -1757,7 +1757,7 @@
{STRING_HDINFOPARTEXISTS,
"em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tipo %-3u %6lu %s"},
+ "%c%c %sTipo %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %S"},
{STRING_HDDINFOUNK6,
@@ -1765,7 +1765,7 @@
{STRING_NEWPARTITION,
"O instalador criou uma nova partiÆo em"},
{STRING_UNPSPACE,
- " Espao nÆo particionado %6lu %s"},
+ " %sEspao nÆo particionado%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1798,7 +1798,7 @@
{STRING_HDINFOPARTEXISTS,
"de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tip %-3u %6lu %s"},
+ "%c%c %sTip %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %S"},
{STRING_HDDINFOUNK6,
@@ -1806,7 +1806,7 @@
{STRING_NEWPARTITION,
"O nouÇ partiîie a fost creatÇ n"},
{STRING_UNPSPACE,
- " Spaîiu nepartiîionat %6lu %s"},
+ " %sSpaîiu nepartiîionat%s %6lu %s"},
{STRING_MAXSIZE,
"Mo (max. %lu Mo)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1722,7 +1722,7 @@
{STRING_HDINFOPARTEXISTS,
" ¦¥á⪮¬ ¤¨áª¥ %lu (%I64u %s), ®àâ=%hu, ¨ =%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c ¯¨áì %-3u %6lu %s"},
+ "%c%c %s ¯¨áì %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s ¥á⪨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu) %S"},
{STRING_HDDINFOUNK6,
@@ -1730,7 +1730,7 @@
{STRING_NEWPARTITION,
"à®£à ¬¬ ãáâ ®¢ª¨ ᮧ¤ « ®¢ë© à §¤¥« :"},
{STRING_UNPSPACE,
- " ¥à §¬¥ç¥®¥ ¯à®áâà á⢮ %6lu %s"},
+ " %s¥à §¬¥ç¥®¥ ¯à®áâà á⢮%s %6lu %s"},
{STRING_MAXSIZE,
" (¬ ªá. %lu )"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1732,7 +1732,7 @@
{STRING_HDINFOPARTEXISTS,
"na pevnom disku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c typ %-3u %6lu %s"},
+ "%c%c %styp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s pevnì disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %S"},
{STRING_HDDINFOUNK6,
@@ -1740,7 +1740,7 @@
{STRING_NEWPARTITION,
"Inçtal tor vytvoril nov£ oblas na"},
{STRING_UNPSPACE,
- " Miesto bez oblast¡ %6lu %s"},
+ " %sMiesto bez oblast¡%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1724,7 +1724,7 @@
{STRING_HDINFOPARTEXISTS,
"on Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tipi %-3u %6lu %s"},
+ "%c%c %sTipi %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
@@ -1732,7 +1732,7 @@
{STRING_NEWPARTITION,
"Instalimi krijoj nj particion t ri n"},
{STRING_UNPSPACE,
- " Hapsire e papjesesezuar %6lu %s"},
+ " %sHapsire e papjesesezuar%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1727,7 +1727,7 @@
{STRING_HDINFOPARTEXISTS,
"p Hrddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Typ %-3u %6lu %s"},
+ "%c%c %sTyp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Hrddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p %S"},
{STRING_HDDINFOUNK6,
@@ -1735,7 +1735,7 @@
{STRING_NEWPARTITION,
"Setup skapade en ny partition p"},
{STRING_UNPSPACE,
- " Opartitionerat utrymme %6lu %s"},
+ " %sOpartitionerat utrymme%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1695,7 +1695,7 @@
{STRING_HDINFOPARTEXISTS,
"zerinde: Disk %lu (%I64u %s), Giri=%hu, Veri Yolu=%hu, Kimlik=%hu, %wZ
zerinde."},
{STRING_HDDINFOUNK5,
- "%c%c Tr %-3u %6lu %s"},
+ "%c%c %sTr %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Disk %lu (Giri=%hu, Veri Yolu=%hu, Kimlik=%hu), %S zerinde"},
{STRING_HDDINFOUNK6,
@@ -1703,7 +1703,7 @@
{STRING_NEWPARTITION,
"Kur, u blm oluturdu:"},
{STRING_UNPSPACE,
- " Kullanlmayan Boluk %6lu %s"},
+ " %sKullanlmayan Boluk%s %6lu %s"},
{STRING_MAXSIZE,
"MB (En ok %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -1727,7 +1727,7 @@
{STRING_HDINFOPARTEXISTS,
" ®àá⪮¬ã ¤¨áªã %lu (%I64u %s), ®àâ=%hu, ¨ =%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s ®àá⪨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
@@ -1735,7 +1735,7 @@
{STRING_NEWPARTITION,
"áâ ®¢«î¢ ç á⢮ਢ ®¢¨© ஧¤i« "},
{STRING_UNPSPACE,
- " ¥à®§¬iç¥ ®¡« áâì %6lu %s"},
+ " %s¥à®§¬iç¥ ®¡« áâì%s %6lu %s"},
{STRING_MAXSIZE,
"MB (¬ ªá. %lu MB)"},
{STRING_EXTENDED_PARTITION,
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] Wed May 21 20:20:18 2014
@@ -520,15 +520,18 @@
static
VOID
-AddPrimaryPartitionToDisk(
+AddPartitionToDisk(
ULONG DiskNumber,
PDISKENTRY DiskEntry,
- ULONG PartitionIndex)
+ ULONG PartitionIndex,
+ BOOLEAN ExtendedPartition)
{
PPARTITION_INFORMATION PartitionInfo;
PPARTENTRY PartEntry;
PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex];
+ if (PartitionInfo->PartitionType == 0)
+ return;
PartEntry = RtlAllocateHeap(ProcessHeap,
HEAP_ZERO_MEMORY,
@@ -545,6 +548,7 @@
PartEntry->PartitionType = PartitionInfo->PartitionType;
PartEntry->HiddenSectors = PartitionInfo->HiddenSectors;
+ PartEntry->ExtendedPartition = ExtendedPartition;
PartEntry->IsPartitioned = TRUE;
PartEntry->PartitionNumber = PartitionInfo->PartitionNumber;
PartEntry->PartitionIndex = PartitionIndex;
@@ -609,8 +613,12 @@
PartEntry->FormatState = UnknownFormat;
}
- InsertTailList(&DiskEntry->PrimaryPartListHead,
- &PartEntry->ListEntry);
+ if (ExtendedPartition)
+ InsertTailList(&DiskEntry->ExtendedPartListHead,
+ &PartEntry->ListEntry);
+ else
+ InsertTailList(&DiskEntry->PrimaryPartListHead,
+ &PartEntry->ListEntry);
}
@@ -1055,24 +1063,18 @@
{
for (i = 0; i < 4; i++)
{
- if (DiskEntry->LayoutBuffer->PartitionEntry[i].PartitionType != 0)
- {
- AddPrimaryPartitionToDisk(DiskNumber,
- DiskEntry,
- i);
- }
+ AddPartitionToDisk(DiskNumber,
+ DiskEntry,
+ i,
+ FALSE);
}
- for (i = 4; i < DiskEntry->LayoutBuffer->PartitionCount; i++)
+ for (i = 4; i < DiskEntry->LayoutBuffer->PartitionCount; i += 4)
{
- if (DiskEntry->LayoutBuffer->PartitionEntry[i].PartitionType != 0)
- {
-#if 0
- AddExtendedPartitionToDisk(DiskNumber,
- DiskEntry,
- i);
-#endif
- }
+ AddPartitionToDisk(DiskNumber,
+ DiskEntry,
+ i,
+ TRUE);
}
}
}
@@ -1340,6 +1342,8 @@
sprintf(LineBuffer,
MUIGetString(STRING_UNPSPACE),
+ PartEntry->ExtendedPartition ? " " : "",
+ PartEntry->ExtendedPartition ? "" : " ",
PartSize.u.LowPart,
Unit);
}
@@ -1406,17 +1410,21 @@
MUIGetString(STRING_HDDINFOUNK5),
(PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
(PartEntry->DriveLetter == 0) ? '-' : ':',
+ PartEntry->ExtendedPartition ? " " : "",
PartEntry->PartitionType,
+ PartEntry->ExtendedPartition ? "" : " ",
PartSize.u.LowPart,
Unit);
}
else
{
sprintf(LineBuffer,
- "%c%c %-24s %6lu %s",
+ "%c%c %s%-24s%s %6lu %s",
(PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
(PartEntry->DriveLetter == 0) ? '-' : ':',
+ PartEntry->ExtendedPartition ? " " : "",
PartType,
+ PartEntry->ExtendedPartition ? "" : " ",
PartSize.u.LowPart,
Unit);
}
@@ -1466,8 +1474,8 @@
PPARTLIST List,
PDISKENTRY DiskEntry)
{
- PPARTENTRY PartEntry;
- PLIST_ENTRY Entry;
+ PPARTENTRY PrimaryPartEntry, ExtendedPartEntry;
+ PLIST_ENTRY PrimaryEntry, ExtendedEntry;
CHAR LineBuffer[128];
COORD coPos;
DWORD Written;
@@ -1551,16 +1559,31 @@
PrintEmptyLine(List);
/* Print partition lines*/
- Entry = DiskEntry->PrimaryPartListHead.Flink;
- while (Entry != &DiskEntry->PrimaryPartListHead)
- {
- PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
+ PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink;
+ while (PrimaryEntry != &DiskEntry->PrimaryPartListHead)
+ {
+ PrimaryPartEntry = CONTAINING_RECORD(PrimaryEntry, PARTENTRY, ListEntry);
PrintPartitionData(List,
DiskEntry,
- PartEntry);
-
- Entry = Entry->Flink;
+ PrimaryPartEntry);
+
+ if (IsContainerPartition(PrimaryPartEntry->PartitionType))
+ {
+ ExtendedEntry = DiskEntry->ExtendedPartListHead.Flink;
+ while (ExtendedEntry != &DiskEntry->ExtendedPartListHead)
+ {
+ ExtendedPartEntry = CONTAINING_RECORD(ExtendedEntry, PARTENTRY,
ListEntry);
+
+ PrintPartitionData(List,
+ DiskEntry,
+ ExtendedPartEntry);
+
+ ExtendedEntry = ExtendedEntry->Flink;
+ }
+ }
+
+ PrimaryEntry = PrimaryEntry->Flink;
}
/* Print separator line */
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] Wed May 21 20:20:18 2014
@@ -57,6 +57,8 @@
CHAR VolumeLabel[17];
CHAR FileSystemName[9];
+ BOOLEAN ExtendedPartition;
+
/* Partition is partitioned disk space */
BOOLEAN IsPartitioned;
3872
days inactive
3872
days old
0 comments
1 participants
participants (1)
-
ekohl＠svn.reactos.org