vbox的更動 56268 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

時間撮記:

2015-6-8 上午09:10:55 (9 年 以前)

作者:

vboxsync

訊息:

Main/Console: improved NDIS version detection (#7849)

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (修改) (5 筆差異)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -749 +749 @@
 /**
  * Report versions of installed drivers to release log.
- *
- * WARNING! This method has a side effect -- it modifies mfNDIS6.
  */
 void Console::i_reportDriverVersions()
@@ -764 +762 @@
     DWORD   cbVerInfo     = 0;
 
-    /* Assume NDIS6 */
-    mfNDIS6 = true;
-
     do
     {
@@ -821 +816 @@
                 if (_tcsnicmp(TEXT("vbox"), szDriver, 4))
                     continue;
-                if (_tcsnicmp(TEXT("vboxnetflt"), szDriver, 10) == 0)
-                    mfNDIS6 = false;
             }
             else
@@ -4443 +4436 @@
 }
 
+
+DECLINLINE(bool) IsNdis6(void)
+{
+    LogFlowFunc(("entry\n"));
+    HANDLE hFile = CreateFile(L"\\\\.\\VBoxNetLwf",
+                              GENERIC_READ,
+                              FILE_SHARE_READ | FILE_SHARE_WRITE,
+                              NULL,
+                              OPEN_EXISTING,
+                              0,
+                              NULL);
+    bool fNdis6 = hFile != INVALID_HANDLE_VALUE;
+    if (fNdis6)
+        CloseHandle(hFile);
+    LogFlowFunc(("return %s\n", fNdis6 ? "true" : "false"));
+    return fNdis6;
+}
+
+
 /**
  *  Construct the Network configuration tree
@@ -5297 +5309 @@
 
                 /* The old NDIS5.1 version of driver uses TRUNKTYPE_NETADP */
-                trunkType = mfNDIS6 ? TRUNKTYPE_NETFLT : TRUNKTYPE_NETADP;
+                trunkType = IsNdis6() ? TRUNKTYPE_NETFLT : TRUNKTYPE_NETADP;
                 InsertConfigInteger(pCfg, "TrunkType", trunkType == TRUNKTYPE_NETFLT ? kIntNetTrunkType_NetFlt : kIntNetTrunkType_NetAdp);