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

Timestamp:

Mar 28, 2017 6:02:37 PM (8 years ago)

Author:

vboxsync

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

114241

Message:

Installer/win: make sure that 'the other' network filter driver is uninstalled on uninstall or on install (just a crude fix attempt, trying to clean up the mess on the test systems)

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2016 Oracle Corporation
+ * Copyright (C) 2008-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -505 +505 @@
 static MSIHANDLE g_hCurrentModule = NULL;
 
+static UINT _uninstallNetFlt(MSIHANDLE hModule);
+static UINT _uninstallNetLwf(MSIHANDLE hModule);
+
 static VOID vboxDrvLoggerCallback(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char *pszMsg, void *pvContext)
 {
@@ -699 +702 @@
 #endif /*VBOX_WITH_NETFLT*/
 
-UINT __stdcall UninstallNetFlt(MSIHANDLE hModule)
+/*static*/ UINT _uninstallNetFlt(MSIHANDLE hModule)
 {
 #ifdef VBOX_WITH_NETFLT
@@ -740 +743 @@
 #endif /* VBOX_WITH_NETFLT */
 
-    /* Never fail the install even if we did not succeed. */
+    /* Never fail the uninstall even if we did not succeed. */
     return ERROR_SUCCESS;
 }
 
-UINT __stdcall InstallNetFlt(MSIHANDLE hModule)
+UINT __stdcall UninstallNetFlt(MSIHANDLE hModule)
+{
+    (void)_uninstallNetLwf(hModule);
+    return _uninstallNetFlt(hModule);
+}
+
+static UINT _installNetFlt(MSIHANDLE hModule)
 {
 #ifdef VBOX_WITH_NETFLT
@@ -799 +808 @@
 }
 
-
-UINT __stdcall UninstallNetLwf(MSIHANDLE hModule)
+UINT __stdcall InstallNetFlt(MSIHANDLE hModule)
+{
+    (void)_uninstallNetLwf(hModule);
+    return _installNetFlt(hModule);
+}
+
+
+/*static*/ UINT _uninstallNetLwf(MSIHANDLE hModule)
 {
 #ifdef VBOX_WITH_NETFLT
@@ -841 +856 @@
 #endif /* VBOX_WITH_NETFLT */
 
-    /* Never fail the install even if we did not succeed. */
+    /* Never fail the uninstall even if we did not succeed. */
     return ERROR_SUCCESS;
 }
 
-UINT __stdcall InstallNetLwf(MSIHANDLE hModule)
+UINT __stdcall UninstallNetLwf(MSIHANDLE hModule)
+{
+    (void)_uninstallNetFlt(hModule);
+    return _uninstallNetLwf(hModule);
+}
+
+static UINT _installNetLwf(MSIHANDLE hModule)
 {
 #ifdef VBOX_WITH_NETFLT
@@ -913 +934 @@
     /* Never fail the install even if we did not succeed. */
     return ERROR_SUCCESS;
+}
+
+UINT __stdcall InstallNetLwf(MSIHANDLE hModule)
+{
+    (void)_uninstallNetFlt(hModule);
+    return _installNetLwf(hModule);
 }
 
@@ -1130 +1157 @@
 #endif /* VBOX_WITH_NETFLT */
 
-    /* Never fail the install even if we did not succeed. */
+    /* Never fail the uninstall even if we did not succeed. */
     return ERROR_SUCCESS;
 }
@@ -1163 +1190 @@
 #endif /* VBOX_WITH_NETFLT */
 
-    /* Never fail the install even if we did not succeed. */
+    /* Never fail the uninstall even if we did not succeed. */
     return ERROR_SUCCESS;
 }
@@ -1244 +1271 @@
 #endif /* VBOX_WITH_NETFLT */
 
-    /* Never fail the install even if we did not succeed. */
+    /* Never fail the update even if we did not succeed. */
     return ERROR_SUCCESS;
 }
@@ -1299 +1326 @@
 #endif /* VBOX_WITH_NETFLT */
 
-    /* Never fail the install even if we did not succeed. */
+    /* Never fail the uninstall even if we did not succeed. */
     return ERROR_SUCCESS;
 }