Author: akhaldi Date: Tue Jun 9 23:20:33 2015 New Revision: 68098
URL: http://svn.reactos.org/svn/reactos?rev=68098&view=rev Log: [SYSSETUP][UNATTENDED] Add a way to disable Gecko install. Brought to you by V.
Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/wizard.c
Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/unatte... ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Tue Jun 9 23:20:33 2015 @@ -44,6 +44,11 @@ ; 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
Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals.... ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Tue Jun 9 23:20:33 2015 @@ -48,6 +48,7 @@ WCHAR AdminPassword[128]; /* max. 127 characters */ BOOL UnattendSetup; BOOL DisableVmwInst; + BOOL DisableGeckoInst;
SYSTEMTIME SystemTime; PTIMEZONE_ENTRY TimeZoneListHead;
Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.c... ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Tue Jun 9 23:20:33 2015 @@ -1992,8 +1992,11 @@ /* 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 @@ 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,