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

4 files changed, 42 insertions, 12 deletions

diff --git a/storage/iscsi/src/EmptyProject.vcxproj b/storage/iscsi/src/EmptyProject.vcxproj
index 9623b594..21c5ce69 100644
--- a/storage/iscsi/src/EmptyProject.vcxproj
+++ b/storage/iscsi/src/EmptyProject.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{455C49DA-CEA2-4534-BD01-3580A803AE6F}</ProjectGuid>
+    <ProjectGuid>{D522AB21-5E8C-4E3F-9934-AE9C8C23C7E6}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <SupportsPackaging>false</SupportsPackaging>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{DBC645C7-90F6-4E12-9D2A-F5B9CF347789}</SampleGuid>
+    <SampleGuid>{DDD40F41-C9A9-428F-8C00-862850DDBB19}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/storage/iscsi/src/EmptyProject.vcxproj.Filters b/storage/iscsi/src/EmptyProject.vcxproj.Filters
index e26968ac..7d076428 100644
--- a/storage/iscsi/src/EmptyProject.vcxproj.Filters
+++ b/storage/iscsi/src/EmptyProject.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>{924AB849-60C2-446A-918F-F4F4F8DECE00}</UniqueIdentifier>
+      <UniqueIdentifier>{BE829036-D337-411D-A34F-863A98618FCC}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{67F9C43E-310B-4E5D-9F7E-42661F07ABD0}</UniqueIdentifier>
+      <UniqueIdentifier>{1552D96B-99E9-4C33-AFDC-C6EC4B876958}</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>{D255EEDA-7C9B-4D68-8180-B81EE573C108}</UniqueIdentifier>
+      <UniqueIdentifier>{D1E77C47-3EE0-4A0C-BCD1-2834CCFEF43C}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/storage/iscsi/src/client/wmisample.c b/storage/iscsi/src/client/wmisample.c
index aff10be5..7ead7fec 100644
--- a/storage/iscsi/src/client/wmisample.c
+++ b/storage/iscsi/src/client/wmisample.c
@@ -4117,8 +4117,8 @@ Routine Description:
 
                     adapterExtension->InitiatorSecretLen = 0;
 
-                    if (InBufferSize >= FIELD_OFFSET(SetCHAPSharedSecret_IN,
-                                                     SharedSecret)) {
+                    if (InBufferSize >= (ULONG)FIELD_OFFSET(SetCHAPSharedSecret_IN,
+                                                            SharedSecret)) {
 
                         setCHAPSecretIn = (PSetCHAPSharedSecret_IN) Buffer;
 
@@ -4187,8 +4187,8 @@ Routine Description:
 
                     adapterExtension->RadiusSecretLen = 0;
 
-                    if (InBufferSize >= FIELD_OFFSET(SetRADIUSSharedSecret_IN,
-                                                     SharedSecret)) {
+                    if (InBufferSize >= (ULONG)FIELD_OFFSET(SetRADIUSSharedSecret_IN,
+                                                            SharedSecret)) {
 
                         setRADIUSSecretIn = (PSetRADIUSSharedSecret_IN) Buffer;
 
@@ -4321,7 +4321,7 @@ Routine Description:
                     updatedCount = count + 1;
                     size = updatedCount * sizeof(ISCSI_IP_Address);
 
-                    adapterExtension->RadiusServerList = ExAllocatePoolWithTag(NonPagedPool,
+                    adapterExtension->RadiusServerList = ExAllocatePoolWithTag(NonPagedPoolNx,
                                                              size,
                                                              'vrSR');
 
@@ -4446,7 +4446,7 @@ Routine Description:
 
                         if (updatedCount > 0) {
 
-                            adapterExtension->RadiusServerList = ExAllocatePoolWithTag(NonPagedPool,
+                            adapterExtension->RadiusServerList = ExAllocatePoolWithTag(NonPagedPoolNx,
                                                                          size,
                                                                          'vrSR');
 
@@ -6300,7 +6300,7 @@ iSpSetLoadBalancePolicy(
         //
         if (!overFlow) {
 
-            LBPolicy = iSpAllocatePool(NonPagedPool,
+            LBPolicy = iSpAllocatePool(NonPagedPoolNx,
                                        sizeNeeded,
                                        ISCSI_TAG_LB_POLICY);
             if (LBPolicy != NULL) {
diff --git a/storage/iscsi/src/iscsihba.mof b/storage/iscsi/src/iscsihba.mof
index 35307c75..d0b57d70 100644
--- a/storage/iscsi/src/iscsihba.mof
+++ b/storage/iscsi/src/iscsihba.mof
@@ -377,6 +377,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
  
 
 
@@ -4173,6 +4183,16 @@ class ISCSI_TargetMapping
 
 
 
+
+
+
+
+
+
+
+
+
+
  
 
 
@@ -8419,6 +8439,16 @@ class MSiSCSI_RADIUSConfig
 
 
 
+
+
+
+
+
+
+
+
+
+