Fix build failures

8 files changed, 96 insertions, 35 deletions

diff --git a/avstream/samplemft0/SampleMft0.vcxproj b/avstream/samplemft0/SampleMft0.vcxproj
index 90c623ba..f4d3fff4 100644
--- a/avstream/samplemft0/SampleMft0.vcxproj
+++ b/avstream/samplemft0/SampleMft0.vcxproj
@@ -36,19 +36,19 @@
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetVersion>Win8</TargetVersion>
+    <TargetVersion>Windows8</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetVersion>Win8</TargetVersion>
+    <TargetVersion>Windows8</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetVersion>Win8</TargetVersion>
+    <TargetVersion>Windows8</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetVersion>Win8</TargetVersion>
+    <TargetVersion>Windows8</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/filesys/miniFilter/delete/delete.c b/filesys/miniFilter/delete/delete.c
index 4050d7d0..74fc435b 100644
--- a/filesys/miniFilter/delete/delete.c
+++ b/filesys/miniFilter/delete/delete.c
@@ -86,7 +86,7 @@ typedef union _DF_FILE_REFERENCE {
     } FileId64;
 
     UCHAR           FileId128[16];  //  The 128-bit file ID lives here.
-    
+
 } DF_FILE_REFERENCE, *PDF_FILE_REFERENCE;
 
 #define DfSizeofFileId(FID) (               \
@@ -189,7 +189,7 @@ typedef struct _DF_TRANSACTION_CONTEXT {
     //  notifications.
     //
 
-    LIST_ENTRY DeleteNotifyList;                
+    LIST_ENTRY DeleteNotifyList;
 
     //
     //  ERESOURCE for synchronized access to the DeleteNotifyList.
@@ -637,7 +637,7 @@ Return Value:
     //
     //  Default to NonPagedPoolNx for non paged pool allocations where supported.
     //
-    
+
     ExInitializeDriverRuntime( DrvRtPoolNxOptIn );
 
     //
@@ -786,7 +786,7 @@ Return Value:
 
     return status;
 }
- 
+
 
 NTSTATUS
 DfInstanceQueryTeardown (
@@ -1105,7 +1105,7 @@ Return Value:
 --*/
 {
     PAGED_CODE();
-    
+
     switch (ContextType) {
 
         case FLT_STREAM_CONTEXT:
@@ -1149,10 +1149,10 @@ Routine Description:
     If a context is already attached to Target, it will be returned in
     *Context. If a context is already attached, but *Context points to
     another context, *Context will be released.
-    
+
     If no context is attached, and *Context points to a previously allocated
     context, *Context will be attached to the Target.
-    
+
     Finally, if no previously allocated context is passed to this routine
     (*Context is a NULL pointer), a new Context is created and then attached
     to Target.
@@ -1248,7 +1248,7 @@ Return Value:
         //
         //  If a context was provided by the caller, release it if it's not
         //  the one attached to the target.
-        //  
+        //
 
         //
         //  The caller is not allowed to set the same context on the target
@@ -1593,7 +1593,7 @@ Return Value:
 
             //
             //  ReFS uses 128-bit file IDs.  FileInternalInformation supports 64-
-            //  bit file IDs.  ReFS signals that a particular file ID can only 
+            //  bit file IDs.  ReFS signals that a particular file ID can only
             //  be represented in 128 bits by returning FILE_INVALID_FILE_ID as
             //  the file ID.  In that case we need to use FileIdInformation.
             //
@@ -1636,15 +1636,15 @@ Return Value:
 
                 StreamContext->FileId.FileId64.Value = fileInternalInformation.IndexNumber.QuadPart;
                 StreamContext->FileId.FileId64.UpperZeroes = 0ll;
-                
+
                 //
                 //  Because there's (currently) no support for 128-bit values in
                 //  the compiler we need to ensure the setting of the ID and our
                 //  remembering that the file ID was set occur in the right order.
                 //
-                
+
                 KeMemoryBarrier();
-                
+
                 StreamContext->FileIdSet = TRUE;
             }
         }
@@ -2025,7 +2025,7 @@ DfDetectDeleteByFileId (
 
 Routine Description:
 
-    This helper routine detects a deleted file by attempting to open it using 
+    This helper routine detects a deleted file by attempting to open it using
     its file ID.
 
     If the file is successfully opened this routine closes the file before returning.
@@ -2626,7 +2626,7 @@ Return Value:
 
     if (FlagOn( Data->Iopb->Parameters.Create.Options, FILE_DELETE_ON_CLOSE )) {
 
-        status = DfAllocateContext( FLT_STREAM_CONTEXT, 
+        status = DfAllocateContext( FLT_STREAM_CONTEXT,
                                     &streamContext );
 
         if (NT_SUCCESS( status )) {
@@ -2740,7 +2740,7 @@ Return Value:
     //  If DfGetOrSetContext failed, if will have released streamContext
     //  already, so only release it if status is successful.
     //
-    
+
     if (NT_SUCCESS( status )) {
 
         FltReleaseContext( streamContext );
@@ -2949,20 +2949,20 @@ Return Value:
         //   Using FileDispositionInformation -
         //    Controls only set disposition information behavior. It uses FILE_DISPOSITION_INFORMATION structure.
         //
-        
+
         if (Data->Iopb->Parameters.SetFileInformation.FileInformationClass == FileDispositionInformationEx) {
 
-            ULONG Flags = ((PFILE_DISPOSITION_INFORMATION_EX) Data->Iopb->Parameters.SetFileInformation.InfoBuffer)->Flags;
+            ULONG flags = ((PFILE_DISPOSITION_INFORMATION_EX) Data->Iopb->Parameters.SetFileInformation.InfoBuffer)->Flags;
+
+            if (FlagOn( flags, FILE_DISPOSITION_ON_CLOSE )) {
 
-            if (FlagOn( Flags, FILE_DISPOSITION_ON_CLOSE )) {
+                streamContext->DeleteOnClose = BooleanFlagOn( flags, FILE_DISPOSITION_DELETE );
 
-                streamContext->DeleteOnClose = BooleanFlagOn( Flags, FILE_DISPOSITION_DELETE );
-                
             } else {
 
-                streamContext->SetDisp = BooleanFlagOn( Flags, FILE_DISPOSITION_DELETE );
+                streamContext->SetDisp = BooleanFlagOn( flags, FILE_DISPOSITION_DELETE );
             }
-            
+
         } else {
 
             streamContext->SetDisp = ((PFILE_DISPOSITION_INFORMATION) Data->Iopb->Parameters.SetFileInformation.InfoBuffer)->DeleteFile;
diff --git a/general/tracing/SystemTraceControl/SystemTraceControl.sln b/general/tracing/SystemTraceControl/SystemTraceControl.sln
index f90d4b3d..a23781bc 100644
--- a/general/tracing/SystemTraceControl/SystemTraceControl.sln
+++ b/general/tracing/SystemTraceControl/SystemTraceControl.sln
@@ -6,13 +6,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Debug|Win32.ActiveCfg = Debug|Win32
 		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Debug|Win32.Build.0 = Debug|Win32
+		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Debug|x64.ActiveCfg = Debug|x64
+		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Debug|x64.Build.0 = Debug|x64
 		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Release|Win32.ActiveCfg = Release|Win32
 		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Release|Win32.Build.0 = Release|Win32
+		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Release|x64.ActiveCfg = Release|x64
+		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj b/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj
index 6aeaa431..7669ebaa 100644
--- a/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj
+++ b/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj
@@ -9,6 +9,14 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <Keyword>Win32Proj</Keyword>
@@ -25,6 +33,16 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -34,6 +52,12 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -63,6 +87,35 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX64</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX64</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="SystemTraceControl.cpp" />
   </ItemGroup>
diff --git a/network/trans/stmedit/stmedit.sln b/network/trans/stmedit/stmedit.sln
index 1dc7150f..8ae2d839 100644
--- a/network/trans/stmedit/stmedit.sln
+++ b/network/trans/stmedit/stmedit.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stmedit", "stmedit.vcxproj", "{9CE912A5-6210-4EF8-B22D-611D13254D4C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stmedit", "sys\stmedit.vcxproj", "{9CE912A5-6210-4EF8-B22D-611D13254D4C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/network/wlan/WDI/.gitignore b/network/wlan/WDI/.gitignore
new file mode 100644
index 00000000..a5ab3e23
--- /dev/null
+++ b/network/wlan/WDI/.gitignore
@@ -0,0 +1,2 @@
+*Debug/
+*Release/
diff --git a/storage/class/classpnp/src/xferpkt.c b/storage/class/classpnp/src/xferpkt.c
index e66918b0..29019140 100644
--- a/storage/class/classpnp/src/xferpkt.c
+++ b/storage/class/classpnp/src/xferpkt.c
@@ -155,10 +155,10 @@ NTSTATUS InitializeTransferPackets(PDEVICE_OBJECT Fdo)
     } else {
 
         // this is Server SKU
-        // Note: the addition max here to make sure we set the min to be at least 
-        // MIN_WORKINGSET_TRANSFER_PACKETS_Server_LowerBound no matter what maxOutstandingIOPerLUN 
-        // reported. We shouldn't set this value to be smaller than client system. 
-        // In other words, the minWorkingSetTransferPackets for server will always between 
+        // Note: the addition max here to make sure we set the min to be at least
+        // MIN_WORKINGSET_TRANSFER_PACKETS_Server_LowerBound no matter what maxOutstandingIOPerLUN
+        // reported. We shouldn't set this value to be smaller than client system.
+        // In other words, the minWorkingSetTransferPackets for server will always between
         // MIN_WORKINGSET_TRANSFER_PACKETS_Server_LowerBound and MIN_WORKINGSET_TRANSFER_PACKETS_Server_UpperBound
 
         minWorkingSetTransferPackets =
@@ -1578,7 +1578,7 @@ CleanupTransferPacketToWorkingSetSizeWorker(
     _In_ PIO_WORKITEM IoWorkItem
     )
 {
-    ULONG node = (ULONG) Context;
+    ULONG node = (ULONG) (ULONG_PTR)Context;
 
     PAGED_CODE();
 
diff --git a/storage/filters/addfilter/src/addfilter.c b/storage/filters/addfilter/src/addfilter.c
index 5e33a660..5c319bf7 100644
--- a/storage/filters/addfilter/src/addfilter.c
+++ b/storage/filters/addfilter/src/addfilter.c
@@ -193,10 +193,10 @@ int __cdecl _tmain(int argc, _In_reads_(argc) LPTSTR argv[])
         PrintUsage();
         return (0);
     }
- 
+
     for (argIndex = 1; argIndex < argc; argIndex++) {
 
-#pragma prefast(suppress:6385, "Previously checked argIndex being less than argc. No buffer overflow.")   
+#pragma prefast(suppress:6385, "Previously checked argIndex being less than argc. No buffer overflow.")
         if( _tcscmp(argv[argIndex], _T("/listdevices")) == 0 ) {
 
             listDevices = TRUE;
@@ -601,7 +601,7 @@ PrintFilters(
     // get the list of filters
     LPTSTR buffer = GetFilters( DeviceInfoSet, DeviceInfoData, UpperFilters );
     LPTSTR filterName;
-    size_t filterPosition;
+    DWORD filterPosition;
 
     if( buffer == NULL )
     {