Changeset 17229 in vbox for trunk/src/VBox

Timestamp:

Mar 2, 2009 9:51:38 AM (16 years ago)

Author:

vboxsync

Message:

NetAdp/win: make the comment-to adapter name to be honored in the driver, make MAC address to be loaded/stored from/to the registry

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/VBoxNetFlt.c (modified) (2 diffs)
• Main/win/NetIfList-win.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c

@@ -653 +653 @@
  *
  * If I'm wrong, then please explain in full.
+ *
+ * r=misha: this code is to prevent race conditions between PVBOXNETFLTINS construct (which occurs on binding to adapter
+ * rather than on vboxNetFltFactoryCreateAndConnect for static_config) and destruction,
+ * namely the instance returned by vboxNetFltFindInstanceLocked in vboxNetFltSearchCreateInstance could be actually the instance being removed.
+ * I guess an approach similar to what you added to vboxNetFltFactoryCreateAndConnect could be used in vboxNetFltSearchCreateInstance in this case we could remove
+ * this ugly hack.
  */
     if (cRefs != 0)
@@ -1142 +1148 @@
     AssertRCReturn(rc, rc);
 
-#if defined(VBOX_TAPMINIPORT) && defined(RT_OS_WINDOWS)
-    /* temporary hack to pick up the first adapter */
-    pCur = pGlobals->pInstanceHead; /** @todo Don't for get to remove this temporary hack... :-) */
-#else
+//#if defined(VBOX_TAPMINIPORT) && defined(RT_OS_WINDOWS)
+//    /* temporary hack to pick up the first adapter */
+//    pCur = pGlobals->pInstanceHead; /** @todo Don't for get to remove this temporary hack... :-) */
+//#else
     pCur = vboxNetFltFindInstanceLocked(pGlobals, pszName);
-#endif
+//#endif
     if (pCur)
     {

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

@@ -610 +610 @@
                 ULONG uComponentStatus;
                 hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
-#ifndef DEBUG_bird
-                Assert(hr == S_OK);
-#endif
+//#ifndef DEBUG_bird
+//                Assert(hr == S_OK);
+//#endif
                 if(hr == S_OK)
                 {