Changeset 52265 in vbox

Timestamp:

Aug 4, 2014 1:50:42 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95362

Message:

pr5904. This fix should resolve the problem with host-only configuration on Windows(2 and more networks).

Location:

trunk/src/VBox/Installer/win

Files:

• InstallHelper/VBoxInstallHelper.cpp (modified) (2 diffs)
• VBoxMergeNetAdpSeq.wxi (modified) (1 diff)

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

@@ -842 +842 @@
     logStringW(hModule, L"CreateHostOnlyInterface: Creating host-only interface");
 
-    HRESULT hr = VBoxNetCfgWinRemoveAllNetDevicesOfId(NETADP_ID);
-    if (FAILED(hr))
-    {
-        logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinRemoveAllNetDevicesOfId failed, error = 0x%x", hr);
-        bSetStaticIp = false;
-    }
+    HRESULT hr;
 
     GUID guid;
@@ -890 +885 @@
     if (SUCCEEDED(hr))
     {
-        logStringW(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinCreateHostOnlyNetworkInterface");
-        hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface(pwszInfPath, bIsFile, &guid, NULL, NULL);
-        logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface returns 0x%x", hr);
+    //first, try to update Host Only Network Interface
+        BOOL fRebootRequired = FALSE;
+        hr = VBoxNetCfgWinUpdateHostOnlyNetworkInterface(pwszInfPath, &fRebootRequired);
         if (SUCCEEDED(hr))
         {
-            ULONG ip = inet_addr("192.168.56.1");
-            ULONG mask = inet_addr("255.255.255.0");
-            logStringW(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinEnableStaticIpConfig");
-            hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask);
-            logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig returns 0x%x", hr);
-            if (FAILED(hr))
-                logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = 0x%x", hr);
+            if (fRebootRequired)
+            {
+                logStringW(hModule, L"UpdateHostOnlyInterfaces: Reboot required, setting REBOOT property to force");
+                HRESULT hr2 = MsiSetPropertyW(hModule, L"REBOOT", L"Force");
+                if (hr2 != ERROR_SUCCESS)
+                    logStringW(hModule, L"UpdateHostOnlyInterfaces: Failed to set REBOOT property, error = 0x%x", hr2);
+            }
         }
         else
-            logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = 0x%x", hr);
+            logStringW(hModule, L"UpdateHostOnlyInterfaces: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = 0x%x", hr);
+    //in fail case call CreateHostOnlyInterface
+        if (FAILED(hr))
+        {
+            logStringW(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinCreateHostOnlyNetworkInterface");
+            hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface(pwszInfPath, bIsFile, &guid, NULL, NULL);
+            logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface returns 0x%x", hr);
+            if (SUCCEEDED(hr))
+            {
+                ULONG ip = inet_addr("192.168.56.1");
+                ULONG mask = inet_addr("255.255.255.0");
+                logStringW(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinEnableStaticIpConfig");
+                hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask);
+                logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig returns 0x%x", hr);
+                if (FAILED(hr))
+                    logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = 0x%x", hr);
+            }
+            else
+                logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = 0x%x", hr);
+        }
     }
 

trunk/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi

@@ -35 +35 @@
     <!-- Don't remove the host-only interfaces on update, only on uninstall -->
     <Custom Action="ca_RemoveHostOnlyInterfaces" After="InstallInitialize" >
-        <![CDATA[(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE="ALL")]]>
     </Custom>
     <!-- First stop the existing host-only interfaces on update ... -->
-    <Custom Action="ca_StopHostOnlyInterfaces" Before="ca_UpdateHostOnlyInterfaces" >
-        <![CDATA[UPGRADINGPRODUCTCODE]]>
-    </Custom>
-    <!-- ... then do the actual driver update -->
-    <Custom Action="ca_UpdateHostOnlyInterfacesArgs" Before="ca_UpdateHostOnlyInterfaces" >
-        <![CDATA[Installed AND UPGRADINGPRODUCTCODE AND (NOT REMOVE="ALL")]]>
-    </Custom>
-    <Custom Action="ca_UpdateHostOnlyInterfaces" Before="InstallFiles" >
-        <![CDATA[Installed AND UPGRADINGPRODUCTCODE AND (NOT REMOVE="ALL")]]>
+    <Custom Action="ca_StopHostOnlyInterfaces" After="InstallInitialize" >
+        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     </Custom>
 <?endif ?>