https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ee9535e05384f291039aa78a31384f139143a68
commit 3ee9535e05384f291039aa78a31384f139143a68 Author: George Bișoc <[email protected]> AuthorDate: Wed Apr 7 10:11:07 2021 +0200 Commit: GitHub <[email protected]> CommitDate: Wed Apr 7 10:11:07 2021 +0200 [USETUP] Display some contents in the page whilst installing the bootloader (#3559) CORE-17523 --- base/setup/usetup/lang/bg-BG.h | 28 ++++++++++ base/setup/usetup/lang/bn-BD.h | 28 ++++++++++ base/setup/usetup/lang/cs-CZ.h | 28 ++++++++++ base/setup/usetup/lang/da-DK.h | 28 ++++++++++ base/setup/usetup/lang/de-DE.h | 28 ++++++++++ base/setup/usetup/lang/el-GR.h | 28 ++++++++++ base/setup/usetup/lang/en-US.h | 28 ++++++++++ base/setup/usetup/lang/es-ES.h | 28 ++++++++++ base/setup/usetup/lang/et-EE.h | 28 ++++++++++ base/setup/usetup/lang/eu-ES.h | 28 ++++++++++ base/setup/usetup/lang/fr-FR.h | 28 ++++++++++ base/setup/usetup/lang/he-IL.h | 28 ++++++++++ base/setup/usetup/lang/hu-HU.h | 28 ++++++++++ base/setup/usetup/lang/id-ID.h | 28 ++++++++++ base/setup/usetup/lang/it-IT.h | 28 ++++++++++ base/setup/usetup/lang/ja-JP.h | 28 ++++++++++ base/setup/usetup/lang/lt-LT.h | 28 ++++++++++ base/setup/usetup/lang/ms-MY.h | 28 ++++++++++ base/setup/usetup/lang/nl-NL.h | 28 ++++++++++ base/setup/usetup/lang/pl-PL.h | 28 ++++++++++ base/setup/usetup/lang/pt-BR.h | 28 ++++++++++ base/setup/usetup/lang/pt-PT.h | 28 ++++++++++ base/setup/usetup/lang/ro-RO.h | 28 ++++++++++ base/setup/usetup/lang/ru-RU.h | 28 ++++++++++ base/setup/usetup/lang/sk-SK.h | 28 ++++++++++ base/setup/usetup/lang/sq-AL.h | 28 ++++++++++ base/setup/usetup/lang/sv-SE.h | 28 ++++++++++ base/setup/usetup/lang/tr-TR.h | 28 ++++++++++ base/setup/usetup/lang/uk-UA.h | 28 ++++++++++ base/setup/usetup/usetup.c | 117 +++++++++++++++++------------------------ base/setup/usetup/usetup.h | 3 +- 31 files changed, 861 insertions(+), 71 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 010cbb78359..184821b2032 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1533,6 +1533,30 @@ static MUI_ENTRY bgBGBootLoaderEntries[] = } }; +static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bgBGKeyboardSettingsEntries[] = { { @@ -2183,6 +2207,10 @@ MUI_PAGE bgBGPages[] = SUCCESS_PAGE, bgBGSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + bgBGBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, bgBGBootPageEntries diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 9c6ea7a80ea..8ecec83cd19 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -981,6 +981,30 @@ static MUI_ENTRY bnBDBootPageEntries[] = }; +static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bnBDSelectPartitionEntries[] = { { @@ -2171,6 +2195,10 @@ MUI_PAGE bnBDPages[] = SUCCESS_PAGE, bnBDSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + bnBDBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, bnBDBootPageEntries diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index fc680399fc2..7ee0878be8e 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1531,6 +1531,30 @@ static MUI_ENTRY csCZBootLoaderEntries[] = } }; +static MUI_ENTRY csCZBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY csCZKeyboardSettingsEntries[] = { { @@ -2179,6 +2203,10 @@ MUI_PAGE csCZPages[] = SUCCESS_PAGE, csCZSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + csCZBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, csCZBootPageEntries diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index aa29e1f774c..d953f6c0d46 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1525,6 +1525,30 @@ static MUI_ENTRY daDKBootLoaderEntries[] = } }; +static MUI_ENTRY daDKBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY daDKKeyboardSettingsEntries[] = { { @@ -2174,6 +2198,10 @@ MUI_PAGE daDKPages[] = SUCCESS_PAGE, daDKSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + daDKBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, daDKBootPageEntries diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index c595845dbde..ad8544fd8c8 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1525,6 +1525,30 @@ static MUI_ENTRY deDEBootLoaderEntries[] = } }; +static MUI_ENTRY deDEBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY deDEKeyboardSettingsEntries[] = { { @@ -2176,6 +2200,10 @@ MUI_PAGE deDEPages[] = SUCCESS_PAGE, deDESuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + deDEBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, deDEBootPageEntries diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index f626aa78386..edb49657ef2 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1540,6 +1540,30 @@ static MUI_ENTRY elGRBootLoaderEntries[] = } }; +static MUI_ENTRY elGRBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY elGRKeyboardSettingsEntries[] = { { @@ -2187,6 +2211,10 @@ MUI_PAGE elGRPages[] = SUCCESS_PAGE, elGRSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + elGRBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, elGRBootPageEntries diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index e71eaa80534..1c94ac657e4 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1523,6 +1523,30 @@ static MUI_ENTRY enUSBootLoaderEntries[] = } }; +static MUI_ENTRY enUSBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY enUSKeyboardSettingsEntries[] = { { @@ -2171,6 +2195,10 @@ MUI_PAGE enUSPages[] = SUCCESS_PAGE, enUSSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + enUSBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, enUSBootPageEntries diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 35d0cabc9c1..82182e30d6c 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1529,6 +1529,30 @@ static MUI_ENTRY esESBootLoaderEntries[] = } }; +static MUI_ENTRY etESBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY esESKeyboardSettingsEntries[] = { { @@ -2177,6 +2201,10 @@ MUI_PAGE esESPages[] = SUCCESS_PAGE, esESSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + etESBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, esESBootPageEntries diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 581ffe97e3e..c29a79ab4d1 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1526,6 +1526,30 @@ static MUI_ENTRY etEEBootLoaderEntries[] = } }; +static MUI_ENTRY etEEBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY etEEKeyboardSettingsEntries[] = { { @@ -2172,6 +2196,10 @@ MUI_PAGE etEEPages[] = SUCCESS_PAGE, etEESuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + etEEBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, etEEBootPageEntries diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index da8ffe3804a..4777c606c2c 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -1524,6 +1524,30 @@ static MUI_ENTRY euESBootLoaderEntries[] = } }; +static MUI_ENTRY euESBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY euESKeyboardSettingsEntries[] = { { @@ -2172,6 +2196,10 @@ MUI_PAGE euESPages[] = SUCCESS_PAGE, euESSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + euESBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, euESBootPageEntries diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 17a3e90e2c2..b34852b57c1 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1560,6 +1560,30 @@ static MUI_ENTRY frFRBootLoaderEntries[] = } }; +static MUI_ENTRY frFRBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY frFRKeyboardSettingsEntries[] = { { @@ -2208,6 +2232,10 @@ MUI_PAGE frFRPages[] = SUCCESS_PAGE, frFRSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + frFRBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, frFRBootPageEntries diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 2f8ea935012..85751ce77e6 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1527,6 +1527,30 @@ static MUI_ENTRY heILBootLoaderEntries[] = } }; +static MUI_ENTRY heILBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY heILKeyboardSettingsEntries[] = { { @@ -2173,6 +2197,10 @@ MUI_PAGE heILPages[] = SUCCESS_PAGE, heILSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + heILBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, heILBootPageEntries diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 9d3d8b3abed..3289d59fc80 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1417,6 +1417,30 @@ static MUI_ENTRY huHUBootLoaderEntries[] = } }; +static MUI_ENTRY huHUBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY huHUKeyboardSettingsEntries[] = { { @@ -2062,6 +2086,10 @@ MUI_PAGE huHUPages[] = SUCCESS_PAGE, huHUSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + huHUBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, huHUBootPageEntries diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index 3a751b34c12..f6713b686f6 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -1523,6 +1523,30 @@ static MUI_ENTRY idIDBootLoaderEntries[] = } }; +static MUI_ENTRY idIDBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY idIDKeyboardSettingsEntries[] = { { @@ -2171,6 +2195,10 @@ MUI_PAGE idIDPages[] = SUCCESS_PAGE, idIDSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + idIDBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, idIDBootPageEntries diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 8041b37c394..e5a6b812a3f 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -980,6 +980,30 @@ static MUI_ENTRY itITBootPageEntries[] = }; +static MUI_ENTRY itITBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY itITSelectPartitionEntries[] = { { @@ -2177,6 +2201,10 @@ MUI_PAGE itITPages[] = SUCCESS_PAGE, itITSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + itITBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, itITBootPageEntries diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index dd0c2357b00..a0817056070 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1526,6 +1526,30 @@ static MUI_ENTRY jaJPBootLoaderEntries[] = } }; +static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY jaJPKeyboardSettingsEntries[] = { { @@ -2174,6 +2198,10 @@ MUI_PAGE jaJPPages[] = SUCCESS_PAGE, jaJPSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + jaJPBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, jaJPBootPageEntries diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 5bcd70c25a2..9c5942222eb 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1534,6 +1534,30 @@ static MUI_ENTRY ltLTBootLoaderEntries[] = } }; +static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ltLTKeyboardSettingsEntries[] = { { @@ -2182,6 +2206,10 @@ MUI_PAGE ltLTPages[] = SUCCESS_PAGE, ltLTSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ltLTBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ltLTBootPageEntries diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 7a04d9bb2d1..933e4795cd9 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1515,6 +1515,30 @@ static MUI_ENTRY msMYBootLoaderEntries[] = } }; +static MUI_ENTRY msMYBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY msMYKeyboardSettingsEntries[] = { { @@ -2156,6 +2180,10 @@ MUI_PAGE msMYPages[] = SUCCESS_PAGE, msMYSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + msMYBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, msMYBootPageEntries diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 8a3e1adf135..3da7c994373 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1538,6 +1538,30 @@ static MUI_ENTRY nlNLBootLoaderEntries[] = } }; +static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY nlNLkeyboardSettingsEntries[] = { { @@ -2196,6 +2220,10 @@ MUI_PAGE nlNLPages[] = SUCCESS_PAGE, nlNLSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + nlNLBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, nlNLBootPageEntries diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 97e27d10776..74f38adb369 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1534,6 +1534,30 @@ static MUI_ENTRY plPLBootLoaderEntries[] = } }; +static MUI_ENTRY plPLBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY plPLKeyboardSettingsEntries[] = { { @@ -2179,6 +2203,10 @@ MUI_PAGE plPLPages[] = SUCCESS_PAGE, plPLSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + plPLBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, plPLBootPageEntries diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 50d59d8ddbb..e898699a295 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1540,6 +1540,30 @@ static MUI_ENTRY ptBRBootLoaderEntries[] = } }; +static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptBRKeyboardSettingsEntries[] = { { @@ -2209,6 +2233,10 @@ MUI_PAGE ptBRPages[] = SUCCESS_PAGE, ptBRSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ptBRBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ptBRBootPageEntries diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index bd5eaa9ea13..b95b4d97899 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1540,6 +1540,30 @@ static MUI_ENTRY ptPTBootLoaderEntries[] = } }; +static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptPTKeyboardSettingsEntries[] = { { @@ -2194,6 +2218,10 @@ MUI_PAGE ptPTPages[] = SUCCESS_PAGE, ptPTSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ptPTBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ptPTBootPageEntries diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 84455496dbb..5f2fe87329b 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1548,6 +1548,30 @@ static MUI_ENTRY roROBootLoaderEntries[] = } }; +static MUI_ENTRY roROBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY roROKeyboardSettingsEntries[] = { { @@ -2217,6 +2241,10 @@ MUI_PAGE roROPages[] = SUCCESS_PAGE, roROSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + roROBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, roROBootPageEntries diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 65d55e58a3e..08e01695965 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1546,6 +1546,30 @@ static MUI_ENTRY ruRUBootLoaderEntries[] = } }; +static MUI_ENTRY ruRUBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ruRUKeyboardSettingsEntries[] = { { @@ -2194,6 +2218,10 @@ MUI_PAGE ruRUPages[] = SUCCESS_PAGE, ruRUSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ruRUBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ruRUBootPageEntries diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 7d37ba38531..5ec671ea635 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1532,6 +1532,30 @@ static MUI_ENTRY skSKBootLoaderEntries[] = } }; +static MUI_ENTRY skSKBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY skSKKeyboardSettingsEntries[] = { { @@ -2183,6 +2207,10 @@ MUI_PAGE skSKPages[] = SUCCESS_PAGE, skSKSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + skSKBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, skSKBootPageEntries diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 7e0c1b7795f..584c30c278e 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1530,6 +1530,30 @@ static MUI_ENTRY sqALBootLoaderEntries[] = } }; +static MUI_ENTRY sqALBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY sqALKeyboardSettingsEntries[] = { { @@ -2184,6 +2208,10 @@ MUI_PAGE sqALPages[] = SUCCESS_PAGE, sqALSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + sqALBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, sqALBootPageEntries diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 3c87c2992aa..b9f2b89ea4a 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1532,6 +1532,30 @@ static MUI_ENTRY svSEBootLoaderEntries[] = } }; +static MUI_ENTRY svSEBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY svSEKeyboardSettingsEntries[] = { { @@ -2180,6 +2204,10 @@ MUI_PAGE svSEPages[] = SUCCESS_PAGE, svSESuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + svSEBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, svSEBootPageEntries diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 229416e336a..bd02a96f3af 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1500,6 +1500,30 @@ static MUI_ENTRY trTRBootLoaderEntries[] = } }; +static MUI_ENTRY trTRBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY trTRKeyboardSettingsEntries[] = { { @@ -2148,6 +2172,10 @@ MUI_PAGE trTRPages[] = SUCCESS_PAGE, trTRSuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + trTRBootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, trTRBootPageEntries diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index d242e3d1d70..ce68ce4cb86 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1531,6 +1531,30 @@ static MUI_ENTRY ukUABootLoaderEntries[] = } }; +static MUI_ENTRY ukUABootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ukUAKeyboardSettingsEntries[] = { { @@ -2180,6 +2204,10 @@ MUI_PAGE ukUAPages[] = SUCCESS_PAGE, ukUASuccessPageEntries }, + { + BOOT_LOADER_INSTALLATION_PAGE, + ukUABootLoaderInstallPageEntries + }, { BOOT_LOADER_FLOPPY_PAGE, ukUABootPageEntries diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index f1fc3a03753..520b257846d 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4023,13 +4023,10 @@ Quit: case 1: return BOOT_LOADER_FLOPPY_PAGE; - /* Install on both MBR and VBR */ + /* Install on both MBR and VBR or VBR only */ case 2: - return BOOT_LOADER_HARDDISK_MBR_PAGE; - - /* Install on VBR only */ case 3: - return BOOT_LOADER_HARDDISK_VBR_PAGE; + return BOOT_LOADER_INSTALLATION_PAGE; } return BOOT_LOADER_PAGE; @@ -4092,83 +4089,69 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) /* - * Displays the BootLoaderHarddiskVbrPage. - * - * Next pages: - * SuccessPage (At once) - * QuitPage - * - * SIDEEFFECTS - * Calls InstallVBRToPartition() - * - * RETURNS - * Number of the next page. - */ -static PAGE_NUMBER -BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) -{ - NTSTATUS Status; - - Status = InstallVBRToPartition(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - &USetupData.DestinationArcPath, - SystemPartition->FileSystem); - if (!NT_SUCCESS(Status)) - { - MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - SystemPartition->FileSystem); - return QUIT_PAGE; - } - - return SUCCESS_PAGE; -} - - -/* - * Displays the BootLoaderHarddiskMbrPage. + * Displays the BootLoaderInstallationPage. * * Next pages: * SuccessPage (At once) * QuitPage * * SIDEEFFECTS - * Calls InstallVBRToPartition() - * Calls InstallMbrBootCodeToDisk() - * + * Calls InstallVBRToPartition() if VBR installation is chosen. + * Otherwise both InstallVBRToPartition() and InstallMbrBootCodeToDisk() + * are called if both MBR and VBR installation is chosen. + * * RETURNS * Number of the next page. */ static PAGE_NUMBER -BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) +BootLoaderInstallationPage(PINPUT_RECORD Ir) { NTSTATUS Status; WCHAR DestinationDevicePathBuffer[MAX_PATH]; - /* Step 1: Write the VBR */ - Status = InstallVBRToPartition(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - &USetupData.DestinationArcPath, - SystemPartition->FileSystem); - if (!NT_SUCCESS(Status)) + MUIDisplayPage(BOOT_LOADER_INSTALLATION_PAGE); + + if (USetupData.MBRInstallType == 2) { - MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - SystemPartition->FileSystem); - return QUIT_PAGE; - } + /* Step 1: Write the VBR */ + Status = InstallVBRToPartition(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + &USetupData.DestinationArcPath, + SystemPartition->FileSystem); + if (!NT_SUCCESS(Status)) + { + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, + SystemPartition->FileSystem); + return QUIT_PAGE; + } - /* Step 2: Write the MBR if the disk containing the system partition is not a super-floppy */ - if (!IsSuperFloppy(SystemPartition->DiskEntry)) + /* Step 2: Write the MBR if the disk containing the system partition is not a super-floppy */ + if (!IsSuperFloppy(SystemPartition->DiskEntry)) + { + RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), + L"\\Device\\Harddisk%d\\Partition0", + SystemPartition->DiskEntry->DiskNumber); + Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + DestinationDevicePathBuffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); + MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); + return QUIT_PAGE; + } + } + } + else { - RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), - L"\\Device\\Harddisk%d\\Partition0", - SystemPartition->DiskEntry->DiskNumber); - Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - DestinationDevicePathBuffer); + Status = InstallVBRToPartition(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + &USetupData.DestinationArcPath, + SystemPartition->FileSystem); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); - MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, + SystemPartition->FileSystem); return QUIT_PAGE; } } @@ -4632,12 +4615,8 @@ RunUSetup(VOID) Page = BootLoaderFloppyPage(&Ir); break; - case BOOT_LOADER_HARDDISK_MBR_PAGE: - Page = BootLoaderHarddiskMbrPage(&Ir); - break; - - case BOOT_LOADER_HARDDISK_VBR_PAGE: - Page = BootLoaderHarddiskVbrPage(&Ir); + case BOOT_LOADER_INSTALLATION_PAGE: + Page = BootLoaderInstallationPage(&Ir); break; /* Repair pages */ diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index cf31b92a81c..a7dbb67f212 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -111,8 +111,7 @@ typedef enum _PAGE_NUMBER REGISTRY_PAGE, BOOT_LOADER_PAGE, BOOT_LOADER_FLOPPY_PAGE, - BOOT_LOADER_HARDDISK_MBR_PAGE, - BOOT_LOADER_HARDDISK_VBR_PAGE, + BOOT_LOADER_INSTALLATION_PAGE, SUCCESS_PAGE, QUIT_PAGE,
