Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [USETUP] Localize the rest of the hardcoded error message strings
by Bișoc George 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fbff73792ed7683e947c… commit 2fbff73792ed7683e947c64e11f174d3a9418ecf Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Feb 13 17:13:48 2019 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sat Aug 17 21:34:39 2019 +0200 [USETUP] Localize the rest of the hardcoded error message strings --- base/setup/lib/errorcode.h | 3 +++ base/setup/usetup/lang/bg-BG.h | 15 +++++++++++++++ base/setup/usetup/lang/bn-BD.h | 15 +++++++++++++++ base/setup/usetup/lang/cs-CZ.h | 15 +++++++++++++++ base/setup/usetup/lang/da-DK.h | 15 +++++++++++++++ base/setup/usetup/lang/de-DE.h | 15 +++++++++++++++ base/setup/usetup/lang/el-GR.h | 15 +++++++++++++++ base/setup/usetup/lang/en-US.h | 15 +++++++++++++++ base/setup/usetup/lang/es-ES.h | 15 +++++++++++++++ base/setup/usetup/lang/et-EE.h | 15 +++++++++++++++ base/setup/usetup/lang/fr-FR.h | 15 +++++++++++++++ base/setup/usetup/lang/he-IL.h | 15 +++++++++++++++ base/setup/usetup/lang/it-IT.h | 15 +++++++++++++++ base/setup/usetup/lang/ja-JP.h | 15 +++++++++++++++ base/setup/usetup/lang/lt-LT.h | 15 +++++++++++++++ base/setup/usetup/lang/ms-MY.h | 15 +++++++++++++++ base/setup/usetup/lang/nl-NL.h | 15 +++++++++++++++ base/setup/usetup/lang/pl-PL.h | 15 +++++++++++++++ base/setup/usetup/lang/pt-BR.h | 15 +++++++++++++++ base/setup/usetup/lang/ro-RO.h | 15 +++++++++++++++ base/setup/usetup/lang/ru-RU.h | 15 +++++++++++++++ base/setup/usetup/lang/sk-SK.h | 15 +++++++++++++++ base/setup/usetup/lang/sq-AL.h | 15 +++++++++++++++ base/setup/usetup/lang/sv-SE.h | 15 +++++++++++++++ base/setup/usetup/lang/tr-TR.h | 15 +++++++++++++++ base/setup/usetup/lang/uk-UA.h | 15 +++++++++++++++ base/setup/usetup/usetup.c | 20 +++++--------------- 27 files changed, 383 insertions(+), 15 deletions(-) diff --git a/base/setup/lib/errorcode.h b/base/setup/lib/errorcode.h index a7fd84e95f8..48f9acb0fc4 100644 --- a/base/setup/lib/errorcode.h +++ b/base/setup/lib/errorcode.h @@ -16,6 +16,9 @@ typedef enum _ERROR_NUMBER { NOT_AN_ERROR = 0, // ERROR_SUCCESS, ERROR_NOT_INSTALLED, + ERROR_NO_BUILD_PATH, + ERROR_SOURCE_PATH, + ERROR_SOURCE_DIR, ERROR_NO_HDD, ERROR_NO_SOURCE_DRIVE, ERROR_LOAD_TXTSETUPSIF, diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 7c44315d9f1..244d2d3c740 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1484,6 +1484,21 @@ MUI_ERROR bgBGErrorEntries[] = " \x07 \207\240 \250\247\345\256\244 \255\240\342\250\341\255\245\342\245 F3.", "F3 = \210\247\345\256\244 ENTER = \217\340\256\244\352\253\246\240\242\240\255\245" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\215\240\341\342\340\256\251\242\240\347\352\342 \255\245 \255\240\254\245\340\250 \342\242\352\340\244 \244\250\341\252.\n", diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 8bb8b75df65..03746a6c4c0 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1473,6 +1473,21 @@ MUI_ERROR bnBDErrorEntries[] = " \x07 Press F3 to quit Setup.", "F3 = Quit ENTER = Continue" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup could not find a harddisk.\n", diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 4c8e661dff1..4d3a719129f 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1482,6 +1482,21 @@ MUI_ERROR csCZErrorEntries[] = " \x07 Stisknut\241m F3 ukon\237\241te instalaci.", "F3 = Ukon\237it ENTER = Pokra\237ovat" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Instalace nedok\240zala naj\241t harddisk.\n", diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 3aee65bcf70..e33dad89cf4 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1489,6 +1489,21 @@ MUI_ERROR daDKErrorEntries[] = " \x07 Tryk p\206 F3 afslutte installationen.", "F3 = Afslut ENTER = Forts\221t" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Installationen kunne ikke finde en harddisk.\n", diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index eab9c9bfdff..08f8a3dd4ea 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1476,6 +1476,21 @@ MUI_ERROR deDEErrorEntries[] = " \x07 Dr\201cken Sie F3, um die Installation zu beenden.", "F3 = Beenden EINGABETASTE = Fortsetzen" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Es konnte keine Festplatte gefunden werden.\n", diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index fc2d6d6f118..69e5baaf6bc 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1500,6 +1500,21 @@ MUI_ERROR elGRErrorEntries[] = " \x07 \217\230\253\343\251\253\234 F3 \232\240\230 \244\230 \230\247\246\256\340\250\343\251\234\253\234 \230\247\346 \253\236\244 \204\232\241\230\253\341\251\253\230\251\236.", "F3 = \200\247\246\256\351\250\236\251\236 ENTER = \221\254\244\342\256\234\240\230" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234 \243\247\346\250\234\251\234 \244\230 \231\250\234\240 \241\341\247\246\240\246\244 \251\241\242\236\250\346 \233\345\251\241\246.\n", diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 63faa0fde62..1ddbbad1582 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1474,6 +1474,21 @@ MUI_ERROR enUSErrorEntries[] = " \x07 Press F3 to quit Setup.", "F3 = Quit ENTER = Continue" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup could not find a harddisk.\n", diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 7ab27f9dbb8..57cb10c5f7c 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1479,6 +1479,21 @@ MUI_ERROR esESErrorEntries[] = " \x07 Presione F3 para abandonar el instalador.", "F3 = Salir INTRO = Continuar" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "El instalador no pudo encontrar un disco duro.\n", diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index b0ef95d4d03..9173c6a8847 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1477,6 +1477,21 @@ MUI_ERROR etEEErrorEntries[] = " \x07 Vajuta F3 paigalduse seiskamiseks.", "F3 = V\204lju ENTER = J\204tka" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "K\344vaketast ei leitud.\n", diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 9eea85258b8..3c5b2bf6d51 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1494,6 +1494,21 @@ MUI_ERROR frFRErrorEntries[] = " \x07 Appuyer sur F3 pour quitter Setup.", "F3 = Quitter ENTR\220E = Continuer" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup n'a pu trouver un disque dur.\n", diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 3bf458bb251..a6550708c56 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1478,6 +1478,21 @@ MUI_ERROR heILErrorEntries[] = " \x07 .\204\220\227\232\204\204\216 \232\200\226\214 \211\203\213 F3 \225\207\214", "\204\220\227\232\204 \214\205\210\211\201 = F3 \212\231\216\204 = ENTER" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD ".\207\211\231\227 \217\220\205\213 \204\200\226\216 \200\214 \204\220\227\232\204\204 \232\211\220\213\232\n", diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 171089ca44c..15e369997b5 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1479,6 +1479,21 @@ MUI_ERROR itITErrorEntries[] = " \x07 Premere F3 per uscire.", "F3 = Uscire INVIO = Continuare" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup non ha trovato un disco fisso.\n", diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 58c254f44c8..c1408ad5b65 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1477,6 +1477,21 @@ MUI_ERROR jaJPErrorEntries[] = " \x07 \276\257\304\261\257\314\337\246 \301\255\263\274 \275\331\306\312 F3 \267\260\246 \265\274\303 \270\300\336\273\262\241", "F3 = \301\255\263\274 ENTER = \277\336\257\272\263" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\276\257\304\261\257\314\337\312 \312\260\304\336\303\336\250\275\270\246 \271\335\274\255\302 \303\336\267\317\276\335 \303\336\274\300\241\n", diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index e1ebf82d13c..f3c3bdf4e74 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1485,6 +1485,21 @@ MUI_ERROR ltLTErrorEntries[] = " \x07 Press F3 to quit Setup.", "F3 = Quit ENTER = Continue" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup could not find a harddisk.\n", diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 32d76284080..67ac883ae42 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1373,6 +1373,21 @@ MUI_ERROR msMYErrorEntries[] = " \x07 Tekan F3 untuk keluar persediaan.", "F3 = Keluar ENTER = Teruskan" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Persediaan tidak dapat mencari cakera keras.\n", diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index a868590d4d3..076240d56e0 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1495,6 +1495,21 @@ MUI_ERROR nlNLErrorEntries[] = " \x07 Druk op F3 om Setup af te sluiten.", "F3 = Afsluiten ENTER = Doorgaan" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup kan geen vaste schijf vinden.\n", diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 87c93c7ccd0..d4d77483dc8 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1485,6 +1485,21 @@ MUI_ERROR plPLErrorEntries[] = " \x07 Naci\230nij F3, aby wyj\230\206 z instalatora.", "F3 = Wyj\230cie ENTER = Kontynuacja" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Instalator nie wykry\210 \276adnego dysku twardego.\n", diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 1c5b97d9961..d19033fadd0 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1507,6 +1507,21 @@ MUI_ERROR ptBRErrorEntries[] = " \x07 Para sair da instala\207\306o, pressione F3.", "F3=Sair ENTER=Continuar" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "N\306o foi poss\241vel localizar um disco r\241digo.\n", diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 92fa85b3397..8a1c5f2135b 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1508,6 +1508,21 @@ MUI_ERROR roROErrorEntries[] = " \x07 Tasta\376i F3 pentru a abandona instalarea.", "F3 = Ie\272ire ENTER = Continuare" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "E\272ec la identificarea unit\343\376ilor interne de stocare.", diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index d820c8089a1..75e9f1e92df 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1494,6 +1494,21 @@ MUI_ERROR ruRUErrorEntries[] = " \x07 \215\240\246\254\250\342\245 F3 \242\353\345\256\244\240 \250\247 \343\341\342\240\255\256\242\252\250.", "F3 = \202\353\345\256\244 ENTER = \217\340\256\244\256\253\246\250\342\354" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\215\245 \343\244\240\253\256\341\354 \255\240\251\342\250 \246\245\341\342\252\250\251 \244\250\341\252.\n", diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 8adac0cdb22..1462032784d 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1483,6 +1483,21 @@ MUI_ERROR skSKErrorEntries[] = " \x07 Stla\237te F3 pre skon\237enie in\347tal\240cie.", "F3 = Skon\237i\234 ENTER = Pokra\237ova\234" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "In\347tal\240toru sa nepodarilo n\240js\234 pevn\354 disk.\n", diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index d2e1f9276ae..98bd309e0e5 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1481,6 +1481,21 @@ MUI_ERROR sqALErrorEntries[] = " \x07 Kliko F3 t\211 dal\211sh nga instalimi.", "F3 = Dil ENTER = Vazhdo" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Instalimi nuk mund t\211 gjej nj\211 harddisk.\n", diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 9e6ece2cb62..0b392550fd7 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1483,6 +1483,21 @@ MUI_ERROR svSEErrorEntries[] = " \x07 Tryck F3 f\224r att avsluta Setup.", "F3 = Avsluta ENTER = Forts\204tta" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup kunde inte hitta n\206gon h\206rddisk.\n", diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 80196752ea9..5fad4675b9b 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1455,6 +1455,21 @@ MUI_ERROR trTRErrorEntries[] = " \x07 Kur'dan \207\215kmak i\207in F3'e bas\215n\215z.", "F3 = \200\215k ENTER = S\201rd\201r" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Kur, bir sabit disk bulamad\215.\n", diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 5f6258c7444..4d12092d41b 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1483,6 +1483,21 @@ MUI_ERROR ukUAErrorEntries[] = " \x07 \215\240\342\250\341\255i\342\354 F3 \244\253\357 \242\250\345\256\244\343 \247 \242\341\342\240\255\256\242\253\356\242\240\347\240.", "F3 = \202\250\251\342\250 ENTER = \217\340\256\244\256\242\246\250\342\250" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\215\245 \242\244\240\253\256\341\354 \247\255\240\251\342\250 \246\256\340\341\342\252\250\251 \244\250\341\252.\n", diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 63c13c5bd01..8aaf3cc5831 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1777,9 +1777,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) // &USetupData.SourceRootPath if (RtlPrefixUnicodeString(&CurrentPartitionU, &USetupData.SourcePath, TRUE)) { - PopupError("You cannot delete the partition containing the installation source!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_SOURCE_PATH, Ir, POPUP_WAIT_ENTER); return SELECT_PARTITION_PAGE; } } @@ -3569,9 +3567,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status); - PopupError("Failed to build the installation paths for the ReactOS installation directory!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3582,9 +3578,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) */ if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE)) { - PopupError("You cannot install ReactOS within the installation source directory!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_SOURCE_DIR, Ir, POPUP_WAIT_ENTER); return INSTALL_DIRECTORY_PAGE; } @@ -3677,9 +3671,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status); - PopupError("Failed to build the installation paths for the ReactOS installation directory!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3690,9 +3682,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) */ if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE)) { - PopupError("You cannot install ReactOS within the installation source directory!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_SOURCE_DIR, Ir, POPUP_WAIT_ENTER); return INSTALL_DIRECTORY_PAGE; }

1 0

[reactos] 01/01: [HAL] Xbox needs more PCI blacklisting!
by Stanislav Motylkov 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=251bf491270ce95e4bb62… commit 251bf491270ce95e4bb62e21ce1f976d1a75b0b5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Aug 17 20:03:39 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 21:19:28 2019 +0200 [HAL] Xbox needs more PCI blacklisting! CORE-16216 --- hal/halx86/legacy/bus/pcibus.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index 93ed9cb5ca1..a0aff2c70da 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -325,6 +325,21 @@ HalpValidPCISlot(IN PBUS_HANDLER BusHandler, if (Slot.u.bits.Reserved) return FALSE; if (Slot.u.bits.DeviceNumber >= BusData->MaxDevice) return FALSE; +#ifdef SARCH_XBOX + /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely + * hang the Xbox. Also, the device number doesn't seem to be decoded for the + * video card, so it appears to be present on 1:0:0 - 1:31:0. + * We hack around these problems by indicating "device not present" for devices + * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ + if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || + (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) + { + DPRINT("HalpValidPCISlot(): Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); + return FALSE; + } +#endif + /* Function 0 doesn't need checking */ if (!Slot.u.bits.FunctionNumber) return TRUE;

1 0

[reactos] 01/01: [CMAKE] KDBG and _WINKD_ do not need a value
by Serge Gautherie 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12dc1089ecca7336a279a… commit 12dc1089ecca7336a279af9c211ac774936bac50 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Aug 17 18:20:51 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 18:40:40 2019 +0200 [CMAKE] KDBG and _WINKD_ do not need a value --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5ccbd70289..aa2fefdb138 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,11 +133,11 @@ else() endif() if(KDBG) - add_definitions(-DKDBG=1) + add_definitions(-DKDBG) endif() if(_WINKD_) - add_definitions(-D_WINKD_=1) + add_definitions(-D_WINKD_) endif() if(CMAKE_VERSION MATCHES "ReactOS")

1 0

[reactos] 01/01: [IPHLPAPI] icmp.c: Complete sync with Wine Staging 1.7.55
by Serge Gautherie 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ba4b11a33ccf792b7f97… commit 8ba4b11a33ccf792b7f97181637d940a8a44e699 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 4 23:25:24 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:48:21 2019 +0200 [IPHLPAPI] icmp.c: Complete sync with Wine Staging 1.7.55 - Restore a missing brace. - Mark all our differences (at that time). Please inspect them. CORE-10536 --- dll/win32/iphlpapi/icmp.c | 28 ++++++++++++++++++++++++++++ media/doc/README.WINE | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dll/win32/iphlpapi/icmp.c b/dll/win32/iphlpapi/icmp.c index 95fbe1bdca3..2dcf4bbafc5 100644 --- a/dll/win32/iphlpapi/icmp.c +++ b/dll/win32/iphlpapi/icmp.c @@ -603,6 +603,7 @@ DWORD WINAPI IcmpSendEcho( WARN("using system ping command since SOCK_RAW was not supported.\n"); return system_icmp(DestinationAddress, RequestData, RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + } #endif /* Prepare the request */ @@ -702,7 +703,11 @@ DWORD WINAPI IcmpSendEcho( #endif send_time = GetTickCount(); +#ifdef __REACTOS__ res=sendto(icp->sid, (const char*)reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); +#else + res=sendto(icp->sid, reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); +#endif HeapFree(GetProcessHeap (), 0, reqbuf); if (res<0) { DWORD dwBestIfIndex; @@ -716,6 +721,7 @@ DWORD WINAPI IcmpSendEcho( memcpy(&ier->Address, &IP4Addr, sizeof(IP4Addr)); } +#ifdef __REACTOS__ if (WSAGetLastError()==WSAEMSGSIZE) ier->Status = IP_PACKET_TOO_BIG; else { @@ -733,6 +739,24 @@ DWORD WINAPI IcmpSendEcho( } } return 1; +#else + if (errno==EMSGSIZE) + SetLastError(IP_PACKET_TOO_BIG); + else { + switch (errno) { + case ENETUNREACH: + SetLastError(IP_DEST_NET_UNREACHABLE); + break; + case EHOSTUNREACH: + SetLastError(IP_DEST_HOST_UNREACHABLE); + break; + default: + TRACE("unknown error: errno=%d\n",errno); + SetLastError(IP_GENERAL_FAILURE); + } + } + return 0; +#endif } /* Get the reply */ @@ -744,7 +768,11 @@ DWORD WINAPI IcmpSendEcho( while (poll(&fdr,1,Timeout)>0) { #endif recv_time = GetTickCount(); +#ifdef __REACTOS__ res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,(int*)&addrlen); +#else + res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); +#endif TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; if (res < 0) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index ebd0f73d913..195f9543d68 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -269,7 +269,7 @@ gdi32 - reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 iphlpapi - - reactos/dll/win32/iphlpapi/icmp.c # Partially synced to WineStaging-1.7.55 + reactos/dll/win32/iphlpapi/icmp.c # Synced to WineStaging-1.7.55 kernel32 - reactos/dll/win32/kernel32/wine/actctx.c # Partly synced with Wine 1.7.55

1 0

[reactos] 03/03: Search for host-tools path
by Andrew Cook 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0341ea5e7bb96fd99b3e6… commit 0341ea5e7bb96fd99b3e6c48b6afc931aaeb59a1 Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Fri Feb 15 12:33:13 2019 +1100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:39:44 2019 +0200 Search for host-tools path Allows source-relative paths --- sdk/cmake/host-tools.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 41b82d29fac..04e58f7c7bb 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -48,7 +48,12 @@ function(setup_host_tools) if(WITH_HOST_TOOLS) # Use pre-built tools, required for cross compiling with msvc # as only one target architecture is available at a time - set(HOST_TOOLS_DIR ${WITH_HOST_TOOLS}) + find_path(HOST_TOOLS_DIR + NAMES ImportExecutables.cmake + HINTS ${WITH_HOST_TOOLS} ${REACTOS_SOURCE_DIR}/${WITH_HOST_TOOLS} + NO_CMAKE_PATH + NO_CMAKE_ENVIRONMENT_PATH) + message(STATUS "Using prebuilt host tools: ${HOST_TOOLS_DIR}") include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) else() # Build host-tools. Changes to tool sources will rebuild targets

1 0

[reactos] 02/03: Add WITH_HOST_TOOLS option
by Andrew Cook 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f67345320fdc400e2f354… commit f67345320fdc400e2f354c4eed915fee96eb01b4 Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Wed Feb 13 21:06:49 2019 +1100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:39:43 2019 +0200 Add WITH_HOST_TOOLS option Required for cross-compiling with msvc as only one target architecture is available at a time in the dev prompt --- sdk/cmake/host-tools.cmake | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 25559192ee2..41b82d29fac 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -1,6 +1,6 @@ -function(setup_host_tools) - file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/host-tools) +function(configure_host_tools HOST_TOOLS_DIR) + file(MAKE_DIRECTORY ${HOST_TOOLS_DIR}) message(STATUS "Configuring host tools...") # cmake sets CC and CXX when those languages are enabled @@ -13,7 +13,7 @@ function(setup_host_tools) -DARCH:STRING=${ARCH} ${USE_CLANG_CL_ARG} ${REACTOS_SOURCE_DIR} - WORKING_DIRECTORY ${REACTOS_BINARY_DIR}/host-tools + WORKING_DIRECTORY ${HOST_TOOLS_DIR} RESULT_VARIABLE _host_config_result OUTPUT_VARIABLE _host_config_log ERROR_VARIABLE _host_config_log) @@ -31,15 +31,30 @@ function(setup_host_tools) # custom target + symbolic output prevents cmake from running # the command multiple times per build add_custom_command( - COMMAND ${CMAKE_COMMAND} --build ${REACTOS_BINARY_DIR}/host-tools + COMMAND ${CMAKE_COMMAND} --build ${HOST_TOOLS_DIR} OUTPUT host_tools) add_custom_target(build-host-tools ALL DEPENDS host_tools) - include(${REACTOS_BINARY_DIR}/host-tools/ImportExecutables.cmake) - include(${REACTOS_BINARY_DIR}/host-tools/TargetList.cmake) + include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) + include(${HOST_TOOLS_DIR}/TargetList.cmake) foreach(_target ${NATIVE_TARGETS}) add_dependencies(native-${_target} build-host-tools) endforeach() endfunction() + +function(setup_host_tools) + if(WITH_HOST_TOOLS) + # Use pre-built tools, required for cross compiling with msvc + # as only one target architecture is available at a time + set(HOST_TOOLS_DIR ${WITH_HOST_TOOLS}) + include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) + else() + # Build host-tools. Changes to tool sources will rebuild targets + # using that tool + set(HOST_TOOLS_DIR ${REACTOS_BINARY_DIR}/host-tools) + configure_host_tools(${HOST_TOOLS_DIR}) + endif() + +endfunction()

1 0

[reactos] 01/03: Rework host tools
by Andrew Cook 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce531a28ec7383340aae3… commit ce531a28ec7383340aae39d6714c1319171b49f8 Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Mon Oct 1 21:07:44 2018 +1000 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:39:31 2019 +0200 Rework host tools Now configured at the same time as reactos and only one list of targets to maintain Correctly rebuilds when a tool changes (tested widl) --- CMakeLists.txt | 38 ++++++--------------- configure.cmd | 59 +------------------------------- configure.sh | 27 +-------------- sdk/cmake/gcc.cmake | 7 +--- sdk/cmake/host-tools.cmake | 83 ++++++++++++++++++++++++---------------------- sdk/cmake/host-tools.in | 1 + sdk/tools/CMakeLists.txt | 4 +-- 7 files changed, 59 insertions(+), 160 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52193933fa3..f5ccbd70289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,6 @@ set(CMAKE_COLOR_MAKEFILE OFF) set(CMAKE_POSITION_INDEPENDENT_CODE OFF) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) -if(NOT DEFINED NEW_STYLE_BUILD) - set(NEW_STYLE_BUILD TRUE) -endif() - if(NOT ARCH) set(ARCH i386) endif() @@ -75,11 +71,7 @@ endif() # include(sdk/cmake/bison-flex.cmake) if(NOT CMAKE_CROSSCOMPILING) - - if(NEW_STYLE_BUILD) - set(TOOLS_FOLDER ${CMAKE_CURRENT_BINARY_DIR}) - endif() - + set(TOOLS_FOLDER ${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DTARGET_${ARCH}) if(MSVC) @@ -105,22 +97,22 @@ if(NOT CMAKE_CROSSCOMPILING) add_subdirectory(sdk/tools) add_subdirectory(sdk/lib) - if(NOT NEW_STYLE_BUILD) - if(NOT MSVC) - export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - endif() + set(NATIVE_TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb) + if(NOT MSVC) + list(APPEND NATIVE_TARGETS rsym) endif() + export(TARGETS ${NATIVE_TARGETS} FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + configure_file(sdk/cmake/host-tools.in ${CMAKE_BINARY_DIR}/TargetList.cmake) + else() + # Add host tools target + include(sdk/cmake/host-tools.cmake) + setup_host_tools() + # We don't need CMake importlib handling. unset(CMAKE_IMPORT_LIBRARY_SUFFIX) - if(NEW_STYLE_BUILD) - include(sdk/cmake/host-tools.cmake) - endif() - # Print build type message("-- Build Type: ${CMAKE_BUILD_TYPE}") @@ -134,14 +126,6 @@ else() #useful stuff! include(CMakeParseArguments) - if(NOT NEW_STYLE_BUILD) - if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) - set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) - endif() - set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") - include(${IMPORT_EXECUTABLES}) - endif() - if(DBG) add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) else() diff --git a/configure.cmd b/configure.cmd index 4509ff04231..a6acd1c9a0c 100755 --- a/configure.cmd +++ b/configure.cmd @@ -18,18 +18,6 @@ if /I "%1" == "/?" ( goto quit ) -REM Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR% -if /I "%1" == "arm_hosttools" ( - echo Configuring x86 host tools for ARM cross build - - REM This launches %VSINSTALLDIR%VS\vcvarsall.bat - call %2 x86 - - REM Configure host tools for x86. - cmake -G %3 -A Win32 -DARCH:STRING=i386 %~dp0 - exit -) - REM Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 @@ -95,14 +83,11 @@ if not defined ARCH ( goto quit ) -set NEW_STYLE_BUILD=1 set USE_CLANG_CL=0 REM Parse command line parameters :repeat - if /I "%1" == "-DNEW_STYLE_BUILD" ( - set NEW_STYLE_BUILD=%2 - ) else if "%BUILD_ENVIRONMENT%" == "MinGW" ( + if "%BUILD_ENVIRONMENT%" == "MinGW" ( if /I "%1" == "Codeblocks" ( set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles" ) else if /I "%1" == "Eclipse" ( @@ -210,50 +195,12 @@ if "%VS_SOLUTION%" == "1" ( goto quit ) -if "%NEW_STYLE_BUILD%"=="0" ( - - if not exist host-tools ( - mkdir host-tools - ) - - if not exist reactos ( - mkdir reactos - ) - - echo Preparing host tools... - cd host-tools - if EXIST CMakeCache.txt ( - del CMakeCache.txt /q - ) - - set REACTOS_BUILD_TOOLS_DIR=!CD! - - REM Use x86 for ARM host tools - if "%ARCH%" == "arm" ( - REM Launch new script instance for x86 host tools configuration - start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR% - ) else ( - cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%" - ) - - cd.. - -) - echo Preparing reactos... -if "%NEW_STYLE_BUILD%"=="0" ( - cd reactos -) - if EXIST CMakeCache.txt ( del CMakeCache.txt /q - del host-tools\CMakeCache.txt /q ) -if "%NEW_STYLE_BUILD%"=="0" ( - set BUILD_TOOLS_FLAG=-DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" -) if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %* "%REACTOS_SOURCE_DIR%" @@ -263,10 +210,6 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DRUNTIME_CHECKS:BOOL=%VS_RUNTIME_CHECKS% %* "%REACTOS_SOURCE_DIR%" ) -if "%NEW_STYLE_BUILD%"=="0" ( - cd.. -) - if %ERRORLEVEL% NEQ 0 ( goto quit ) diff --git a/configure.sh b/configure.sh index 52417c06e5d..9ff728088ef 100755 --- a/configure.sh +++ b/configure.sh @@ -9,7 +9,6 @@ BUILD_ENVIRONMENT=MinGW ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -USE_NEW_STYLE=1 usage() { echo Invalid parameter given. @@ -34,9 +33,6 @@ while [ $# -gt 0 ]; do makefiles|Makefiles) CMAKE_GENERATOR="Unix Makefiles" ;; - with-host-tools) - USE_NEW_STYLE=0 - ;; *) usage esac @@ -50,30 +46,9 @@ if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then cd "$REACTOS_OUTPUT_PATH" fi -#EXTRA_ARGS="" -if [ $USE_NEW_STYLE -eq 0 ]; then - mkdir -p host-tools - mkdir -p reactos - echo Preparing host tools... - cd host-tools - rm -f CMakeCache.txt - - REACTOS_BUILD_TOOLS_DIR="$PWD" - cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR" - - EXTRA_ARGS="$EXTRA_ARGS -DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" - - cd .. -fi - echo Preparing reactos... - -if [ $USE_NEW_STYLE -eq 0 ]; then - cd reactos -fi - rm -f CMakeCache.txt host-tools/CMakeCache.txt -cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands $ex: ninja, make, makex, etc...$. diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index b3db8626d07..2493d999bf5 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -228,12 +228,7 @@ elseif(NO_ROSSYM) set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") else() # Normal rsym build - if(NEW_STYLE_BUILD) - string(TOUPPER ${CMAKE_BUILD_TYPE} _build_type) - get_target_property(RSYM native-rsym IMPORTED_LOCATION_${_build_type}) - else() - get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) - endif() + get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 100df6fd524..25559192ee2 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -1,42 +1,45 @@ -if(CMAKE_HOST_WIN32) - set(native_suffix ".exe") -endif() - -string(TOUPPER ${CMAKE_BUILD_TYPE} _build_type) - -# List of host tools -list(APPEND host_tools_list bin2c hpp widl gendib cabman fatten isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb) -if(NOT MSVC) - list(APPEND host_tools_list rsym) -endif() - -foreach(_host_tool ${host_tools_list}) - if(MSVC_IDE) - get_filename_component(_tool_location "${CMAKE_CURRENT_BINARY_DIR}/host-tools/${CMAKE_BUILD_TYPE}/${_host_tool}${native_suffix}" ABSOLUTE) - else() - get_filename_component(_tool_location "${CMAKE_CURRENT_BINARY_DIR}/host-tools/${_host_tool}${native_suffix}" ABSOLUTE) +function(setup_host_tools) + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/host-tools) + + message(STATUS "Configuring host tools...") + # cmake sets CC and CXX when those languages are enabled + # so we need to clear them here + execute_process(COMMAND + ${CMAKE_COMMAND} + -E env --unset=CC --unset=CXX + ${CMAKE_COMMAND} + -G "${CMAKE_GENERATOR}" + -DARCH:STRING=${ARCH} + ${USE_CLANG_CL_ARG} + ${REACTOS_SOURCE_DIR} + WORKING_DIRECTORY ${REACTOS_BINARY_DIR}/host-tools + RESULT_VARIABLE _host_config_result + OUTPUT_VARIABLE _host_config_log + ERROR_VARIABLE _host_config_log) + + # Show cmake output only if host-tools breaks + if(NOT _host_config_result EQUAL 0) + message("\nHost tools log:") + message("${_host_config_log}") + message(FATAL_ERROR "Failed to configure host tools") endif() - list(APPEND tools_binaries ${_tool_location}) - add_executable(native-${_host_tool} IMPORTED) - set_property(TARGET native-${_host_tool} PROPERTY IMPORTED_LOCATION_${_build_type} ${_tool_location}) - add_dependencies(native-${_host_tool} host-tools) -endforeach() - -if(USE_CLANG_CL) - # FIXME: Fix host tools build with clang - #set(USE_CLANG_CL_ARG "-DCMAKE_C_COMPILER=clang-cl;-DCMAKE_CXX_COMPILER=clang-cl") -endif() - -include(ExternalProject) - -ExternalProject_Add(host-tools - SOURCE_DIR ${REACTOS_SOURCE_DIR} - BINARY_DIR ${REACTOS_BINARY_DIR}/host-tools - STAMP_DIR ${REACTOS_BINARY_DIR}/host-tools/stamps - BUILD_ALWAYS 1 - PREFIX host-tools - EXCLUDE_FROM_ALL 1 - CMAKE_ARGS "-DNEW_STYLE_BUILD=1;-DARCH:STRING=${ARCH};${USE_CLANG_CL_ARG}" - INSTALL_COMMAND "" - BUILD_BYPRODUCTS ${tools_binaries}) + + set_property(SOURCE host_tools PROPERTY SYMBOLIC 1) + + # Make a host-tools target so it'll be built when needed + # custom target + symbolic output prevents cmake from running + # the command multiple times per build + add_custom_command( + COMMAND ${CMAKE_COMMAND} --build ${REACTOS_BINARY_DIR}/host-tools + OUTPUT host_tools) + add_custom_target(build-host-tools ALL DEPENDS host_tools) + + include(${REACTOS_BINARY_DIR}/host-tools/ImportExecutables.cmake) + include(${REACTOS_BINARY_DIR}/host-tools/TargetList.cmake) + + foreach(_target ${NATIVE_TARGETS}) + add_dependencies(native-${_target} build-host-tools) + endforeach() + +endfunction() diff --git a/sdk/cmake/host-tools.in b/sdk/cmake/host-tools.in new file mode 100644 index 00000000000..1d82da932c3 --- /dev/null +++ b/sdk/cmake/host-tools.in @@ -0,0 +1 @@ +set(NATIVE_TARGETS @NATIVE_TARGETS@) diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index f7217280154..d89372552e9 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -1,9 +1,7 @@ function(add_host_tool _tool) add_executable(${_tool} ${ARGN}) - if(NEW_STYLE_BUILD) - set_target_properties(${_tool} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TOOLS_FOLDER}) - endif() + set_target_properties(${_tool} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TOOLS_FOLDER}) endfunction() #add_executable(pefixup pefixup.c)

1 0

[reactos] 01/01: [NTOS:IO] iomgr.c: Add a missing '#if defined(KDBG)'
by Serge Gautherie 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87a625bd6c45f3244818a… commit 87a625bd6c45f3244818a56e2087fc93fad04198 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jun 8 04:16:20 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:36:49 2019 +0200 [NTOS:IO] iomgr.c: Add a missing '#if defined(KDBG)' --- ntoskrnl/io/iomgr/iomgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 8d01f35079e..a9c7ba35991 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -584,7 +584,7 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Initialize PnP root relations */ IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); -#ifndef _WINKD_ +#if !defined(_WINKD_) && defined(KDBG) /* Read KDB Data */ KdbInit();

1 0

[reactos] 04/04: [UDFS] Avoid freeing Vcb when it couldn't have been allocated in UDFPnpSurpriseRemove() CORE-11203
by Victor Martinez 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d60acd88cb7e1a7a113c6… commit d60acd88cb7e1a7a113c6d41c0e4d8be9ed9dab8 Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sat Aug 17 16:44:57 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Aug 17 16:49:11 2019 +0300 [UDFS] Avoid freeing Vcb when it couldn't have been allocated in UDFPnpSurpriseRemove() CORE-11203 --- drivers/filesystems/udfs/pnp.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/udfs/pnp.cpp b/drivers/filesystems/udfs/pnp.cpp index 61db744d51f..fa24c84a3e3 100644 --- a/drivers/filesystems/udfs/pnp.cpp +++ b/drivers/filesystems/udfs/pnp.cpp @@ -588,7 +588,12 @@ Return Value: // Knock as many files down for this volume as we can. Vcb->Vpb->RealDevice->Flags |= DO_VERIFY_VOLUME; Buf = (PPREVENT_MEDIA_REMOVAL_USER_IN)MyAllocatePool__(NonPagedPool, sizeof(PREVENT_MEDIA_REMOVAL_USER_IN)); - if(!Buf) try_return(RC = STATUS_INSUFFICIENT_RESOURCES); + if(!Buf) { + VcbAcquired = FALSE; + VcbDeleted = FALSE; + try_return(RC = STATUS_INSUFFICIENT_RESOURCES); + } + UDFDoDismountSequence(Vcb, Buf, FALSE); Vcb->VCBFlags &= ~UDF_VCB_FLAGS_VOLUME_MOUNTED; Vcb->WriteSecurity = FALSE;

1 0

[reactos] 03/04: [UDFS] Fix NewCFBName leakage in UDFFirstOpenFile() CORE-11098
by Victor Martinez 17 Aug '19

17 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5e4362b6dc87a2e001cb… commit e5e4362b6dc87a2e001cb3f68000e85f7fede4fd Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sat Aug 17 16:39:55 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Aug 17 16:49:11 2019 +0300 [UDFS] Fix NewCFBName leakage in UDFFirstOpenFile() CORE-11098 --- drivers/filesystems/udfs/create.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/filesystems/udfs/create.cpp b/drivers/filesystems/udfs/create.cpp index 3c777e8f493..6455389d52b 100644 --- a/drivers/filesystems/udfs/create.cpp +++ b/drivers/filesystems/udfs/create.cpp @@ -2312,7 +2312,10 @@ UDFFirstOpenFile( ((LocalPath->Buffer[LocalPath->Length/sizeof(WCHAR)-1] != L':') /*&& (LocalPath->Buffer[LocalPath->Length/sizeof(WCHAR)-1] != L'\\')*/) )) { RC = MyAppendUnicodeToString(&(NewFCBName->ObjectName), L"\\"); - if(!NT_SUCCESS(RC)) return STATUS_INSUFFICIENT_RESOURCES; + if(!NT_SUCCESS(RC)) { + UDFReleaseObjectName(NewFCBName); + return STATUS_INSUFFICIENT_RESOURCES; + } } // Make link between Fcb and FileInfo @@ -2321,9 +2324,11 @@ UDFFirstOpenFile( (*PtrNewFcb)->ParentFcb = RelatedFileInfo->Fcb; if(!((*PtrNewFcb)->NTRequiredFCB = NewFileInfo->Dloc->CommonFcb)) { - if(!((*PtrNewFcb)->NTRequiredFCB = - (PtrUDFNTRequiredFCB)MyAllocatePool__(NonPagedPool, UDFQuadAlign(sizeof(UDFNTRequiredFCB))) ) ) + (*PtrNewFcb)->NTRequiredFCB = (PtrUDFNTRequiredFCB)MyAllocatePool__(NonPagedPool, UDFQuadAlign(sizeof(UDFNTRequiredFCB))); + if(!((*PtrNewFcb)->NTRequiredFCB)) { + UDFReleaseObjectName(NewFCBName); return STATUS_INSUFFICIENT_RESOURCES; + } UDFPrint(("UDFAllocateNtReqFCB: %x\n", (*PtrNewFcb)->NTRequiredFCB)); RtlZeroMemory((*PtrNewFcb)->NTRequiredFCB, UDFQuadAlign(sizeof(UDFNTRequiredFCB))); @@ -2333,6 +2338,7 @@ UDFFirstOpenFile( if(!(NewFileInfo->Dloc->CommonFcb->NtReqFCBFlags & UDF_NTREQ_FCB_VALID)) { (*PtrNewFcb)->NTRequiredFCB = NULL; BrutePoint(); + UDFReleaseObjectName(NewFCBName); return STATUS_ACCESS_DENIED; } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs