From 406bb0105f783886f35a1dddad576522ef5c69bb Mon Sep 17 00:00:00 2001
From: Mark Jansen <mark.jansen@reactos.org>
Date: Thu, 15 Sep 2016 19:58:29 +0000
Subject: [PATCH] [SYSSETUP][UNATTENDED] Remove dead code for VmwInst. Found by
 Jared Smudde.

svn path=/trunk/; revision=72690
---
 reactos/boot/bootdata/bootcd/unattend.inf     |  5 --
 .../boot/bootdata/bootcdregtest/unattend.inf  |  7 +--
 reactos/dll/win32/syssetup/wizard.c           | 55 -------------------
 .../include/reactos/libs/syssetup/syssetup.h  |  1 -
 4 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/reactos/boot/bootdata/bootcd/unattend.inf b/reactos/boot/bootdata/bootcd/unattend.inf
index 27a07974206..23206c8985b 100644
--- a/reactos/boot/bootdata/bootcd/unattend.inf
+++ b/reactos/boot/bootdata/bootcd/unattend.inf
@@ -39,11 +39,6 @@ FormatPartition=1
 ; 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
diff --git a/reactos/boot/bootdata/bootcdregtest/unattend.inf b/reactos/boot/bootdata/bootcdregtest/unattend.inf
index 4d200b83b30..22bfeebfd65 100644
--- a/reactos/boot/bootdata/bootcdregtest/unattend.inf
+++ b/reactos/boot/bootdata/bootcdregtest/unattend.inf
@@ -39,10 +39,9 @@ FormatPartition=1
 ; 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
diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c
index e7cf4f3d66e..da799609f64 100644
--- a/reactos/dll/win32/syssetup/wizard.c
+++ b/reactos/dll/win32/syssetup/wizard.c
@@ -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 @@ extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWOR
 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 @@ ProcessPageDlgProc(HWND hwndDlg,
 
             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);
@@ -2234,13 +2186,6 @@ ProcessUnattendInf(
         {
             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"))
         {
             if(!wcscmp(szValue, L"yes"))
diff --git a/reactos/sdk/include/reactos/libs/syssetup/syssetup.h b/reactos/sdk/include/reactos/libs/syssetup/syssetup.h
index 33845f002f2..5d888c779f8 100644
--- a/reactos/sdk/include/reactos/libs/syssetup/syssetup.h
+++ b/reactos/sdk/include/reactos/libs/syssetup/syssetup.h
@@ -54,7 +54,6 @@ typedef struct _SETUPDATA
     WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1];  /* max. 15 characters */
     WCHAR AdminPassword[128];              /* max. 127 characters */
     BOOL  UnattendSetup;
-    BOOL  DisableVmwInst;
     BOOL  DisableGeckoInst;
 
     SYSTEMTIME SystemTime;