Author: tretiakov
Date: Sun Jan 7 00:18:36 2007
New Revision: 25334
URL:
http://svn.reactos.org/svn/reactos?rev=25334&view=rev
Log:
Add DisableVmwInst option to unattend setup to disable vmware driver setup wizard
Modified:
trunk/reactos/boot/bootdata/unattend.inf.sample
trunk/reactos/dll/win32/syssetup/globals.h
trunk/reactos/dll/win32/syssetup/wizard.c
Modified: trunk/reactos/boot/bootdata/unattend.inf.sample
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf…
==============================================================================
--- trunk/reactos/boot/bootdata/unattend.inf.sample (original)
+++ trunk/reactos/boot/bootdata/unattend.inf.sample Sun Jan 7 00:18:36 2007
@@ -31,6 +31,8 @@
; DisableAutoDaylightTimeSet = 1
; enable this setting to format the selected partition
+; 1 - format enabled
+; 0 - format disabled
FormatPartition=1
; enable this section to automatically launch programs
@@ -38,3 +40,8 @@
;
; [GuiRunOnce]
; %SystemRoot%\system32\cmd.exe
+
+; enable this setting to disable vmware driver install
+; yes - disabled
+; no - enabled
+DisableVmwInst = yes
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 (original)
+++ trunk/reactos/dll/win32/syssetup/globals.h Sun Jan 7 00:18:36 2007
@@ -46,6 +46,7 @@
TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 63 characters */
TCHAR AdminPassword[15]; /* max. 14 characters */
BOOL UnattendSetup;
+ BOOL DisableVmwInst;
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.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c Sun Jan 7 00:18:36 2007
@@ -1784,7 +1784,8 @@
if (wParam)
{
#ifdef VMWINST
- RunVMWInstall(GetParent(hwndDlg));
+ if(!SetupData->UnattendSetup && !SetupData->DisableVmwInst)
+ RunVMWInstall(GetParent(hwndDlg));
#endif
/* Enable the Back and Next buttons */
@@ -2003,6 +2004,11 @@
{
SetupData.DisableAutoDaylightTimeSet = _ttoi(szValue);
}
+ else if (_tcscmp(szName, _T("DisableVmwInst")))
+ {
+ if(_tcscmp(szValue, _T("yes"))) SetupData.DisableVmwInst = 1;
+ else SetupData.DisableVmwInst = 0;
+ }
}
while (SetupFindNextLine(&InfContext, &InfContext));