From 3ea683ba536c2ef06843e3044bd72d4d44cd29cd Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 9 Jun 2015 23:20:33 +0000 Subject: [PATCH] [SYSSETUP][UNATTENDED] Add a way to disable Gecko install. Brought to you by V. svn path=/trunk/; revision=68098 --- reactos/boot/bootdata/bootcd/unattend.inf | 5 +++++ reactos/dll/win32/syssetup/globals.h | 1 + reactos/dll/win32/syssetup/wizard.c | 15 ++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/reactos/boot/bootdata/bootcd/unattend.inf b/reactos/boot/bootdata/bootcd/unattend.inf index 6d6a8d17cea..27a07974206 100644 --- a/reactos/boot/bootdata/bootcd/unattend.inf +++ b/reactos/boot/bootdata/bootcd/unattend.inf @@ -44,6 +44,11 @@ AutoPartition = 1 ; no - enabled DisableVmwInst = yes +; enable this setting to disable Gecko install +; yes - disabled +; no - enabled +DisableGeckoInst = no + ; set this option to automatically ; specify language in 2nd mode setup ; see hivesys.inf for available languages diff --git a/reactos/dll/win32/syssetup/globals.h b/reactos/dll/win32/syssetup/globals.h index 06e18aec22c..1f65ad682b2 100644 --- a/reactos/dll/win32/syssetup/globals.h +++ b/reactos/dll/win32/syssetup/globals.h @@ -48,6 +48,7 @@ typedef struct _SETUPDATA WCHAR AdminPassword[128]; /* max. 127 characters */ BOOL UnattendSetup; BOOL DisableVmwInst; + BOOL DisableGeckoInst; SYSTEMTIME SystemTime; PTIMEZONE_ENTRY TimeZoneListHead; diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c index b8699309c90..da5f76b5ff8 100644 --- a/reactos/dll/win32/syssetup/wizard.c +++ b/reactos/dll/win32/syssetup/wizard.c @@ -1992,8 +1992,11 @@ FinishDlgProc(HWND hwndDlg, /* Get pointer to the global setup data */ PSETUPDATA SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - /* Run the Wine Gecko prompt */ - Control_RunDLLW(hwndDlg, 0, L"appwiz.cpl install_gecko", SW_SHOW); + 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, @@ -2179,10 +2182,16 @@ ProcessUnattendInf(HINF hUnattendedInf) else SetupData.DisableVmwInst = 0; } + else if (!wcscmp(szName, L"DisableGeckoInst")) + { + if(!wcscmp(szValue, L"yes")) + SetupData.DisableGeckoInst = 1; + else + SetupData.DisableGeckoInst = 0; + } } while (SetupFindNextLine(&InfContext, &InfContext)); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce", 0,