From 6117b1bdefed27b061e3f2d2c19f8e027dc05c84 Mon Sep 17 00:00:00 2001 From: "Carl J. Bialorucki" Date: Sat, 4 Jul 2026 12:03:47 -0500 Subject: [PATCH] [SYSSETUP][BOOTDATA] Add winevdm as an optional module (#9219) - Add winevdm_setup as an optional module that can be preloaded on install - Prompt to install both gecko and winevdm if the installer is not on disk - Change "DisableGeckoInst" to "DisableAddonsInst" because we are installing more than just Gecko now - No longer use appwiz,,install_gecko hack from wine appwiz - Delete installer after successfully installing winevdm and gecko locally --- boot/bootdata/bootcd/unattend.inf | 8 +- boot/bootdata/packages/reactos.dff.in | 1 + dll/win32/syssetup/CMakeLists.txt | 1 + dll/win32/syssetup/addons.c | 176 +++++++++++++++++++ dll/win32/syssetup/globals.h | 5 + dll/win32/syssetup/lang/bg-BG.rc | 11 +- dll/win32/syssetup/lang/cs-CZ.rc | 11 +- dll/win32/syssetup/lang/da-DK.rc | 11 +- dll/win32/syssetup/lang/de-DE.rc | 11 +- dll/win32/syssetup/lang/el-GR.rc | 11 +- dll/win32/syssetup/lang/en-GB.rc | 11 +- dll/win32/syssetup/lang/en-US.rc | 11 +- dll/win32/syssetup/lang/es-ES.rc | 11 +- dll/win32/syssetup/lang/et-EE.rc | 11 +- dll/win32/syssetup/lang/eu-ES.rc | 11 +- dll/win32/syssetup/lang/fr-FR.rc | 11 +- dll/win32/syssetup/lang/he-IL.rc | 11 +- dll/win32/syssetup/lang/hi-IN.rc | 11 +- dll/win32/syssetup/lang/hr-HR.rc | 11 +- dll/win32/syssetup/lang/hu-HU.rc | 11 +- dll/win32/syssetup/lang/id-ID.rc | 11 +- dll/win32/syssetup/lang/it-IT.rc | 11 +- dll/win32/syssetup/lang/ja-JP.rc | 11 +- dll/win32/syssetup/lang/nl-NL.rc | 11 +- dll/win32/syssetup/lang/no-NO.rc | 11 +- dll/win32/syssetup/lang/pl-PL.rc | 11 +- dll/win32/syssetup/lang/pt-BR.rc | 11 +- dll/win32/syssetup/lang/pt-PT.rc | 11 +- dll/win32/syssetup/lang/ro-RO.rc | 11 +- dll/win32/syssetup/lang/ru-RU.rc | 11 +- dll/win32/syssetup/lang/sk-SK.rc | 11 +- dll/win32/syssetup/lang/sq-AL.rc | 11 +- dll/win32/syssetup/lang/sv-SE.rc | 11 +- dll/win32/syssetup/lang/th-TH.rc | 11 +- dll/win32/syssetup/lang/tr-TR.rc | 11 +- dll/win32/syssetup/lang/uk-UA.rc | 11 +- dll/win32/syssetup/lang/zh-CN.rc | 11 +- dll/win32/syssetup/lang/zh-HK.rc | 11 +- dll/win32/syssetup/lang/zh-TW.rc | 11 +- dll/win32/syssetup/resource.h | 24 ++- dll/win32/syssetup/wizard.c | 21 +-- sdk/include/reactos/libs/syssetup/syssetup.h | 2 +- 42 files changed, 553 insertions(+), 59 deletions(-) create mode 100644 dll/win32/syssetup/addons.c diff --git a/boot/bootdata/bootcd/unattend.inf b/boot/bootdata/bootcd/unattend.inf index d3905176384..1ff70f9ddd5 100644 --- a/boot/bootdata/bootcd/unattend.inf +++ b/boot/bootdata/bootcd/unattend.inf @@ -43,10 +43,10 @@ AutoPartition = 1 ; 1 - BtrFS FsType = 0 -; Enable this setting to disable Gecko install. -; yes - disabled -; no - enabled -DisableGeckoInst = no +; Choose if RAPPS can download optional components during setup. +; yes - Download addons from RAPPS +; no - Don't download addons from RAPPS +RappsDownload = no ; Set this option to automatically specify language in 2nd mode setup. ; See hivesys.inf for available languages. diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 8d33031ffea..e4d9de074b6 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -153,5 +153,6 @@ Signature = "$Windows NT$" "modules/optional/vmxnet3ndis5.inf" 6 optional "modules/optional/vmxnet3n51x86.sys" 3 optional "modules/optional/wine_gecko-2.40-x86.msi" 1 optional +"modules/optional/winevdm_setup.exe" 1 optional "boot/bootdata/bootcdregtest/AHKAppTests.cmd" 7 optional ; DON'T REMOVE THE FOLLOWING NEW LINE ! THIS MEANS YOU ! diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt index 703c1d411c6..51878821566 100644 --- a/dll/win32/syssetup/CMakeLists.txt +++ b/dll/win32/syssetup/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/tzlib) spec2def(syssetup.dll syssetup.spec) list(APPEND SOURCE + addons.c classinst.c dllmain.c install.c diff --git a/dll/win32/syssetup/addons.c b/dll/win32/syssetup/addons.c new file mode 100644 index 00000000000..7c508b3d37f --- /dev/null +++ b/dll/win32/syssetup/addons.c @@ -0,0 +1,176 @@ +/* + * PROJECT: ReactOS System Setup + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * or GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Addon installation management + * COPYRIGHT: Copyright 2026 Carl Bialorucki + */ + +#include "precomp.h" +#include + +typedef enum _RappsConsent { + NOT_ASKED, + APPROVED, + DENIED +} RappsConsent; + +typedef struct _ADDON_INSTALL_DATA +{ + PCWSTR Title; + PCWSTR AddonPath; + PCWSTR CreateProcessFormatString; + PCWSTR RappsId; +} ADDON_INSTALL_DATA, *PADDON_INSTALL_DATA; +typedef const ADDON_INSTALL_DATA* PCADDON_INSTALL_DATA; + +/* TODO: Move this out of code and into an .inf or something. */ +static const ADDON_INSTALL_DATA Addons[] = { +#ifdef _M_IX86 + {L"Wine Gecko", L"%SystemRoot%\\wine_gecko-2.40-x86.msi", L"msiexec.exe /i \"%s\" /qn /norestart", L"gecko"}, + {L"WineVDM", L"%SystemRoot%\\winevdm_setup.exe", L"\"%s\" /VERYSILENT", L"winevdm"}, +#endif + {NULL, NULL, NULL} +}; + +HRESULT +RunCommandAndWait( + _In_ PWCHAR Command) +{ + STARTUPINFOW si = { sizeof(si) }; + PROCESS_INFORMATION pi; + DWORD ExitCode = 0; + + if (CreateProcessW(NULL, Command, NULL, NULL, FALSE, + 0, NULL, NULL, &si, &pi)) + { + WaitForSingleObject(pi.hProcess, INFINITE); + GetExitCodeProcess(pi.hProcess, &ExitCode); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + if (ExitCode == 0) + return S_OK; + } + + return HRESULT_FROM_WIN32(GetLastError()); +} + +BOOL DoesFileExist( + _In_ PCWSTR path) +{ + DWORD attr = GetFileAttributesW(path); + return (attr != INVALID_FILE_ATTRIBUTES && + !(attr & FILE_ATTRIBUTE_DIRECTORY)); +} + +HRESULT +InstallAddon( + _In_ PCADDON_INSTALL_DATA pInstallData, + _Inout_ RappsConsent* Consent, + _In_ PITEMSDATA pItemsData, + _Inout_ PREGISTRATIONNOTIFY pNotify) +{ + HRESULT hr; + WCHAR Command[MAX_PATH], ExpandedAddonPath[MAX_PATH]; + + pNotify->Progress++; + pNotify->CurrentItem = pInstallData->Title; + SendMessage(pItemsData->hwndDlg, PM_STEP_START, 3, (LPARAM)pNotify); + + ExpandEnvironmentStringsW(pInstallData->AddonPath, + ExpandedAddonPath, + ARRAYSIZE(ExpandedAddonPath)); + + /* Attempt to install addon from local installer. */ + if (!DoesFileExist(ExpandedAddonPath)) + goto rapps_install; + + hr = StringCchPrintfW(Command, ARRAYSIZE(Command), + pInstallData->CreateProcessFormatString, ExpandedAddonPath); + if (!SUCCEEDED(hr)) + goto done; + + hr = RunCommandAndWait(Command); + if (SUCCEEDED(hr)) + { + /* We successfully installed the addon locally! Try removing it from disk and finish. */ + DeleteFileW(ExpandedAddonPath); + goto done; + } + +rapps_install: + /* Local installer doesn't exist or failed. Try installing through Rapps. */ + if (*Consent == NOT_ASKED) + { + WCHAR szMessage[256], szCaption[64]; + LoadStringW(hDllInstance, IDS_INSTALLADDONSMESSAGE, szMessage, ARRAYSIZE(szMessage)); + LoadStringW(hDllInstance, IDS_INSTALLADDONSCAPTION, szCaption, ARRAYSIZE(szCaption)); + int MsgBox = MessageBoxW(NULL, szMessage, szCaption, + MB_YESNO | MB_ICONINFORMATION); + *Consent = (MsgBox == IDYES) ? APPROVED : DENIED; + } + + if (*Consent == DENIED) + { + hr = HRESULT_FROM_WIN32(ERROR_CANCELLED); + goto done; + } + + hr = StringCchPrintfW(Command, ARRAYSIZE(Command), L"rapps.exe /install /S %s", pInstallData->RappsId); + if (!SUCCEEDED(hr)) + goto done; + + hr = RunCommandAndWait(Command); + +done: + /* We don't set an error in pNotify because the user chose to cancel rapps install. + * Showing an error may make the user think the installation of the operating system failed. */ + if (!SUCCEEDED(hr) && hr != HRESULT_FROM_WIN32(ERROR_CANCELLED)) + pNotify->LastError = HRESULT_CODE(hr); + SendMessage(pItemsData->hwndDlg, PM_STEP_END, 3, (LPARAM)pNotify); + return hr; +} + +HRESULT +InstallOptionalComponents( + _In_ PITEMSDATA pItemsData) +{ + HRESULT hr; + PSETUPDATA pSetupData; + REGISTRATIONNOTIFY Notify = { 0 }; + RappsConsent Consent = NOT_ASKED; + + /* The last element in Addons is null, don't count it as a step. */ + SendMessage(pItemsData->hwndDlg, PM_ITEM_START, 3, (LPARAM)(ARRAYSIZE(Addons) - 1)); + pSetupData = (PSETUPDATA)GetWindowLongPtr(pItemsData->hwndDlg, GWLP_USERDATA); + + if (pSetupData->UnattendSetup) + Consent = pSetupData->RappsDownload ? APPROVED : DENIED; + + for (DWORD i = 0; i < ARRAYSIZE(Addons); i++) + { + if (Addons[i].AddonPath == NULL + || Addons[i].CreateProcessFormatString == NULL + || Addons[i].RappsId == NULL) + continue; + + hr = InstallAddon(&Addons[i], &Consent, pItemsData, &Notify); + + /* Cancelling rapps install is not an error. Reset hr to S_OK. */ + if (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED)) + hr = S_OK; + + if (!SUCCEEDED(hr)) + { + WCHAR szMessage[256], szCaption[64]; + LoadStringW(hDllInstance, IDS_INSTALLADDONSFAILEDMESSAGE, szMessage, ARRAYSIZE(szMessage)); + LoadStringW(hDllInstance, IDS_INSTALLADDONSCAPTION, szCaption, ARRAYSIZE(szCaption)); + MessageBoxW(NULL, szMessage, szCaption, + MB_OK | MB_ICONWARNING | MB_TOPMOST); + break; + } + } + + SendMessage(pItemsData->hwndDlg, PM_ITEM_END, 3, HRESULT_CODE(hr)); + return hr; +} diff --git a/dll/win32/syssetup/globals.h b/dll/win32/syssetup/globals.h index 2d97f95efdf..c6c357222f8 100644 --- a/dll/win32/syssetup/globals.h +++ b/dll/win32/syssetup/globals.h @@ -68,6 +68,11 @@ extern HINSTANCE hDllInstance; extern HINF hSysSetupInf; extern ADMIN_INFO AdminInfo; +/* addons.c */ +HRESULT +InstallOptionalComponents( + _In_ PITEMSDATA pItemsData); + /* install */ BOOL diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index d9f21049c61..d76581bce6a 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Вписване на съставните", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(По подразбиране)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 2ebab315089..e23f0e3b4d2 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -122,13 +122,15 @@ BEGIN LTEXT "Registruji součásti", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -274,3 +276,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index d28d8df1b50..e2684328c83 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -122,13 +122,15 @@ BEGIN LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -274,3 +276,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 7fc27ae32a6..f15849efcbb 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Registrieren der Komponenten", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installieren der Elemente des Startmenüs", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Speichern der Einstellungen", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Löschen der temporären Dateien", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Löschen der temporären Dateien", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Standard)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index d6483b2ac28..4972295285f 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Καταχώρηση στοιχείων στο μητρώο", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc index f038781c407..9ff4c03bc33 100644 --- a/dll/win32/syssetup/lang/en-GB.rc +++ b/dll/win32/syssetup/lang/en-GB.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index 0a9d88081ac..2582bf72e9b 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -122,13 +122,15 @@ BEGIN LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -274,3 +276,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index a9d12d214ba..51f27c0c2cd 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -123,13 +123,15 @@ BEGIN LTEXT "Registrando componentes", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Instalando elementos del menú de inicio", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Guardando la configuración", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Eliminando archivos temporales", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Eliminando archivos temporales", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -275,3 +277,10 @@ BEGIN */ IDS_DEFAULT "(Por defecto)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 204e687e53c..2959b5395eb 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Komponentide registreerimine", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/eu-ES.rc b/dll/win32/syssetup/lang/eu-ES.rc index 9e0b3ad9d78..e0e93e277d6 100644 --- a/dll/win32/syssetup/lang/eu-ES.rc +++ b/dll/win32/syssetup/lang/eu-ES.rc @@ -120,13 +120,15 @@ BEGIN LTEXT "Osagaiak erregistratzea", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -270,3 +272,10 @@ BEGIN */ IDS_DEFAULT "(Lehenetsia)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index cd92e057659..068a1639722 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Enregistrement des composants", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installation des éléments du menu Démarrer", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Enregistrement des paramètres", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Suppression des fichiers temporaires", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installation des composants optionnels", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Suppression des fichiers temporaires", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Défaut)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Composants optionnels" + IDS_INSTALLADDONSMESSAGE "Les composants optionnels sont disponibles pour améliorer la compatibilité des applications.\n\nVoulez-vous les télécharger et les installer ?" + IDS_INSTALLADDONSFAILEDMESSAGE "L'installation de l'un ou plusieurs composants optionnels a échoué." +END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 850e8f72b33..abf2c481869 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "רושם רכיבים", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 32731dd0232..84b7b5a0ad1 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -121,13 +121,15 @@ BEGIN LTEXT "कॉम्पोनेन्ट का दर्ज होना", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -273,3 +275,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/hr-HR.rc b/dll/win32/syssetup/lang/hr-HR.rc index 67f532e10d8..06083391759 100644 --- a/dll/win32/syssetup/lang/hr-HR.rc +++ b/dll/win32/syssetup/lang/hr-HR.rc @@ -121,13 +121,15 @@ BEGIN LTEXT "Registriranje komponenti", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Instalacija stvari za početni izbornik (start menu)", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Spremanje postavki", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Uklananje privremenih datoteka", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Uklananje privremenih datoteka", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -273,3 +275,10 @@ BEGIN */ IDS_DEFAULT "Zadano (Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 37f1fd75e68..4ac36f3ee19 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Komponensek regisztrálása", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "A start menü elemeinek telepítése", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Beállítások mentése", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Ideiglenes fájlok eltávolítása", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Ideiglenes fájlok eltávolítása", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(alapértelmezett)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index d82bc4b614e..58665e86bc0 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Meregister komponen", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Asli)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index cd5218eddbe..c886291c2fe 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Registrazione dei componenti", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 83b068735a9..5f4d9c72533 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "コンポーネントを登録しています", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "スタートメニュー項目のインストール", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "設定の保存", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "一時ファイルの削除", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "一時ファイルの削除", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(既定)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 75f8bc76e3a..e74f6d299d7 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index ae668f4a61d..0170517b28f 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Registrerer komponenter", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index eeddd2b29d6..b9aafb29666 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -121,13 +121,15 @@ BEGIN LTEXT "Rejestrowanie składników", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Instalowanie elementów menu Start", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Zapisywanie ustawień", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Usuwanie plików tymczasowych", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Usuwanie plików tymczasowych", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -273,3 +275,10 @@ BEGIN */ IDS_DEFAULT "(Domyślnie)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index df1f455a012..bf347068696 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -114,13 +114,15 @@ BEGIN LTEXT "Registrando componentes", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -266,3 +268,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index ac69e270da2..6ab835d584a 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -121,13 +121,15 @@ BEGIN LTEXT "A registar componentes", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "A instalar itens do menu iniciar", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Guardando as configurações", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "A remover ficheiros temporários", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "A remover ficheiros temporários", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -273,3 +275,10 @@ BEGIN */ IDS_DEFAULT "(Predefinição)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 2856d69b56e..6d779b198e9 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -123,13 +123,15 @@ BEGIN LTEXT "Componente în curs de înregistrare", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Instalarea elementelor din meniul de pornire", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Salvarea setărilor", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Ștergerea fișierelor temporare", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Ștergerea fișierelor temporare", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -275,3 +277,10 @@ BEGIN */ IDS_DEFAULT "(Implicit)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 70d8dc232c0..72230744865 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -122,13 +122,15 @@ BEGIN LTEXT "Регистрация компонентов", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Установка элементов меню ""Пуск""", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Сохранение параметров настройки", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Удаление временных файлов", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Установка дополнительных компонентов", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Удаление временных файлов", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -274,3 +276,10 @@ BEGIN */ IDS_DEFAULT "(по умолчанию)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Дополнительные компоненты" + IDS_INSTALLADDONSMESSAGE "Для повышения совместимости приложений доступны дополнительные компоненты.\n\nХотите загрузить и установить их?" + IDS_INSTALLADDONSFAILEDMESSAGE "Не удалось установить один или несколько дополнительных компонентов." +END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index acced4b8753..c763699e51d 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -121,13 +121,15 @@ BEGIN LTEXT "Registrujem súčasti", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -273,3 +275,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 87980efb817..c175b86998e 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -122,13 +122,15 @@ BEGIN LTEXT "Regjistrimi Komponenteve", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -274,3 +276,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index ffbf03b88ec..59c1a5fe31c 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -122,13 +122,15 @@ BEGIN LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -274,3 +276,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 4595f115f25..dc2fbacd123 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -122,13 +122,15 @@ BEGIN LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -274,3 +276,10 @@ BEGIN */ IDS_DEFAULT "(Default)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index 3967eff1bfb..64d3e4d3b1b 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -123,13 +123,15 @@ BEGIN LTEXT "Bileşenler kaydediliyor", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Başlat menüsü öğeleri yükleniyor", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Ayarlar kaydediliyor", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Geçici dosyalar kaldırılıyor", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Geçici dosyalar kaldırılıyor", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -275,3 +277,10 @@ BEGIN */ IDS_DEFAULT "(Varsayılan)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 6f2a81ecde7..68d3069afab 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -123,13 +123,15 @@ BEGIN LTEXT "Реєстрація компонентів", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -275,3 +277,10 @@ BEGIN */ IDS_DEFAULT "(за замовчуванням)" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 05209881a39..63cda71f776 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -122,13 +122,15 @@ BEGIN LTEXT "请稍候，安装程序正在注册组件。", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "正在安装“开始”菜单项目", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "正在保存配置", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "正在删除临时文件", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "正在删除临时文件", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -277,3 +279,10 @@ BEGIN */ IDS_DEFAULT "（默认）" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/zh-HK.rc b/dll/win32/syssetup/lang/zh-HK.rc index 8ade9647161..2afbc585e2a 100644 --- a/dll/win32/syssetup/lang/zh-HK.rc +++ b/dll/win32/syssetup/lang/zh-HK.rc @@ -121,13 +121,15 @@ BEGIN LTEXT "正在登錄元件", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -278,3 +280,10 @@ BEGIN */ IDS_DEFAULT "（預設）" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 3e84b780354..2db2cab4f68 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -123,13 +123,15 @@ BEGIN LTEXT "正在登錄元件", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Installing optional components", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT5, 65, 75, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 ICON "", IDC_CHECK1, 48, 26, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK2, 48, 38, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK3, 48, 50, 10, 10, SS_REALSIZEIMAGE | WS_GROUP ICON "", IDC_CHECK4, 48, 62, 10, 10, SS_REALSIZEIMAGE | WS_GROUP + ICON "", IDC_CHECK5, 48, 74, 10, 10, SS_REALSIZEIMAGE | WS_GROUP END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -280,3 +282,10 @@ BEGIN */ IDS_DEFAULT "（預設）" END + +STRINGTABLE +BEGIN + IDS_INSTALLADDONSCAPTION "Optional Components" + IDS_INSTALLADDONSMESSAGE "Optional components are available to improve application compatibility.\n\nWould you like to download and install them?" + IDS_INSTALLADDONSFAILEDMESSAGE "One or more optional components failed to install." +END diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 75d93f91f9e..9abeb8f7869 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -73,14 +73,17 @@ #define IDC_TASKTEXT2 1064 #define IDC_TASKTEXT3 1065 #define IDC_TASKTEXT4 1066 -#define IDC_TASKBITMAP1 1067 -#define IDC_TASKBITMAP2 1068 -#define IDC_TASKBITMAP3 1069 -#define IDC_TASKBITMAP4 1070 -#define IDC_CHECK1 1071 -#define IDC_CHECK2 1072 -#define IDC_CHECK3 1073 -#define IDC_CHECK4 1074 +#define IDC_TASKTEXT5 1067 +#define IDC_TASKBITMAP1 1068 +#define IDC_TASKBITMAP2 1069 +#define IDC_TASKBITMAP3 1070 +#define IDC_TASKBITMAP4 1071 +#define IDC_TASKBITMAP5 1072 +#define IDC_CHECK1 1073 +#define IDC_CHECK2 1074 +#define IDC_CHECK3 1075 +#define IDC_CHECK4 1076 +#define IDC_CHECK5 1077 #define IDD_FINISHPAGE 1080 #define IDC_FINISHTITLE 1081 @@ -184,5 +187,10 @@ #define IDR_GPL 4000 +/* Strings for install addons consent dialog */ +#define IDS_INSTALLADDONSCAPTION 4010 +#define IDS_INSTALLADDONSMESSAGE 4011 +#define IDS_INSTALLADDONSFAILEDMESSAGE 4012 + /* Timer ID for the animated dialog bar. */ #define IDT_BAR 1 diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 518abe8514e..600f00645f8 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -2481,7 +2481,10 @@ ItemCompletionThread( /* Step 2 - Saving Settings */ SaveSettings(pItemsData); - /* Step 3 - Removing temporary files */ + /* Step 3 - Install optional components */ + InstallOptionalComponents(pItemsData); + + /* Step 4 - Removing temporary files */ // RemoveTempFiles(pItemsData); // FIXME: Move this call to a separate cleanup page! @@ -2633,8 +2636,8 @@ ProcessPageDlgProc(HWND hwndDlg, /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); - ShowDlgItem(hwndDlg, IDC_TASKTEXT4, SW_HIDE); - ShowDlgItem(hwndDlg, IDC_CHECK4, SW_HIDE); + ShowDlgItem(hwndDlg, IDC_TASKTEXT5, SW_HIDE); + ShowDlgItem(hwndDlg, IDC_CHECK5, SW_HIDE); s_hCheckIcon = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDI_CHECKICON), IMAGE_ICON, 16, 16, 0); s_hArrowIcon = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDI_ARROWICON), IMAGE_ICON, 16, 16, 0); s_hCrossIcon = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDI_CROSSICON), IMAGE_ICON, 16, 16, 0); @@ -2773,12 +2776,6 @@ FinishDlgProc(HWND hwndDlg, /* Get pointer to the global setup data */ PSETUPDATA SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - if (!SetupData->UnattendSetup || !SetupData->DisableGeckoInst) - { - /* Run the Wine Gecko prompt */ - Control_RunDLLW(hwndDlg, 0, L"appwiz.cpl,,install_gecko", SW_SHOW); - } - /* Set title font */ SendDlgItemMessage(hwndDlg, IDC_FINISHTITLE, @@ -3031,12 +3028,12 @@ ProcessUnattendSection( { pSetupData->DisableAutoDaylightTimeSet = _wtoi(szValue); } - else if (!_wcsicmp(szName, L"DisableGeckoInst")) + else if (!_wcsicmp(szName, L"RappsDownload")) { if (!_wcsicmp(szValue, L"yes")) - pSetupData->DisableGeckoInst = TRUE; + pSetupData->RappsDownload = TRUE; else - pSetupData->DisableGeckoInst = FALSE; + pSetupData->RappsDownload = FALSE; } else if (!_wcsicmp(szName, L"InstallationType")) { diff --git a/sdk/include/reactos/libs/syssetup/syssetup.h b/sdk/include/reactos/libs/syssetup/syssetup.h index 1a1ad31deb5..40d0d61e2d7 100644 --- a/sdk/include/reactos/libs/syssetup/syssetup.h +++ b/sdk/include/reactos/libs/syssetup/syssetup.h @@ -48,7 +48,7 @@ typedef struct _SETUPDATA WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 15 characters */ WCHAR AdminPassword[128]; /* max. 127 characters */ BOOL UnattendSetup; - BOOL DisableGeckoInst; + BOOL RappsDownload; SYSTEMTIME SystemTime; struct _TIMEZONE_ENTRY* TimeZoneListHead;