Updated for "Windows 10 Anniversary Update" (Version 1607)

5 files changed, 16 insertions, 19 deletions

diff --git a/smartcrd/pscr/Pscr.vcxproj b/smartcrd/pscr/Pscr.vcxproj
index a2a60ea8..519d508f 100644
--- a/smartcrd/pscr/Pscr.vcxproj
+++ b/smartcrd/pscr/Pscr.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C90317D3-294B-41DD-9E58-EA5C4592B822}</ProjectGuid>
+    <ProjectGuid>{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{4497680E-B15A-4377-9690-CC9B9A94CBBC}</SampleGuid>
+    <SampleGuid>{C4BFAC45-E5B3-45A2-84DC-3157BEA6459E}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/smartcrd/pscr/Pscr.vcxproj.Filters b/smartcrd/pscr/Pscr.vcxproj.Filters
index 1bad5e49..2234e96d 100644
--- a/smartcrd/pscr/Pscr.vcxproj.Filters
+++ b/smartcrd/pscr/Pscr.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>{54D65CE6-224F-4E82-BCA5-3348D0F43339}</UniqueIdentifier>
+      <UniqueIdentifier>{F6DCEA03-7E73-4728-9A36-6F2660A2FDC5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{FB0DF8C2-7B63-4219-B2EF-23A2BA12B7EC}</UniqueIdentifier>
+      <UniqueIdentifier>{FC94F874-585D-4FB1-BBF3-056316743FFD}</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>{9C2A7E2B-9B74-4579-A1D3-5C5B3D397F7E}</UniqueIdentifier>
+      <UniqueIdentifier>{FF14E418-C0F9-4318-9066-63DC787AAA35}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{B796B525-44D3-4260-8C76-705DBADA1043}</UniqueIdentifier>
+      <UniqueIdentifier>{714222A6-ED57-494F-B49C-F0D52484310E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/smartcrd/pscr/pscrnt.c b/smartcrd/pscr/pscrnt.c
index 75d37304..4505035f 100644
--- a/smartcrd/pscr/pscrnt.c
+++ b/smartcrd/pscr/pscrnt.c
@@ -407,7 +407,7 @@ PscrRegisterWithSmcLib(
 
    //   allocate the reader extension
     ReaderExtension = ExAllocatePoolWithTag(
-                                    NonPagedPool,
+                                    NonPagedPoolNx,
                                     sizeof( READER_EXTENSION ),
                                     SMARTCARD_POOL_TAG
                                     );
diff --git a/smartcrd/pscr/pscrrdwr.c b/smartcrd/pscr/pscrrdwr.c
index 82ebb03d..94d5e819 100644
--- a/smartcrd/pscr/pscrrdwr.c
+++ b/smartcrd/pscr/pscrrdwr.c
@@ -40,7 +40,6 @@ Revision History:
 #include <PscrCmd.h>
 #include <PscrRdWr.h>
 
-#pragma optimize( "", off )
 VOID
 PscrFlushInterface( PREADER_EXTENSION ReaderExtension )
 /*++
@@ -504,6 +503,4 @@ Return Value:
     return NTStatus;
 }
 
-#pragma optimize( "", on )
-
 
diff --git a/smartcrd/smartcrd.sln b/smartcrd/smartcrd.sln
index a8cd3b2f..8c403bcf 100644
--- a/smartcrd/smartcrd.sln
+++ b/smartcrd/smartcrd.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}") = "Pscr", "pscr\Pscr.vcxproj", "{C90317D3-294B-41DD-9E58-EA5C4592B822}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pscr", "pscr\Pscr.vcxproj", "{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C90317D3-294B-41DD-9E58-EA5C4592B822}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C90317D3-294B-41DD-9E58-EA5C4592B822}.Debug|Win32.Build.0 = Debug|Win32
-		{C90317D3-294B-41DD-9E58-EA5C4592B822}.Release|Win32.ActiveCfg = Release|Win32
-		{C90317D3-294B-41DD-9E58-EA5C4592B822}.Release|Win32.Build.0 = Release|Win32
-		{C90317D3-294B-41DD-9E58-EA5C4592B822}.Debug|x64.ActiveCfg = Debug|x64
-		{C90317D3-294B-41DD-9E58-EA5C4592B822}.Debug|x64.Build.0 = Debug|x64
-		{C90317D3-294B-41DD-9E58-EA5C4592B822}.Release|x64.ActiveCfg = Release|x64
-		{C90317D3-294B-41DD-9E58-EA5C4592B822}.Release|x64.Build.0 = Release|x64
+		{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}.Debug|Win32.Build.0 = Debug|Win32
+		{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}.Release|Win32.ActiveCfg = Release|Win32
+		{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}.Release|Win32.Build.0 = Release|Win32
+		{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}.Debug|x64.ActiveCfg = Debug|x64
+		{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}.Debug|x64.Build.0 = Debug|x64
+		{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}.Release|x64.ActiveCfg = Release|x64
+		{BD0EF16C-0230-4D98-B6FC-FEAD0FC3398D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE