Author: ekohl
Date: Sat Jul 11 12:40:34 2015
New Revision: 68388
URL:
http://svn.reactos.org/svn/reactos?rev=68388&view=rev
Log:
[USETUP]
Show an error message if formatting a partition fails.
Based on patch by mna.
CORE-7969 #resolve #comment Thanks a lot!
Modified:
trunk/reactos/base/setup/usetup/errorcode.h
trunk/reactos/base/setup/usetup/interface/usetup.c
trunk/reactos/base/setup/usetup/lang/bg-BG.h
trunk/reactos/base/setup/usetup/lang/bn-BD.h
trunk/reactos/base/setup/usetup/lang/cs-CZ.h
trunk/reactos/base/setup/usetup/lang/de-DE.h
trunk/reactos/base/setup/usetup/lang/el-GR.h
trunk/reactos/base/setup/usetup/lang/en-US.h
trunk/reactos/base/setup/usetup/lang/es-ES.h
trunk/reactos/base/setup/usetup/lang/et-EE.h
trunk/reactos/base/setup/usetup/lang/fr-FR.h
trunk/reactos/base/setup/usetup/lang/he-IL.h
trunk/reactos/base/setup/usetup/lang/it-IT.h
trunk/reactos/base/setup/usetup/lang/ja-JP.h
trunk/reactos/base/setup/usetup/lang/lt-LT.h
trunk/reactos/base/setup/usetup/lang/nl-NL.h
trunk/reactos/base/setup/usetup/lang/pl-PL.h
trunk/reactos/base/setup/usetup/lang/pt-BR.h
trunk/reactos/base/setup/usetup/lang/ro-RO.h
trunk/reactos/base/setup/usetup/lang/ru-RU.h
trunk/reactos/base/setup/usetup/lang/sk-SK.h
trunk/reactos/base/setup/usetup/lang/sq-AL.h
trunk/reactos/base/setup/usetup/lang/sv-SE.h
trunk/reactos/base/setup/usetup/lang/tr-TR.h
trunk/reactos/base/setup/usetup/lang/uk-UA.h
Modified: trunk/reactos/base/setup/usetup/errorcode.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod…
==============================================================================
--- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -70,6 +70,7 @@
ERROR_INSUFFICIENT_PARTITION_SIZE,
ERROR_PARTITION_TABLE_FULL,
ERROR_ONLY_ONE_EXTENDED,
+ ERROR_FORMATTING_PARTITION,
ERROR_LAST_ERROR_CODE
} ERROR_NUMBER;
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jul 11 12:40:34
2015
@@ -2899,7 +2899,7 @@
if (!NT_SUCCESS(Status))
{
DPRINT1("FormatPartition() failed with status 0x%08lx\n",
Status);
- /* FIXME: show an error dialog */
+ MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY,
PathBuffer);
return QUIT_PAGE;
}
Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1507,6 +1507,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1494,6 +1494,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1502,6 +1502,13 @@
"Nen¡ mo§n vytvoýit v¡ce ne§ jeden rozç¡ýenì odd¡l na disk.\n"
"\n"
" * Pokraujte stisknut¡m libovoln kl vesy."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1498,6 +1498,13 @@
"Sie knnen nur eine erweiterte Partition auf jeder Festplatte
anlegen.\n"
"\n"
" * Eine beliebige Taste zum Fortsetzen drcken."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1511,6 +1511,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1494,6 +1494,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1502,6 +1502,13 @@
"No es posible crear m s de una partici¢n extendida por disco.\n"
"\n"
" * Presione una tecla para continuar."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1492,6 +1492,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1507,6 +1507,13 @@
"Impossible de crer plus d'une partition tendue par disque.\n"
"\n"
" * Appuyer sur une touche pour continuer."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1495,6 +1495,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1502,6 +1502,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1496,6 +1496,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1504,6 +1504,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1534,6 +1534,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1504,6 +1504,13 @@
"Nie mo¾esz utworzy wi©cej ni¾ jednej partycji rozszerzonej na
dysku.\n"
"\n"
" * Nacinij dowolny klawisz, aby kontynuowa."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1532,6 +1532,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1565,6 +1565,13 @@
"Nu se poate crea mai mult de o partiîie extinsÇ pe un disc.\n"
"\n"
" * Tastaîi pentru a continua."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1495,6 +1495,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥¨ï."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1506,6 +1506,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1499,6 +1499,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1502,6 +1502,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1482,6 +1482,13 @@
"Bir diskte birden ok geniletilmi blm oluturamazsnz.\n"
"\n"
" * Srdrmek iin bir d§meye basnz."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sat Jul 11 12:40:34 2015
@@ -1502,6 +1502,13 @@
"You can not create more than one extended partition per disk.\n"
"\n"
" * Press any key to continue."
+ },
+ {
+ //ERROR_FORMATTING_PARTITION,
+ "Setup is unable to format the partition:\n"
+ " %S\n"
+ "\n"
+ "ENTER = Reboot computer"
},
{
NULL,