From 9d83452366f0bdca802d068b91f1957c4339078d Mon Sep 17 00:00:00 2001 From: kahashimoto-ms <117399367+kahashimoto-ms@users.noreply.github.com> Date: Thu, 13 Apr 2023 09:59:25 -0700 Subject: Ndisprot inf violations (#974) * Add PnpLockdown=1 to the version section of the inf * Change service name to Ndisprot60 * Change Section 'wdfsection' to 'Install.Wdf' so it can be referenced. Change service to NdisProt60 in that section * Change all DIRID to 13 * Add different manufacturer entires so installtion is different for Windows 7 vs Windows 10 and above * Add another manufacturer so the driver installs in DriverStore for newest builds * Enable the Control-flow Enforcement Technology (CET) Shadow Stack mitigation * Add SAL annotation to the DllCanUnloadNow definition to match declaration * Use stampinf ARCH variable to replace hard coded architectures * Fix a comment * Add the correct build number for installing network drivers using Dlls and update comment. --- network/ndis/ndisprot_kmdf/60/ndisprot.inx | Bin 9312 -> 13478 bytes network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj | 1 + network/ndis/ndisprot_kmdf/notifyob/dllmain.cpp | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/network/ndis/ndisprot_kmdf/60/ndisprot.inx b/network/ndis/ndisprot_kmdf/60/ndisprot.inx index 45305bb7..ecd932c1 100644 Binary files a/network/ndis/ndisprot_kmdf/60/ndisprot.inx and b/network/ndis/ndisprot_kmdf/60/ndisprot.inx differ diff --git a/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj b/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj index 980c6052..81a2d78e 100644 --- a/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj +++ b/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj @@ -143,6 +143,7 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib + true diff --git a/network/ndis/ndisprot_kmdf/notifyob/dllmain.cpp b/network/ndis/ndisprot_kmdf/notifyob/dllmain.cpp index b3e3a66c..2452d95c 100644 --- a/network/ndis/ndisprot_kmdf/notifyob/dllmain.cpp +++ b/network/ndis/ndisprot_kmdf/notifyob/dllmain.cpp @@ -92,7 +92,7 @@ DllMain( return TRUE; } - +__control_entrypoint(DllExport) STDAPI DllCanUnloadNow( ) { -- cgit v1.3.1