Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 63403: [USETUP] Display logical partitions. They cannot be selected or modified yet.
by ekohl＠svn.reactos.org 21 May '14

21 May '14

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;

1 0

[akhaldi] 63402: [MSVCRT] * Don't export mbstowcs_s(). CORE-7889
by akhaldi＠svn.reactos.org 21 May '14

21 May '14

Author: akhaldi Date: Wed May 21 18:02:48 2014 New Revision: 63402 URL: http://svn.reactos.org/svn/reactos?rev=63402&view=rev Log: [MSVCRT] * Don't export mbstowcs_s(). CORE-7889 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Wed May 21 18:02:48 2014 @@ -1304,7 +1304,6 @@ # stub mbsrtowcs # stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) -@ cdecl mbstowcs_s(ptr ptr long str long) @ cdecl mbtowc(wstr str long) @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long)

1 0

[akhaldi] 63401: [MSVCRT_CRT_APITEST] * Don't enable wcstombs_s() tests (it shouldn't be exported). CORE-7889
by akhaldi＠svn.reactos.org 21 May '14

21 May '14

Author: akhaldi Date: Wed May 21 14:26:20 2014 New Revision: 63401 URL: http://svn.reactos.org/svn/reactos?rev=63401&view=rev Log: [MSVCRT_CRT_APITEST] * Don't enable wcstombs_s() tests (it shouldn't be exported). CORE-7889 Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Wed May 21 14:26:20 2014 @@ -1251,7 +1251,7 @@ # wcstok_s.c # wcstol.c # wcstombs.c - wcstombs_s.c +# wcstombs_s.c Not exported in 2k3 Sp1 # wcstoul.c # wcsxfrm.c # wctob Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Wed May 21 14:26:20 2014 @@ -4,7 +4,6 @@ #include <apitest.h> #if defined(TEST_MSVCRT) -extern void func_wcstombs_s(void); extern void func__vscprintf(void); extern void func__vscwprintf(void); #endif @@ -30,7 +29,6 @@ #endif #if defined(TEST_STATIC_CRT) #elif defined(TEST_MSVCRT) - { "wcstombs_s", func_wcstombs_s }, { "_vscprintf", func__vscprintf }, { "_vscwprintf", func__vscwprintf }, #elif defined(TEST_NTDLL)

1 0

[akhaldi] 63400: [MSVCRT_CRT_APITEST] * Don't enable mbstowcs_s() tests (it shouldn't be exported). CORE-7889
by akhaldi＠svn.reactos.org 21 May '14

21 May '14

Author: akhaldi Date: Wed May 21 13:30:26 2014 New Revision: 63400 URL: http://svn.reactos.org/svn/reactos?rev=63400&view=rev Log: [MSVCRT_CRT_APITEST] * Don't enable mbstowcs_s() tests (it shouldn't be exported). CORE-7889 Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Wed May 21 13:30:26 2014 @@ -1118,7 +1118,7 @@ # mbsrtowcs # mbsrtowcs_s # mbstowcs.c - mbstowcs_s +# mbstowcs_s Not exported in 2k3 Sp1 # mbtowc.c # memchr.c # memcmp.c Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Wed May 21 13:30:26 2014 @@ -4,7 +4,6 @@ #include <apitest.h> #if defined(TEST_MSVCRT) -extern void func_mbstowcs_s(void); extern void func_wcstombs_s(void); extern void func__vscprintf(void); extern void func__vscwprintf(void); @@ -31,7 +30,6 @@ #endif #if defined(TEST_STATIC_CRT) #elif defined(TEST_MSVCRT) - { "mbstowcs_s", func_mbstowcs_s }, { "wcstombs_s", func_wcstombs_s }, { "_vscprintf", func__vscprintf }, { "_vscwprintf", func__vscwprintf },

1 0

[akhaldi] 63399: [MSVCRT_CRT_APITEST] * Don't reply on _set_errno() which shouldn't be exported.
by akhaldi＠svn.reactos.org 21 May '14

21 May '14

Author: akhaldi Date: Wed May 21 13:20:38 2014 New Revision: 63399 URL: http://svn.reactos.org/svn/reactos?rev=63399&view=rev Log: [MSVCRT_CRT_APITEST] * Don't reply on _set_errno() which shouldn't be exported. Modified: trunk/rostests/apitests/crt/mbstowcs_s.c trunk/rostests/apitests/crt/wcstombs_s.c Modified: trunk/rostests/apitests/crt/mbstowcs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs_s.c… ============================================================================== --- trunk/rostests/apitests/crt/mbstowcs_s.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/mbstowcs_s.c [iso-8859-1] Wed May 21 13:20:38 2014 @@ -54,7 +54,7 @@ size_t cchConverted; wchar_t widechar[10]; - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; widechar[5] = 0xFF; ret = mbstowcs_s(&cchConverted, widechar, 6, "hallo", 5); @@ -64,7 +64,7 @@ ok_wstr(widechar, L"hallo"); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; widechar[0] = 0xFF; ret = mbstowcs_s(&cchConverted, widechar, 1, "", 0); @@ -73,7 +73,7 @@ ok_wchar(widechar[0], 0); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; widechar[0] = 0xFF; widechar[1] = 0xFF; @@ -92,7 +92,7 @@ ok_wchar(widechar[0], 0); ok_errno(ERANGE); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; widechar[0] = 0xFF; widechar[1] = 0xFF; @@ -111,64 +111,64 @@ ok_wchar(widechar[0], 0); ok_errno(ERANGE); - _set_errno(0); + *_errno() = 0; ret = mbstowcs_s(0, 0, 0, 0, 0); ok_long(ret, EINVAL); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, 0, 0, 0, 0); ok_long(ret, EINVAL); ok_size_t(cchConverted, 0); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; widechar[0] = L'x'; ret = mbstowcs_s(0, widechar, 0, 0, 0); ok_long(ret, EINVAL); ok_wchar(widechar[0], L'x'); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; ret = mbstowcs_s(0, widechar, 10, "hallo", 5); ok_long(ret, 0); ok_errno(0); - _set_errno(0); + *_errno() = 0; ret = mbstowcs_s(0, widechar, 0, "hallo", 5); ok_long(ret, EINVAL); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, 0, 10, "hallo", 5); ok_long(ret, EINVAL); ok_size_t(cchConverted, 0xf00bac); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, 0, 0, "hallo", 5); ok_long(ret, 0); ok_size_t(cchConverted, 6); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, widechar, 10, 0, 5); ok_long(ret, EINVAL); ok_size_t(cchConverted, 0); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, widechar, 10, "hallo", 0); ok_long(ret, 0); ok_size_t(cchConverted, 1); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; widechar[0] = 0xABCD; widechar[1] = 0xABCD; @@ -187,28 +187,28 @@ ok_wchar(widechar[0], L'h'); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, widechar, 10, 0, 0); ok_long(ret, 0); ok_size_t(cchConverted, 1); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, widechar, 10, "hallo", 7); ok_long(ret, 0); ok_size_t(cchConverted, 6); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, 0, 0, "hallo", 7); ok_long(ret, 0); ok_size_t(cchConverted, 6); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; widechar[0] = 0xABCD; widechar[1] = 0xABCD; @@ -227,7 +227,7 @@ ok_wchar(widechar[0], L'h'); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = mbstowcs_s(&cchConverted, widechar, 10, "hallo", -1); ok_long(ret, 0); Modified: trunk/rostests/apitests/crt/wcstombs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs_s.c… ============================================================================== --- trunk/rostests/apitests/crt/wcstombs_s.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/wcstombs_s.c [iso-8859-1] Wed May 21 13:20:38 2014 @@ -36,7 +36,7 @@ size_t cchConverted; char mbsbuffer[10]; - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; mbsbuffer[5] = 0xFF; ret = wcstombs_s(&cchConverted, mbsbuffer, 6, L"hallo", 5); @@ -46,7 +46,7 @@ ok_str(mbsbuffer, "hallo"); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; mbsbuffer[0] = 0xFF; ret = wcstombs_s(&cchConverted, mbsbuffer, 1, L"", 0); @@ -55,7 +55,7 @@ ok_wchar(mbsbuffer[0], 0); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; mbsbuffer[0] = 0xFF; mbsbuffer[1] = 0xFF; @@ -74,7 +74,7 @@ ok_char(mbsbuffer[0], 0); ok_errno(ERANGE); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; mbsbuffer[0] = 0xFF; mbsbuffer[1] = 0xFF; @@ -93,64 +93,64 @@ ok_char(mbsbuffer[0], 0); ok_errno(ERANGE); - _set_errno(0); + *_errno() = 0; ret = wcstombs_s(0, 0, 0, 0, 0); ok_long(ret, EINVAL); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, 0, 0, 0, 0); ok_long(ret, EINVAL); ok_size_t(cchConverted, 0); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; mbsbuffer[0] = L'x'; ret = wcstombs_s(0, mbsbuffer, 0, 0, 0); ok_long(ret, EINVAL); ok_char(mbsbuffer[0], L'x'); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; ret = wcstombs_s(0, mbsbuffer, 10, L"hallo", 5); ok_long(ret, 0); ok_errno(0); - _set_errno(0); + *_errno() = 0; ret = wcstombs_s(0, mbsbuffer, 0, L"hallo", 5); ok_long(ret, EINVAL); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, 0, 10, L"hallo", 5); ok_long(ret, EINVAL); ok_size_t(cchConverted, 0xf00bac); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, 0, 0, L"hallo", 5); ok_long(ret, 0); ok_size_t(cchConverted, 6); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, mbsbuffer, 10, 0, 5); ok_long(ret, EINVAL); ok_size_t(cchConverted, 0); ok_errno(EINVAL); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, mbsbuffer, 10, L"hallo", 0); ok_long(ret, 0); ok_size_t(cchConverted, 1); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; mbsbuffer[0] = 0xAB; mbsbuffer[1] = 0xCD; @@ -169,28 +169,28 @@ ok_char(mbsbuffer[0], L'h'); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, mbsbuffer, 10, 0, 0); ok_long(ret, 0); ok_size_t(cchConverted, 1); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, mbsbuffer, 10, L"hallo", 7); ok_long(ret, 0); ok_size_t(cchConverted, 6); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, 0, 0, L"hallo", 7); ok_long(ret, 0); ok_size_t(cchConverted, 6); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; mbsbuffer[0] = 0xAB; mbsbuffer[1] = 0xCD; @@ -209,7 +209,7 @@ ok_char(mbsbuffer[0], L'h'); ok_errno(0); - _set_errno(0); + *_errno() = 0; cchConverted = 0xf00bac; ret = wcstombs_s(&cchConverted, mbsbuffer, 10, L"hallo", -1); ok_long(ret, 0);

1 0

[hbelusca] 63398: [USETUP] - Fix a bit the translation of yesterday; - Use TEXT_PADDING_BIG instead of hardcoding 3 spaces in the status messages.
by hbelusca＠svn.reactos.org 21 May '14

21 May '14

Author: hbelusca Date: Wed May 21 12:23:04 2014 New Revision: 63398 URL: http://svn.reactos.org/svn/reactos?rev=63398&view=rev Log: [USETUP] - Fix a bit the translation of yesterday; - Use TEXT_PADDING_BIG instead of hardcoding 3 spaces in the status messages. Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h 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 12:23:04 2014 @@ -42,8 +42,8 @@ { 0, 0, - " ENTRE = Continuer F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -118,8 +118,8 @@ { 0, 0, - " ENTRE = Continuer R = Rparer F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer R = Rparer L = Licence F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -218,8 +218,8 @@ { 0, 0, - " ENTRE = Continuer F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -342,8 +342,8 @@ { 0, 0, - " ENTRE = Retour", - TEXT_TYPE_STATUS + "ENTRE = Retour", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -435,8 +435,8 @@ { 0, 0, - " ENTRE = Continuer F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -505,8 +505,8 @@ { 0, 0, - " CHAP = Page principale ENTRE = Redmarrer", - TEXT_TYPE_STATUS + "CHAP = Page principale ENTRE = Redmarrer", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -556,8 +556,8 @@ { 0, 0, - " ENTRE = Continuer CHAP = Annuler F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer CHAP = Annuler F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -596,8 +596,8 @@ { 0, 0, - " Vidage du cache", - TEXT_TYPE_STATUS + "Vidage du cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -642,8 +642,8 @@ { 0, 0, - " Veuillez attendre ...", - TEXT_TYPE_STATUS, + "Veuillez attendre ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -693,8 +693,8 @@ { 0, 0, - " ENTRE = Continuer CHAP = Annuler F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer CHAP = Annuler F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -739,8 +739,8 @@ { 0, 0, - " ENTRE = Redmarrer l'ordinateur", - TEXT_TYPE_STATUS + "ENTRE = Redmarrer l'ordinateur", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -785,8 +785,8 @@ { 0, 0, - " ENTRE = Continuer F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -850,8 +850,8 @@ { 0, 0, - " Patienter...", - TEXT_TYPE_STATUS + "Patienter...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -884,8 +884,8 @@ { 0, 0, - " ENTRE = Continuer F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -936,8 +936,8 @@ { 0, 0, - " ENTRE = Continuer F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1028,8 +1028,8 @@ { 0, 0, - " ENTRE = Continuer F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1068,7 +1068,7 @@ { 8, 13, - "\x07 Appuyez sur CHAP pour revenir a la page prcdente sans changer", + "\x07 Appuyez sur CHAP pour revenir la page prcdente sans changer", TEXT_STYLE_NORMAL }, { @@ -1080,8 +1080,8 @@ { 0, 0, - " ENTRE = Continuer CHAP = Annuler F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer CHAP = Annuler F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1120,7 +1120,7 @@ { 8, 13, - "\x07 Appuyez sur CHAP pour revenir a la page prcdente sans changer", + "\x07 Appuyez sur CHAP pour revenir la page prcdente sans changer", TEXT_STYLE_NORMAL }, { @@ -1132,8 +1132,8 @@ { 0, 0, - " ENTRE = Continuer CHAP = Annuler F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer CHAP = Annuler F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1161,8 +1161,8 @@ { 0, 0, - " Prpare la liste de fichiers copier...", - TEXT_TYPE_STATUS + "Prpare la liste de fichiers copier...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1208,8 +1208,8 @@ { 0, 0, - " ENTRE = Continuer CHAP = Annuler F3 = Quitter", - TEXT_TYPE_STATUS + "ENTRE = Continuer CHAP = Annuler F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1255,8 +1255,8 @@ { 0, 0, - " D = Supprimer la Partition CHAP = Annuler F3 = Quitter", - TEXT_TYPE_STATUS + "D = Supprimer la Partition CHAP = Annuler F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1283,8 +1283,8 @@ { 0, 0, - " En train de crer la base de registres...", - TEXT_TYPE_STATUS + "En train de crer la base de registres...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1532,7 +1532,7 @@ }, { //ERROR_EXTENDED_NOT_LAST, - "Une partition tendue doit toujours être place en dernier\n" + "Une partition tendue doit toujours tre place en dernier\n" "dans la table de partition.\n" "\n" " * Appuyer sur une touche pour continuer." @@ -1649,7 +1649,7 @@ {STRING_PLEASEWAIT, " Veuillez patienter..."}, {STRING_INSTALLCREATEPARTITION, - " ENTRE = Installer C = Crer Partition Primaire E = Crer Partition tendue F3 = Quitter"}, + " ENTRE = Installer P/E = Crer Partition Primaire/tendue F3 = Quitter"}, {STRING_INSTALLDELETEPARTITION, " ENTRE = Installer D = Supprimer Partition F3 = Quitter"}, {STRING_DELETEPARTITION,

1 0

[dquintana] 63397: [BROWSEUI] * Improve the message loop to allow processing of accelerators. [SHELL32] * Return the accelerator to the shell browser if the view doesn't handle it.
by dquintana＠svn.reactos.org 21 May '14

21 May '14

Author: dquintana Date: Wed May 21 11:38:29 2014 New Revision: 63397 URL: http://svn.reactos.org/svn/reactos?rev=63397&view=rev Log: [BROWSEUI] * Improve the message loop to allow processing of accelerators. [SHELL32] * Return the accelerator to the shell browser if the view doesn't handle it. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed May 21 11:38:29 2014 @@ -2528,7 +2528,7 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::v_MayTranslateAccelerator(MSG *pmsg) { - return E_NOTIMPL; + return fCurrentShellView->TranslateAcceleratorW(pmsg); } HRESULT STDMETHODCALLTYPE CShellBrowser::_GetBorderDWHelper(IUnknown *punkSrc, LPRECT lprectBorder, BOOL bUseHmonitor) @@ -3272,56 +3272,59 @@ return 0; } -//static LRESULT CALLBACK ExplorerWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -//{ -// return DefWindowProc(hwnd, uMsg, wParam, lParam); -//} - -static void ExplorerMessageLoop() -{ +static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) +{ + CComPtr<IShellBrowser> shellBrowser; + CComObject<CShellBrowser> *theCabinet; + HRESULT hResult; MSG Msg; BOOL Ret; - while (1) - { - Ret = (GetMessage(&Msg, NULL, 0, 0) != 0); - - if (Ret != -1) + OleInitialize(NULL); + + ATLTRY(theCabinet = new CComObject<CShellBrowser>); + if (theCabinet == NULL) + { + hResult = E_OUTOFMEMORY; + goto uninitialize; + } + + hResult = theCabinet->QueryInterface(IID_PPV_ARG(IShellBrowser, &shellBrowser)); + if (FAILED(hResult)) + { + delete theCabinet; + goto uninitialize; + } + + hResult = theCabinet->Initialize(parameters->directoryPIDL, 0, 0, 0); + if (FAILED(hResult)) + goto uninitialize; + + while (Ret = GetMessage(&Msg, NULL, 0, 0)) + { + if (Ret == -1) { - if (!Ret) - break; - + // Error: continue or exit? + break; + } + + if (theCabinet->v_MayTranslateAccelerator(&Msg) != S_OK) + { TranslateMessage(&Msg); DispatchMessage(&Msg); - - if (Msg.message == WM_QUIT) - break; } - } + + if (Msg.message == WM_QUIT) + break; + } + +uninitialize: + OleUninitialize(); + return hResult; } DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter) { - CComPtr<IShellBrowser> shellBrowser; - CComObject<CShellBrowser> *theCabinet; - IEThreadParamBlock *parameters; - HRESULT hResult; - - parameters = (IEThreadParamBlock *)lpThreadParameter; - OleInitialize(NULL); - ATLTRY (theCabinet = new CComObject<CShellBrowser>); - if (theCabinet == NULL) - return E_OUTOFMEMORY; - hResult = theCabinet->QueryInterface(IID_PPV_ARG(IShellBrowser, &shellBrowser)); - if (FAILED(hResult)) - { - delete theCabinet; - return hResult; - } - hResult = theCabinet->Initialize(parameters->directoryPIDL, 0, 0, 0); - if (FAILED(hResult)) - return hResult; - ExplorerMessageLoop(); - OleUninitialize(); - return 0; -} + IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; + return ExplorerMessageLoop(parameters); +} Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed May 21 11:38:29 2014 @@ -1925,6 +1925,8 @@ /* FIXME: should call TranslateAcceleratorSB */ + return m_pShellBrowser->TranslateAcceleratorSB(lpmsg, 0); + TRACE("-- key=0x04%lx\n", lpmsg->wParam) ; }

1 0

[ekohl] 63396: [USETUP] Display the proper partition type 'Extended Partiton' when an extended partition is going to be deleted.
by ekohl＠svn.reactos.org 21 May '14

21 May '14

Author: ekohl Date: Wed May 21 11:01:17 2014 New Revision: 63396 URL: http://svn.reactos.org/svn/reactos?rev=63396&view=rev Log: [USETUP] Display the proper partition type 'Extended Partiton' when an extended partition is going to be deleted. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c 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] Wed May 21 11:01:17 2014 @@ -2137,6 +2137,10 @@ { PartType = "NTFS"; /* FIXME: Not quite correct! */ } + else if (IsContainerPartition(PartEntry->PartitionType)) + { + PartType = MUIGetString(STRING_EXTENDED_PARTITION); + } } PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;

1 0

[tkreuzer] 63395: [NTOSKRNL] Do not ASSERT, when an unimplemented, yet legal flag (MEM_RESERVE) is passed to NtMapViewOfSection. Instead fail gracefully.
by tkreuzer＠svn.reactos.org 21 May '14

21 May '14

Author: tkreuzer Date: Wed May 21 09:44:41 2014 New Revision: 63395 URL: http://svn.reactos.org/svn/reactos?rev=63395&view=rev Log: [NTOSKRNL] Do not ASSERT, when an unimplemented, yet legal flag (MEM_RESERVE) is passed to NtMapViewOfSection. Instead fail gracefully. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed May 21 09:44:41 2014 @@ -2655,8 +2655,14 @@ ASSERT(Section->u.Flags.Image == 0); ASSERT(Section->u.Flags.NoCache == 0); ASSERT(Section->u.Flags.WriteCombined == 0); - ASSERT((AllocationType & MEM_RESERVE) == 0); ASSERT(ControlArea->u.Flags.PhysicalMemory == 0); + + /* FIXME */ + if ((AllocationType & MEM_RESERVE) != 0) + { + DPRINT1("MmMapViewOfArm3Section called with MEM_RESERVE, this is not implemented yet!!!\n"); + return STATUS_NOT_IMPLEMENTED; + } /* Check if the mapping protection is compatible with the create */ if (!MiIsProtectionCompatible(Section->InitialPageProtection, Protect))

1 0

[hbelusca] 63394: Forgot this...
by hbelusca＠svn.reactos.org 21 May '14

21 May '14

Author: hbelusca Date: Wed May 21 00:22:05 2014 New Revision: 63394 URL: http://svn.reactos.org/svn/reactos?rev=63394&view=rev Log: Forgot this... Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h 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 00:22:05 2014 @@ -1653,7 +1653,7 @@ {STRING_INSTALLDELETEPARTITION, " ENTRE = Installer D = Supprimer Partition F3 = Quitter"}, {STRING_DELETEPARTITION, - " D = Supprimer Partition F3 = Quit"}, + " D = Supprimer Partition F3 = Quitter"}, {STRING_PARTITIONSIZE, "Taille de la nouvelle partition :"}, {STRING_CHOOSENEWPARTITION,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs