[USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.

svn path=/trunk/; revision=70857
2025-06-06 01:40:36 +00:00 · 2016-03-02 00:51:48 +00:00 · 2016-03-02 00:51:48 +00:00 · 9fe7f7642f
commit 9fe7f7642f
parent d763a707db
27 changed files with 61 additions and 8 deletions
--- a/reactos/base/setup/usetup/interface/usetup.c
+++ b/reactos/base/setup/usetup/interface/usetup.c
@ -3154,13 +3154,15 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
        if (!NT_SUCCESS(Status))
        {
            DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status);
-            sprintf(Buffer, "Setup failed to verify the selected partition.\n"
+            // sprintf(Buffer, "Setup failed to verify the selected partition.\n"
+            sprintf(Buffer, "ChkDsk detected some disk errors.\n"
                    "(Status 0x%08lx).\n", Status);
            PopupError(Buffer,
-                       MUIGetString(STRING_REBOOTCOMPUTER),
+                       // MUIGetString(STRING_REBOOTCOMPUTER),
+                       MUIGetString(STRING_CONTINUE),
                       Ir, POPUP_WAIT_ENTER);

-            return QUIT_PAGE;
+            // return QUIT_PAGE;
        }

        PartEntry->NeedsCheck = FALSE;
--- a/reactos/base/setup/usetup/lang/bg-BG.h
+++ b/reactos/base/setup/usetup/lang/bg-BG.h
@ -1758,6 +1758,8 @@ MUI_STRING bgBGStrings[] =
    "‘« £ ¥   <20>¥ ªâŽ‘ ¢êàåã ¤ï«"},
    {STRING_CHECKINGPART,
    "’¥ç¥ ¯à®¢¥àª    ¨§¡à ¨ï ¤ï«."},
+    {STRING_CONTINUE,
+    "ENTER = <20>à®¤ê«¦ ¢ ¥"},
    {STRING_QUITCONTINUE,
    "F3 = ˆ§å®¤  ENTER = <20>à®¤ê«¦ ¢ ¥"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/bn-BD.h
+++ b/reactos/base/setup/usetup/lang/bn-BD.h
@ -1743,6 +1743,8 @@ MUI_STRING bnBDStrings[] =
    "Setup installs ReactOS onto Partition"},
    {STRING_CHECKINGPART,
    "Setup is now checking the selected partition."},
+    {STRING_CONTINUE,
+    "ENTER = Continue"},
    {STRING_QUITCONTINUE,
    "F3 = Quit  ENTER = Continue"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/cs-CZ.h
+++ b/reactos/base/setup/usetup/lang/cs-CZ.h
@ -1751,6 +1751,8 @@ MUI_STRING csCZStrings[] =
    "Instalace nakop¡ruje ReactOS na odd¡l"},
    {STRING_CHECKINGPART,
    "Instalace nyn¡ kontroluje zvolenì odd¡l."},
+    {STRING_CONTINUE,
+    "ENTER = PokraŸovat"},
    {STRING_QUITCONTINUE,
    "F3 = UkonŸit  ENTER = PokraŸovat"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/da-DK.h
+++ b/reactos/base/setup/usetup/lang/da-DK.h
@ -1763,6 +1763,8 @@ MUI_STRING daDKStrings[] =
    "Installationen installere ReactOS p† partitionen"},
    {STRING_CHECKINGPART,
    "Installationen tjekker den valgte partition."},
+    {STRING_CONTINUE,
+    "ENTER = Forts‘t"},
    {STRING_QUITCONTINUE,
    "F3 = Afslut  ENTER = Forts‘t"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/de-DE.h
+++ b/reactos/base/setup/usetup/lang/de-DE.h
@ -1747,6 +1747,8 @@ MUI_STRING deDEStrings[] =
    "ReactOS wird auf dieser Partition installiert."},
    {STRING_CHECKINGPART,
    "Die ausgew„hlte Partition wird <20>berpr<70>ft."},
+    {STRING_CONTINUE,
+    "EINGABETASTE = Fortsetzen"},
    {STRING_QUITCONTINUE,
    "F3 = Beenden  EINGABETASTE = Fortsetzen"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/el-GR.h
+++ b/reactos/base/setup/usetup/lang/el-GR.h
@ -1762,6 +1762,8 @@ MUI_STRING elGRStrings[] =
    "Setup install ReactOS onto Partition"},
    {STRING_CHECKINGPART,
    "† œš¡˜«á©«˜©ž œ¢âš®œ  «é¨˜ «¦ œ§ ¢œš£â¤¦ partition."},
+    {STRING_CONTINUE,
+    "ENTER = ‘¬¤â®œ ˜"},
    {STRING_QUITCONTINUE,
    "F3 = €§¦®é¨ž©ž  ENTER = ‘¬¤â®œ ˜"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/en-US.h
+++ b/reactos/base/setup/usetup/lang/en-US.h
@ -1743,6 +1743,8 @@ MUI_STRING enUSStrings[] =
    "Setup installs ReactOS onto Partition"},
    {STRING_CHECKINGPART,
    "Setup is now checking the selected partition."},
+    {STRING_CONTINUE,
+    "ENTER = Continue"},
    {STRING_QUITCONTINUE,
    "F3 = Quit  ENTER = Continue"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/es-ES.h
+++ b/reactos/base/setup/usetup/lang/es-ES.h
@ -1753,6 +1753,8 @@ MUI_STRING esESStrings[] =
    "El instalador est  instalando ReactOS en la partici¢n"},
    {STRING_CHECKINGPART,
    "El instalador est  comprobando la partici¢n seleccionada."},
+    {STRING_CONTINUE,
+    "INTRO = Continuar"},
    {STRING_QUITCONTINUE,
    "F3 = Salir  INTRO = Continuar"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/et-EE.h
+++ b/reactos/base/setup/usetup/lang/et-EE.h
@ -1743,6 +1743,8 @@ MUI_STRING etEEStrings[] =
    "ReactOS paigaldatakse partitsioonile"},
    {STRING_CHECKINGPART,
    "Valitud partitsiooni kontrollitakse."},
+    {STRING_CONTINUE,
+    "ENTER = J„tka"},
    {STRING_QUITCONTINUE,
    "F3 = V„lju  ENTER = J„tka"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/fr-FR.h
+++ b/reactos/base/setup/usetup/lang/fr-FR.h
@ -1768,6 +1768,8 @@ MUI_STRING frFRStrings[] =
    "Setup installe ReactOS sur la partition"},
    {STRING_CHECKINGPART,
    "Setup v‚rifie la partition s‚lectionn‚e."},
+    {STRING_CONTINUE,
+    "ENTR<EFBFBD>E = Continuer"},
    {STRING_QUITCONTINUE,
    "F3 = Quitter  ENTR<54>E = Continuer"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/he-IL.h
+++ b/reactos/base/setup/usetup/lang/he-IL.h
@ -1745,6 +1745,8 @@ MUI_STRING heILStrings[] =
    "Setup installs ReactOS onto Partition"},
    {STRING_CHECKINGPART,
    "Setup is now checking the selected partition."},
+    {STRING_CONTINUE,
+    "ENTER = „Ž™Š"},
    {STRING_QUITCONTINUE,
    "F3 = <20>ˆŒ „š—<C5A1>„  ENTER = „Ž™Š"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/it-IT.h
+++ b/reactos/base/setup/usetup/lang/it-IT.h
@ -1753,6 +1753,8 @@ MUI_STRING itITStrings[] =
    "Setup installer… ReactOS sulla partitione"},
    {STRING_CHECKINGPART,
    "Setup sta controllando la partizione selezionata."},
+    {STRING_CONTINUE,
+    "INVIO = Continua"},
    {STRING_QUITCONTINUE,
    "F3 = Esci  INVIO = Continua"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/ja-JP.h
+++ b/reactos/base/setup/usetup/lang/ja-JP.h
@ -1747,6 +1747,8 @@ MUI_STRING jaJPStrings[] =
    "¾¯Ä±¯ÌßÊ ReactOS¦ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"},
    {STRING_CHECKINGPART,
    "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý¦ ¹Ý» ¼Ã²Ï½¡"},
+    {STRING_CONTINUE,
+    "ENTER = ¿Þ¯º³"},
    {STRING_QUITCONTINUE,
    "F3 = Á³¼  ENTER = ¿Þ¯º³"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/lt-LT.h
+++ b/reactos/base/setup/usetup/lang/lt-LT.h
@ -1753,6 +1753,8 @@ MUI_STRING ltLTStrings[] =
    "Setup installs ReactOS onto Partition"},
    {STRING_CHECKINGPART,
    "Setup is now checking the selected partition."},
+    {STRING_CONTINUE,
+    "ENTER = Continue"},
    {STRING_QUITCONTINUE,
    "F3 = Quit  ENTER = Continue"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/ms-MY.h
+++ b/reactos/base/setup/usetup/lang/ms-MY.h
@ -1632,6 +1632,8 @@ MUI_STRING msMYStrings[] =
    "Persediaan memasang ReactOS ke Partition"},
    {STRING_CHECKINGPART,
    "Persediaan kini sedang menyemak sekatan yang dipilih."},
+    {STRING_CONTINUE,
+    "ENTER = Teruskan"},
    {STRING_QUITCONTINUE,
    "F3 = Keluar  ENTER = Teruskan"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/nl-NL.h
+++ b/reactos/base/setup/usetup/lang/nl-NL.h
@ -1785,6 +1785,8 @@ MUI_STRING nlNLStrings[] =
    "Setup installeert ReactOS op Partitie"},
    {STRING_CHECKINGPART,
    "Setup controleert nu de geselecteerde partitie."},
+    {STRING_CONTINUE,
+    "ENTER = Doorgaan"},
    {STRING_QUITCONTINUE,
    "F3 = Afsluiten   ENTER = Doorgaan"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/pl-PL.h
+++ b/reactos/base/setup/usetup/lang/pl-PL.h
@ -1754,6 +1754,8 @@ MUI_STRING plPLStrings[] =
    "Instalator kopiuje pliki systemu na wybran¥ partycj©."},
    {STRING_CHECKINGPART,
    "Instalator sprawdza wybran¥ partycj©."},
+    {STRING_CONTINUE,
+    "ENTER = Kontynuacja"},
    {STRING_QUITCONTINUE,
    "F3 = Wyj˜cie  ENTER = Kontynuacja"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/pt-BR.h
+++ b/reactos/base/setup/usetup/lang/pt-BR.h
@ -1783,6 +1783,8 @@ MUI_STRING ptBRStrings[] =
    "O instalador instala o ReactOS na parti‡Æo"},
    {STRING_CHECKINGPART,
    "O instalador est  verificando a parti‡Æo selecionada."},
+    {STRING_CONTINUE,
+    "ENTER=Continuar"},
    {STRING_QUITCONTINUE,
    "F3=Sair  ENTER=Continuar"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/ro-RO.h
+++ b/reactos/base/setup/usetup/lang/ro-RO.h
@ -1814,6 +1814,8 @@ MUI_STRING roROStrings[] =
    "ReactOS va fi instalat pe partiþia"},
    {STRING_CHECKINGPART,
    "Programul de instalare verificã acum partiþia aleasã."},
+    {STRING_CONTINUE,
+    "ENTER = Continuare"},
    {STRING_QUITCONTINUE,
    "F3 = Ieºire  ENTER = Continuare"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/ru-RU.h
+++ b/reactos/base/setup/usetup/lang/ru-RU.h
@ -1744,6 +1744,8 @@ MUI_STRING ruRUStrings[] =
    "ReactOS ãáâ  ¢«¨¢ ¥âáï   à §¤¥«:"},
    {STRING_CHECKINGPART,
    "<EFBFBD>à®£à ¬¬  ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."},
+    {STRING_CONTINUE,
+    "ENTER = <20>à®¤®«¦¨âì"},
    {STRING_QUITCONTINUE,
    "F3 = ‚ëå®¤  ENTER = <20>à®¤®«¦¨âì"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/sk-SK.h
+++ b/reactos/base/setup/usetup/lang/sk-SK.h
@ -1757,6 +1757,8 @@ MUI_STRING skSKStrings[] =
    "Inçtal tor nainçtaluje syst‚m ReactOS na oblasœ"},
    {STRING_CHECKINGPART,
    "Inçtal tor teraz skontroluje vybran£ oblasœ."},
+    {STRING_CONTINUE,
+    "ENTER = PokraŸovaœ"},
    {STRING_QUITCONTINUE,
    "F3 = SkonŸiœ  ENTER = PokraŸovaœ"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/sq-AL.h
+++ b/reactos/base/setup/usetup/lang/sq-AL.h
@ -1750,6 +1750,8 @@ MUI_STRING sqALStrings[] =
    "Instalimi i ReactOS ne Particion"},
    {STRING_CHECKINGPART,
    "Instalimi tani ‰sht‰ duke kontrolluar particionin e p‰rzgjedhur."},
+    {STRING_CONTINUE,
+    "ENTER = Vazhdo"},
    {STRING_QUITCONTINUE,
    "F3 = Dil  ENTER = Vazhdo"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/sv-SE.h
+++ b/reactos/base/setup/usetup/lang/sv-SE.h
@ -1753,6 +1753,8 @@ MUI_STRING svSEStrings[] =
    "Setup installerar ReactOS till Partitionen"},
    {STRING_CHECKINGPART,
    "Setup unders”ker nu den valda partitionen."},
+    {STRING_CONTINUE,
+    "ENTER = Forts„tt"},
    {STRING_QUITCONTINUE,
    "F3 = Avsluta  ENTER = Forts„tt"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/tr-TR.h
+++ b/reactos/base/setup/usetup/lang/tr-TR.h
@ -1724,6 +1724,8 @@ MUI_STRING trTRStrings[] =
    "Kur, ReactOS'u b”l<E2809D>m <20>zerine kurar."},
    {STRING_CHECKINGPART,
    "Kur, Ÿimdi se‡ili b”l<E2809D>m<EFBFBD> g”zden ge‡iriyor."},
+    {STRING_CONTINUE,
+    "GiriŸ = S<>rd<72>r"},
    {STRING_QUITCONTINUE,
    "˜3 = €<>k   GiriŸ = S<>rd<72>r"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/lang/uk-UA.h
+++ b/reactos/base/setup/usetup/lang/uk-UA.h
@ -1753,6 +1753,8 @@ MUI_STRING ukUAStrings[] =
    "ReactOS ¢áâ ®¢«îóâìáï   à®§¤i«"},
    {STRING_CHECKINGPART,
    "‚áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© à®§¤i«."},
+    {STRING_CONTINUE,
+    "ENTER = <20>à®¤®¢¦¨â¨"},
    {STRING_QUITCONTINUE,
    "F3 = ‚¨©â¨  ENTER = <20>à®¤®¢¦¨â¨"},
    {STRING_REBOOTCOMPUTER,
--- a/reactos/base/setup/usetup/mui.h
+++ b/reactos/base/setup/usetup/mui.h
@ -115,11 +115,12 @@ MUIGetString(
 #define STRING_NONFORMATTEDOTHERPART          63
 #define STRING_INSTALLONPART             10
 #define STRING_CHECKINGPART              11
-#define STRING_QUITCONTINUE              12
-#define STRING_REBOOTCOMPUTER            13
-#define STRING_TXTSETUPFAILED            14
-#define STRING_COPYING                   15
-#define STRING_SETUPCOPYINGFILES         16
+#define STRING_CONTINUE                  12
+#define STRING_QUITCONTINUE              13
+#define STRING_REBOOTCOMPUTER            14
+#define STRING_TXTSETUPFAILED            15
+#define STRING_COPYING                   16
+#define STRING_SETUPCOPYINGFILES         17
 #define STRING_REGHIVEUPDATE             20
 #define STRING_IMPORTFILE                21
 #define STRING_DISPLAYETTINGSUPDATE      22