Changeset 52824 in vbox for trunk/src/VBox/Installer/win/InstallHelper

Timestamp:

Sep 23, 2014 10:37:15 AM (10 years ago)

Author:

vboxsync

Message:

pr7489. Added uninstallation inf files and driver packages related to Host-Only adapter (VBoxNetAdp)

Location:

trunk/src/VBox/Installer/win/InstallHelper

Files:

• VBoxInstallHelper.cpp (modified) (1 diff)
• VBoxInstallHelper.def (modified) (1 diff)

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

@@ -1097 +1097 @@
 
     netCfgLoggerDisable();
+#endif /* VBOX_WITH_NETFLT */
+
+    /* Never fail the install even if we did not succeed. */
+    return ERROR_SUCCESS;
+}
+
+UINT __stdcall UninstallNetAdp(MSIHANDLE hModule)
+{
+#ifdef VBOX_WITH_NETFLT
+    INetCfg *pNetCfg;
+    UINT uErr;
+
+    netCfgLoggerEnable(hModule);
+
+    BOOL bOldIntMode = SetupSetNonInteractiveMode(FALSE);
+
+    __try
+    {
+        logStringW(hModule, L"Uninstalling NetAdp");
+
+        uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
+        if (uErr == ERROR_SUCCESS)
+        {
+            HRESULT hr = VBoxNetCfgWinNetAdpUninstall(pNetCfg);
+            if (hr != S_OK)
+                logStringW(hModule, L"UninstallNetAdp: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
+
+            uErr = errorConvertFromHResult(hModule, hr);
+
+            VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
+
+            logStringW(hModule, L"Uninstalling NetAdp done, error = 0x%x", uErr);
+        }
+        else
+            logStringW(hModule, L"UninstallNetAdp: doNetCfgInit failed, error = 0x%x", uErr);
+    }
+    __finally
+    {
+        if (bOldIntMode)
+        {
+            /* The prev mode != FALSE, i.e. non-interactive. */
+            SetupSetNonInteractiveMode(bOldIntMode);
+        }
+        netCfgLoggerDisable();
+    }
 #endif /* VBOX_WITH_NETFLT */
 

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

@@ -25 +25 @@
     InstallNetFlt
     UninstallNetFlt
-    InstallNetLwf
+        UninstallNetAdp
+        InstallNetLwf
     UninstallNetLwf
     UninstallTAPInstances