Changeset 14685 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 27, 2008 8:13:37 AM (16 years ago)

Author:

vboxsync

Message:

NetFlt/win: fix to 1.host network issue after vm termination 2.hif filtering 3.ms loopback adapter support

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (3 diffs)
• HostImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1336 +1336 @@
                                                             FILE_ATTRIBUTE_NORMAL,
                                                             NULL);
-                                Assert(hDevice != INVALID_HANDLE_VALUE);
                                 if (hDevice != INVALID_HANDLE_VALUE)
                                 {
@@ -1364 +1363 @@
                                     else
                                     {
-                                        AssertBreakpoint();
                                         int winEr = GetLastError();
                                         LogRel(("Console::configConstructor: DeviceIoControl failed, err (0x%x), ignoring\n", winEr));
+                                        AssertBreakpoint();
                                     }
 
@@ -1375 +1374 @@
                                     int winEr = GetLastError();
                                     LogRel(("Console::configConstructor: CreateFile failed, err (0x%x), ignoring\n", winEr));
+                                    AssertBreakpoint();
                                 }
                                 CoTaskMemFree(pName);

trunk/src/VBox/Main/HostImpl.cpp

@@ -1028 +1028 @@
                 while( hr == S_OK )
                 {
-                    hr = VBoxNetCfgWinGetBindingInterfaceEnum(pBp, &pEnumBi);
-                    Assert(hr == S_OK);
-                    if ( hr == S_OK )
+                    /* S_OK == enabled, S_FALSE == disabled */
+                    if(pBp->IsEnabled() == S_OK)
                     {
-                        hr = VBoxNetCfgWinGetFirstBindingInterface(pEnumBi, &pBi);
+                        hr = VBoxNetCfgWinGetBindingInterfaceEnum(pBp, &pEnumBi);
                         Assert(hr == S_OK);
-                        while(hr == S_OK)
+                        if ( hr == S_OK )
                         {
-                            hr = pBi->GetLowerComponent( &pMpNcc );
+                            hr = VBoxNetCfgWinGetFirstBindingInterface(pEnumBi, &pBi);
                             Assert(hr == S_OK);
-                            if(hr == S_OK)
+                            while(hr == S_OK)
                             {
-                                vboxNetWinAddComponent(&list, pMpNcc);
-                                VBoxNetCfgWinReleaseRef( pMpNcc );
+                                hr = pBi->GetLowerComponent( &pMpNcc );
+                                Assert(hr == S_OK);
+                                if(hr == S_OK)
+                                {
+                                    vboxNetWinAddComponent(&list, pMpNcc);
+                                    VBoxNetCfgWinReleaseRef( pMpNcc );
+                                }
+                                VBoxNetCfgWinReleaseRef(pBi);
+
+                                hr = VBoxNetCfgWinGetNextBindingInterface(pEnumBi, &pBi);
                             }
-                            VBoxNetCfgWinReleaseRef(pBi);
-
-                            hr = VBoxNetCfgWinGetNextBindingInterface(pEnumBi, &pBi);
+                            VBoxNetCfgWinReleaseRef(pEnumBi);
                         }
-                        VBoxNetCfgWinReleaseRef(pEnumBi);
                     }
                     VBoxNetCfgWinReleaseRef(pBp);