Skip to content

Commit

Permalink
Simplify build by reducing number of driver configs.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bonsaiviking
bonsaiviking committed May 20, 2021
1 parent b179e6b commit 64228d9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
3 changes: 1 addition & 2 deletions packetWin7/npf/npf/Loopback.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,11 +893,10 @@ Callouts and filters will be removed during DriverUnload.
#define _WIDE(X) _WIDE2(X)
#define _WIDE2(X) L ## X
#define NPCAP_COMPANY_NAME_W _WIDE(WINPCAP_COMPANY_NAME)
#define NPCAP_PRODUCT_NAME_W _WIDE(WINPCAP_PRODUCT_NAME)
RtlZeroMemory(&provider, sizeof(FWPM_PROVIDER));
provider.providerKey = NPF_FWPM_PROVIDER_GUID;
provider.displayData.name = NPCAP_COMPANY_NAME_W;
provider.displayData.description = NPCAP_PRODUCT_NAME_W;
provider.displayData.description = NPF_DRIVER_NAME_NORMAL_WIDECHAR;
provider.serviceName = NPF_DRIVER_NAME_SMALL_WIDECHAR;
status = FwpmProviderAdd(g_WFPEngineHandle, &provider, NULL);
if (status != NO_ERROR)
Expand Down
16 changes: 0 additions & 16 deletions packetWin7/vs14/npcap.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,7 @@ Global
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Debug Win10 driver|x86.Deploy.0 = Win10 OEM Debug|Win32
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Debug|ARM64.ActiveCfg = Win7 OEM Debug|ARM64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Debug|x64.ActiveCfg = Win7 OEM Debug|x64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Debug|x64.Build.0 = Win7 OEM Debug|x64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Debug|x64.Deploy.0 = Win7 OEM Debug|x64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Debug|x86.ActiveCfg = Win7 OEM Debug|Win32
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Debug|x86.Build.0 = Win7 OEM Debug|Win32
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Debug|x86.Deploy.0 = Win7 OEM Debug|Win32
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release Win10 driver|ARM64.ActiveCfg = Win10 OEM Release|ARM64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release Win10 driver|ARM64.Build.0 = Win10 OEM Release|ARM64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release Win10 driver|ARM64.Deploy.0 = Win10 OEM Release|ARM64
Expand All @@ -121,11 +117,7 @@ Global
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release Win8 driver|x86.Deploy.0 = Win8 OEM Release|Win32
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release|ARM64.ActiveCfg = Win7 OEM Release|ARM64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release|x64.ActiveCfg = Win7 OEM Release|x64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release|x64.Build.0 = Win7 OEM Release|x64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release|x64.Deploy.0 = Win7 OEM Release|x64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release|x86.ActiveCfg = Win7 OEM Release|Win32
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release|x86.Build.0 = Win7 OEM Release|Win32
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM Release|x86.Deploy.0 = Win7 OEM Release|Win32
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM RO Release Win10 driver|ARM64.ActiveCfg = Win10 OEM RO Release|ARM64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM RO Release Win10 driver|ARM64.Build.0 = Win10 OEM RO Release|ARM64
{3556F5BC-F8EC-437E-93E3-7CF2DC63FF61}.OEM RO Release Win10 driver|ARM64.Deploy.0 = Win10 OEM RO Release|ARM64
Expand Down Expand Up @@ -213,11 +205,7 @@ Global
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Debug Win10 driver|x86.Deploy.0 = Win10 OEM Debug|Win32
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Debug|ARM64.ActiveCfg = Win7 OEM Debug|ARM64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Debug|x64.ActiveCfg = Win7 OEM Debug|x64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Debug|x64.Build.0 = Win7 OEM Debug|x64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Debug|x64.Deploy.0 = Win7 OEM Debug|x64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Debug|x86.ActiveCfg = Win7 OEM Debug|Win32
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Debug|x86.Build.0 = Win7 OEM Debug|Win32
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Debug|x86.Deploy.0 = Win7 OEM Debug|Win32
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release Win10 driver|ARM64.ActiveCfg = Win10 OEM Release|ARM64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release Win10 driver|ARM64.Build.0 = Win10 OEM Release|ARM64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release Win10 driver|ARM64.Deploy.0 = Win10 OEM Release|ARM64
Expand All @@ -236,11 +224,7 @@ Global
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release Win8 driver|x86.Deploy.0 = Win8 OEM Release|Win32
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release|ARM64.ActiveCfg = Win7 OEM Release|ARM64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release|x64.ActiveCfg = Win7 OEM Release|x64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release|x64.Build.0 = Win7 OEM Release|x64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release|x64.Deploy.0 = Win7 OEM Release|x64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release|x86.ActiveCfg = Win7 OEM Release|Win32
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release|x86.Build.0 = Win7 OEM Release|Win32
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM Release|x86.Deploy.0 = Win7 OEM Release|Win32
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM RO Release Win10 driver|ARM64.ActiveCfg = Win10 OEM RO Release|ARM64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM RO Release Win10 driver|ARM64.Build.0 = Win10 OEM RO Release|ARM64
{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.OEM RO Release Win10 driver|ARM64.Deploy.0 = Win10 OEM RO Release|ARM64
Expand Down

0 comments on commit 64228d9

Please sign in to comment.