[SYSSETUP][UNATTENDED] Add a way to disable Gecko install. Brought to you by V.

svn path=/trunk/; revision=68098
This commit is contained in:
Amine Khaldi 2015-06-09 23:20:33 +00:00
parent f52d4e3c8d
commit 3ea683ba53
3 changed files with 18 additions and 3 deletions

View file

@ -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

View file

@ -48,6 +48,7 @@ typedef struct _SETUPDATA
WCHAR AdminPassword[128]; /* max. 127 characters */
BOOL UnattendSetup;
BOOL DisableVmwInst;
BOOL DisableGeckoInst;
SYSTEMTIME SystemTime;
PTIMEZONE_ENTRY TimeZoneListHead;

View file

@ -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,