Used another NetCfgInstanceId for Npcap mode driver, so two drivers c…

…an coexist.
xyz12810 · Jun 5, 2016 · 9b18a9d · 9b18a9d
1 parent a535ed3
commit 9b18a9d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/packetWin7/npf/npf/Packet.c b/packetWin7/npf/npf/Packet.c
@@ -54,7 +54,11 @@
 #pragma NDIS_INIT_FUNCTION(DriverEntry)
 #endif // ALLOC_PRAGMA
 
+#ifdef NPF_NPCAP_RUN_IN_WINPCAP_MODE
 #define				FILTER_UNIQUE_NAME		L"{7daf2ac8-e9f6-4765-a842-f1f5d2501340}"
+#else
+#define				FILTER_UNIQUE_NAME		L"{7daf2ac8-e9f6-4765-a842-f1f5d2501341}"
+#endif
 
 #if DBG
 // Declare the global debug flag for this driver.

diff --git a/packetWin7/npf/npf/npcap.inf b/packetWin7/npf/npf/npcap.inf
@@ -30,7 +30,7 @@ DriverVer=05/15/2015,14.48.38.905
 [Install]
 AddReg=Inst_Ndi
 Characteristics=0x40000
-NetCfgInstanceId="{7daf2ac8-e9f6-4765-a842-f1f5d2501340}"
+NetCfgInstanceId="{7daf2ac8-e9f6-4765-a842-f1f5d2501341}"
 Copyfiles = npf.copyfiles.sys
 
 [SourceDisksNames]

diff --git a/packetWin7/npf/npf/npcap_wfp.inf b/packetWin7/npf/npf/npcap_wfp.inf
@@ -30,7 +30,7 @@ DriverVer=05/15/2015,14.48.38.905
 [Install]
 AddReg=Inst_Ndi
 Characteristics=0x40000
-NetCfgInstanceId="{7daf2ac8-e9f6-4765-a842-f1f5d2501340}"
+NetCfgInstanceId="{7daf2ac8-e9f6-4765-a842-f1f5d2501341}"
 Copyfiles = npf.copyfiles.sys
 
 [SourceDisksNames]

diff --git a/packetWin7/npf/npf/npcap_wifi.inf b/packetWin7/npf/npf/npcap_wifi.inf
@@ -30,7 +30,7 @@ DriverVer=05/15/2015,14.48.38.905
 [Install]
 AddReg=Inst_Ndi
 Characteristics=0x40000
-NetCfgInstanceId="{7daf2ac8-e9f6-4765-a842-f1f5d2501340}"
+NetCfgInstanceId="{7daf2ac8-e9f6-4765-a842-f1f5d2501341}"
 Copyfiles = npf.copyfiles.sys
 
 [SourceDisksNames]