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

4 files changed, 28 insertions, 20 deletions

diff --git a/filesys/miniFilter/simrep/simrep.c b/filesys/miniFilter/simrep/simrep.c
index 4daf17ca..3db3f15d 100644
--- a/filesys/miniFilter/simrep/simrep.c
+++ b/filesys/miniFilter/simrep/simrep.c
@@ -1730,7 +1730,6 @@ Return Value:
     UNICODE_STRING newFileName;
 
     struct {
-        BOOLEAN ReplaceIfExists;
         HANDLE RootDirectory;
         ULONG FileNameLength;
         PWSTR FileName;
@@ -1749,6 +1748,7 @@ Return Value:
     switch (fileInfoClass) {
         
         case FileRenameInformation:
+        case FileRenameInformationEx:
 
             //
             //  Note: We should never see a rename of the mapping path \x\y itself
@@ -1759,7 +1759,12 @@ Return Value:
 
             renameInfo = Cbd->Iopb->Parameters.SetFileInformation.InfoBuffer;
 
-            setInfo.ReplaceIfExists = renameInfo->ReplaceIfExists;
+            //
+            //  Accessing ReplaceIfExists -
+            //    Using FileRenameInformation - renameInfo->ReplaceIfExists
+            //    Using FileRenameInformationEx - FlagOn( renameInfo->Flags, FILE_RENAME_REPLACE_IF_EXISTS )
+            //
+
             setInfo.RootDirectory = renameInfo->RootDirectory;
             setInfo.FileNameLength = renameInfo->FileNameLength;
             setInfo.FileName = renameInfo->FileName;
@@ -1770,7 +1775,8 @@ Return Value:
 
             linkInfo = Cbd->Iopb->Parameters.SetFileInformation.InfoBuffer;
 
-            setInfo.ReplaceIfExists = linkInfo->ReplaceIfExists;
+            //  Accessing ReplaceIfExists - linkInfo->ReplaceIfExists
+            
             setInfo.RootDirectory = linkInfo->RootDirectory;
             setInfo.FileNameLength = linkInfo->FileNameLength;
             setInfo.FileName = linkInfo->FileName;
@@ -1815,6 +1821,7 @@ Return Value:
         case FileIdFullDirectoryInformation: // 38
         case FileValidDataLengthInformation: // 39
         case FileShortNameInformation:       // 40
+        case FileDispositionInformationEx:   // 64
 
             goto SimRepPreSetInformationCleanup;
         
@@ -1928,7 +1935,8 @@ Return Value:
     //  destination from FLT_GET_DESTINATION_FILE_NAME_INFORMATION.
     //
 
-    if (fileInfoClass == FileRenameInformation) {
+    if ((fileInfoClass == FileRenameInformation) ||
+        (fileInfoClass == FileRenameInformationEx)) {
 
          bufferLength = FIELD_OFFSET( FILE_RENAME_INFORMATION, FileName ) + newFileName.Length;
 
@@ -1942,7 +1950,7 @@ Return Value:
 
          newRenameInfo = (PFILE_RENAME_INFORMATION)buffer;
          
-         newRenameInfo->ReplaceIfExists = renameInfo->ReplaceIfExists;
+         newRenameInfo->Flags = renameInfo->Flags;
          newRenameInfo->RootDirectory = NULL;
          newRenameInfo->FileNameLength = newFileName.Length;
 
diff --git a/filesys/miniFilter/simrep/simrep.sln b/filesys/miniFilter/simrep/simrep.sln
index 820fab27..eacfb5a7 100644
--- a/filesys/miniFilter/simrep/simrep.sln
+++ b/filesys/miniFilter/simrep/simrep.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}") = "simrep", "simrep.vcxproj", "{EC584CEA-EE54-4673-9934-2E77A90EC210}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simrep", "simrep.vcxproj", "{E007014C-F23C-4E49-A483-D3AE86B8B988}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EC584CEA-EE54-4673-9934-2E77A90EC210}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EC584CEA-EE54-4673-9934-2E77A90EC210}.Debug|Win32.Build.0 = Debug|Win32
-		{EC584CEA-EE54-4673-9934-2E77A90EC210}.Release|Win32.ActiveCfg = Release|Win32
-		{EC584CEA-EE54-4673-9934-2E77A90EC210}.Release|Win32.Build.0 = Release|Win32
-		{EC584CEA-EE54-4673-9934-2E77A90EC210}.Debug|x64.ActiveCfg = Debug|x64
-		{EC584CEA-EE54-4673-9934-2E77A90EC210}.Debug|x64.Build.0 = Debug|x64
-		{EC584CEA-EE54-4673-9934-2E77A90EC210}.Release|x64.ActiveCfg = Release|x64
-		{EC584CEA-EE54-4673-9934-2E77A90EC210}.Release|x64.Build.0 = Release|x64
+		{E007014C-F23C-4E49-A483-D3AE86B8B988}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E007014C-F23C-4E49-A483-D3AE86B8B988}.Debug|Win32.Build.0 = Debug|Win32
+		{E007014C-F23C-4E49-A483-D3AE86B8B988}.Release|Win32.ActiveCfg = Release|Win32
+		{E007014C-F23C-4E49-A483-D3AE86B8B988}.Release|Win32.Build.0 = Release|Win32
+		{E007014C-F23C-4E49-A483-D3AE86B8B988}.Debug|x64.ActiveCfg = Debug|x64
+		{E007014C-F23C-4E49-A483-D3AE86B8B988}.Debug|x64.Build.0 = Debug|x64
+		{E007014C-F23C-4E49-A483-D3AE86B8B988}.Release|x64.ActiveCfg = Release|x64
+		{E007014C-F23C-4E49-A483-D3AE86B8B988}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/filesys/miniFilter/simrep/simrep.vcxproj b/filesys/miniFilter/simrep/simrep.vcxproj
index c5f59320..3bc8d1da 100644
--- a/filesys/miniFilter/simrep/simrep.vcxproj
+++ b/filesys/miniFilter/simrep/simrep.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{EC584CEA-EE54-4673-9934-2E77A90EC210}</ProjectGuid>
+    <ProjectGuid>{E007014C-F23C-4E49-A483-D3AE86B8B988}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{E984D0ED-160E-4FD6-BEF1-1757750C5048}</SampleGuid>
+    <SampleGuid>{C81FEAC2-1F94-45CB-BED1-670C90145D61}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/filesys/miniFilter/simrep/simrep.vcxproj.Filters b/filesys/miniFilter/simrep/simrep.vcxproj.Filters
index 6164fa35..5020e8e2 100644
--- a/filesys/miniFilter/simrep/simrep.vcxproj.Filters
+++ b/filesys/miniFilter/simrep/simrep.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>{27314838-BE3C-4784-A1B3-F9602A9963E7}</UniqueIdentifier>
+      <UniqueIdentifier>{D32E9355-EB79-4170-900D-068997E9B1B1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{015E9141-968D-497D-92A0-A3A5E9AC9E79}</UniqueIdentifier>
+      <UniqueIdentifier>{EDD908F5-A7A3-4D70-BFBC-64ABC3DB5F3F}</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>{9711FBE9-3E19-4FA7-B349-84AF2E4CF11C}</UniqueIdentifier>
+      <UniqueIdentifier>{87B836AE-66FA-41ED-A411-C2065BDBF404}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{86BE30D7-22F0-413F-AE02-B4D5A5104ED8}</UniqueIdentifier>
+      <UniqueIdentifier>{F2A59718-BA87-4522-8863-8827FB568F1E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>