summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkahashimoto-ms <[email protected]>2023-04-13 09:59:25 -0700
committerGitHub <[email protected]>2023-04-13 09:59:25 -0700
commit9d83452366f0bdca802d068b91f1957c4339078d (patch)
treedb2687334fbd0e39cb33722792e95349d6120a49
parent8526a742cd5721ff53f244bf5071bcf3d27dded6 (diff)
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.
-rw-r--r--network/ndis/ndisprot_kmdf/60/ndisprot.inxbin9312 -> 13478 bytes
-rw-r--r--network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj1
-rw-r--r--network/ndis/ndisprot_kmdf/notifyob/dllmain.cpp2
3 files changed, 2 insertions, 1 deletions
diff --git a/network/ndis/ndisprot_kmdf/60/ndisprot.inx b/network/ndis/ndisprot_kmdf/60/ndisprot.inx
index 45305bb7..ecd932c1 100644
--- a/network/ndis/ndisprot_kmdf/60/ndisprot.inx
+++ b/network/ndis/ndisprot_kmdf/60/ndisprot.inx
Binary files 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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Link>
<AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
+ <CETCompat>true</CETCompat>
</Link>
<ClCompile>
<ExceptionHandling>
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(
)
{