[ros-diffs] [mjansen] 72690: [SYSSETUP][UNATTENDED] Remove dead code for VmwInst. Found by Jared Smudde.

Author: mjansen
Date: Thu Sep 15 19:58:29 2016
New Revision: 72690

URL: http://svn.reactos.org/svn/reactos?rev=72690&view=rev
Log:
[SYSSETUP][UNATTENDED] Remove dead code for VmwInst. Found by Jared Smudde.

Modified:
    trunk/reactos/boot/bootdata/bootcd/unattend.inf
    trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf
    trunk/reactos/dll/win32/syssetup/wizard.c
    trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h

Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/unatt…
==============================================================================
--- trunk/reactos/boot/bootdata/bootcd/unattend.inf	[iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcd/unattend.inf	[iso-8859-1] Thu Sep 15 19:58:29 2016
@@ -39,11 +39,6 @@
 ; 0 - disabled
 AutoPartition = 1
 
-; enable this setting to disable vmware driver install
-; yes - disabled
-; no  - enabled
-DisableVmwInst = yes
-
 ; enable this setting to disable Gecko install
 ; yes - disabled
 ; no  - enabled

Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes…
==============================================================================
--- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf	[iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf	[iso-8859-1] Thu Sep 15
19:58:29 2016
@@ -39,10 +39,9 @@
 ; 0 - disabled
 AutoPartition = 1
 
-; enable this setting to disable vmware driver install
-; yes - disabled
-; no  - enabled
-DisableVmwInst = yes
+; set this option to automatically
+; specify language in 2nd mode setup
+; see hivesys.inf for available languages
 LocaleID = 409
 
 ; enable this section to automatically launch programs

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	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c	[iso-8859-1] Thu Sep 15 19:58:29 2016
@@ -20,8 +20,6 @@
 #define NDEBUG
 #include <debug.h>
 
-#undef VMWINST
-
 #define PM_REGISTRATION_NOTIFY (WM_APP + 1)
 /* Private Message used to communicate progress from the background
    registration thread to the main thread.
@@ -53,47 +51,6 @@
 BOOL
 GetRosInstallCD(WCHAR *pwszPath, DWORD cchPathMax);
 
-#ifdef VMWINST
-static BOOL
-RunVMWInstall(HWND hWnd)
-{
-    PROCESS_INFORMATION ProcInfo;
-    MSG msg;
-    DWORD ret;
-    STARTUPINFOW si;
-    WCHAR InstallName[] = L"vmwinst.exe";
-
-    ZeroMemory(&si, sizeof(si));
-    si.cb = sizeof(si);
-
-    if(CreateProcessW(NULL, InstallName, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS,
-                      NULL, NULL, &si, &ProcInfo))
-    {
-        EnableWindow(hWnd, FALSE);
-        for (;;)
-        {
-            while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-            {
-                if (msg.message == WM_QUIT)
-                    goto done;
-                TranslateMessage(&msg);
-                DispatchMessage(&msg);
-            }
-
-            ret = MsgWaitForMultipleObjects(1, &ProcInfo.hProcess, FALSE, INFINITE,
QS_ALLEVENTS | QS_ALLINPUT);
-            if (ret == WAIT_OBJECT_0)
-                break;
-        }
-done:
-        EnableWindow(hWnd, TRUE);
-
-        CloseHandle(ProcInfo.hThread);
-        CloseHandle(ProcInfo.hProcess);
-        return TRUE;
-    }
-    return FALSE;
-}
-#endif
 
 static VOID
 CenterWindow(HWND hWnd)
@@ -1986,11 +1943,6 @@
 
             if (wParam)
             {
-#ifdef VMWINST
-                if(!SetupData->UnattendSetup &&
!SetupData->DisableVmwInst)
-                    RunVMWInstall(GetParent(hwndDlg));
-#endif
-
                 /* Enable the Back and Next buttons */
                 PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
                 PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT);
@@ -2233,13 +2185,6 @@
         else if (!wcscmp(szName, L"DisableAutoDaylightTimeSet"))
         {
             pSetupData->DisableAutoDaylightTimeSet = _wtoi(szValue);
-        }
-        else if (!wcscmp(szName, L"DisableVmwInst"))
-        {
-            if(!wcscmp(szValue, L"yes"))
-                pSetupData->DisableVmwInst = 1;
-            else
-                pSetupData->DisableVmwInst = 0;
         }
         else if (!wcscmp(szName, L"DisableGeckoInst"))
         {

Modified: trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/s…
==============================================================================
--- trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h	[iso-8859-1] Thu Sep 15
19:58:29 2016
@@ -54,7 +54,6 @@
     WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1];  /* max. 15 characters */
     WCHAR AdminPassword[128];              /* max. 127 characters */
     BOOL  UnattendSetup;
-    BOOL  DisableVmwInst;
     BOOL  DisableGeckoInst;
 
     SYSTEMTIME SystemTime;