https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a75ed2acd93961412d2d2bda1797862fba726284
commit a75ed2acd93961412d2d2bda1797862fba726284 Author: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org> AuthorDate: Tue Jan 9 03:21:38 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org> CommitDate: Wed Aug 28 22:05:21 2024 +0200 [SETUP:REACTOS] Add the update-registry code (#7222) This code has been tested on Windows and works as expected. --- base/setup/reactos/lang/bg-BG.rc | 17 +++++++++++ base/setup/reactos/lang/cs-CZ.rc | 17 +++++++++++ base/setup/reactos/lang/de-DE.rc | 17 +++++++++++ base/setup/reactos/lang/el-GR.rc | 17 +++++++++++ base/setup/reactos/lang/en-US.rc | 17 +++++++++++ base/setup/reactos/lang/es-ES.rc | 17 +++++++++++ base/setup/reactos/lang/et-EE.rc | 17 +++++++++++ base/setup/reactos/lang/eu-ES.rc | 17 +++++++++++ base/setup/reactos/lang/fi-FI.rc | 17 +++++++++++ base/setup/reactos/lang/fr-FR.rc | 17 +++++++++++ base/setup/reactos/lang/he-IL.rc | 17 +++++++++++ base/setup/reactos/lang/hi-IN.rc | 17 +++++++++++ base/setup/reactos/lang/hu-HU.rc | 17 +++++++++++ base/setup/reactos/lang/id-ID.rc | 17 +++++++++++ base/setup/reactos/lang/it-IT.rc | 17 +++++++++++ base/setup/reactos/lang/ja-JP.rc | 17 +++++++++++ base/setup/reactos/lang/ms-MY.rc | 17 +++++++++++ base/setup/reactos/lang/no-NO.rc | 17 +++++++++++ base/setup/reactos/lang/pl-PL.rc | 17 +++++++++++ base/setup/reactos/lang/pt-BR.rc | 17 +++++++++++ base/setup/reactos/lang/pt-PT.rc | 17 +++++++++++ base/setup/reactos/lang/ro-RO.rc | 17 +++++++++++ base/setup/reactos/lang/ru-RU.rc | 17 +++++++++++ base/setup/reactos/lang/sk-SK.rc | 17 +++++++++++ base/setup/reactos/lang/sq-AL.rc | 17 +++++++++++ base/setup/reactos/lang/tr-TR.rc | 17 +++++++++++ base/setup/reactos/lang/uk-UA.rc | 17 +++++++++++ base/setup/reactos/lang/vi-VN.rc | 17 +++++++++++ base/setup/reactos/lang/zh-CN.rc | 17 +++++++++++ base/setup/reactos/lang/zh-HK.rc | 17 +++++++++++ base/setup/reactos/lang/zh-TW.rc | 17 +++++++++++ base/setup/reactos/reactos.c | 66 +++++++++++++++++++++++++++++++++++++++- base/setup/reactos/resource.h | 12 ++++++++ 33 files changed, 604 insertions(+), 1 deletion(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index e1f401df9c1..2f43f74839a 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index ed499e1caf5..9645e7cbc00 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -227,6 +227,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 5423229f2a5..00b0347afe4 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index e547eaebf4d..4ef7d7f2485 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index a118f6f4f51..f408db08e42 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index fb875e1f0e4..e2f2443cda4 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -230,6 +230,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index f524373aaf3..2173ed3fe83 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 75ce0cf14ee..174b6c36c1f 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -228,6 +228,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index abc7cbe9162..2cdadc38d2b 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index 90d9d5a3a9c..c1655ba3a56 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Prépare les partitions..." IDS_PREPARE_FILES "Prépare la liste de fichiers à copier, veuillez patienter..." IDS_COPYING_FILES "Copie les fichiers..." + + IDS_CREATE_REGISTRY "Crée la base de registres..." + IDS_UPDATE_REGISTRY "Mise à jour de la base de registres..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Terminé" + IDS_REG_REGHIVEUPDATE "Mise à jour de la base de registres" + IDS_REG_IMPORTFILE "Importe %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Mise à jour des paramètres de registre pour l'écran" + IDS_REG_LOCALESETTINGSUPDATE "Mise à jour des paramètres régionaux" + IDS_REG_ADDKBLAYOUTS "Ajout des dispositions de clavier" + IDS_REG_KEYBOARDSETTINGSUPDATE "Mise à jour des paramètres de disposition du clavier" + IDS_REG_CODEPAGEINFOUPDATE "Ajout des informations de pages de codes" + IDS_REG_UNKNOWN "Statut %d inconnu" END /* Error Strings */ diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index da55c6c1206..bca834654ca 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -223,6 +223,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index 1922772dea2..649fbc1c0bc 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -191,6 +191,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 3b7da052e54..21498adb4c4 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -223,6 +223,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 606cc28bda5..8a02a29a0bb 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index 639097aba5b..c1415f9b2f2 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index 844dee36824..e432ae65f22 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index 0a217d2e948..da8c49cc800 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -223,6 +223,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 4dd353f5505..8ffecfa7a0e 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index b9cc2a83c7a..fadc7d1ac62 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -232,6 +232,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index a912761ebbc..38fab3d8b8f 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 657009a66b8..26c8547d453 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index f81d116c7d7..efebc60631a 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -230,6 +230,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index b1544f5ce69..1c6ea120e51 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index 13fa7f99c5b..0314a8adb61 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -226,6 +226,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index 531be78dab3..67df75a0690 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -223,6 +223,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 3e9493faf4c..984d7469379 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -228,6 +228,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index 47c935add18..7b3cc3f6368 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -229,6 +229,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index c1f35322f5c..412fbc53fac 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 86357dcd187..ceaab5efa48 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index 888eb35c3b4..0c31f4db676 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -229,6 +229,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index 541d8869cdd..f7860c17214 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -230,6 +230,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 3dd9eae4e35..4c0b3d64f80 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -1706,6 +1706,38 @@ FileCopyCallback(PVOID Context, return FILEOP_DOIT; } +static VOID +__cdecl +RegistryStatus(IN REGISTRY_STATUS RegStatus, ...) +{ + /* WARNING: Please keep this lookup table in sync with the resources! */ + static const UINT StringIDs[] = + { + IDS_REG_DONE, /* Success */ + IDS_REG_REGHIVEUPDATE, /* RegHiveUpdate */ + IDS_REG_IMPORTFILE, /* ImportRegHive */ + IDS_REG_DISPLAYSETTINGSUPDATE, /* DisplaySettingsUpdate */ + IDS_REG_LOCALESETTINGSUPDATE, /* LocaleSettingsUpdate */ + IDS_REG_ADDKBLAYOUTS, /* KeybLayouts */ + IDS_REG_KEYBOARDSETTINGSUPDATE, /* KeybSettingsUpdate */ + IDS_REG_CODEPAGEINFOUPDATE, /* CodePageInfoUpdate */ + }; + + if (RegStatus < _countof(StringIDs)) + { + va_list args; + va_start(args, RegStatus); + SetWindowResPrintfVW(UiContext.hWndItem, SetupData.hInstance, StringIDs[RegStatus], args); + va_end(args); + } + else + { + SetWindowResPrintfW(UiContext.hWndItem, SetupData.hInstance, IDS_REG_UNKNOWN, RegStatus); + } + + SendMessageW(UiContext.hWndProgress, PBM_STEPIT, 0, 0); +} + /** * @brief * Enables or disables the Cancel and the Close title-bar @@ -1732,7 +1764,7 @@ PrepareAndDoCopyThread( HWND hwndDlg = (HWND)Param; HWND hWndProgress; LONG_PTR dwStyle; - // ERROR_NUMBER ErrorNumber; + ERROR_NUMBER ErrorNumber; BOOLEAN Success; NTSTATUS Status; FSVOL_CONTEXT FsVolContext; @@ -1923,6 +1955,38 @@ PrepareAndDoCopyThread( /* Create the $winnt$.inf file */ InstallSetupInfFile(&pSetupData->USetupData); + + /* + * Create or update the registry hives + */ + + /* Set status text */ + SetWindowResTextW(GetDlgItem(hwndDlg, IDC_ACTIVITY), + pSetupData->hInstance, + pSetupData->RepairUpdateFlag ? IDS_UPDATE_REGISTRY + : IDS_CREATE_REGISTRY); + SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); + + /* Set up the progress bar */ + SendMessageW(hWndProgress, + PBM_SETRANGE, 0, + MAKELPARAM(0, 8)); // FIXME: hardcoded number of steps, see StringIDs[] array in RegistryStatus() + SendMessageW(hWndProgress, + PBM_SETSTEP, 1, 0); + SendMessageW(hWndProgress, + PBM_SETPOS, 0, 0); + + ErrorNumber = UpdateRegistry(&pSetupData->USetupData, + pSetupData->RepairUpdateFlag, + pSetupData->PartitionList, + InstallVolume->Info.DriveLetter, + pSetupData->SelectedLanguageId, + RegistryStatus, + NULL /* SubstSettings */); + DBG_UNREFERENCED_PARAMETER(ErrorNumber); + SendMessageW(UiContext.hWndProgress, PBM_SETPOS, 100, 0); + + /* We are done! Switch to the Terminate page */ PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); return 0; diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index 7e53e711194..fac1ad7b48d 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -127,6 +127,18 @@ #define IDS_PREPARE_PARTITIONS 5208 #define IDS_PREPARE_FILES 5209 #define IDS_COPYING_FILES 5210 +#define IDS_CREATE_REGISTRY 5211 +#define IDS_UPDATE_REGISTRY 5212 + +#define IDS_REG_DONE 5220 +#define IDS_REG_REGHIVEUPDATE 5221 +#define IDS_REG_IMPORTFILE 5222 +#define IDS_REG_DISPLAYSETTINGSUPDATE 5223 +#define IDS_REG_LOCALESETTINGSUPDATE 5224 +#define IDS_REG_ADDKBLAYOUTS 5225 +#define IDS_REG_KEYBOARDSETTINGSUPDATE 5226 +#define IDS_REG_CODEPAGEINFOUPDATE 5227 +#define IDS_REG_UNKNOWN 5228 /* Error Strings */