[SYSSETUP][UNATTENDED] Remove dead code for VmwInst. Found by Jared Smudde.

svn path=/trunk/; revision=72690

diff --git a/reactos/boot/bootdata/bootcd/unattend.inf b/reactos/boot/bootdata/bootcd/unattend.inf
index 27a0797..23206c8 100644 (file)
--- 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 4d200b8..22bfeeb 100644 (file)
--- a/reactos/boot/bootdata/bootcdregtest/unattend.inf
+++ b/reactos/boot/bootdata/bootcdregtest/unattend.inf
@@ -39,10 +39,9 @@ FormatPartition=1
 ; 0 - disabled\r
 AutoPartition = 1\r
 \r
-; enable this setting to disable vmware driver install\r
-; yes - disabled\r
-; no  - enabled\r
-DisableVmwInst = yes\r
+; set this option to automatically\r
+; specify language in 2nd mode setup\r
+; see hivesys.inf for available languages\r
 LocaleID = 409\r
 \r
 ; enable this section to automatically launch programs\r

diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c
index e7cf4f3..da79960 100644 (file)
--- 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 33845f0..5d888c7 100644 (file)
--- 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;