Changeset 15752 in vbox for trunk/src/VBox

Timestamp:

Dec 24, 2008 3:19:35 PM (16 years ago)

Author:

vboxsync

Message:

NetFlt/win: don't display disabled adapters

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (3 diffs)
• win/NetIfList-win.cpp (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -362 +362 @@
     if (RT_SUCCESS (mHostDrives.updateDVDs()))
         for (DriveInfoList::const_iterator it = mHostDrives.DVDBegin();
-             SUCCEEDED (rc) && it != mHostDrives.DVDEnd(); ++it)        
+             SUCCEEDED (rc) && it != mHostDrives.DVDEnd(); ++it)
         {
             ComObjPtr<HostDVDDrive> hostDVDDriveObj;
@@ -442 +442 @@
     if (RT_SUCCESS (mHostDrives.updateFloppies()))
         for (DriveInfoList::const_iterator it = mHostDrives.FloppyBegin();
-             SUCCEEDED (rc) && it != mHostDrives.FloppyEnd(); ++it)        
+             SUCCEEDED (rc) && it != mHostDrives.FloppyEnd(); ++it)
         {
             ComObjPtr<HostFloppyDrive> hostFloppyDriveObj;
@@ -997 +997 @@
                                 if(hr == S_OK)
                                 {
-                                    vboxNetWinAddComponent(&list, pMpNcc);
+                                    ULONG uComponentStatus;
+                                    hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
+                                    Assert(hr == S_OK);
+                                    if(hr == S_OK)
+                                    {
+                                        if(uComponentStatus == 0)
+                                        {
+                                            vboxNetWinAddComponent(&list, pMpNcc);
+                                        }
+                                    }
                                     VBoxNetCfgWinReleaseRef( pMpNcc );
                                 }

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

@@ -398 +398 @@
                                 if(hr == S_OK)
                                 {
-                                    vboxNetWinAddComponent(&list, pMpNcc);
+                                    ULONG uComponentStatus;
+                                    hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
+                                    Assert(hr == S_OK);
+                                    if(hr == S_OK)
+                                    {
+                                        if(uComponentStatus == 0)
+                                        {
+                                            vboxNetWinAddComponent(&list, pMpNcc);
+                                        }
+                                    }
                                     VBoxNetCfgWinReleaseRef( pMpNcc );
                                 }