From 362c44aef8e9046f21a4c653ed582110765294dc Mon Sep 17 00:00:00 2001 From: Keith Horton Date: Wed, 13 Mar 2024 19:29:31 -0700 Subject: Fixing the WFP Sampler build --- .../sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp') diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp index 0c42a94e..cef0b6df 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp @@ -4197,6 +4197,12 @@ VOID PerformBasicPacketExaminationAtDiscard(_In_ CLASSIFY_DATA* pClassifyData) { pDiscardReason = "Extension Headers Failure"; + break; + } + case IpDiscardIpsnpiClientDrop: + { + pDiscardReason = "IPSNPI Drop"; + break; } } -- cgit v1.3.1 From dcf36200862b796412710aca87c37219f20e1a5b Mon Sep 17 00:00:00 2001 From: Keith Horton Date: Thu, 14 Mar 2024 14:40:14 -0700 Subject: Revert "Fixing the WFP Sampler build" This reverts commit 362c44aef8e9046f21a4c653ed582110765294dc. --- network/trans/WFPSampler/WFPSampler.sln | 4 ++-- network/trans/WFPSampler/exe/WFPSampler.vcxproj | 12 ++++++------ network/trans/WFPSampler/lib/WFPSampler.vcxproj | 16 ++++++++++------ .../trans/WFPSampler/svc/WFPSamplerService.vcxproj | 20 ++++++++------------ ...ssifyFunctions_BasicPacketExaminationCallouts.cpp | 6 ------ .../trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX | 8 -------- .../WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj | 8 ++++---- network/trans/WFPSampler/syslib/WFPSampler.vcxproj | 12 ++++++------ 8 files changed, 36 insertions(+), 50 deletions(-) (limited to 'network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp') diff --git a/network/trans/WFPSampler/WFPSampler.sln b/network/trans/WFPSampler/WFPSampler.sln index 4f4851d9..1e71e3d1 100644 --- a/network/trans/WFPSampler/WFPSampler.sln +++ b/network/trans/WFPSampler/WFPSampler.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34701.34 +# Visual Studio 2013 +VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{7DD950F3-D068-438B-808A-EE9BE2D1F34D}" EndProject diff --git a/network/trans/WFPSampler/exe/WFPSampler.vcxproj b/network/trans/WFPSampler/exe/WFPSampler.vcxproj index 3a80bd7c..86fae1b7 100644 --- a/network/trans/WFPSampler/exe/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/exe/WFPSampler.vcxproj @@ -29,20 +29,18 @@ Windows10 False - Universal + Desktop WindowsApplicationForDrivers10.0 Application - Spectre Windows10 False - Universal + Desktop WindowsApplicationForDrivers10.0 Application - Spectre Windows10 @@ -51,7 +49,6 @@ WindowsApplicationForDrivers10.0 Application - Spectre Windows10 @@ -60,7 +57,6 @@ WindowsApplicationForDrivers10.0 Application - Spectre @@ -110,6 +106,7 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib + %(IgnoreSpecificDefaultLibraries) @@ -131,6 +128,7 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib + %(IgnoreSpecificDefaultLibraries) @@ -152,6 +150,7 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib + %(IgnoreSpecificDefaultLibraries) @@ -173,6 +172,7 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib + %(IgnoreSpecificDefaultLibraries) diff --git a/network/trans/WFPSampler/lib/WFPSampler.vcxproj b/network/trans/WFPSampler/lib/WFPSampler.vcxproj index a905e396..d7889fb8 100644 --- a/network/trans/WFPSampler/lib/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/lib/WFPSampler.vcxproj @@ -30,20 +30,18 @@ Windows10 False - Universal + Desktop WindowsApplicationForDrivers10.0 StaticLibrary - Spectre Windows10 False - Universal + Desktop WindowsApplicationForDrivers10.0 StaticLibrary - Spectre Windows10 @@ -52,7 +50,6 @@ WindowsApplicationForDrivers10.0 StaticLibrary - Spectre Windows10 @@ -61,7 +58,6 @@ WindowsApplicationForDrivers10.0 StaticLibrary - Spectre @@ -109,6 +105,8 @@ %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib @@ -128,6 +126,8 @@ %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib @@ -147,6 +147,8 @@ %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib @@ -166,6 +168,8 @@ %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib diff --git a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj index af85fe06..af6f39f6 100644 --- a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj +++ b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj @@ -29,7 +29,7 @@ Windows10 False - Universal + Desktop WindowsApplicationForDrivers10.0 Application @@ -38,7 +38,7 @@ Windows10 False - Universal + Desktop WindowsApplicationForDrivers10.0 Application @@ -47,7 +47,7 @@ Windows10 True - Universal + Desktop WindowsApplicationForDrivers10.0 Application @@ -56,7 +56,7 @@ Windows10 True - Universal + Desktop WindowsApplicationForDrivers10.0 Application @@ -99,9 +99,6 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) MultiThreaded - false - true - true %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE @@ -114,6 +111,7 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib + libcmt.lib;libcmtd.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -124,7 +122,6 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) MultiThreaded - true %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE @@ -137,6 +134,7 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib + libcmt.lib;libcmtd.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -147,8 +145,6 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) MultiThreadedDebug - false - true %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE @@ -161,6 +157,7 @@ %(AdditionalOptions) /integritycheck /VERBOSE:LIB %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib + false libcmt.lib;msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -172,8 +169,6 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) MultiThreadedDebug - StdCall - true %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE @@ -186,6 +181,7 @@ %(AdditionalOptions) /integritycheck /VERBOSE:LIB %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib + false libcmt.lib;msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp index cef0b6df..0c42a94e 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp @@ -4197,12 +4197,6 @@ VOID PerformBasicPacketExaminationAtDiscard(_In_ CLASSIFY_DATA* pClassifyData) { pDiscardReason = "Extension Headers Failure"; - break; - } - case IpDiscardIpsnpiClientDrop: - { - pDiscardReason = "IPSNPI Drop"; - break; } } diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX index 717e34d2..bb55b7ad 100644 --- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX +++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX @@ -46,14 +46,6 @@ [DefaultInstall.nt$ARCH$.Services] AddService = %WFPSamplerCalloutDriverServiceName%,,WFPSamplerCalloutDriver.Service -[DefaultUninstall.nt$ARCH$] - LegacyUninstall = 1 - DelFiles = WFPSamplerCalloutDriver.DriverFiles - DelReg = WFPCalloutsClassReg - -[DefaultUninstall.nt$ARCH$.Services] - DelService = %WFPSamplerCalloutDriverServiceName%,0x200 ;/// SPSVCINST_STOPSERVICE - [WFPCalloutsClassReg] HKR,,,0 HKR,,Icon,, diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj index af141891..09bfdeba 100644 --- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj +++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj @@ -47,7 +47,7 @@ Windows10 True - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -55,7 +55,7 @@ Windows10 True - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -171,7 +171,7 @@ %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) - %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)\WFPSampler.lib + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)WFPSampler.lib @@ -190,7 +190,7 @@ %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) - %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)\WFPSampler.lib + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)WFPSampler.lib diff --git a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj index cc19afc6..9ec9b254 100644 --- a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj @@ -32,20 +32,18 @@ Windows10 False - Universal + Desktop KMDF WindowsKernelModeDriver10.0 StaticLibrary - Spectre Windows10 False - Universal + Desktop KMDF WindowsKernelModeDriver10.0 StaticLibrary - Spectre Windows10 @@ -54,7 +52,6 @@ KMDF WindowsKernelModeDriver10.0 StaticLibrary - Spectre Windows10 @@ -63,7 +60,6 @@ KMDF WindowsKernelModeDriver10.0 StaticLibrary - Spectre @@ -123,6 +119,7 @@ %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib sha256 @@ -146,6 +143,7 @@ %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib sha256 @@ -169,6 +167,7 @@ %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib sha256 @@ -192,6 +191,7 @@ %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib sha256 -- cgit v1.3.1 From a53b20b64f9c89b91f44cb30f755223c9b79453d Mon Sep 17 00:00:00 2001 From: Keith Horton Date: Thu, 4 Apr 2024 17:20:14 -0700 Subject: [network/trans/WFPSampler] Fix to build for all flavors (#1149) --- network/trans/WFPSampler/WFPSampler.sln | 4 +-- network/trans/WFPSampler/exe/WFPSampler.vcxproj | 12 +++---- network/trans/WFPSampler/lib/WFPSampler.vcxproj | 16 ++++----- .../trans/WFPSampler/svc/WFPSamplerService.vcxproj | 20 ++++++----- ...ifyFunctions_BasicPacketExaminationCallouts.cpp | 6 ++++ .../WFPSampler/sys/WFPSamplerCalloutDriver.InX | 20 ++++++++--- .../WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj | 8 ++--- network/trans/WFPSampler/syslib/WFPSampler.vcxproj | 12 +++---- network/trans/stmedit/sys/InlineEdit.c | 4 +-- network/trans/stmedit/sys/stmedit.vcxproj | 39 +++++++++++----------- network/trans/stmedit/sys/stmedit.vcxproj.Filters | 14 ++++---- 11 files changed, 87 insertions(+), 68 deletions(-) (limited to 'network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp') diff --git a/network/trans/WFPSampler/WFPSampler.sln b/network/trans/WFPSampler/WFPSampler.sln index 1e71e3d1..4f4851d9 100644 --- a/network/trans/WFPSampler/WFPSampler.sln +++ b/network/trans/WFPSampler/WFPSampler.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34701.34 MinimumVisualStudioVersion = 12.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{7DD950F3-D068-438B-808A-EE9BE2D1F34D}" EndProject diff --git a/network/trans/WFPSampler/exe/WFPSampler.vcxproj b/network/trans/WFPSampler/exe/WFPSampler.vcxproj index 86fae1b7..3a80bd7c 100644 --- a/network/trans/WFPSampler/exe/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/exe/WFPSampler.vcxproj @@ -29,18 +29,20 @@ Windows10 False - Desktop + Universal WindowsApplicationForDrivers10.0 Application + Spectre Windows10 False - Desktop + Universal WindowsApplicationForDrivers10.0 Application + Spectre Windows10 @@ -49,6 +51,7 @@ WindowsApplicationForDrivers10.0 Application + Spectre Windows10 @@ -57,6 +60,7 @@ WindowsApplicationForDrivers10.0 Application + Spectre @@ -106,7 +110,6 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib - %(IgnoreSpecificDefaultLibraries) @@ -128,7 +131,6 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib - %(IgnoreSpecificDefaultLibraries) @@ -150,7 +152,6 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib - %(IgnoreSpecificDefaultLibraries) @@ -172,7 +173,6 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib - %(IgnoreSpecificDefaultLibraries) diff --git a/network/trans/WFPSampler/lib/WFPSampler.vcxproj b/network/trans/WFPSampler/lib/WFPSampler.vcxproj index d7889fb8..a905e396 100644 --- a/network/trans/WFPSampler/lib/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/lib/WFPSampler.vcxproj @@ -30,18 +30,20 @@ Windows10 False - Desktop + Universal WindowsApplicationForDrivers10.0 StaticLibrary + Spectre Windows10 False - Desktop + Universal WindowsApplicationForDrivers10.0 StaticLibrary + Spectre Windows10 @@ -50,6 +52,7 @@ WindowsApplicationForDrivers10.0 StaticLibrary + Spectre Windows10 @@ -58,6 +61,7 @@ WindowsApplicationForDrivers10.0 StaticLibrary + Spectre @@ -105,8 +109,6 @@ %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) - %(AdditionalOptions) /integritycheck - %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib @@ -126,8 +128,6 @@ %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) - %(AdditionalOptions) /integritycheck - %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib @@ -147,8 +147,6 @@ %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) - %(AdditionalOptions) /integritycheck - %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib @@ -168,8 +166,6 @@ %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) - %(AdditionalOptions) /integritycheck - %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib diff --git a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj index af6f39f6..af85fe06 100644 --- a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj +++ b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj @@ -29,7 +29,7 @@ Windows10 False - Desktop + Universal WindowsApplicationForDrivers10.0 Application @@ -38,7 +38,7 @@ Windows10 False - Desktop + Universal WindowsApplicationForDrivers10.0 Application @@ -47,7 +47,7 @@ Windows10 True - Desktop + Universal WindowsApplicationForDrivers10.0 Application @@ -56,7 +56,7 @@ Windows10 True - Desktop + Universal WindowsApplicationForDrivers10.0 Application @@ -99,6 +99,9 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) MultiThreaded + false + true + true %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE @@ -111,7 +114,6 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib - libcmt.lib;libcmtd.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -122,6 +124,7 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) MultiThreaded + true %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE @@ -134,7 +137,6 @@ %(AdditionalOptions) /integritycheck %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib - libcmt.lib;libcmtd.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -145,6 +147,8 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) MultiThreadedDebug + false + true %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE @@ -157,7 +161,6 @@ %(AdditionalOptions) /integritycheck /VERBOSE:LIB %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib - false libcmt.lib;msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -169,6 +172,8 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) MultiThreadedDebug + StdCall + true %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE @@ -181,7 +186,6 @@ %(AdditionalOptions) /integritycheck /VERBOSE:LIB %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib - false libcmt.lib;msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp index 0c42a94e..cef0b6df 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketExaminationCallouts.cpp @@ -4197,6 +4197,12 @@ VOID PerformBasicPacketExaminationAtDiscard(_In_ CLASSIFY_DATA* pClassifyData) { pDiscardReason = "Extension Headers Failure"; + break; + } + case IpDiscardIpsnpiClientDrop: + { + pDiscardReason = "IPSNPI Drop"; + break; } } diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX index bb55b7ad..c6aad050 100644 --- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX +++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX @@ -37,15 +37,24 @@ AddReg = WFPCalloutsClassReg [DestinationDirs] - WFPSamplerCalloutDriver.DriverFiles = 13 ;/// %WinDir%\System32\Drivers + WFPSamplerCalloutDriver.CopyFiles = 12 ;/// %WinDir%\System32\Drivers + WFPSamplerCalloutDriver.DelFiles = 12 ;/// %WinDir%\System32\Drivers [DefaultInstall.nt$ARCH$] OptionDesc = %WFPSamplerCalloutDriverDescription% - CopyFiles = WFPSamplerCalloutDriver.DriverFiles + CopyFiles = WFPSamplerCalloutDriver.CopyFiles [DefaultInstall.nt$ARCH$.Services] AddService = %WFPSamplerCalloutDriverServiceName%,,WFPSamplerCalloutDriver.Service +[DefaultUninstall.nt$ARCH$] + LegacyUninstall = 1 + DelFiles = WFPSamplerCalloutDriver.DelFiles + DelReg = WFPCalloutsClassReg + +[DefaultUninstall.nt$ARCH$.Services] + DelService = %WFPSamplerCalloutDriverServiceName%,0x200 ;/// SPSVCINST_STOPSERVICE + [WFPCalloutsClassReg] HKR,,,0 HKR,,Icon,, @@ -53,16 +62,19 @@ HKR,,DeviceCharacteristics,0x10001,0x100 ;/// FLG_ADDREG_BINVALUETYPE | FLG_ADDREG_TYPE_MULTI_SZ, FILE_DEVICE_SECURE_OPEN HKR,,Security,, ;/// Permit Generic All access to SYstem, Built-in Admin, and Local System. -[WFPSamplerCalloutDriver.DriverFiles] +[WFPSamplerCalloutDriver.CopyFiles] WFPSamplerCalloutDriver.sys,,,0x00000040 ;/// COPYFLG_OVERWRITE_OLDER_ONLY +[WFPSamplerCalloutDriver.DelFiles] + WFPSamplerCalloutDriver.sys + [WFPSamplerCalloutDriver.Service] DisplayName = %WFPSamplerCalloutDriverServiceName% Description = %WFPSamplerCalloutDriverServiceDescription% ServiceType = 1 ;/// SERVICE_KERNEL_DRIVER StartType = 0 ;/// SERVICE_BOOT_START ErrorControl = 1 ;/// SERVICE_ERROR_NORMAL - ServiceBinary = %13%\WFPSamplerCalloutDriver.sys ;/// %WinDir%\System32\Drivers\WFPSamplerCalloutDriver.sys + ServiceBinary = %12%\WFPSamplerCalloutDriver.sys ;/// %WinDir%\System32\Drivers\WFPSamplerCalloutDriver.sys LoadOrderGroup = NDIS ;/// Load immediately after TCPIP.sys Dependencies = TCPIP diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj index 09bfdeba..af141891 100644 --- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj +++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj @@ -47,7 +47,7 @@ Windows10 True - Windows Driver + Universal KMDF WindowsKernelModeDriver10.0 Driver @@ -55,7 +55,7 @@ Windows10 True - Windows Driver + Universal KMDF WindowsKernelModeDriver10.0 Driver @@ -171,7 +171,7 @@ %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) - %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)WFPSampler.lib + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)\WFPSampler.lib @@ -190,7 +190,7 @@ %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) - %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)WFPSampler.lib + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)\WFPSampler.lib diff --git a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj index 9ec9b254..cc19afc6 100644 --- a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj @@ -32,18 +32,20 @@ Windows10 False - Desktop + Universal KMDF WindowsKernelModeDriver10.0 StaticLibrary + Spectre Windows10 False - Desktop + Universal KMDF WindowsKernelModeDriver10.0 StaticLibrary + Spectre Windows10 @@ -52,6 +54,7 @@ KMDF WindowsKernelModeDriver10.0 StaticLibrary + Spectre Windows10 @@ -60,6 +63,7 @@ KMDF WindowsKernelModeDriver10.0 StaticLibrary + Spectre @@ -119,7 +123,6 @@ %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) - %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib sha256 @@ -143,7 +146,6 @@ %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) - %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib sha256 @@ -167,7 +169,6 @@ %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) - %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib sha256 @@ -191,7 +192,6 @@ %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) - %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib sha256 diff --git a/network/trans/stmedit/sys/InlineEdit.c b/network/trans/stmedit/sys/InlineEdit.c index b21cc429..2586072e 100644 --- a/network/trans/stmedit/sys/InlineEdit.c +++ b/network/trans/stmedit/sys/InlineEdit.c @@ -316,8 +316,8 @@ InlineEditClassify( // If a FIN/RST has been classified, flush any data and permit the FIN/RST. // if ((!FlowContext->bFlowActive) || - (streamData->flags & FWPS_STREAM_FLAG_SEND_DISCONNECT) || - (streamData->flags & FWPS_STREAM_FLAG_RECEIVE_DISCONNECT)) + (streamData->flags & FWPS_STREAM_FLAG_SEND_DISCONNECT) || // must also handle FWPS_STREAM_FLAG_SEND_ABORT + (streamData->flags & FWPS_STREAM_FLAG_RECEIVE_DISCONNECT)) // must also handle FWPS_STREAM_FLAG_RECEIVE_ABORT { DoTraceLevelMessage(TRACE_LEVEL_INFORMATION, CO_GENERAL, "FlowCtx %p, FIN/RST classified (Flow Active %d)!", FlowContext, FlowContext->bFlowActive); diff --git a/network/trans/stmedit/sys/stmedit.vcxproj b/network/trans/stmedit/sys/stmedit.vcxproj index aeb8cca6..acd6c422 100644 --- a/network/trans/stmedit/sys/stmedit.vcxproj +++ b/network/trans/stmedit/sys/stmedit.vcxproj @@ -22,6 +22,7 @@ {9CE912A5-6210-4EF8-B22D-611D13254D4C} $(MSBuildProjectName) 1 + 15 Debug x64 {8FEDC4BC-EFA4-4BF4-91B6-E33FA555EB15} @@ -44,22 +45,19 @@ Driver - - + Windows10 True - - + Universal KMDF WindowsKernelModeDriver10.0 Driver false + Spectre - - + Windows10 True - - + Universal KMDF WindowsKernelModeDriver10.0 Driver @@ -97,21 +95,22 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN true DoTraceLevelMessage(LEVEL,FLAGS,MSG,...) StmEdit Trace.h + MaxSpeed %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;uuid.lib @@ -123,11 +122,11 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN true @@ -137,7 +136,7 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;uuid.lib @@ -149,11 +148,11 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS630;NDIS60;POOL_NX_OPTIN true @@ -163,7 +162,7 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;uuid.lib @@ -175,11 +174,11 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions);UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN true @@ -189,7 +188,7 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO + %(PreprocessorDefinitions)NT;UNICODE;_UNICODE;NDIS630;POOL_NX_OPTIN_AUTO %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;uuid.lib diff --git a/network/trans/stmedit/sys/stmedit.vcxproj.Filters b/network/trans/stmedit/sys/stmedit.vcxproj.Filters index 662fe098..8286c235 100644 --- a/network/trans/stmedit/sys/stmedit.vcxproj.Filters +++ b/network/trans/stmedit/sys/stmedit.vcxproj.Filters @@ -33,16 +33,18 @@ - + + Header Files + + Header Files - - - + + Header Files + + Header Files - - Header Files -- cgit v1.3.1