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

Timestamp:

Apr 1, 2011 8:21:30 AM (14 years ago)

Author:

vboxsync

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

70893

Message:

netflt/adp/win: switch to new VBoxDrvCfg lib

Location:

trunk/src/VBox/Installer/win/InstallHelper

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxInstallHelper.cpp (modified) (3 diffs)

trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

@@ -37 +37 @@
 VBoxInstallHelper_LIBS     = $(PATH_SDK_W2K3DDK_LIB)/Msi.lib
 ifdef VBOX_WITH_NETFLT
- VBoxInstallHelper_LIBS   += $(PATH_LIB)/WinNetConfig.lib \
+ VBoxInstallHelper_LIBS   += $(TARGET_WinNetConfig) \
+    $(TARGET_VBoxDrvCfg) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib

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

@@ -18 +18 @@
 #ifdef VBOX_WITH_NETFLT
 # include "VBox/VBoxNetCfg-win.h"
+# include "VBox/VBoxDrvCfg-win.h"
 #endif /* VBOX_WITH_NETFLT */
 
@@ -899 +900 @@
     if(!!pInfPath && bIsFile)
     {
-        HRESULT tmpHr = VBoxNetCfgWinInfInstall(pInfPath);
+        HRESULT tmpHr = VBoxDrvCfgInfInstall(pInfPath);
         Assert(tmpHr == S_OK);
     }
@@ -949 +950 @@
     if(hr == S_OK)
     {
-        hr = VBoxNetCfgWinInfUninstallAll(&GUID_DEVCLASS_NET, NETADP_ID, L"Net", 0/* could be SUOI_FORCEDELETE */);
+        hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, NETADP_ID, L"Net", 0/* could be SUOI_FORCEDELETE */);
         if(hr != S_OK)
         {