diff options
| author | karlf <[email protected]> | 2016-08-11 13:28:13 -0700 |
|---|---|---|
| committer | karlf <[email protected]> | 2016-08-11 13:28:13 -0700 |
| commit | 96eb96dfb613e4c745db6bd1f53a92fe7e2290fc (patch) | |
| tree | ad5f3ede5cbcd6b598677ce41bcf8318471bdd92 /network/ndis | |
| parent | 687b274aa38fd05c8c26e3068932121876d7f745 (diff) | |
Updated for "Windows 10 Anniversary Update" (Version 1607)
Diffstat (limited to 'network/ndis')
47 files changed, 289 insertions, 289 deletions
diff --git a/network/ndis/extension/base/sxbase.vcxproj b/network/ndis/extension/base/sxbase.vcxproj index 13a49e61..47c5be68 100644 --- a/network/ndis/extension/base/sxbase.vcxproj +++ b/network/ndis/extension/base/sxbase.vcxproj @@ -11,11 +11,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{B838EAEA-2046-4E93-AC2D-CB203C9D4036}</ProjectGuid> + <ProjectGuid>{116389EB-9596-42A0-9C05-66DBD2A62363}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">x64</Platform> - <SampleGuid>{F44EC1A6-6C23-4D60-B89C-39A239AABA69}</SampleGuid> + <SampleGuid>{76212B41-7DC5-4A2D-A52B-05043D88FAF6}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/extension/base/sxbase.vcxproj.Filters b/network/ndis/extension/base/sxbase.vcxproj.Filters index a75c71be..65b2b72a 100644 --- a/network/ndis/extension/base/sxbase.vcxproj.Filters +++ b/network/ndis/extension/base/sxbase.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{A16DB2BA-3F19-47BD-B171-7D2A069155B0}</UniqueIdentifier> + <UniqueIdentifier>{A6E18088-0BDB-40AF-8FFF-B26E957107C3}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{594FE438-B8A6-4B44-B108-9504E84B573E}</UniqueIdentifier> + <UniqueIdentifier>{D6935950-2C41-4E45-B48B-AD44D1F767C4}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{BCEFAB4C-06AA-4C9F-81B8-057321327165}</UniqueIdentifier> + <UniqueIdentifier>{376F3435-038B-4A8F-882F-5F5F913E0631}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{3B1FC56B-F654-4AA2-9F91-AB9E496D8160}</UniqueIdentifier> + <UniqueIdentifier>{4D05B842-8D95-4BBE-83A4-984A422F7783}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/extension/extensions.sln b/network/ndis/extension/extensions.sln index 75fb7b83..6915713c 100644 --- a/network/ndis/extension/extensions.sln +++ b/network/ndis/extension/extensions.sln @@ -3,24 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Base", "Base", "{28219E37-D912-456C-A3F7-03912CD5C2C4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Base", "Base", "{D02CEB8E-8252-4474-9397-FC5FCDBAEBB8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forward", "Forward", "{B3C1B1A2-7677-428B-9D67-61DEE9DF4035}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forward", "Forward", "{CD9D8AAC-3F52-4714-8A1F-72372A0D23E8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9212747D-6D63-4D9C-8961-FA8AD5A2DEDD}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{F46A020E-CBD7-4626-A638-DD8261EFA8FF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Passthrough", "Passthrough", "{875DC1CC-D5FA-4D39-94DE-A059F05174C9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Passthrough", "Passthrough", "{5B973CF1-375C-4E45-A4EA-A37FF093DCBB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxbase", "base\sxbase.vcxproj", "{B838EAEA-2046-4E93-AC2D-CB203C9D4036}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxbase", "base\sxbase.vcxproj", "{116389EB-9596-42A0-9C05-66DBD2A62363}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msforwardext", "samples\forward\msforwardext.vcxproj", "{D112446E-9C5A-42CF-9C9B-CDA3E7DC5B3A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msforwardext", "samples\forward\msforwardext.vcxproj", "{86E5643E-4462-4EDC-A315-07C2D260C5AD}" ProjectSection(ProjectDependencies) = postProject - {B838EAEA-2046-4E93-AC2D-CB203C9D4036} = {B838EAEA-2046-4E93-AC2D-CB203C9D4036} + {116389EB-9596-42A0-9C05-66DBD2A62363} = {116389EB-9596-42A0-9C05-66DBD2A62363} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mspassthroughext", "samples\passthrough\mspassthroughext.vcxproj", "{C60917BE-A59D-4FDB-BEFD-98DC106BDCA9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mspassthroughext", "samples\passthrough\mspassthroughext.vcxproj", "{C0A48ACA-3961-4E93-B2B4-4D27E0106A3B}" ProjectSection(ProjectDependencies) = postProject - {B838EAEA-2046-4E93-AC2D-CB203C9D4036} = {B838EAEA-2046-4E93-AC2D-CB203C9D4036} + {116389EB-9596-42A0-9C05-66DBD2A62363} = {116389EB-9596-42A0-9C05-66DBD2A62363} EndProjectSection EndProject Global @@ -29,27 +29,27 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B838EAEA-2046-4E93-AC2D-CB203C9D4036}.Debug|x64.ActiveCfg = Debug|x64 - {B838EAEA-2046-4E93-AC2D-CB203C9D4036}.Debug|x64.Build.0 = Debug|x64 - {B838EAEA-2046-4E93-AC2D-CB203C9D4036}.Release|x64.ActiveCfg = Release|x64 - {B838EAEA-2046-4E93-AC2D-CB203C9D4036}.Release|x64.Build.0 = Release|x64 - {D112446E-9C5A-42CF-9C9B-CDA3E7DC5B3A}.Debug|x64.ActiveCfg = Debug|x64 - {D112446E-9C5A-42CF-9C9B-CDA3E7DC5B3A}.Debug|x64.Build.0 = Debug|x64 - {D112446E-9C5A-42CF-9C9B-CDA3E7DC5B3A}.Release|x64.ActiveCfg = Release|x64 - {D112446E-9C5A-42CF-9C9B-CDA3E7DC5B3A}.Release|x64.Build.0 = Release|x64 - {C60917BE-A59D-4FDB-BEFD-98DC106BDCA9}.Debug|x64.ActiveCfg = Debug|x64 - {C60917BE-A59D-4FDB-BEFD-98DC106BDCA9}.Debug|x64.Build.0 = Debug|x64 - {C60917BE-A59D-4FDB-BEFD-98DC106BDCA9}.Release|x64.ActiveCfg = Release|x64 - {C60917BE-A59D-4FDB-BEFD-98DC106BDCA9}.Release|x64.Build.0 = Release|x64 + {116389EB-9596-42A0-9C05-66DBD2A62363}.Debug|x64.ActiveCfg = Debug|x64 + {116389EB-9596-42A0-9C05-66DBD2A62363}.Debug|x64.Build.0 = Debug|x64 + {116389EB-9596-42A0-9C05-66DBD2A62363}.Release|x64.ActiveCfg = Release|x64 + {116389EB-9596-42A0-9C05-66DBD2A62363}.Release|x64.Build.0 = Release|x64 + {86E5643E-4462-4EDC-A315-07C2D260C5AD}.Debug|x64.ActiveCfg = Debug|x64 + {86E5643E-4462-4EDC-A315-07C2D260C5AD}.Debug|x64.Build.0 = Debug|x64 + {86E5643E-4462-4EDC-A315-07C2D260C5AD}.Release|x64.ActiveCfg = Release|x64 + {86E5643E-4462-4EDC-A315-07C2D260C5AD}.Release|x64.Build.0 = Release|x64 + {C0A48ACA-3961-4E93-B2B4-4D27E0106A3B}.Debug|x64.ActiveCfg = Debug|x64 + {C0A48ACA-3961-4E93-B2B4-4D27E0106A3B}.Debug|x64.Build.0 = Debug|x64 + {C0A48ACA-3961-4E93-B2B4-4D27E0106A3B}.Release|x64.ActiveCfg = Release|x64 + {C0A48ACA-3961-4E93-B2B4-4D27E0106A3B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {B838EAEA-2046-4E93-AC2D-CB203C9D4036} = {28219E37-D912-456C-A3F7-03912CD5C2C4} - {D112446E-9C5A-42CF-9C9B-CDA3E7DC5B3A} = {B3C1B1A2-7677-428B-9D67-61DEE9DF4035} - {C60917BE-A59D-4FDB-BEFD-98DC106BDCA9} = {875DC1CC-D5FA-4D39-94DE-A059F05174C9} - {B3C1B1A2-7677-428B-9D67-61DEE9DF4035} = {9212747D-6D63-4D9C-8961-FA8AD5A2DEDD} - {875DC1CC-D5FA-4D39-94DE-A059F05174C9} = {9212747D-6D63-4D9C-8961-FA8AD5A2DEDD} + {116389EB-9596-42A0-9C05-66DBD2A62363} = {D02CEB8E-8252-4474-9397-FC5FCDBAEBB8} + {86E5643E-4462-4EDC-A315-07C2D260C5AD} = {CD9D8AAC-3F52-4714-8A1F-72372A0D23E8} + {C0A48ACA-3961-4E93-B2B4-4D27E0106A3B} = {5B973CF1-375C-4E45-A4EA-A37FF093DCBB} + {CD9D8AAC-3F52-4714-8A1F-72372A0D23E8} = {F46A020E-CBD7-4626-A638-DD8261EFA8FF} + {5B973CF1-375C-4E45-A4EA-A37FF093DCBB} = {F46A020E-CBD7-4626-A638-DD8261EFA8FF} EndGlobalSection EndGlobal diff --git a/network/ndis/extension/samples/forward/msforwardext.vcxproj b/network/ndis/extension/samples/forward/msforwardext.vcxproj index be2eea6b..589a0857 100644 --- a/network/ndis/extension/samples/forward/msforwardext.vcxproj +++ b/network/ndis/extension/samples/forward/msforwardext.vcxproj @@ -11,11 +11,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{D112446E-9C5A-42CF-9C9B-CDA3E7DC5B3A}</ProjectGuid> + <ProjectGuid>{86E5643E-4462-4EDC-A315-07C2D260C5AD}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">x64</Platform> - <SampleGuid>{EA90456F-BB1A-4F16-B579-F296EF617DD6}</SampleGuid> + <SampleGuid>{46825092-9971-43D3-A5D3-A987CD3E1434}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/extension/samples/forward/msforwardext.vcxproj.Filters b/network/ndis/extension/samples/forward/msforwardext.vcxproj.Filters index b9d7e74c..152d91cc 100644 --- a/network/ndis/extension/samples/forward/msforwardext.vcxproj.Filters +++ b/network/ndis/extension/samples/forward/msforwardext.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{F68973A5-CE87-470D-BA57-416A25240DF3}</UniqueIdentifier> + <UniqueIdentifier>{AEB3EF09-357E-42FD-9DD6-D859E011A53B}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{97E8830C-C990-4BF0-A9E1-C9E672F737B4}</UniqueIdentifier> + <UniqueIdentifier>{C4110269-9086-437B-884F-4C7DF3F154CF}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{9274D3AF-075C-4C05-A5FF-E9D3DD0229C2}</UniqueIdentifier> + <UniqueIdentifier>{966DDD9B-30E5-43B7-9775-88D46FA6B6B4}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{34ADA108-C24C-4574-921B-055BF882ADC6}</UniqueIdentifier> + <UniqueIdentifier>{051A81C9-2D1C-47F7-BD6F-C32B966F6591}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj index c64db7ea..e590510a 100644 --- a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj +++ b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj @@ -11,11 +11,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{C60917BE-A59D-4FDB-BEFD-98DC106BDCA9}</ProjectGuid> + <ProjectGuid>{C0A48ACA-3961-4E93-B2B4-4D27E0106A3B}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">x64</Platform> - <SampleGuid>{2B0884D6-EEF4-4FA0-BA85-91716EF53A20}</SampleGuid> + <SampleGuid>{4D1A04DA-F327-44B8-9448-4BC4C01D30CF}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj.Filters b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj.Filters index e08626d6..23d5b54c 100644 --- a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj.Filters +++ b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{359A1D8D-C03D-495A-A725-8463CB68AD28}</UniqueIdentifier> + <UniqueIdentifier>{F91FDBCA-2FA2-4A08-95C3-698E337F5EC2}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{B413F3C3-1A7A-47F1-871C-DD463CF462FA}</UniqueIdentifier> + <UniqueIdentifier>{548EC420-097B-44CB-9AB2-CA4F00781B5F}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{1A7DD397-5E2F-460C-8CDA-7CB5C2EB8B84}</UniqueIdentifier> + <UniqueIdentifier>{F05ED0BC-130C-4B76-9311-C5ABEFF663EE}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{9110AEBB-3824-490A-9B6E-92BED551B86D}</UniqueIdentifier> + <UniqueIdentifier>{B5B20273-FD92-443F-959D-70901F346798}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/filter/filter.sln b/network/ndis/filter/filter.sln index af8aa594..6b8b743f 100644 --- a/network/ndis/filter/filter.sln +++ b/network/ndis/filter/filter.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndislwf", "ndislwf.vcxproj", "{BA1E550F-9F59-4729-98F9-2E9135355331}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndislwf", "ndislwf.vcxproj", "{CD502925-8888-4A09-8AD0-04B80A73FBBD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BA1E550F-9F59-4729-98F9-2E9135355331}.Debug|Win32.ActiveCfg = Debug|Win32 - {BA1E550F-9F59-4729-98F9-2E9135355331}.Debug|Win32.Build.0 = Debug|Win32 - {BA1E550F-9F59-4729-98F9-2E9135355331}.Release|Win32.ActiveCfg = Release|Win32 - {BA1E550F-9F59-4729-98F9-2E9135355331}.Release|Win32.Build.0 = Release|Win32 - {BA1E550F-9F59-4729-98F9-2E9135355331}.Debug|x64.ActiveCfg = Debug|x64 - {BA1E550F-9F59-4729-98F9-2E9135355331}.Debug|x64.Build.0 = Debug|x64 - {BA1E550F-9F59-4729-98F9-2E9135355331}.Release|x64.ActiveCfg = Release|x64 - {BA1E550F-9F59-4729-98F9-2E9135355331}.Release|x64.Build.0 = Release|x64 + {CD502925-8888-4A09-8AD0-04B80A73FBBD}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD502925-8888-4A09-8AD0-04B80A73FBBD}.Debug|Win32.Build.0 = Debug|Win32 + {CD502925-8888-4A09-8AD0-04B80A73FBBD}.Release|Win32.ActiveCfg = Release|Win32 + {CD502925-8888-4A09-8AD0-04B80A73FBBD}.Release|Win32.Build.0 = Release|Win32 + {CD502925-8888-4A09-8AD0-04B80A73FBBD}.Debug|x64.ActiveCfg = Debug|x64 + {CD502925-8888-4A09-8AD0-04B80A73FBBD}.Debug|x64.Build.0 = Debug|x64 + {CD502925-8888-4A09-8AD0-04B80A73FBBD}.Release|x64.ActiveCfg = Release|x64 + {CD502925-8888-4A09-8AD0-04B80A73FBBD}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/network/ndis/filter/ndislwf.vcxproj b/network/ndis/filter/ndislwf.vcxproj index 503d9301..f381ba89 100644 --- a/network/ndis/filter/ndislwf.vcxproj +++ b/network/ndis/filter/ndislwf.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{BA1E550F-9F59-4729-98F9-2E9135355331}</ProjectGuid> + <ProjectGuid>{CD502925-8888-4A09-8AD0-04B80A73FBBD}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{63E20C70-DE9B-4A15-9F7D-B388D4B6E048}</SampleGuid> + <SampleGuid>{F40772D8-6882-4C62-8849-D5651CC7751C}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/filter/ndislwf.vcxproj.Filters b/network/ndis/filter/ndislwf.vcxproj.Filters index b08d85b9..200de09e 100644 --- a/network/ndis/filter/ndislwf.vcxproj.Filters +++ b/network/ndis/filter/ndislwf.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{84396FDB-160B-48B8-8764-F838E443D514}</UniqueIdentifier> + <UniqueIdentifier>{E549C692-AB5D-4B19-A27F-39CB688D325C}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{DAFBC6E8-0471-4153-B9EA-04B4264C4757}</UniqueIdentifier> + <UniqueIdentifier>{86E411A4-7A15-4BA4-97E2-8CC8596C66E7}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{A57EFF04-85E0-4EC9-A9A3-E3FE3A0E7F56}</UniqueIdentifier> + <UniqueIdentifier>{E39D3E0D-5966-4619-A8EB-D91989A3EF89}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{9DFDBF97-3CA3-458D-830D-083C1414E124}</UniqueIdentifier> + <UniqueIdentifier>{3CE8B5F7-6B57-4C41-93D5-1F9C5132D57D}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/mux/driver/60/miniport.c b/network/ndis/mux/driver/60/miniport.c index 45cdef53..e0c3e380 100644 --- a/network/ndis/mux/driver/60/miniport.c +++ b/network/ndis/mux/driver/60/miniport.c @@ -2543,7 +2543,7 @@ NOTE: This functio doesn't handle vlan tagging in an efficient way, please wait while (TRUE) { pVa = NULL; - NdisQueryMdl(Mdl, &pVa, &BufferLength, NormalPagePriority); + NdisQueryMdl(Mdl, &pVa, &BufferLength, NormalPagePriority | MdlMappingNoExecute); if (pVa == NULL) { @@ -2853,7 +2853,7 @@ Return Value: NdisQueryMdl(NET_BUFFER_CURRENT_MDL(CurrentMdlAllocatedNetBuffer), &pVa, &BufferLength, - NormalPagePriority); + NormalPagePriority | MdlMappingNoExecute); if( pVa == NULL ){ //you may do something } diff --git a/network/ndis/mux/driver/60/novlan/mux.vcxproj b/network/ndis/mux/driver/60/novlan/mux.vcxproj index d3848065..5740775a 100644 --- a/network/ndis/mux/driver/60/novlan/mux.vcxproj +++ b/network/ndis/mux/driver/60/novlan/mux.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{B5858D53-B828-4CA4-BB86-D9E9C31B7F77}</ProjectGuid> + <ProjectGuid>{B2DE2C37-B3F2-491E-94AE-402A7B4D3308}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{114EA080-E360-4DFF-933D-32330FBCE32D}</SampleGuid> + <SampleGuid>{66B17978-A259-41F2-B762-8A38382B603D}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/mux/driver/60/novlan/mux.vcxproj.Filters b/network/ndis/mux/driver/60/novlan/mux.vcxproj.Filters index abae9d84..ff91d92c 100644 --- a/network/ndis/mux/driver/60/novlan/mux.vcxproj.Filters +++ b/network/ndis/mux/driver/60/novlan/mux.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{D4B49EC5-E87F-461E-8F43-16C86C0D27B7}</UniqueIdentifier> + <UniqueIdentifier>{6BCB0E00-374A-4F26-86ED-0A06B529744D}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{BB7C27BC-A288-4C98-A16A-4F35D1DD7D26}</UniqueIdentifier> + <UniqueIdentifier>{05B937DD-309E-4FDF-9A95-695BDAE919B5}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{0466D1AB-867D-4829-A10F-4C6E5F154268}</UniqueIdentifier> + <UniqueIdentifier>{66C974D2-A44A-44F8-85EE-EFE46968148A}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{33D5CCAF-775D-45F9-B08A-C2951B557268}</UniqueIdentifier> + <UniqueIdentifier>{FB8BB109-6E26-4E1E-B5A2-8707820E07AC}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj b/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj index 52825b7a..b9ad71ca 100644 --- a/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj +++ b/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{C2CFEECC-2281-4F99-B855-185BEE431415}</ProjectGuid> + <ProjectGuid>{015D7470-0FC8-4597-A67E-BD9C754F0681}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{43683E92-7DA7-43A8-958C-057E3A015D28}</SampleGuid> + <SampleGuid>{261E8436-6685-4860-962C-AF3076B35DB9}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj.Filters b/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj.Filters index e1651444..8bd7f5bf 100644 --- a/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj.Filters +++ b/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{94237C24-6B64-43C1-A5E1-10FCDCD13519}</UniqueIdentifier> + <UniqueIdentifier>{EAA25048-A8D8-4B0D-A1B1-877F9D4DB341}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{B7E57BF5-A4DA-44A1-8A61-BEF5A6016D5D}</UniqueIdentifier> + <UniqueIdentifier>{729ABB1C-6C3A-43EA-895E-20934A64EC06}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{373729B5-7B52-4DA0-9380-18CBE8AE382A}</UniqueIdentifier> + <UniqueIdentifier>{59F5A994-E083-4BBC-9AF0-52685EA1B653}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{6DEAB32E-549A-4629-AE3C-8BBC83887CDE}</UniqueIdentifier> + <UniqueIdentifier>{239D4489-66F7-4647-A5B6-04594F97F958}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/mux/mux.sln b/network/ndis/mux/mux.sln index f9483243..551a21b7 100644 --- a/network/ndis/mux/mux.sln +++ b/network/ndis/mux/mux.sln @@ -3,21 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vlan", "Vlan", "{9817776F-C460-4A80-BD6D-201A2CB3A0A4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vlan", "Vlan", "{DFD0A31B-8B62-4BAA-998E-161F01D1A01B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60", "60", "{8844C087-57E1-4934-AA51-CF9CF8F50313}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60", "60", "{BB781269-F74A-43E0-AD7D-DBD32BBF2012}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{F830CF4F-2AA8-4AE1-9068-5F63F12A3ACF}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{26B59072-BF66-4E06-83CA-3F4F95378A23}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Novlan", "Novlan", "{D477BF5F-6512-4E1E-9115-44CF150CBD69}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Novlan", "Novlan", "{2D3D13DE-5985-4A6C-8562-3E954D634F1E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notifyob", "Notifyob", "{98C539D7-554A-4D00-B2C5-7897ADA27626}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notifyob", "Notifyob", "{2CAF23FF-28F8-4D52-B6C9-B76C8BCD5F67}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "muxvlan", "driver\60\vlan\muxvlan.vcxproj", "{C2CFEECC-2281-4F99-B855-185BEE431415}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "muxvlan", "driver\60\vlan\muxvlan.vcxproj", "{015D7470-0FC8-4597-A67E-BD9C754F0681}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mux", "driver\60\novlan\mux.vcxproj", "{B5858D53-B828-4CA4-BB86-D9E9C31B7F77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mux", "driver\60\novlan\mux.vcxproj", "{B2DE2C37-B3F2-491E-94AE-402A7B4D3308}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mux", "notifyob\mux.vcxproj", "{285AA43E-0509-4716-8586-405D086C370D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mux", "notifyob\mux.vcxproj", "{92E3B437-C258-47FB-8856-D3FEA56A3BCC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,40 +27,40 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C2CFEECC-2281-4F99-B855-185BEE431415}.Debug|Win32.ActiveCfg = Debug|Win32 - {C2CFEECC-2281-4F99-B855-185BEE431415}.Debug|Win32.Build.0 = Debug|Win32 - {C2CFEECC-2281-4F99-B855-185BEE431415}.Release|Win32.ActiveCfg = Release|Win32 - {C2CFEECC-2281-4F99-B855-185BEE431415}.Release|Win32.Build.0 = Release|Win32 - {C2CFEECC-2281-4F99-B855-185BEE431415}.Debug|x64.ActiveCfg = Debug|x64 - {C2CFEECC-2281-4F99-B855-185BEE431415}.Debug|x64.Build.0 = Debug|x64 - {C2CFEECC-2281-4F99-B855-185BEE431415}.Release|x64.ActiveCfg = Release|x64 - {C2CFEECC-2281-4F99-B855-185BEE431415}.Release|x64.Build.0 = Release|x64 - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77}.Debug|Win32.ActiveCfg = Debug|Win32 - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77}.Debug|Win32.Build.0 = Debug|Win32 - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77}.Release|Win32.ActiveCfg = Release|Win32 - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77}.Release|Win32.Build.0 = Release|Win32 - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77}.Debug|x64.ActiveCfg = Debug|x64 - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77}.Debug|x64.Build.0 = Debug|x64 - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77}.Release|x64.ActiveCfg = Release|x64 - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77}.Release|x64.Build.0 = Release|x64 - {285AA43E-0509-4716-8586-405D086C370D}.Debug|Win32.ActiveCfg = Debug|Win32 - {285AA43E-0509-4716-8586-405D086C370D}.Debug|Win32.Build.0 = Debug|Win32 - {285AA43E-0509-4716-8586-405D086C370D}.Release|Win32.ActiveCfg = Release|Win32 - {285AA43E-0509-4716-8586-405D086C370D}.Release|Win32.Build.0 = Release|Win32 - {285AA43E-0509-4716-8586-405D086C370D}.Debug|x64.ActiveCfg = Debug|x64 - {285AA43E-0509-4716-8586-405D086C370D}.Debug|x64.Build.0 = Debug|x64 - {285AA43E-0509-4716-8586-405D086C370D}.Release|x64.ActiveCfg = Release|x64 - {285AA43E-0509-4716-8586-405D086C370D}.Release|x64.Build.0 = Release|x64 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|Win32.ActiveCfg = Debug|Win32 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|Win32.Build.0 = Debug|Win32 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Release|Win32.ActiveCfg = Release|Win32 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Release|Win32.Build.0 = Release|Win32 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|x64.ActiveCfg = Debug|x64 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|x64.Build.0 = Debug|x64 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Release|x64.ActiveCfg = Release|x64 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Release|x64.Build.0 = Release|x64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Debug|Win32.ActiveCfg = Debug|Win32 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Debug|Win32.Build.0 = Debug|Win32 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Release|Win32.ActiveCfg = Release|Win32 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Release|Win32.Build.0 = Release|Win32 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Debug|x64.ActiveCfg = Debug|x64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Debug|x64.Build.0 = Debug|x64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Release|x64.ActiveCfg = Release|x64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Release|x64.Build.0 = Release|x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Debug|Win32.ActiveCfg = Debug|Win32 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Debug|Win32.Build.0 = Debug|Win32 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Release|Win32.ActiveCfg = Release|Win32 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Release|Win32.Build.0 = Release|Win32 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Debug|x64.ActiveCfg = Debug|x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Debug|x64.Build.0 = Debug|x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Release|x64.ActiveCfg = Release|x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {C2CFEECC-2281-4F99-B855-185BEE431415} = {9817776F-C460-4A80-BD6D-201A2CB3A0A4} - {B5858D53-B828-4CA4-BB86-D9E9C31B7F77} = {D477BF5F-6512-4E1E-9115-44CF150CBD69} - {285AA43E-0509-4716-8586-405D086C370D} = {98C539D7-554A-4D00-B2C5-7897ADA27626} - {9817776F-C460-4A80-BD6D-201A2CB3A0A4} = {8844C087-57E1-4934-AA51-CF9CF8F50313} - {8844C087-57E1-4934-AA51-CF9CF8F50313} = {F830CF4F-2AA8-4AE1-9068-5F63F12A3ACF} - {D477BF5F-6512-4E1E-9115-44CF150CBD69} = {8844C087-57E1-4934-AA51-CF9CF8F50313} + {015D7470-0FC8-4597-A67E-BD9C754F0681} = {DFD0A31B-8B62-4BAA-998E-161F01D1A01B} + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308} = {2D3D13DE-5985-4A6C-8562-3E954D634F1E} + {92E3B437-C258-47FB-8856-D3FEA56A3BCC} = {2CAF23FF-28F8-4D52-B6C9-B76C8BCD5F67} + {DFD0A31B-8B62-4BAA-998E-161F01D1A01B} = {BB781269-F74A-43E0-AD7D-DBD32BBF2012} + {BB781269-F74A-43E0-AD7D-DBD32BBF2012} = {26B59072-BF66-4E06-83CA-3F4F95378A23} + {2D3D13DE-5985-4A6C-8562-3E954D634F1E} = {BB781269-F74A-43E0-AD7D-DBD32BBF2012} EndGlobalSection EndGlobal diff --git a/network/ndis/mux/notifyob/mux.vcxproj b/network/ndis/mux/notifyob/mux.vcxproj index bd1a8bdd..dc1e2897 100644 --- a/network/ndis/mux/notifyob/mux.vcxproj +++ b/network/ndis/mux/notifyob/mux.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{285AA43E-0509-4716-8586-405D086C370D}</ProjectGuid> + <ProjectGuid>{92E3B437-C258-47FB-8856-D3FEA56A3BCC}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{D12584A6-2527-4C8D-B135-1ECB73201A21}</SampleGuid> + <SampleGuid>{67118C02-9183-4F2D-8E60-3D4F02B62EA9}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/mux/notifyob/mux.vcxproj.Filters b/network/ndis/mux/notifyob/mux.vcxproj.Filters index 5e6a78d7..902b402e 100644 --- a/network/ndis/mux/notifyob/mux.vcxproj.Filters +++ b/network/ndis/mux/notifyob/mux.vcxproj.Filters @@ -3,15 +3,15 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{D2FB3445-77C3-4BD9-BA51-E5B0D6C08BEE}</UniqueIdentifier> + <UniqueIdentifier>{45A756E2-A979-4163-A3FF-66314E15E3F3}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{B20B5A99-B397-40F6-A904-F5239D1E7041}</UniqueIdentifier> + <UniqueIdentifier>{60F0A149-A97B-4AB6-A5FB-44A2D183B1ED}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{EE9C4162-6737-4614-941D-1942E86D02B7}</UniqueIdentifier> + <UniqueIdentifier>{EA529E48-8EB7-40F7-A3CA-AE7AC13FF93D}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/ndisprot/6x/ndisprot60.sln b/network/ndis/ndisprot/6x/ndisprot60.sln index 69c4b38f..474b2ff0 100644 --- a/network/ndis/ndisprot/6x/ndisprot60.sln +++ b/network/ndis/ndisprot/6x/ndisprot60.sln @@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60", "60", "{1D62C0DD-3166-4212-A396-0C32A8133256}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60", "60", "{09F8A71E-BD45-42F5-8CB5-82F137773350}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{464025BB-16D1-4B86-ACF9-3F9EF08B865E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{40B41B7C-63E0-4BEC-9BF6-2AE9002E0670}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "630", "630", "{247D6A97-6A59-4E29-BA6F-B20EEE3AE3B6}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "630", "630", "{7B0AA49C-0A8C-4EED-8ACE-1A80EC2E5AEB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{8E714E74-8167-4A2E-B5D9-97506C801DB0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{20D7328F-9929-4D3A-BC1D-08E2442A929D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndisprot60", "sys\60\ndisprot60.vcxproj", "{D8336C3A-8FB7-46CA-82A9-209B7EB4339D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndisprot60", "sys\60\ndisprot60.vcxproj", "{F27914B8-F3D9-4164-BF33-42BBFA19AED4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndisprot630", "sys\630\ndisprot630.vcxproj", "{6EE064DA-28D2-478C-BC25-FD04382FAD44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndisprot630", "sys\630\ndisprot630.vcxproj", "{C0748EAB-F425-488A-9F39-77D5DE2DD251}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prottest", "test\prottest.vcxproj", "{62009D19-D80B-46B8-8360-D84AA57DD567}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prottest", "test\prottest.vcxproj", "{34A953AA-28CB-472E-B438-1BE26FDF1D54}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,39 +25,39 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D}.Debug|Win32.ActiveCfg = Debug|Win32 - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D}.Debug|Win32.Build.0 = Debug|Win32 - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D}.Release|Win32.ActiveCfg = Release|Win32 - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D}.Release|Win32.Build.0 = Release|Win32 - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D}.Debug|x64.ActiveCfg = Debug|x64 - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D}.Debug|x64.Build.0 = Debug|x64 - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D}.Release|x64.ActiveCfg = Release|x64 - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D}.Release|x64.Build.0 = Release|x64 - {6EE064DA-28D2-478C-BC25-FD04382FAD44}.Debug|Win32.ActiveCfg = Debug|Win32 - {6EE064DA-28D2-478C-BC25-FD04382FAD44}.Debug|Win32.Build.0 = Debug|Win32 - {6EE064DA-28D2-478C-BC25-FD04382FAD44}.Release|Win32.ActiveCfg = Release|Win32 - {6EE064DA-28D2-478C-BC25-FD04382FAD44}.Release|Win32.Build.0 = Release|Win32 - {6EE064DA-28D2-478C-BC25-FD04382FAD44}.Debug|x64.ActiveCfg = Debug|x64 - {6EE064DA-28D2-478C-BC25-FD04382FAD44}.Debug|x64.Build.0 = Debug|x64 - {6EE064DA-28D2-478C-BC25-FD04382FAD44}.Release|x64.ActiveCfg = Release|x64 - {6EE064DA-28D2-478C-BC25-FD04382FAD44}.Release|x64.Build.0 = Release|x64 - {62009D19-D80B-46B8-8360-D84AA57DD567}.Debug|Win32.ActiveCfg = Debug|Win32 - {62009D19-D80B-46B8-8360-D84AA57DD567}.Debug|Win32.Build.0 = Debug|Win32 - {62009D19-D80B-46B8-8360-D84AA57DD567}.Release|Win32.ActiveCfg = Release|Win32 - {62009D19-D80B-46B8-8360-D84AA57DD567}.Release|Win32.Build.0 = Release|Win32 - {62009D19-D80B-46B8-8360-D84AA57DD567}.Debug|x64.ActiveCfg = Debug|x64 - {62009D19-D80B-46B8-8360-D84AA57DD567}.Debug|x64.Build.0 = Debug|x64 - {62009D19-D80B-46B8-8360-D84AA57DD567}.Release|x64.ActiveCfg = Release|x64 - {62009D19-D80B-46B8-8360-D84AA57DD567}.Release|x64.Build.0 = Release|x64 + {F27914B8-F3D9-4164-BF33-42BBFA19AED4}.Debug|Win32.ActiveCfg = Debug|Win32 + {F27914B8-F3D9-4164-BF33-42BBFA19AED4}.Debug|Win32.Build.0 = Debug|Win32 + {F27914B8-F3D9-4164-BF33-42BBFA19AED4}.Release|Win32.ActiveCfg = Release|Win32 + {F27914B8-F3D9-4164-BF33-42BBFA19AED4}.Release|Win32.Build.0 = Release|Win32 + {F27914B8-F3D9-4164-BF33-42BBFA19AED4}.Debug|x64.ActiveCfg = Debug|x64 + {F27914B8-F3D9-4164-BF33-42BBFA19AED4}.Debug|x64.Build.0 = Debug|x64 + {F27914B8-F3D9-4164-BF33-42BBFA19AED4}.Release|x64.ActiveCfg = Release|x64 + {F27914B8-F3D9-4164-BF33-42BBFA19AED4}.Release|x64.Build.0 = Release|x64 + {C0748EAB-F425-488A-9F39-77D5DE2DD251}.Debug|Win32.ActiveCfg = Debug|Win32 + {C0748EAB-F425-488A-9F39-77D5DE2DD251}.Debug|Win32.Build.0 = Debug|Win32 + {C0748EAB-F425-488A-9F39-77D5DE2DD251}.Release|Win32.ActiveCfg = Release|Win32 + {C0748EAB-F425-488A-9F39-77D5DE2DD251}.Release|Win32.Build.0 = Release|Win32 + {C0748EAB-F425-488A-9F39-77D5DE2DD251}.Debug|x64.ActiveCfg = Debug|x64 + {C0748EAB-F425-488A-9F39-77D5DE2DD251}.Debug|x64.Build.0 = Debug|x64 + {C0748EAB-F425-488A-9F39-77D5DE2DD251}.Release|x64.ActiveCfg = Release|x64 + {C0748EAB-F425-488A-9F39-77D5DE2DD251}.Release|x64.Build.0 = Release|x64 + {34A953AA-28CB-472E-B438-1BE26FDF1D54}.Debug|Win32.ActiveCfg = Debug|Win32 + {34A953AA-28CB-472E-B438-1BE26FDF1D54}.Debug|Win32.Build.0 = Debug|Win32 + {34A953AA-28CB-472E-B438-1BE26FDF1D54}.Release|Win32.ActiveCfg = Release|Win32 + {34A953AA-28CB-472E-B438-1BE26FDF1D54}.Release|Win32.Build.0 = Release|Win32 + {34A953AA-28CB-472E-B438-1BE26FDF1D54}.Debug|x64.ActiveCfg = Debug|x64 + {34A953AA-28CB-472E-B438-1BE26FDF1D54}.Debug|x64.Build.0 = Debug|x64 + {34A953AA-28CB-472E-B438-1BE26FDF1D54}.Release|x64.ActiveCfg = Release|x64 + {34A953AA-28CB-472E-B438-1BE26FDF1D54}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {D8336C3A-8FB7-46CA-82A9-209B7EB4339D} = {1D62C0DD-3166-4212-A396-0C32A8133256} - {6EE064DA-28D2-478C-BC25-FD04382FAD44} = {247D6A97-6A59-4E29-BA6F-B20EEE3AE3B6} - {62009D19-D80B-46B8-8360-D84AA57DD567} = {8E714E74-8167-4A2E-B5D9-97506C801DB0} - {1D62C0DD-3166-4212-A396-0C32A8133256} = {464025BB-16D1-4B86-ACF9-3F9EF08B865E} - {247D6A97-6A59-4E29-BA6F-B20EEE3AE3B6} = {464025BB-16D1-4B86-ACF9-3F9EF08B865E} + {F27914B8-F3D9-4164-BF33-42BBFA19AED4} = {09F8A71E-BD45-42F5-8CB5-82F137773350} + {C0748EAB-F425-488A-9F39-77D5DE2DD251} = {7B0AA49C-0A8C-4EED-8ACE-1A80EC2E5AEB} + {34A953AA-28CB-472E-B438-1BE26FDF1D54} = {20D7328F-9929-4D3A-BC1D-08E2442A929D} + {09F8A71E-BD45-42F5-8CB5-82F137773350} = {40B41B7C-63E0-4BEC-9BF6-2AE9002E0670} + {7B0AA49C-0A8C-4EED-8ACE-1A80EC2E5AEB} = {40B41B7C-63E0-4BEC-9BF6-2AE9002E0670} EndGlobalSection EndGlobal diff --git a/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf b/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf Binary files differindex 985a651a..92f30001 100644 --- a/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf +++ b/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf diff --git a/network/ndis/ndisprot/6x/sys/60/ndisprot60.vcxproj b/network/ndis/ndisprot/6x/sys/60/ndisprot60.vcxproj index de9c1877..0f930a7b 100644 --- a/network/ndis/ndisprot/6x/sys/60/ndisprot60.vcxproj +++ b/network/ndis/ndisprot/6x/sys/60/ndisprot60.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{D8336C3A-8FB7-46CA-82A9-209B7EB4339D}</ProjectGuid> + <ProjectGuid>{F27914B8-F3D9-4164-BF33-42BBFA19AED4}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{D4489723-0609-411D-B3A9-258AF098B21A}</SampleGuid> + <SampleGuid>{2D8FA4FC-0D81-4E0A-B63E-A6622384ED94}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/ndisprot/6x/sys/60/ndisprot60.vcxproj.Filters b/network/ndis/ndisprot/6x/sys/60/ndisprot60.vcxproj.Filters index 7e2f4a07..fb3baf30 100644 --- a/network/ndis/ndisprot/6x/sys/60/ndisprot60.vcxproj.Filters +++ b/network/ndis/ndisprot/6x/sys/60/ndisprot60.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{26EA05C5-4E1D-434E-B936-33352970A161}</UniqueIdentifier> + <UniqueIdentifier>{9D351BB6-73CE-4A43-B46D-1AB2965DAF8D}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{F4571230-8339-4A49-AD38-78962F103829}</UniqueIdentifier> + <UniqueIdentifier>{AF2F3419-9435-4B22-84EB-31847FCD1CAF}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{DFDB6D3D-533A-4562-BD43-338AB736860B}</UniqueIdentifier> + <UniqueIdentifier>{370C2F13-6981-4E4B-B92F-7A384F46242A}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{0C4980F7-5BA2-400E-A1D2-29520A8F0761}</UniqueIdentifier> + <UniqueIdentifier>{777425E1-9B05-4BA9-8CB5-3324B6FEA824}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf b/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf Binary files differindex 6c152a02..f992ad08 100644 --- a/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf +++ b/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf diff --git a/network/ndis/ndisprot/6x/sys/630/ndisprot630.vcxproj b/network/ndis/ndisprot/6x/sys/630/ndisprot630.vcxproj index 676449b8..d71b2b54 100644 --- a/network/ndis/ndisprot/6x/sys/630/ndisprot630.vcxproj +++ b/network/ndis/ndisprot/6x/sys/630/ndisprot630.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{6EE064DA-28D2-478C-BC25-FD04382FAD44}</ProjectGuid> + <ProjectGuid>{C0748EAB-F425-488A-9F39-77D5DE2DD251}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{A72934EE-A162-44C2-9268-572F34455685}</SampleGuid> + <SampleGuid>{7354BBA5-44E7-4346-8B50-AD13E3CACB81}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/ndisprot/6x/sys/630/ndisprot630.vcxproj.Filters b/network/ndis/ndisprot/6x/sys/630/ndisprot630.vcxproj.Filters index 545dfd91..ef0ceb63 100644 --- a/network/ndis/ndisprot/6x/sys/630/ndisprot630.vcxproj.Filters +++ b/network/ndis/ndisprot/6x/sys/630/ndisprot630.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{92710B14-4232-4967-AEA5-6DA05EE52B03}</UniqueIdentifier> + <UniqueIdentifier>{766B6D2A-1481-456F-A4F3-9FAB955141A7}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{4CE674DD-0F36-49B2-AF98-8252D938425C}</UniqueIdentifier> + <UniqueIdentifier>{073C12EF-29DC-44D8-A97B-4E3EB3ABBD30}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{8F3006B3-3A4B-4094-AA85-3461E4C4FEF2}</UniqueIdentifier> + <UniqueIdentifier>{CE79DDD5-05DE-41BB-AF6F-78689FA3C4EC}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{682C4A58-1F91-422F-8E77-84FBAF36215A}</UniqueIdentifier> + <UniqueIdentifier>{2507FC52-16AF-4448-BEBC-046EB69598BE}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/ndisprot/6x/sys/recv.c b/network/ndis/ndisprot/6x/sys/recv.c index 71c867f1..a7291992 100644 --- a/network/ndis/ndisprot/6x/sys/recv.c +++ b/network/ndis/ndisprot/6x/sys/recv.c @@ -81,7 +81,7 @@ Return Value: // // Try to get a virtual address for the MDL. // - if (MmGetSystemAddressForMdlSafe(pIrp->MdlAddress, NormalPagePriority) == NULL) + if (MmGetSystemAddressForMdlSafe(pIrp->MdlAddress, NormalPagePriority | MdlMappingNoExecute) == NULL) { DEBUGP(DL_FATAL, ("Read: MmGetSystemAddr failed for IRP %p, MDL %p\n", pIrp, pIrp->MdlAddress)); @@ -314,7 +314,7 @@ Return Value: // pDst = NULL; - NdisQueryMdl(pIrp->MdlAddress, &pDst, &BytesRemaining, NormalPagePriority); + NdisQueryMdl(pIrp->MdlAddress, &pDst, &BytesRemaining, NormalPagePriority | MdlMappingNoExecute); NPROT_ASSERT(pDst != NULL); // since it was already mapped _Analysis_assume_(pDst != NULL); @@ -333,7 +333,7 @@ Return Value: while (BytesRemaining && (pMdl != NULL) && SrcTotalLength) { pSrc = NULL; - NdisQueryMdl(pMdl, &pSrc, &BytesAvailable, NormalPagePriority); + NdisQueryMdl(pMdl, &pSrc, &BytesAvailable, NormalPagePriority | MdlMappingNoExecute); if (pSrc == NULL) { @@ -489,7 +489,7 @@ Return Value: pMdl, &pEthHeader, &BufferLength, - NormalPagePriority); + NormalPagePriority | MdlMappingNoExecute); } if (pEthHeader == NULL) @@ -938,7 +938,7 @@ Return Value: pMdl, (PVOID *)&pCopyData, &BufferLength, - NormalPagePriority); + NormalPagePriority | MdlMappingNoExecute); NPROT_ASSERT(BufferLength == TotalLength); diff --git a/network/ndis/ndisprot/6x/sys/send.c b/network/ndis/ndisprot/6x/sys/send.c index b2be7300..73cc282b 100644 --- a/network/ndis/ndisprot/6x/sys/send.c +++ b/network/ndis/ndisprot/6x/sys/send.c @@ -88,7 +88,7 @@ Return Value: // pEthHeader = NULL; - NdisQueryMdl(pIrp->MdlAddress, &pEthHeader, &DataLength, NormalPagePriority); + NdisQueryMdl(pIrp->MdlAddress, &pEthHeader, &DataLength, NormalPagePriority | MdlMappingNoExecute); if (pEthHeader == NULL) { @@ -222,7 +222,7 @@ Return Value: { PUCHAR pData; - pData = MmGetSystemAddressForMdlSafe(pMdl, NormalPagePriority); + pData = MmGetSystemAddressForMdlSafe(pMdl, NormalPagePriority | MdlMappingNoExecute); NPROT_ASSERT(pEthHeader == pData); DEBUGP(DL_VERY_LOUD, diff --git a/network/ndis/ndisprot/6x/test/prottest.vcxproj b/network/ndis/ndisprot/6x/test/prottest.vcxproj index a0c8b84a..9ef15c25 100644 --- a/network/ndis/ndisprot/6x/test/prottest.vcxproj +++ b/network/ndis/ndisprot/6x/test/prottest.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{62009D19-D80B-46B8-8360-D84AA57DD567}</ProjectGuid> + <ProjectGuid>{34A953AA-28CB-472E-B438-1BE26FDF1D54}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{97FEB721-B7B8-47E2-8626-1014E491740F}</SampleGuid> + <SampleGuid>{80BF7199-3D05-47CD-85FC-CEE847224F3E}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/ndisprot/6x/test/prottest.vcxproj.Filters b/network/ndis/ndisprot/6x/test/prottest.vcxproj.Filters index b234c0e7..d227a297 100644 --- a/network/ndis/ndisprot/6x/test/prottest.vcxproj.Filters +++ b/network/ndis/ndisprot/6x/test/prottest.vcxproj.Filters @@ -3,15 +3,15 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{850BEAB1-E8E0-47E1-8E5A-6658B932B7D8}</UniqueIdentifier> + <UniqueIdentifier>{A1FD5B83-AA65-4E6F-8F3F-B73275FC0315}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{F8344599-BDE9-4143-A6B1-F26CC295C368}</UniqueIdentifier> + <UniqueIdentifier>{EF5DC367-401C-48DB-8A87-F303D8ABD840}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{9473E458-864C-4149-B1B7-95A8BFEF1BCE}</UniqueIdentifier> + <UniqueIdentifier>{9F746E51-A77B-465E-B14B-2C6A02DD8C3F}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/ndisprot_kmdf/60/ndisprot.inx b/network/ndis/ndisprot_kmdf/60/ndisprot.inx Binary files differindex c45f23e5..a25033cf 100644 --- a/network/ndis/ndisprot_kmdf/60/ndisprot.inx +++ b/network/ndis/ndisprot_kmdf/60/ndisprot.inx diff --git a/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj b/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj index 0dfe75d5..4aac032f 100644 --- a/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj +++ b/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj @@ -19,14 +19,14 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{85BE7B07-69F5-4BC1-A755-483A9051AAC4}</ProjectGuid> + <ProjectGuid>{D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR> <SupportsPackaging>false</SupportsPackaging> <RequiresPackageProject>true</RequiresPackageProject> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{5FFC7B32-58A8-4689-BB54-F9599B4ADBA4}</SampleGuid> + <SampleGuid>{BDE78A2F-D982-42E4-9E9E-95DA20A2BBAA}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj.Filters b/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj.Filters index f7dd5657..fceec83e 100644 --- a/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj.Filters +++ b/network/ndis/ndisprot_kmdf/60/nprt6wdf.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{E4D652D6-CACA-4396-AD3B-663DF32E592D}</UniqueIdentifier> + <UniqueIdentifier>{80A01E55-3191-4D6B-998C-AFB39E2FDC54}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{6E73277A-3F21-4FCF-A20D-60158B809E3F}</UniqueIdentifier> + <UniqueIdentifier>{64859B48-AA38-4234-94F3-B8BC6B373604}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{054D1114-7FD2-462E-A612-2ED4BC48F6EF}</UniqueIdentifier> + <UniqueIdentifier>{AA5FE339-6D5C-4A03-B8FF-06288B3110A4}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{3B2480E6-3700-4AEB-A0B5-7D3C29E29B1B}</UniqueIdentifier> + <UniqueIdentifier>{4031EF35-F0B5-47A2-9817-91B0AAB10A76}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/ndisprot_kmdf/60/recv.c b/network/ndis/ndisprot_kmdf/60/recv.c index 75b4da4d..742fed44 100644 --- a/network/ndis/ndisprot_kmdf/60/recv.c +++ b/network/ndis/ndisprot_kmdf/60/recv.c @@ -194,7 +194,7 @@ Return Value: break; } - pDst = MmGetSystemAddressForMdlSafe(pMdl, NormalPagePriority); + pDst = MmGetSystemAddressForMdlSafe(pMdl, NormalPagePriority | MdlMappingNoExecute); if (pDst == NULL) { DEBUGP(DL_FATAL, ("Read: MmGetSystemAddr failed for Request %p, MDL %p\n", @@ -235,7 +235,7 @@ Return Value: while (BytesRemaining && (pMdl != NULL)) { pSrc = NULL; - NdisQueryMdl(pMdl, &pSrc, &BytesAvailable, NormalPagePriority); + NdisQueryMdl(pMdl, &pSrc, &BytesAvailable, NormalPagePriority | MdlMappingNoExecute); if (pSrc == NULL) { @@ -380,7 +380,7 @@ Return Value: pMdl, &pEthHeader, &BufferLength, - NormalPagePriority); + NormalPagePriority | MdlMappingNoExecute); } if (pEthHeader == NULL) @@ -803,7 +803,7 @@ Return Value: pMdl, (PVOID *)&pCopyData, &BufferLength, - NormalPagePriority); + NormalPagePriority | MdlMappingNoExecute); NPROT_ASSERT(BufferLength == TotalLength); @@ -980,7 +980,7 @@ Caller IRQL: Must be running at IRQL <= DISPATCH_LEVEL. SourceByteCount = BytesRemaining; } - SourceVa = MmGetSystemAddressForMdlSafe(SourceMdl, LowPagePriority); + SourceVa = MmGetSystemAddressForMdlSafe(SourceMdl, LowPagePriority | MdlMappingNoExecute); if (SourceVa == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -994,7 +994,7 @@ Caller IRQL: Must be running at IRQL <= DISPATCH_LEVEL. TargetByteCount = MmGetMdlByteCount(TargetMdl) - TargetOffset; - TargetVa = MmGetSystemAddressForMdlSafe(TargetMdl, LowPagePriority); + TargetVa = MmGetSystemAddressForMdlSafe(TargetMdl, LowPagePriority | MdlMappingNoExecute); if (TargetVa == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -1044,7 +1044,7 @@ Caller IRQL: Must be running at IRQL <= DISPATCH_LEVEL. } while(TargetByteCount == 0); TargetVa = MmGetSystemAddressForMdlSafe(TargetMdl, - LowPagePriority); + LowPagePriority | MdlMappingNoExecute); if (TargetVa == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -1079,7 +1079,7 @@ Caller IRQL: Must be running at IRQL <= DISPATCH_LEVEL. SourceByteCount = BytesRemaining; } SourceVa = MmGetSystemAddressForMdlSafe(SourceMdl, - LowPagePriority); + LowPagePriority | MdlMappingNoExecute); if (SourceVa == NULL) { return STATUS_INSUFFICIENT_RESOURCES; diff --git a/network/ndis/ndisprot_kmdf/60/send.c b/network/ndis/ndisprot_kmdf/60/send.c index 561c49f0..5c009939 100644 --- a/network/ndis/ndisprot_kmdf/60/send.c +++ b/network/ndis/ndisprot_kmdf/60/send.c @@ -104,7 +104,7 @@ Return Value: // // Try to get a virtual address for the MDL. // - pEthHeader = MmGetSystemAddressForMdlSafe(pMdl, NormalPagePriority); + pEthHeader = MmGetSystemAddressForMdlSafe(pMdl, NormalPagePriority | MdlMappingNoExecute); if (pEthHeader == NULL) { diff --git a/network/ndis/ndisprot_kmdf/Package/package.VcxProj b/network/ndis/ndisprot_kmdf/Package/package.VcxProj index 4f36efdb..44cbc9bb 100644 --- a/network/ndis/ndisprot_kmdf/Package/package.VcxProj +++ b/network/ndis/ndisprot_kmdf/Package/package.VcxProj @@ -20,10 +20,10 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="..\60\nprt6wdf.vcxproj"> - <Project>{85BE7B07-69F5-4BC1-A755-483A9051AAC4}</Project> + <Project>{D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}</Project> </ProjectReference> <ProjectReference Include="..\notifyob\ProtNotify.vcxproj"> - <Project>{9B2221A3-32D0-4769-8092-4F9F98043A63}</Project> + <Project>{E92C4A1E-396E-4CAF-A5DB-44901F07C515}</Project> </ProjectReference> </ItemGroup> <PropertyGroup Label="PropertySheets"> @@ -35,8 +35,8 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Globals"> - <ProjectGuid>{613FEF0A-2AE9-46B7-994C-69D95973B366}</ProjectGuid> - <SampleGuid>{86285A85-2FEA-4AEF-8233-356041B6282B}</SampleGuid> + <ProjectGuid>{346D9284-B69E-40A5-9584-084D7BE578B2}</ProjectGuid> + <SampleGuid>{9B10F9EB-6405-4756-A5C7-FB9F5A528BE5}</SampleGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> diff --git a/network/ndis/ndisprot_kmdf/Package/package.VcxProj.Filters b/network/ndis/ndisprot_kmdf/Package/package.VcxProj.Filters index 23795007..4e8f5d9a 100644 --- a/network/ndis/ndisprot_kmdf/Package/package.VcxProj.Filters +++ b/network/ndis/ndisprot_kmdf/Package/package.VcxProj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{89CB9D79-7DA6-49D6-806B-B901625DE978}</UniqueIdentifier> + <UniqueIdentifier>{D2EB0C78-1A46-4820-8C97-48C2ACDE1DB7}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{55E7969D-0357-4614-BFC9-8A045E04B4E1}</UniqueIdentifier> + <UniqueIdentifier>{18454B81-D5E4-41B2-A8F6-981ADC6B76F3}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{A4F0352B-5991-430C-815D-30F30B63E33B}</UniqueIdentifier> + <UniqueIdentifier>{B5D0C371-0619-4231-9302-DAE245241204}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{593070BD-C864-4041-9213-2688C7CC3A7D}</UniqueIdentifier> + <UniqueIdentifier>{F7B4D404-2912-43E3-BB9E-48B914053848}</UniqueIdentifier> </Filter> </ItemGroup> </Project>
\ No newline at end of file diff --git a/network/ndis/ndisprot_kmdf/ndisprot_kmdf.sln b/network/ndis/ndisprot_kmdf/ndisprot_kmdf.sln index 15a50f20..e8eb8891 100644 --- a/network/ndis/ndisprot_kmdf/ndisprot_kmdf.sln +++ b/network/ndis/ndisprot_kmdf/ndisprot_kmdf.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{FE73654B-E5D8-428F-967F-B9396A8B0DA3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{1349FD28-83C5-4368-A01F-3460B3D43BE5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notifyob", "Notifyob", "{DB46D8C9-4FFA-41D6-93A9-7315ADD0879A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notifyob", "Notifyob", "{8B63109F-4592-442B-95FB-56D94EA535D4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60", "60", "{AA65D22A-3101-4BE1-9F7B-1835DEA3D22A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60", "60", "{F9B84962-B7B2-4592-9AFC-645D1EEEACA8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{613FEF0A-2AE9-46B7-994C-69D95973B366}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{346D9284-B69E-40A5-9584-084D7BE578B2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtNotify", "notifyob\ProtNotify.vcxproj", "{9B2221A3-32D0-4769-8092-4F9F98043A63}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtNotify", "notifyob\ProtNotify.vcxproj", "{E92C4A1E-396E-4CAF-A5DB-44901F07C515}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nprt6wdf", "60\nprt6wdf.vcxproj", "{85BE7B07-69F5-4BC1-A755-483A9051AAC4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nprt6wdf", "60\nprt6wdf.vcxproj", "{D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,37 +23,37 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {613FEF0A-2AE9-46B7-994C-69D95973B366}.Debug|Win32.ActiveCfg = Debug|Win32 - {613FEF0A-2AE9-46B7-994C-69D95973B366}.Debug|Win32.Build.0 = Debug|Win32 - {613FEF0A-2AE9-46B7-994C-69D95973B366}.Release|Win32.ActiveCfg = Release|Win32 - {613FEF0A-2AE9-46B7-994C-69D95973B366}.Release|Win32.Build.0 = Release|Win32 - {613FEF0A-2AE9-46B7-994C-69D95973B366}.Debug|x64.ActiveCfg = Debug|x64 - {613FEF0A-2AE9-46B7-994C-69D95973B366}.Debug|x64.Build.0 = Debug|x64 - {613FEF0A-2AE9-46B7-994C-69D95973B366}.Release|x64.ActiveCfg = Release|x64 - {613FEF0A-2AE9-46B7-994C-69D95973B366}.Release|x64.Build.0 = Release|x64 - {9B2221A3-32D0-4769-8092-4F9F98043A63}.Debug|Win32.ActiveCfg = Debug|Win32 - {9B2221A3-32D0-4769-8092-4F9F98043A63}.Debug|Win32.Build.0 = Debug|Win32 - {9B2221A3-32D0-4769-8092-4F9F98043A63}.Release|Win32.ActiveCfg = Release|Win32 - {9B2221A3-32D0-4769-8092-4F9F98043A63}.Release|Win32.Build.0 = Release|Win32 - {9B2221A3-32D0-4769-8092-4F9F98043A63}.Debug|x64.ActiveCfg = Debug|x64 - {9B2221A3-32D0-4769-8092-4F9F98043A63}.Debug|x64.Build.0 = Debug|x64 - {9B2221A3-32D0-4769-8092-4F9F98043A63}.Release|x64.ActiveCfg = Release|x64 - {9B2221A3-32D0-4769-8092-4F9F98043A63}.Release|x64.Build.0 = Release|x64 - {85BE7B07-69F5-4BC1-A755-483A9051AAC4}.Debug|Win32.ActiveCfg = Debug|Win32 - {85BE7B07-69F5-4BC1-A755-483A9051AAC4}.Debug|Win32.Build.0 = Debug|Win32 - {85BE7B07-69F5-4BC1-A755-483A9051AAC4}.Release|Win32.ActiveCfg = Release|Win32 - {85BE7B07-69F5-4BC1-A755-483A9051AAC4}.Release|Win32.Build.0 = Release|Win32 - {85BE7B07-69F5-4BC1-A755-483A9051AAC4}.Debug|x64.ActiveCfg = Debug|x64 - {85BE7B07-69F5-4BC1-A755-483A9051AAC4}.Debug|x64.Build.0 = Debug|x64 - {85BE7B07-69F5-4BC1-A755-483A9051AAC4}.Release|x64.ActiveCfg = Release|x64 - {85BE7B07-69F5-4BC1-A755-483A9051AAC4}.Release|x64.Build.0 = Release|x64 + {346D9284-B69E-40A5-9584-084D7BE578B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {346D9284-B69E-40A5-9584-084D7BE578B2}.Debug|Win32.Build.0 = Debug|Win32 + {346D9284-B69E-40A5-9584-084D7BE578B2}.Release|Win32.ActiveCfg = Release|Win32 + {346D9284-B69E-40A5-9584-084D7BE578B2}.Release|Win32.Build.0 = Release|Win32 + {346D9284-B69E-40A5-9584-084D7BE578B2}.Debug|x64.ActiveCfg = Debug|x64 + {346D9284-B69E-40A5-9584-084D7BE578B2}.Debug|x64.Build.0 = Debug|x64 + {346D9284-B69E-40A5-9584-084D7BE578B2}.Release|x64.ActiveCfg = Release|x64 + {346D9284-B69E-40A5-9584-084D7BE578B2}.Release|x64.Build.0 = Release|x64 + {E92C4A1E-396E-4CAF-A5DB-44901F07C515}.Debug|Win32.ActiveCfg = Debug|Win32 + {E92C4A1E-396E-4CAF-A5DB-44901F07C515}.Debug|Win32.Build.0 = Debug|Win32 + {E92C4A1E-396E-4CAF-A5DB-44901F07C515}.Release|Win32.ActiveCfg = Release|Win32 + {E92C4A1E-396E-4CAF-A5DB-44901F07C515}.Release|Win32.Build.0 = Release|Win32 + {E92C4A1E-396E-4CAF-A5DB-44901F07C515}.Debug|x64.ActiveCfg = Debug|x64 + {E92C4A1E-396E-4CAF-A5DB-44901F07C515}.Debug|x64.Build.0 = Debug|x64 + {E92C4A1E-396E-4CAF-A5DB-44901F07C515}.Release|x64.ActiveCfg = Release|x64 + {E92C4A1E-396E-4CAF-A5DB-44901F07C515}.Release|x64.Build.0 = Release|x64 + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}.Debug|Win32.ActiveCfg = Debug|Win32 + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}.Debug|Win32.Build.0 = Debug|Win32 + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}.Release|Win32.ActiveCfg = Release|Win32 + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}.Release|Win32.Build.0 = Release|Win32 + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}.Debug|x64.ActiveCfg = Debug|x64 + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}.Debug|x64.Build.0 = Debug|x64 + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}.Release|x64.ActiveCfg = Release|x64 + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {613FEF0A-2AE9-46B7-994C-69D95973B366} = {FE73654B-E5D8-428F-967F-B9396A8B0DA3} - {9B2221A3-32D0-4769-8092-4F9F98043A63} = {DB46D8C9-4FFA-41D6-93A9-7315ADD0879A} - {85BE7B07-69F5-4BC1-A755-483A9051AAC4} = {AA65D22A-3101-4BE1-9F7B-1835DEA3D22A} + {346D9284-B69E-40A5-9584-084D7BE578B2} = {1349FD28-83C5-4368-A01F-3460B3D43BE5} + {E92C4A1E-396E-4CAF-A5DB-44901F07C515} = {8B63109F-4592-442B-95FB-56D94EA535D4} + {D01AA8E0-4817-4C0F-BDD7-B367F1A4B680} = {F9B84962-B7B2-4592-9AFC-645D1EEEACA8} EndGlobalSection EndGlobal diff --git a/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj b/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj index eede7f0c..da20b3b2 100644 --- a/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj +++ b/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj @@ -19,7 +19,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{9B2221A3-32D0-4769-8092-4F9F98043A63}</ProjectGuid> + <ProjectGuid>{E92C4A1E-396E-4CAF-A5DB-44901F07C515}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR> <KMDF_VERSION_MINOR>11</KMDF_VERSION_MINOR> @@ -27,7 +27,7 @@ <RequiresPackageProject>true</RequiresPackageProject> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{3264ACE7-D19C-4948-B829-8E1BE32CC07D}</SampleGuid> + <SampleGuid>{27DF4F3B-383E-497C-8DBB-DFA4C1A27708}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj.Filters b/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj.Filters index 66da4399..2b0e587a 100644 --- a/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj.Filters +++ b/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj.Filters @@ -3,15 +3,15 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{46131C3C-10A8-41E3-9DA7-8E3B89E16D30}</UniqueIdentifier> + <UniqueIdentifier>{6E5EE8C9-ED2A-40AD-8E8A-375EBC7D128E}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{00C80488-71A9-4598-BCF9-717F096DF9B1}</UniqueIdentifier> + <UniqueIdentifier>{4D844843-A153-45F4-B76F-2BBBD92A56C8}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{2DF3CEF8-49DE-4280-A200-9E821B9D3C04}</UniqueIdentifier> + <UniqueIdentifier>{E70D55C3-EC56-4430-97F2-4899522099D1}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/netvmini/6x/60/netvmini60.vcxproj b/network/ndis/netvmini/6x/60/netvmini60.vcxproj index d278b934..0e361bda 100644 --- a/network/ndis/netvmini/6x/60/netvmini60.vcxproj +++ b/network/ndis/netvmini/6x/60/netvmini60.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{B141DA60-040A-41CF-8D57-477AA9ABB743}</ProjectGuid> + <ProjectGuid>{50458BE9-A423-44C1-AF44-21D4B5233063}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{F6634E5E-8F90-40D9-BE58-42CF856B00D2}</SampleGuid> + <SampleGuid>{68DE2BFB-DBF2-4102-B6D9-5C3D45F287A0}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/netvmini/6x/60/netvmini60.vcxproj.Filters b/network/ndis/netvmini/6x/60/netvmini60.vcxproj.Filters index 68dd2474..a48fa573 100644 --- a/network/ndis/netvmini/6x/60/netvmini60.vcxproj.Filters +++ b/network/ndis/netvmini/6x/60/netvmini60.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{1FAC931A-0EDD-4CD0-9017-5A2412CE9732}</UniqueIdentifier> + <UniqueIdentifier>{56F9A5EA-1486-4EE7-8BA0-B1BF57D0E43C}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{2B2AAD08-E00A-4ED1-BBD5-77F9535D796D}</UniqueIdentifier> + <UniqueIdentifier>{CD736472-4C15-48A4-AA49-E7504430AB74}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{A563DE90-B977-4364-BF64-6CAC13B90435}</UniqueIdentifier> + <UniqueIdentifier>{81231740-0300-4CC2-8D01-AA32FB32CFA6}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{36A97725-AE42-4EBD-8FEB-1F91A7030AF2}</UniqueIdentifier> + <UniqueIdentifier>{B76F6C65-12C8-4CA2-9BFE-4EE31CADE60D}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/netvmini/6x/620/netvmini620.vcxproj b/network/ndis/netvmini/6x/620/netvmini620.vcxproj index 0d6830d4..088ba237 100644 --- a/network/ndis/netvmini/6x/620/netvmini620.vcxproj +++ b/network/ndis/netvmini/6x/620/netvmini620.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{F6C9791E-8975-472B-9851-63C91C220C77}</ProjectGuid> + <ProjectGuid>{062B87F8-6021-4BE2-B677-3AEF2456CBA0}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{380FA876-25EB-43FF-97D9-BDA9335C398D}</SampleGuid> + <SampleGuid>{A9AA92D6-CEFF-4533-A39F-156429EEE805}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/netvmini/6x/620/netvmini620.vcxproj.Filters b/network/ndis/netvmini/6x/620/netvmini620.vcxproj.Filters index a6dec852..eb65f843 100644 --- a/network/ndis/netvmini/6x/620/netvmini620.vcxproj.Filters +++ b/network/ndis/netvmini/6x/620/netvmini620.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{FBACAA72-1D30-4675-B421-2DA331729033}</UniqueIdentifier> + <UniqueIdentifier>{1DEEE801-DDA1-46A7-AA42-2C58C7E0BBDD}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{264EB6DE-5BE0-4C2C-A950-150060D39476}</UniqueIdentifier> + <UniqueIdentifier>{F09FEAD2-319C-4CA0-8884-AE3AD0C87A7D}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{3F3AB143-503A-4CA4-8F97-49EF709CC3EC}</UniqueIdentifier> + <UniqueIdentifier>{0343A7AF-6A54-41DE-B2D4-BC7D0FA959B4}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{BEB3FA42-4236-45C6-A2F9-A5DD3E2C283B}</UniqueIdentifier> + <UniqueIdentifier>{D8B6A86B-A984-4AAC-8E74-5D2ECD8797B4}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/netvmini/6x/630/netvmini630.vcxproj b/network/ndis/netvmini/6x/630/netvmini630.vcxproj index 96a8175b..a5ae87e4 100644 --- a/network/ndis/netvmini/6x/630/netvmini630.vcxproj +++ b/network/ndis/netvmini/6x/630/netvmini630.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{CB768EFE-18C4-4621-BCD2-A08AD88E782E}</ProjectGuid> + <ProjectGuid>{7B9C33BA-F817-42B9-A355-9E54854CE9D6}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{0DDF32DB-1657-4CE9-9F4A-DABA52BBDDE5}</SampleGuid> + <SampleGuid>{173BE266-31F2-4D74-A9C1-35B20D4DD5EA}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/network/ndis/netvmini/6x/630/netvmini630.vcxproj.Filters b/network/ndis/netvmini/6x/630/netvmini630.vcxproj.Filters index 57acadcd..73baeda8 100644 --- a/network/ndis/netvmini/6x/630/netvmini630.vcxproj.Filters +++ b/network/ndis/netvmini/6x/630/netvmini630.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{CE65B986-17A1-4A63-8E68-A81A032C10DE}</UniqueIdentifier> + <UniqueIdentifier>{1FEAFB34-8DD3-4B56-A9A1-F6572B7E94F0}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{93F7C1D6-DA0E-4F71-A7FB-A13F40A9F36D}</UniqueIdentifier> + <UniqueIdentifier>{4E98F484-F310-4E1A-A097-D7ADBAE1351F}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{769948AE-BBF6-4212-AB7B-EBE9A721768B}</UniqueIdentifier> + <UniqueIdentifier>{D8093E47-6AB1-4358-AC7C-7ACE55606993}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{1E0F6197-640A-42EE-8B60-19F429CF8546}</UniqueIdentifier> + <UniqueIdentifier>{7E4706EB-3B87-4AB9-BA5C-93CC3E3B78CA}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/network/ndis/netvmini/6x/mphal.c b/network/ndis/netvmini/6x/mphal.c index c7747319..e363f613 100644 --- a/network/ndis/netvmini/6x/mphal.c +++ b/network/ndis/netvmini/6x/mphal.c @@ -499,7 +499,7 @@ Notes: // Map MDL memory to System Address Space. LowPagePriority means mapping may fail if // system is low on memory resources. // - PUCHAR SrcMemory = MmGetSystemAddressForMdlSafe(CurrentMdl, LowPagePriority); + PUCHAR SrcMemory = MmGetSystemAddressForMdlSafe(CurrentMdl, LowPagePriority | MdlMappingNoExecute); ULONG Length = MmGetMdlByteCount(CurrentMdl); if (!SrcMemory) { diff --git a/network/ndis/netvmini/6x/netvmini.sln b/network/ndis/netvmini/6x/netvmini.sln index c9f7b86e..d42e00a0 100644 --- a/network/ndis/netvmini/6x/netvmini.sln +++ b/network/ndis/netvmini/6x/netvmini.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60", "60", "{946F3B99-3F33-4464-B3A6-588ABFD005AA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60", "60", "{0D16B31B-2170-40BA-8850-F16E85EE02F0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "620", "620", "{64A56FB2-256D-4064-957E-D65A8503EF37}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "620", "620", "{60E2C616-EC5B-4B24-ADDD-1BE70657EDEC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "630", "630", "{1BBB3B2F-E670-4DED-B558-FADB5856C2DC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "630", "630", "{C6046890-63CF-4299-B25C-6C97B4ED890A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netvmini60", "60\netvmini60.vcxproj", "{B141DA60-040A-41CF-8D57-477AA9ABB743}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netvmini60", "60\netvmini60.vcxproj", "{50458BE9-A423-44C1-AF44-21D4B5233063}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netvmini620", "620\netvmini620.vcxproj", "{F6C9791E-8975-472B-9851-63C91C220C77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netvmini620", "620\netvmini620.vcxproj", "{062B87F8-6021-4BE2-B677-3AEF2456CBA0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netvmini630", "630\netvmini630.vcxproj", "{CB768EFE-18C4-4621-BCD2-A08AD88E782E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netvmini630", "630\netvmini630.vcxproj", "{7B9C33BA-F817-42B9-A355-9E54854CE9D6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,37 +23,37 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B141DA60-040A-41CF-8D57-477AA9ABB743}.Debug|Win32.ActiveCfg = Debug|Win32 - {B141DA60-040A-41CF-8D57-477AA9ABB743}.Debug|Win32.Build.0 = Debug|Win32 - {B141DA60-040A-41CF-8D57-477AA9ABB743}.Release|Win32.ActiveCfg = Release|Win32 - {B141DA60-040A-41CF-8D57-477AA9ABB743}.Release|Win32.Build.0 = Release|Win32 - {B141DA60-040A-41CF-8D57-477AA9ABB743}.Debug|x64.ActiveCfg = Debug|x64 - {B141DA60-040A-41CF-8D57-477AA9ABB743}.Debug|x64.Build.0 = Debug|x64 - {B141DA60-040A-41CF-8D57-477AA9ABB743}.Release|x64.ActiveCfg = Release|x64 - {B141DA60-040A-41CF-8D57-477AA9ABB743}.Release|x64.Build.0 = Release|x64 - {F6C9791E-8975-472B-9851-63C91C220C77}.Debug|Win32.ActiveCfg = Debug|Win32 - {F6C9791E-8975-472B-9851-63C91C220C77}.Debug|Win32.Build.0 = Debug|Win32 - {F6C9791E-8975-472B-9851-63C91C220C77}.Release|Win32.ActiveCfg = Release|Win32 - {F6C9791E-8975-472B-9851-63C91C220C77}.Release|Win32.Build.0 = Release|Win32 - {F6C9791E-8975-472B-9851-63C91C220C77}.Debug|x64.ActiveCfg = Debug|x64 - {F6C9791E-8975-472B-9851-63C91C220C77}.Debug|x64.Build.0 = Debug|x64 - {F6C9791E-8975-472B-9851-63C91C220C77}.Release|x64.ActiveCfg = Release|x64 - {F6C9791E-8975-472B-9851-63C91C220C77}.Release|x64.Build.0 = Release|x64 - {CB768EFE-18C4-4621-BCD2-A08AD88E782E}.Debug|Win32.ActiveCfg = Debug|Win32 - {CB768EFE-18C4-4621-BCD2-A08AD88E782E}.Debug|Win32.Build.0 = Debug|Win32 - {CB768EFE-18C4-4621-BCD2-A08AD88E782E}.Release|Win32.ActiveCfg = Release|Win32 - {CB768EFE-18C4-4621-BCD2-A08AD88E782E}.Release|Win32.Build.0 = Release|Win32 - {CB768EFE-18C4-4621-BCD2-A08AD88E782E}.Debug|x64.ActiveCfg = Debug|x64 - {CB768EFE-18C4-4621-BCD2-A08AD88E782E}.Debug|x64.Build.0 = Debug|x64 - {CB768EFE-18C4-4621-BCD2-A08AD88E782E}.Release|x64.ActiveCfg = Release|x64 - {CB768EFE-18C4-4621-BCD2-A08AD88E782E}.Release|x64.Build.0 = Release|x64 + {50458BE9-A423-44C1-AF44-21D4B5233063}.Debug|Win32.ActiveCfg = Debug|Win32 + {50458BE9-A423-44C1-AF44-21D4B5233063}.Debug|Win32.Build.0 = Debug|Win32 + {50458BE9-A423-44C1-AF44-21D4B5233063}.Release|Win32.ActiveCfg = Release|Win32 + {50458BE9-A423-44C1-AF44-21D4B5233063}.Release|Win32.Build.0 = Release|Win32 + {50458BE9-A423-44C1-AF44-21D4B5233063}.Debug|x64.ActiveCfg = Debug|x64 + {50458BE9-A423-44C1-AF44-21D4B5233063}.Debug|x64.Build.0 = Debug|x64 + {50458BE9-A423-44C1-AF44-21D4B5233063}.Release|x64.ActiveCfg = Release|x64 + {50458BE9-A423-44C1-AF44-21D4B5233063}.Release|x64.Build.0 = Release|x64 + {062B87F8-6021-4BE2-B677-3AEF2456CBA0}.Debug|Win32.ActiveCfg = Debug|Win32 + {062B87F8-6021-4BE2-B677-3AEF2456CBA0}.Debug|Win32.Build.0 = Debug|Win32 + {062B87F8-6021-4BE2-B677-3AEF2456CBA0}.Release|Win32.ActiveCfg = Release|Win32 + {062B87F8-6021-4BE2-B677-3AEF2456CBA0}.Release|Win32.Build.0 = Release|Win32 + {062B87F8-6021-4BE2-B677-3AEF2456CBA0}.Debug|x64.ActiveCfg = Debug|x64 + {062B87F8-6021-4BE2-B677-3AEF2456CBA0}.Debug|x64.Build.0 = Debug|x64 + {062B87F8-6021-4BE2-B677-3AEF2456CBA0}.Release|x64.ActiveCfg = Release|x64 + {062B87F8-6021-4BE2-B677-3AEF2456CBA0}.Release|x64.Build.0 = Release|x64 + {7B9C33BA-F817-42B9-A355-9E54854CE9D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {7B9C33BA-F817-42B9-A355-9E54854CE9D6}.Debug|Win32.Build.0 = Debug|Win32 + {7B9C33BA-F817-42B9-A355-9E54854CE9D6}.Release|Win32.ActiveCfg = Release|Win32 + {7B9C33BA-F817-42B9-A355-9E54854CE9D6}.Release|Win32.Build.0 = Release|Win32 + {7B9C33BA-F817-42B9-A355-9E54854CE9D6}.Debug|x64.ActiveCfg = Debug|x64 + {7B9C33BA-F817-42B9-A355-9E54854CE9D6}.Debug|x64.Build.0 = Debug|x64 + {7B9C33BA-F817-42B9-A355-9E54854CE9D6}.Release|x64.ActiveCfg = Release|x64 + {7B9C33BA-F817-42B9-A355-9E54854CE9D6}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {B141DA60-040A-41CF-8D57-477AA9ABB743} = {946F3B99-3F33-4464-B3A6-588ABFD005AA} - {F6C9791E-8975-472B-9851-63C91C220C77} = {64A56FB2-256D-4064-957E-D65A8503EF37} - {CB768EFE-18C4-4621-BCD2-A08AD88E782E} = {1BBB3B2F-E670-4DED-B558-FADB5856C2DC} + {50458BE9-A423-44C1-AF44-21D4B5233063} = {0D16B31B-2170-40BA-8850-F16E85EE02F0} + {062B87F8-6021-4BE2-B677-3AEF2456CBA0} = {60E2C616-EC5B-4B24-ADDD-1BE70657EDEC} + {7B9C33BA-F817-42B9-A355-9E54854CE9D6} = {C6046890-63CF-4299-B25C-6C97B4ED890A} EndGlobalSection EndGlobal |