Index: base/setup/reactos/lang/bg-BG.rc =================================================================== --- base/setup/reactos/lang/bg-BG.rc (revision 65840) +++ base/setup/reactos/lang/bg-BG.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Списък на възможностите за слагане за проверка преди прилагане върху устройството за слагане" IDS_ABORTSETUP "РеактОС не е напълно сложен на компютъра ви. Ако излезете от настройването сега, ще трябва да пуснете настройването отново, за да сложите Реактос. Наистина ли излизате?" IDS_ABORTSETUP2 "Прекъсване на слагането?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Настройка на РеактОС" END Index: base/setup/reactos/lang/cs-CZ.rc =================================================================== --- base/setup/reactos/lang/cs-CZ.rc (revision 65840) +++ base/setup/reactos/lang/cs-CZ.rc (working copy) @@ -150,4 +150,6 @@ IDS_SUMMARYSUBTITLE "Výpis voleb instalace k ověření před tím, než začne instalace" IDS_ABORTSETUP "Systém ReactOS není na tomto počítači kompletně nainstalovaný. Pokud nyní ukončíte instalaci, bude ji pro nainstalování systému ReactOS nutné provést znova. Opravdu ukončit?" IDS_ABORTSETUP2 "Přerušit instalaci?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Instalace systému ReactOS" END Index: base/setup/reactos/lang/de-DE.rc =================================================================== --- base/setup/reactos/lang/de-DE.rc (revision 65840) +++ base/setup/reactos/lang/de-DE.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Liste alle Installationseinstellungen vor Anwendung auf die Geräte auf" IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, dann müssen Sie das Setup nochmals ausführen, um ReactOS zu installieren. Wirklich beenden?" IDS_ABORTSETUP2 "Installation abbrechen?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Index: base/setup/reactos/lang/el-GR.rc =================================================================== --- base/setup/reactos/lang/el-GR.rc (revision 65840) +++ base/setup/reactos/lang/el-GR.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Index: base/setup/reactos/lang/en-US.rc =================================================================== --- base/setup/reactos/lang/en-US.rc (revision 65840) +++ base/setup/reactos/lang/en-US.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue" + IDS_CAPTION "ReactOS Setup" END Index: base/setup/reactos/lang/es-ES.rc =================================================================== --- base/setup/reactos/lang/es-ES.rc (revision 65840) +++ base/setup/reactos/lang/es-ES.rc (working copy) @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su verificación antes de aplicarlas al dispositivo instalado" IDS_ABORTSETUP "ReactOS no está completamente instalado en su equipo. Si sale de la instalación ahora, tendrá que ejecutar el instalador otra vez para instalar ReactOS. ¿Realmente quiere salir?" IDS_ABORTSETUP2 "¿Abortar instalación?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Instalación de ReactOS" END Index: base/setup/reactos/lang/et-EE.rc =================================================================== --- base/setup/reactos/lang/et-EE.rc (revision 65840) +++ base/setup/reactos/lang/et-EE.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Seadete kontrollimine enne paigaldamise alustamist" IDS_ABORTSETUP "ReactOS ei ole veel täielikult paigaldatud. Kas tõesti lahkuda?" IDS_ABORTSETUP2 "Katkestada paigaldamine?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOSi paigaldamine" END Index: base/setup/reactos/lang/fi-FI.rc =================================================================== --- base/setup/reactos/lang/fi-FI.rc (revision 65840) +++ base/setup/reactos/lang/fi-FI.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Index: base/setup/reactos/lang/fr-FR.rc =================================================================== --- base/setup/reactos/lang/fr-FR.rc (revision 65840) +++ base/setup/reactos/lang/fr-FR.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Installation de ReactOS" END Index: base/setup/reactos/lang/he-IL.rc =================================================================== --- base/setup/reactos/lang/he-IL.rc (revision 65840) +++ base/setup/reactos/lang/he-IL.rc (working copy) @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "התקנת ReactOS" END Index: base/setup/reactos/lang/hu-HU.rc =================================================================== --- base/setup/reactos/lang/hu-HU.rc (revision 65840) +++ base/setup/reactos/lang/hu-HU.rc (working copy) @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Index: base/setup/reactos/lang/it-IT.rc =================================================================== --- base/setup/reactos/lang/it-IT.rc (revision 65840) +++ base/setup/reactos/lang/it-IT.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Lista delle proprietà della installazione da controllare prima che siano eseguite sul dispositivo di installazione" IDS_ABORTSETUP "ReactOS non è installato completamente sul computer. Se interropete l'installazione ora sarà necessario eseguire l'installazione di nuovo. Volete procedere?" IDS_ABORTSETUP2 "Volete interrompere l'installazione?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Installazione di ReactOS" END Index: base/setup/reactos/lang/no-NO.rc =================================================================== --- base/setup/reactos/lang/no-NO.rc (revision 65840) +++ base/setup/reactos/lang/no-NO.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Sjekk listen av installasjon egenskapene før du fortsetter installasjon av enhetene" IDS_ABORTSETUP "ReactOS er ikke fullstendig installert på datamaskinen. Hvis du avslutter nå, trenger du å kjøre installeringen på nytt for å installere ReactOS. Vil du virkelig avslutte?" IDS_ABORTSETUP2 "Avbryt installasjonen?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS installering" END Index: base/setup/reactos/lang/pl-PL.rc =================================================================== --- base/setup/reactos/lang/pl-PL.rc (revision 65840) +++ base/setup/reactos/lang/pl-PL.rc (working copy) @@ -154,4 +154,6 @@ IDS_SUMMARYSUBTITLE "Sprawdź ustawienia instalacji przed dokonaniem zmian na dysku" IDS_ABORTSETUP "Instalacja ReactOS nie została ukończona na tym komputerze. Jeśli teraz zakończysz instalację, będziesz musiał uruchomić Instalator ponownie, aby zainstalować ReactOS. Na pewno zakończyć?" IDS_ABORTSETUP2 "Przerwać instalację?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Instalator ReactOS" END Index: base/setup/reactos/lang/pt-BR.rc =================================================================== --- base/setup/reactos/lang/pt-BR.rc (revision 65840) +++ base/setup/reactos/lang/pt-BR.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Listar propriedades da instalação para verificação antes de aplicá-las na instalação dos despositivos" IDS_ABORTSETUP "ReactOS não está totalmente instalado em seu computador. Se você sair da Instalação agora, você precisará executar o Instalador novamente para instalar o ReactOS. Tem certeza que deseja sair?" IDS_ABORTSETUP2 "Abortar instalação?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Instalação do ReactOS" END Index: base/setup/reactos/lang/ro-RO.rc =================================================================== --- base/setup/reactos/lang/ro-RO.rc (revision 65840) +++ base/setup/reactos/lang/ro-RO.rc (working copy) @@ -153,4 +153,6 @@ IDS_SUMMARYSUBTITLE "Lista cu opțiuni de instalare ce necesită verificare înainte de a continua instalarea." IDS_ABORTSETUP "ReactOS încă nu este complet instalat în calculator. Daca întrerupeți procesul de instalare, pentru a instala va fi necesară repetarea pașilor parcurși până acum. Sigur doriți asta?" IDS_ABORTSETUP2 "Abandonați instalarea?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Asistentul de instalare ReactOS" END Index: base/setup/reactos/lang/ru-RU.rc =================================================================== --- base/setup/reactos/lang/ru-RU.rc (revision 65840) +++ base/setup/reactos/lang/ru-RU.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Проверьте список параметров перед началом установки" IDS_ABORTSETUP "ReactOS установлен на компьютер не полностью. Если вы закроете программу установки сейчас, в дальнейшем вам придется повторить установку ReactOS. Вы уверены, что необходимо прервать установку?" IDS_ABORTSETUP2 "Прервать установку?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Установка ReactOS" END Index: base/setup/reactos/lang/sk-SK.rc =================================================================== --- base/setup/reactos/lang/sk-SK.rc (revision 65840) +++ base/setup/reactos/lang/sk-SK.rc (working copy) @@ -149,4 +149,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Naozaj skončiť?" IDS_ABORTSETUP2 "Prerušiť inštaláciu?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Index: base/setup/reactos/lang/sq-AL.rc =================================================================== --- base/setup/reactos/lang/sq-AL.rc (revision 65840) +++ base/setup/reactos/lang/sq-AL.rc (working copy) @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "Listo të dhënat e instalimit për të kontrolluar para së të aplikohen për pajisjet e instalimit/kompjuterit" IDS_ABORTSETUP "ReactOS nuk është instaluar plotësisht në kompjuterin tuaj. Nëse ju dilni nga instalimi tani, do ju duhet të filloni instalimin përsëri për të instalumar ReactOS. Doni ta mbyllni?" IDS_ABORTSETUP2 "Ndërpritni Instalimin?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Index: base/setup/reactos/lang/tr-TR.rc =================================================================== --- base/setup/reactos/lang/tr-TR.rc (revision 65840) +++ base/setup/reactos/lang/tr-TR.rc (working copy) @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "Kurulumdan aygıtına uygulanmadan önce gözden geçirmek için dizelgelenen kurulum seçenekleri." IDS_ABORTSETUP "ReactOS bilgisayarınıza tümüyle kurulmadı. Eğer şimdi Kur'dan çıkarsanız, ReactOS'u kurmak için Kur'u yeniden çalıştırmayı isteybilirsiniz. Gerçekten çıkılsın mı?" IDS_ABORTSETUP2 "Kurulum iptal edilsin mi?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Kur" END Index: base/setup/reactos/lang/uk-UA.rc =================================================================== --- base/setup/reactos/lang/uk-UA.rc (revision 65840) +++ base/setup/reactos/lang/uk-UA.rc (working copy) @@ -152,4 +152,6 @@ IDS_SUMMARYSUBTITLE "Перевірте список властивостей встановлення, перш ніж почати встановлення системи" IDS_ABORTSETUP "ReactOS встановлений на комп'ютер не повністю. Якщо ви закриєте програму встановлення зараз, в подальшому вам доведеться повторити встановлення ReactOS. Ви впевнені, що необхідно перервати встановлення?" IDS_ABORTSETUP2 "Перервати встановлення?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Встановлення ReactOS" END Index: base/setup/reactos/lang/zh-CN.rc =================================================================== --- base/setup/reactos/lang/zh-CN.rc (revision 65840) +++ base/setup/reactos/lang/zh-CN.rc (working copy) @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "正是安装前列出安装属性以供检查" IDS_ABORTSETUP "ReactOS 未在您的电脑上安装完成。如果您现在退出安装程序，您需要在一次运行安装程序来安装 ReactOS。 确定退出？" IDS_ABORTSETUP2 "终止安装？" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS 安装" END Index: base/setup/reactos/reactos.c =================================================================== --- base/setup/reactos/reactos.c (revision 65840) +++ base/setup/reactos/reactos.c (working copy) @@ -989,7 +989,7 @@ return FALSE; } -void LoadSetupData() +BOOL LoadSetupData(void) { WCHAR szPath[MAX_PATH]; TCHAR tmp[10]; @@ -1116,6 +1116,19 @@ } SetupCloseInfFile(hTxtsetupSif); } + else + { + TCHAR message[512], caption[64]; + + // txtsetup.sif cannot be found + LoadString(NULL, IDS_NO_TXTSETUP_SIF, message, sizeof(message)/sizeof(TCHAR)); + LoadString(NULL, IDS_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); + + MessageBoxW(NULL, message, caption, MB_OK | MB_ICONERROR); + return FALSE; + } + + return TRUE; } LONG LoadGenentry(HINF hinf,PCTSTR name,PGENENTRY *gen,PINFCONTEXT context) @@ -1212,7 +1225,10 @@ if (!isUnattend) { - LoadSetupData(); + if(!LoadSetupData()) + { + return 0; + } /* Create the Start page, until setup is working */ psp.dwSize = sizeof(PROPSHEETPAGE); Index: base/setup/reactos/resource.h =================================================================== --- base/setup/reactos/resource.h (revision 65840) +++ base/setup/reactos/resource.h (working copy) @@ -59,5 +59,7 @@ #define IDS_SUMMARYTITLE 2050 #define IDS_SUMMARYSUBTITLE 2051 #define IDC_DEVICEDRIVER 2052 +#define IDS_NO_TXTSETUP_SIF 2053 +#define IDS_CAPTION 2054 #define IDI_MAIN 3000