Changeset 17174 in vbox for trunk/src/VBox

Timestamp:

Feb 26, 2009 4:05:01 PM (16 years ago)

Author:

vboxsync

Message:

burn fix

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• win/NetIfList-win.cpp (modified) (6 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -332 +332 @@
  VBoxSVC_INCS.win += $(foreach VARSDK, $(VBoxSVC_SDKS), $(PATH_SDK_$(VARSDK)_INC)/crt)
  #needed to include comsupp.lib
- VBoxSVC_LIBPATH += $(if $(VBOX_USE_VCC80),$(PATH_TOOL_VCC80_LIB),$(PATH_TOOL_VCC70_LIB))
- VBoxSVC_LIBS.win += wbemuuid.lib comsupp.lib
+ VBoxSVC_LIBS.win += $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib
+ #VBoxSVC_LIBPATH.win += $(if $(VBOX_USE_VCC80),$(PATH_TOOL_VCC80_LIB),$(PATH_TOOL_VCC70_LIB))
+ VBoxSVC_LIBS.win += wbemuuid.lib
  VBoxSVC_LIBS.win += $(PATH_LIB)/WinNetConfig.lib
  ifdef VBOX_NETFLT_ONDEMAND_BIND

trunk/src/VBox/Main/win/NetIfList-win.cpp

@@ -47 +47 @@
 #include "netif.h"
 
+#ifdef VBOX_WITH_NETFLT
 #include <Wbemidl.h>
 #include <comdef.h>
@@ -301 +302 @@
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnableStatic(IWbemServices * pSvc, IWbemClassObject *pObj,  in_addr* aIp,  in_addr * aMask, UINT cIp)
+static HRESULT VBoxNetCfgWinEnableStatic(IWbemServices * pSvc, IWbemClassObject *pObj,  in_addr* aIp,  in_addr * aMask, UINT cIp)
 {
     IWbemClassObject * pClass;
@@ -461 +462 @@
 }
 
-#ifdef VBOX_WITH_NETFLT
 # define VBOX_APP_NAME L"VirtualBox"
 
@@ -651 +651 @@
 }
 
+#if 0
 //TODO: this is sample currently, hardcoded balues should be removed and exposed to the API
 static int enableStatic()
@@ -659 +660 @@
     HRESULT hr;
 
-            hr = VBoxNetCfgWinQueryINetCfg(FALSE, L"VirtualBox", &pnc, &lpszLockedBy);
+            hr = VBoxNetCfgWinQueryINetCfg(FALSE, VBOX_APP_NAME, &pnc, &lpszLockedBy);
             if(hr == S_OK)
             {
@@ -699 +700 @@
     return r;
 }
+#endif
 
 int NetIfList(std::list <ComObjPtr <HostNetworkInterface> > &list)