Changeset 40995 in vbox for trunk/src/VBox/Installer

Timestamp:

Apr 19, 2012 5:36:57 PM (13 years ago)

Author:

vboxsync

Message:

installer/win: add netadp disable/update code (not invoked properly)

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (4 diffs)

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -967 +967 @@
     logStringW(hModule, L"StopHostOnlyInterfaces: Stopping all host-only Interfaces");
 
-    /** TODO */
+    BOOL bSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
+
+    HRESULT hr = VBoxNetCfgWinPropChangeAllNetDevicesOfId(NETADP_ID, VBOXNECTFGWINPROPCHANGE_TYPE_DISABLE);
+    if (SUCCEEDED(hr))
+    {
+        hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, NETADP_ID, L"Net", 0/* could be SUOI_FORCEDELETE */);
+        if (FAILED(hr))
+        {
+            logStringW(hModule, L"RemoveHostOnlyInterfaces: VBoxDrvCfgInfUninstallAllSetupDi failed hr = 0x%x\n", hr);
+        }
+    }
+    else
+        logStringW(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstall failed, hr = 0x%x\n", hr);
+
+    /* Restore original setup mode. */
+    if (bSetupModeInteractive)
+        SetupSetNonInteractiveMode(bSetupModeInteractive);
 
     netCfgLoggerDisable();
@@ -982 +998 @@
 
     logStringW(hModule, L"UpdateHostOnlyInterfaces: Updating all host-only Interfaces");
+
+    BOOL bSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
 
     WCHAR wszMpInf[MAX_PATH];
@@ -1004 +1022 @@
 
             logStringW(hModule, L"UpdateHostOnlyInterfaces: Resulting INF path = %s", pwszInfPath);
+
+            BOOL fRebootRequired = FALSE;
+            HRESULT hr = VBoxNetCfgWinUpdateHostOnlyNetworkInterface(pwszInfPath, &fRebootRequired);
+            if (SUCCEEDED(hr))
+            {
+                if (fRebootRequired)
+                {
+                    logStringW(hModule, L"Reboot required, setting REBOOT property to Force");
+                    HRESULT hr2 = MsiSetPropertyW(hModule, L"REBOOT", L"Force");
+                    if (hr2 != ERROR_SUCCESS)
+                        logStringW(hModule, L"Failed to set REBOOT property, error = 0x%x", hr2);
+                }
+            }
+            else
+                logStringW(hModule, L"UpdateHostOnlyInterfaces: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = 0x%x", hr);
         }
         else
@@ -1011 +1044 @@
         logStringW(hModule, L"UpdateHostOnlyInterfaces: Failed to get NetAdpDir property, error = 0x%x", uErr);
 
-    /** TODO */
+    /* Restore original setup mode. */
+    if (bSetupModeInteractive)
+        SetupSetNonInteractiveMode(bSetupModeInteractive);
 
     netCfgLoggerDisable();