Changeset 13854 in vbox

Timestamp:

Nov 5, 2008 1:05:58 PM (16 years ago)

Author:

vboxsync

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

38849

Message:

NetFlt/win: VBoxNetFltNf-win.* removed, uppercased WinNetCfg lib public function names

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• Main/HostImpl.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -32 +32 @@
         win/VBoxNetFlt-win.c \
         win/VBoxNetFltPt-win.c \
-        win/VBoxNetFltNf-win.c \
         win/VBoxNetFlt-win.rc
 ifdef VBOX_NETFLT_ONDEMAND_BIND

trunk/src/VBox/Main/HostImpl.cpp

@@ -946 +946 @@
 
     /* we are using the INetCfg API for getting the list of miniports */
-    hr = vboxNetCfgWinQueryINetCfg( FALSE,
+    hr = VBoxNetCfgWinQueryINetCfg( FALSE,
                        VBOX_APP_NAME,
                        &pNc,
@@ -964 +964 @@
         if(hr == S_OK)
         {
-            hr = vboxNetCfgWinGetBindingPathEnum(pTcpIpNcc, EBP_BELOW, &pEnumBp);
+            hr = VBoxNetCfgWinGetBindingPathEnum(pTcpIpNcc, EBP_BELOW, &pEnumBp);
             Assert(hr == S_OK);
             if ( hr == S_OK )
             {
-                hr = vboxNetCfgWinGetFirstBindingPath(pEnumBp, &pBp);
+                hr = VBoxNetCfgWinGetFirstBindingPath(pEnumBp, &pBp);
                 Assert(hr == S_OK || hr == S_FALSE);
                 while( hr == S_OK )
                 {
-                    hr = vboxNetCfgWinGetBindingInterfaceEnum(pBp, &pEnumBi);
+                    hr = VBoxNetCfgWinGetBindingInterfaceEnum(pBp, &pEnumBi);
                     Assert(hr == S_OK);
                     if ( hr == S_OK )
                     {
-                        hr = vboxNetCfgWinGetFirstBindingInterface(pEnumBi, &pBi);
+                        hr = VBoxNetCfgWinGetFirstBindingInterface(pEnumBi, &pBi);
                         Assert(hr == S_OK);
                         while(hr == S_OK)
@@ -985 +985 @@
                             {
                                 vboxNetWinAddComponent(&list, pMpNcc);
-                                vboxNetCfgWinReleaseRef( pMpNcc );
+                                VBoxNetCfgWinReleaseRef( pMpNcc );
                             }
-                            vboxNetCfgWinReleaseRef(pBi);
-
-                            hr = vboxNetCfgWinGetNextBindingInterface(pEnumBi, &pBi);
+                            VBoxNetCfgWinReleaseRef(pBi);
+
+                            hr = VBoxNetCfgWinGetNextBindingInterface(pEnumBi, &pBi);
                         }
-                        vboxNetCfgWinReleaseRef(pEnumBi);
+                        VBoxNetCfgWinReleaseRef(pEnumBi);
                     }
-                    vboxNetCfgWinReleaseRef(pBp);
-
-                    hr = vboxNetCfgWinGetNextBindingPath(pEnumBp, &pBp);
+                    VBoxNetCfgWinReleaseRef(pBp);
+
+                    hr = VBoxNetCfgWinGetNextBindingPath(pEnumBp, &pBp);
                 }
-                vboxNetCfgWinReleaseRef(pEnumBp);
+                VBoxNetCfgWinReleaseRef(pEnumBp);
             }
-            vboxNetCfgWinReleaseRef(pTcpIpNcc);
+            VBoxNetCfgWinReleaseRef(pTcpIpNcc);
         }
-        vboxNetCfgWinReleaseINetCfg(pNc, FALSE);
+        VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
     }
 #  endif /* #  if defined VBOX_WITH_NETFLT */