build: choco: update chocolatey package as per guidelines from chocolatey admin

- reported by Pavel Franc over email

Changelog.asciidoc

@@ -1,6 +1,75 @@
 = Changelog
 
 
+v1.2 (2017.2)::
+
+Changes since v1.1:
+
+- WinFsp-FUSE now supports BSD flags (Windows file attributes) during `getattr` and `fgetattr`. It also adds the `chflags` operation. BSD flags support requires use of the `FSP_FUSE_CAP_STAT_EX` capability and the new `struct fuse_stat_ex` which includes an `st_flags` field. If the preprocessor macro `FSP_FUSE_USE_STAT_EX` is defined before inclusion of `<fuse.h>` then `struct fuse_stat` will also be defined to include the `st_flags` field.
+- WinFsp-FUSE also adds the following OSXFUSE operations: `setcrtime`, `setchgtime`. These can be used to set the creation (birth) time and change (ctime) time of a file.
+- New `GetDirInfoByName` file system operation adds fast queries of directory info by file name rather than pattern [e.g. `FindFirstFileW(L"foobar", FindData)`]. Tests with fsbench showed that such queries are sped up by an order of magnitude when using `GetDirInfoByName` in MEMFS. Case-sensitive FUSE file systems get this optimization for free. The .NET layer also adds `GetDirInfoByName`.
+- New `FspFileSystemOperationProcessId` API adds support for getting the originating process ID (PID) during `Create`, `Open` and `Rename` calls. FUSE file systems can now access `fuse_context::pid`. The .NET layer also adds `GetOperationProcessId`.
+- New command line tool `fsptool` allows command line access to some WinFsp features.
+- The WinFsp launcher now passes the name of the user who launched the file system as a special parameter %U. This is useful to file systems that use the launcher infrastructure, such as SSHFS-Win. [Please note that in earlier betas the user name was passed as parameter %3; the previous method was insecure and is no longer supported.]
+- Important GitHub issues fixed: #96, #97, #103, #107
+
+
+v1.2B3 (2017.2 B3)::
+
+Changes since v1.1:
+
+- WinFsp-FUSE now supports BSD flags (Windows file attributes) during `getattr` and `fgetattr`. It also adds the `chflags` operation. BSD flags support requires use of the `FSP_FUSE_CAP_STAT_EX` capability and the new `struct fuse_stat_ex` which includes an `st_flags` field. If the preprocessor macro `FSP_FUSE_USE_STAT_EX` is defined before inclusion of `<fuse.h>` then `struct fuse_stat` will also be defined to include the `st_flags` field.
+- WinFsp-FUSE also adds the following OSXFUSE operations: `setcrtime`, `setchgtime`. These can be used to set the creation (birth) time and change (ctime) time of a file.
+- New `GetDirInfoByName` file system operation adds fast queries of directory info by file name rather than pattern [e.g. `FindFirstFileW(L"foobar", FindData)`]. Tests with fsbench showed that such queries are sped up by an order of magnitude when using `GetDirInfoByName` in MEMFS. Case-sensitive FUSE file systems get this optimization for free. The .NET layer also adds `GetDirInfoByName`.
+- New `FspFileSystemOperationProcessId` API adds support for getting the originating process ID (PID) during `Create`, `Open` and `Rename` calls. FUSE file systems can now access `fuse_context::pid`. The .NET layer also adds `GetOperationProcessId`.
+- New command line tool `fsptool` allows command line access to some WinFsp features.
+- The WinFsp launcher now passes the username of the user who launched the file system as parameter %3. This is useful to file systems that use the launcher infrastructure, such as SSHFS-Win.
+- Important GitHub issues fixed: #96, #97, #103, #107
+
+
+v1.2B2 (2017.2 B2)::
+
+Changes since v1.1:
+
+- New command line tool `fsptool` allows command line access to some WinFsp features.
+- New `GetDirInfoByName` file system operation adds fast queries of directory info by file name rather than pattern [e.g. `FindFirstFileW(L"foobar", FindData)`]. Tests with fsbench showed that such queries are sped up by an order of magnitude when using `GetDirInfoByName` in MEMFS. Case-sensitive FUSE file systems get this optimization for free. The .NET layer also adds `GetDirInfoByName`.
+- New `FspFileSystemOperationProcessId` API adds support for getting the originating process ID (PID) during `Create`, `Open` and `Rename` calls. FUSE file systems can now access `fuse_context::pid`. The .NET layer also adds `GetOperationProcessId`.
+- Important GitHub issues fixed: #96, #97, #103, #107
+
+
+v1.2B1 (2017.2 B1)::
+
+- New command line tool `fsptool` allows command line access to some WinFsp features.
+- New `GetDirInfoByName` file system operation adds fast queries of directory info by file name rather than pattern [e.g. `FindFirstFileW("foobar", FindData)`]. Tests with fsbench showed that such queries are sped up by an order of magnitude when using `GetDirInfoByName` in MEMFS.
+- New `FspFileSystemOperationProcessId` API adds support for getting the originating process ID (PID) during `Create`, `Open` and `Rename` calls.
+
+
+v1.1 (2017.1)::
+
+This release brings some major new components and improvements.
+
+- A .NET layer that allows the creation of file systems in managed mode. This is contained in the new `winfsp-msil.dll`. The new .NET layer is being tested with the WinFsp test suites and Microsoft's ifstest.
+- FUSE for Cygwin is now included with the installer.
+- FUSE now has a `-ovolname=VOLNAME` parameter that allows setting the volume label. Thanks @samkelly.
+- A number of other FUSE improvements have been made (see issue #85).
+
+NOTE: The C++ layer included in the v1.1 beta releases is not part of this release as it is still work in progress. It can be found in `inc/winfsp/winfsp.hpp` in the WinFsp source repository.
+
+
+v1.1B3 (2017.1 B3)::
+
+v1.1B2 (2017.1 B2)::
+
+v1.1B1 (2017.1 BETA)::
+
+This release brings some major new components and improvements.
+
+- A .NET layer that allows the creation of file systems in managed mode. This is contained in the new `winfsp-msil.dll`. The new .NET layer is being tested with the WinFsp test suites and Microsoft's ifstest.
+- A simple C++ layer can be found in `inc/winfsp/winfsp.hpp`.
+- FUSE for Cygwin is now included with the installer.
+- FUSE now has a `-ovolname=VOLNAME` parameter that allows setting the volume label. Thanks @samkelly.
+
+
 v1.0::
 
 This is the WinFsp 2017 release! :tada:

Contributors.asciidoc

@@ -54,5 +54,8 @@ This CONTRIBUTOR AGREEMENT applies to any contribution that you make to the WinF
 CONTRIBUTOR LIST
 ----------------
 |===
-|Bill Zissimopoulos                     |billziss at navimatics.com
+|Bill Zissimopoulos                                             |billziss at navimatics.com
+|John Oberschelp                                                |john at oberschelp.net
+|Sam Kelly (DuroSoft Technologies LLC, https://durosoft.com)    |sam at durosoft.com
+|Tobias Urlaub                                                  |saibotu at outlook.de
 |===

License.txt

@@ -6,7 +6,7 @@ permissions to Free/Libre and Open Source Software ("FLOSS") without requiring
 that such software is covered by the GPLv3.
 
     1. Permission to link with a platform specific version of the WinFsp DLL
-    (currently winfsp-x64.dll or winfsp-x86.dll).
+    (one of: winfsp-x64.dll, winfsp-x86.dll, winfsp-msil.dll).
 
     2. Permission to distribute unmodified binary releases of the WinFsp
     installer (as released by the WinFsp project).

README.md

@@ -3,7 +3,9 @@
 ![WinFsp Demo](http://www.secfs.net/winfsp/files/cap.gif)
 
 
-<a href="https://github.com/billziss-gh/winfsp/releases"><img src="http://www.secfs.net/winfsp/resources/Download-WinFsp.png" alt="Download WinFsp Installer" width="244" height="34"></a>
+<a href="https://github.com/billziss-gh/winfsp/releases/latest"><img src="http://www.secfs.net/winfsp/resources/Download-WinFsp.png" alt="Download WinFsp Installer" width="244" height="34"></a>
+&emsp;
+<a href="https://chocolatey.org/packages/winfsp"><img src="http://www.secfs.net/winfsp/resources/Choco-WinFsp.png" alt="choco install winfsp" width="244" height="34"></a>
 
 
 
@@ -16,6 +18,7 @@ Some of the benefits of using WinFsp are listed below:
 * Strives for compatibility with NTFS. Read about its [Compatibility](doc/NTFS-Compatibility.asciidoc ).
 * Easy to understand but comprehensive API. Consult the [API Reference](http://www.secfs.net/winfsp/apiref/). There is also a simple [Tutorial](doc/WinFsp-Tutorial.asciidoc).
 * FUSE compatibility layer for native Windows and Cygwin. See [fuse.h](inc/fuse/fuse.h).
+* .NET layer for managed development. See [src/dotnet](src/dotnet).
 * Signed drivers provided on every release.
 * Available under the [GPLv3](License.txt) license with a special exception for Free/Libre and Open Source Software.
 
@@ -27,19 +30,23 @@ WinFsp consists of a kernel mode FSD (File System Driver) and a user mode DLL (D
 
 The project source code is organized as follows:
 
-* build/VStudio: WinFsp solution and project files.
-* doc: The WinFsp design documents and additional documentation can be found here.
-* ext/tlib: A small test library originally from the secfs (Secure Cloud File System) project.
-* ext/test: Submodule pointing to the secfs.test project, which contains a number of tools for testing Windows and POSIX file systems.
-* inc/winfsp: Public headers for the WinFsp API.
-* inc/fuse: Public headers for the FUSE compatibility layer.
-* src/dll: Source code to the WinFsp DLL.
-* src/dll/fuse: Source code to the FUSE compatibility layer.
-* src/launcher: Source code to the launcher service and the launchctl utility.
-* src/sys: Source code to the WinFsp FSD.
-* opt/cygfuse: Source code for the Cygwin FUSE package.
-* tst/memfs: Source code to an example file system written in C++ (memfs).
-* tst/winfsp-tests: WinFsp test suite.
+* `build/VStudio`: WinFsp solution and project files.
+* `doc`: The WinFsp design documents and additional documentation can be found here.
+* `ext/tlib`: A small test library originally from the secfs (Secure Cloud File System) project.
+* `ext/test`: Submodule pointing to the secfs.test project, which contains a number of tools for testing Windows and POSIX file systems.
+* `inc/fuse`: Public headers for the FUSE compatibility layer.
+* `inc/winfsp`: Public headers for the WinFsp API.
+* `src/dll`: Source code to the WinFsp DLL.
+* `src/dll/fuse`: Source code to the FUSE compatibility layer.
+* `src/dotnet`: Source code to the .NET layer.
+* `src/fsptool`: Source code to fsptool command line utility.
+* `src/launcher`: Source code to the launcher service and the launchctl utility.
+* `src/sys`: Source code to the WinFsp FSD.
+* `opt/cygfuse`: Source code for the Cygwin FUSE package.
+* `tst/memfs*`: Source code to an example file system written in C/C++ (memfs) or C# (memfs-dotnet).
+* `tst/passthrough*`: Source code to additional example file systems.
+* `tst/winfsp-tests`: WinFsp test suite.
+* `tools`: Various tools for building and testing WinFsp.
 
 ## Building and Running
 
@@ -68,7 +75,7 @@ WinFsp is designed to run on Windows 7 and above. It has been tested on the foll
 I am looking for help in the following areas:
 
 * If you have a file system that runs on FUSE please consider porting it to WinFsp. WinFsp has a native API, but it also has a FUSE (high-level) API.
-* If you are working with a language other than C/C++ (e.g. Delphi, C#, etc.) and you are interested in porting/wrapping WinFsp I would love to hear from you.
+* If you are working with a language other than C/C++ (e.g. Delphi, Java, etc.) and you are interested in porting/wrapping WinFsp I would love to hear from you.
 * There are a number of outstanding issues listed in the [GitHub repository](https://github.com/billziss-gh/winfsp/issues). Many of these require knowledge of Windows kernel-mode and an understanding of the internals of WinFsp so they are not for the faint of heart.
 
 In all cases I can provide ideas and/or support.

appveyor.yml

@@ -6,8 +6,10 @@ environment:
     TESTING: Func
   - CONFIGURATION: Release
     TESTING: Func
-  - CONFIGURATION: Release
-    TESTING: Perf
+  #- CONFIGURATION: Release
+  #  TESTING: Avast
+  #- CONFIGURATION: Release
+  #  TESTING: Perf
 
 install:
 - git submodule update --init --recursive
@@ -30,6 +32,9 @@ test_script:
 - if %TESTING%==Func tools\run-tests.bat %CONFIGURATION%
 - if %TESTING%==Func tools\run-tests.bat %CONFIGURATION% ifstest
 - if %TESTING%==Func tools\run-tests.bat %CONFIGURATION% sample
+- if %TESTING%==Func tools\run-tests.bat %CONFIGURATION% compat
+- if %TESTING%==Avast choco install avastfreeantivirus && fltmc instances -v "C:"
+- if %TESTING%==Avast tools\run-tests.bat %CONFIGURATION% avast-tests
 - if %TESTING%==Perf tools\run-perf-tests.bat %CONFIGURATION% baseline > perf-tests.csv && type perf-tests.csv & appveyor PushArtifact perf-tests.csv
 - choco uninstall winfsp -y
 - if exist %SystemRoot%\memory.dmp exit 1

build/VStudio/.gitignore

@@ -3,3 +3,4 @@ build
 *.suo
 *.vcproj.*
 *.vcxproj.user
+*.csproj.user

build/VStudio/dotnet/winfsp.net.csproj

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\version.properties" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{94580219-CC8D-4FE5-A3BE-437B0B3481E1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <ProjectName>winfsp.net</ProjectName>
+    <RootNamespace>Fsp</RootNamespace>
+    <AssemblyName>winfsp-msil</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\winfsp-msil.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\winfsp-msil.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>winfsp.net.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\src\dotnet\FileSystemBase+Const.cs">
+      <Link>FileSystemBase+Const.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\dotnet\FileSystemBase.cs">
+      <Link>FileSystemBase.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\dotnet\FileSystemHost.cs">
+      <Link>FileSystemHost.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\dotnet\Interop.cs">
+      <Link>Interop.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\dotnet\Service.cs">
+      <Link>Service.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="winfsp.net.snk" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <Target Name="BeforeBuild">
+    <ItemGroup>
+      <AssemblyInfo Include="using System.Reflection%3b" />
+      <AssemblyInfo Include="[assembly: AssemblyProduct(&quot;$(MyProductName)&quot;)]" />
+      <AssemblyInfo Include="[assembly: AssemblyTitle(&quot;$(MyDescription)&quot;)]" />
+      <AssemblyInfo Include="[assembly: AssemblyCompany(&quot;$(MyCompanyName)&quot;)]" />
+      <AssemblyInfo Include="[assembly: AssemblyCopyright(&quot;$(MyCopyright)&quot;)]" />
+      <AssemblyInfo Include="[assembly: AssemblyVersion(&quot;$(MyAssemblyVersion)&quot;)]" />
+      <AssemblyInfo Include="[assembly: AssemblyFileVersion(&quot;$(MyVersion)&quot;)]" />
+    </ItemGroup>
+    <MakeDir Directories="$(IntermediateOutputPath)" />
+    <WriteLinesToFile File="$(IntermediateOutputPath)AssemblyInfo.cs" Lines="@(AssemblyInfo)" Overwrite="true" />
+    <ItemGroup>
+      <Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
+      <FileWrites Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
+    </ItemGroup>
+  </Target>
+  <PropertyGroup>
+    <PostBuildEvent>exit /b 0
+
+set TargetName=$(TargetName)
+set MyAssemblyPolicyVersion=$(MyAssemblyPolicyVersion)
+set MyAssemblyVersion=$(MyAssemblyVersion)
+
+setlocal EnableDelayedExpansion
+if exist $(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).config del $(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).config
+for /f "delims=" %25%25l in ($(ProjectDir)winfsp.net.policy.config) do (
+    set line=%25%25l
+    echo !line! &gt;&gt;$(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).config
+)
+
+"$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.0A\Bin\al.exe" /product:"$(MyProductName)" /title:"$(MyDescription)" /company:"$(MyCompanyName)" /copyright:"$(MyCopyright)" /version:"$(MyAssemblyPolicyVersion)" /fileversion:"$(MyVersion)" /link:$(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).config /out:$(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).dll /keyfile:$(ProjectDir)$(ProjectName).snk
+</PostBuildEvent>
+  </PropertyGroup>
+</Project>

build/VStudio/dotnet/winfsp.net.policy.config

@@ -0,0 +1,10 @@
+<configuration>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="!TargetName!" publicKeyToken="b099876d8fa9b1f3" culture="neutral" />
+                <bindingRedirect oldVersion="!MyAssemblyPolicyVersion!.0.0-!MyAssemblyVersion!" newVersion="!MyAssemblyVersion!" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>

build/VStudio/installer/Product.wxs

@@ -39,6 +39,7 @@
                     <Directory Id="BINDIR" Name="bin" />
                     <Directory Id="INCDIR" Name="inc" />
                     <Directory Id="LIBDIR" Name="lib" />
+                    <Directory Id="OPTDIR" Name="opt" />
                     <Directory Id="SMPDIR" Name="samples" />
                     <Directory Id="SYMDIR" Name="sym" />
                 </Directory>
@@ -87,6 +88,23 @@
                 <Condition>NOT VersionNT64</Condition>
             </Component>
 
+            <!-- install assembly -->
+            <Component Id="C.winfsp_msil.dll" Guid="0D8BA6AE-9F87-402B-AE1A-95B0AE3BE179">
+                <File Id="FILE.winfsp_msil.dll" Name="winfsp-msil.dll" KeyPath="yes" />
+            </Component>
+            <Component Id="C.winfsp_msil.xml" Guid="1657F707-C112-454C-91AE-0FDEBBF454AB">
+                <File Id="FILE.winfsp_msil.xml" Name="winfsp-msil.xml" KeyPath="yes" />
+            </Component>
+            <!--
+            <Component Id="C.winfsp_msil.dll.GAC" Guid="6469467D-8C90-4889-8138-4028F9DA6E85">
+                <File Id="FILE.winfsp_msil.dll.GAC" Name="winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
+            </Component>
+            <Component Id="C.policy.winfsp_msil.dll.GAC">
+                <File Name="policy.1.0.winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
+                <File Name="policy.1.0.winfsp-msil.config" KeyPath="no" />
+            </Component>
+            -->
+
             <!-- On Win64 ServiceInstall launcher-x64.exe -->
             <Component Id="C.launcher_x64.exe.svcinst">
                 <File Id="launcher_x64.exe.svcinst" Name="launcher-x64.exe" KeyPath="yes" />
@@ -140,6 +158,13 @@
                 <File Name="launchctl-x86.exe" KeyPath="yes" />
             </Component>
 
+            <Component Id="C.fsptool_x64.exe" Guid="013FE508-097D-4433-9C60-717F5446E7F4">
+                <File Name="fsptool-x64.exe" KeyPath="yes" />
+            </Component>
+            <Component Id="C.fsptool_x86.exe" Guid="6C16DC2C-E12F-49FB-A665-3AF0475487AD">
+                <File Name="fsptool-x86.exe" KeyPath="yes" />
+            </Component>
+
             <Component Id="C.diag.bat">
                 <File Name="diag.bat" Source="..\..\..\tools\diag.bat" KeyPath="yes" />
             </Component>
@@ -199,6 +224,32 @@
                     </RegistryKey>
                 </RegistryKey>
             </Component>
+            <Component Id="C.memfs_dotnet_msil.exe">
+                <File Name="memfs-dotnet-msil.exe" KeyPath="yes" />
+                <RegistryKey
+                    Root="HKLM"
+                    Key="[P.LauncherRegistryKey]">
+                    <RegistryKey
+                        Key="memfs-dotnet">
+                        <RegistryValue
+                            Type="string"
+                            Name="Executable"
+                            Value="[BINDIR]memfs-dotnet-msil.exe" />
+                        <RegistryValue
+                            Type="string"
+                            Name="CommandLine"
+                            Value="-i -F NTFS -n 65536 -s 67108864 -u %1 -m %2" />
+                        <RegistryValue
+                            Type="string"
+                            Name="Security"
+                            Value="D:P(A;;RPWPLC;;;WD)" />
+                        <RegistryValue
+                            Type="integer"
+                            Name="JobControl"
+                            Value="1" />
+                    </RegistryKey>
+                </RegistryKey>
+            </Component>
         </DirectoryRef>
         <DirectoryRef Id="INCDIR" FileSource="..\..\..\inc">
             <Directory Id="INCDIR.winfsp" Name="winfsp">
@@ -208,6 +259,9 @@
                 <Component Id="C.winfsp.h">
                     <File Name="winfsp.h" KeyPath="yes" />
                 </Component>
+                <!--Component Id="C.winfsp.hpp">
+                    <File Name="winfsp.hpp" KeyPath="yes" />
+                </Component-->
             </Directory>
             <Directory Id="INCDIR.fuse" Name="fuse">
                 <Component Id="C.fuse.h">
@@ -252,6 +306,26 @@
                 <Condition>NOT VersionNT64</Condition>
             </Component>
         </DirectoryRef>
+        <DirectoryRef Id="OPTDIR">
+            <Directory Id="OPTDIR.cygfuse" Name="cygfuse" FileSource="..\..\..\opt\cygfuse\dist">
+                <Directory Id="OPTDIR.cygfuse.x64" Name="x64">
+                    <Component Id="C.fuse.tar.xz.x64">
+                        <File Id="FILE.fuse.tar.xz.x64" Name="fuse-2.8-7.tar.xz" KeyPath="yes" />
+                    </Component>
+                </Directory>
+                <Directory Id="OPTDIR.cygfuse.x86" Name="x86">
+                    <Component Id="C.fuse.tar.xz.x86">
+                        <File Id="FILE.fuse.tar.xz.x86" Name="fuse-2.8-7.tar.xz" KeyPath="yes" />
+                    </Component>
+                </Directory>
+                <Component Id="C.fuse.install.sh">
+                    <File Name="install.sh" KeyPath="yes" />
+                </Component>
+                <Component Id="C.fuse.uninstall.sh">
+                    <File Name="uninstall.sh" KeyPath="yes" />
+                </Component>
+            </Directory>
+        </DirectoryRef>
         <DirectoryRef Id="SMPDIR" FileSource="..\..\..\tst">
             <Directory Id="SMPDIR.memfs" Name="memfs">
                 <Component Id="C.memfs.h">
@@ -264,6 +338,11 @@
                     <File Name="memfs-main.c" KeyPath="yes" />
                 </Component>
             </Directory>
+            <Directory Id="SMPDIR.memfs_dotnet" Name="memfs-dotnet">
+                <Component Id="C.memfs_dotnet.Program.cs">
+                    <File Id="FILE.memfs_dotnet.Program.cs" Name="Program.cs" KeyPath="yes" />
+                </Component>
+            </Directory>
             <Directory Id="SMPDIR.passthrough" Name="passthrough">
                 <Component Id="C.passthrough.c">
                     <File Name="passthrough.c" KeyPath="yes" />
@@ -278,6 +357,20 @@
                     <File Name="passthrough.vcxproj.filters" KeyPath="yes" />
                 </Component>
             </Directory>
+            <!--Directory Id="SMPDIR.passthrough_cpp" Name="passthrough-cpp">
+                <Component Id="C.passthrough_cpp.cpp">
+                    <File Name="passthrough-cpp.cpp" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough_cpp.sln">
+                    <File Name="passthrough-cpp.sln" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough_cpp.vcxproj">
+                    <File Name="passthrough-cpp.vcxproj" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough_cpp.vcxproj.filters">
+                    <File Name="passthrough-cpp.vcxproj.filters" KeyPath="yes" />
+                </Component>
+            </Directory-->
             <Directory Id="SMPDIR.passthrough_fuse" Name="passthrough-fuse">
                 <Component Id="C.passthrough_fuse.c">
                     <File Name="passthrough-fuse.c" KeyPath="yes" />
@@ -304,6 +397,17 @@
                     <File Name="README.md" KeyPath="yes" />
                 </Component>
             </Directory>
+            <Directory Id="SMPDIR.passthrough_dotnet" Name="passthrough-dotnet">
+                <Component Id="C.passthrough_dotnet.Program.cs">
+                    <File Id="FILE.passthrough_dotnet.Program.cs" Name="Program.cs" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough_dotnet.sln">
+                    <File Name="passthrough-dotnet.sln" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough_dotnet.csproj">
+                    <File Name="passthrough-dotnet.csproj" KeyPath="yes" />
+                </Component>
+            </Directory>
         </DirectoryRef>
         <DirectoryRef Id="SYMDIR">
             <Component Id="C.winfsp_x64.sys.pdb">
@@ -330,6 +434,12 @@
             <Component Id="C.launchctl_x86.pdb">
                 <File Name="launchctl-x86.pdb" Source="..\build\$(var.Configuration)\launchctl-x86.public.pdb" KeyPath="yes" />
             </Component>
+            <Component Id="C.fsptool_x64.pdb">
+                <File Name="fsptool-x64.pdb" Source="..\build\$(var.Configuration)\fsptool-x64.public.pdb" KeyPath="yes" />
+            </Component>
+            <Component Id="C.fsptool_x86.pdb">
+                <File Name="fsptool-x86.pdb" Source="..\build\$(var.Configuration)\fsptool-x86.public.pdb" KeyPath="yes" />
+            </Component>
             <Component Id="C.memfs_x64.pdb">
                 <File Name="memfs-x64.pdb" Source="..\build\$(var.Configuration)\memfs-x64.public.pdb" KeyPath="yes" />
             </Component>
@@ -351,12 +461,15 @@
             <ComponentRef Id="C.launcher_x86.exe.svcinst" />
             <ComponentRef Id="C.launchctl_x64.exe" />
             <ComponentRef Id="C.launchctl_x86.exe" />
+            <ComponentRef Id="C.fsptool_x64.exe" />
+            <ComponentRef Id="C.fsptool_x86.exe" />
             <ComponentRef Id="C.diag.bat" />
             <ComponentRef Id="C.fsreg.bat" />
         </ComponentGroup>
         <ComponentGroup Id="C.WinFsp.inc">
             <ComponentRef Id="C.fsctl.h" />
             <ComponentRef Id="C.winfsp.h" />
+            <!--ComponentRef Id="C.winfsp.hpp" /-->
             <ComponentRef Id="C.fuse.h" />
             <ComponentRef Id="C.fuse_common.h" />
             <ComponentRef Id="C.fuse_opt.h" />
@@ -368,6 +481,12 @@
             <ComponentRef Id="C.fuse_x64.pc" />
             <ComponentRef Id="C.fuse_x86.pc" />
         </ComponentGroup>
+        <ComponentGroup Id="C.WinFsp.opt.fuse">
+            <ComponentRef Id="C.fuse.tar.xz.x64" />
+            <ComponentRef Id="C.fuse.tar.xz.x86" />
+            <ComponentRef Id="C.fuse.install.sh" />
+            <ComponentRef Id="C.fuse.uninstall.sh" />
+        </ComponentGroup>
         <ComponentGroup Id="C.WinFsp.smp">
             <ComponentRef Id="C.memfs_x64.exe" />
             <ComponentRef Id="C.memfs_x86.exe" />
@@ -378,6 +497,10 @@
             <ComponentRef Id="C.passthrough.sln" />
             <ComponentRef Id="C.passthrough.vcxproj" />
             <ComponentRef Id="C.passthrough.vcxproj.filters" />
+            <!--ComponentRef Id="C.passthrough_cpp.cpp" /-->
+            <!--ComponentRef Id="C.passthrough_cpp.sln" /-->
+            <!--ComponentRef Id="C.passthrough_cpp.vcxproj" /-->
+            <!--ComponentRef Id="C.passthrough_cpp.vcxproj.filters" /-->
             <ComponentRef Id="C.passthrough_fuse.c" />
             <ComponentRef Id="C.passthrough_fuse.winposix.c" />
             <ComponentRef Id="C.passthrough_fuse.winposix.h" />
@@ -396,9 +519,26 @@
             <ComponentRef Id="C.launcher_x64.pdb" />
             <ComponentRef Id="C.launchctl_x64.pdb" />
             <ComponentRef Id="C.launchctl_x86.pdb" />
+            <ComponentRef Id="C.fsptool_x64.pdb" />
+            <ComponentRef Id="C.fsptool_x86.pdb" />
             <ComponentRef Id="C.memfs_x64.pdb" />
             <ComponentRef Id="C.memfs_x86.pdb" />
         </ComponentGroup>
+        <ComponentGroup Id="C.WinFsp.net">
+            <ComponentRef Id="C.winfsp_msil.dll" />
+            <ComponentRef Id="C.winfsp_msil.xml" />
+            <!--
+            <ComponentRef Id="C.winfsp_msil.dll.GAC" />
+            <ComponentRef Id="C.policy.winfsp_msil.dll.GAC" />
+            -->
+        </ComponentGroup>
+        <ComponentGroup Id="C.WinFsp.smp.net">
+            <ComponentRef Id="C.memfs_dotnet_msil.exe" />
+            <ComponentRef Id="C.memfs_dotnet.Program.cs" />
+            <ComponentRef Id="C.passthrough_dotnet.Program.cs" />
+            <ComponentRef Id="C.passthrough_dotnet.sln" />
+            <ComponentRef Id="C.passthrough_dotnet.csproj" />
+        </ComponentGroup>
 
         <Feature
             Id="F.Main"
@@ -421,7 +561,20 @@
                 InstallDefault="local"
                 Absent="disallow">
                 <ComponentGroupRef Id="C.WinFsp.bin" />
+                <ComponentGroupRef Id="C.WinFsp.net" />
             </Feature>
+            <!--
+            <Feature
+                Id="F.Net"
+                Level="10"
+                Title=".NET"
+                Description="The managed $(var.MyProductName) files."
+                AllowAdvertise="no"
+                InstallDefault="local"
+                Absent="allow">
+                <ComponentGroupRef Id="C.WinFsp.net" />
+            </Feature>
+            -->
             <Feature
                 Id="F.Developer"
                 Level="1000"
@@ -433,8 +586,19 @@
                 <ComponentGroupRef Id="C.WinFsp.inc" />
                 <ComponentGroupRef Id="C.WinFsp.lib" />
                 <ComponentGroupRef Id="C.WinFsp.smp" />
+                <ComponentGroupRef Id="C.WinFsp.smp.net" />
                 <ComponentGroupRef Id="C.WinFsp.sym" />
             </Feature>
+            <Feature
+                Id="F.Cygfuse"
+                Level="1000"
+                Title="FUSE for Cygwin"
+                Description="From a Cygwin prompt change to &lt;InstallDir&gt;/opt/cygfuse and run install.sh."
+                AllowAdvertise="no"
+                InstallDefault="local"
+                Absent="allow">
+                <ComponentGroupRef Id="C.WinFsp.opt.fuse" />
+            </Feature>
         </Feature>
 
         <WixVariable Id="WixUIBannerBmp" Value="wixbanner.bmp" />

build/VStudio/testing/memfs-dotnet.csproj

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4920E350-D496-4652-AE98-6C4208AEC1D8}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectName>memfs-dotnet</ProjectName>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>memfs</RootNamespace>
+    <AssemblyName>memfs-dotnet-msil</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\tst\memfs-dotnet\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\dotnet\winfsp.net.csproj">
+      <Project>{94580219-cc8d-4fe5-a3be-437b0b3481e1}</Project>
+      <Name>winfsp.net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

build/VStudio/tools/fsptool.vcxproj

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\version.properties" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <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">
+    <ProjectGuid>{1E997BEC-1642-4A5C-B252-852DA094E11E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>fsptool</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|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)'=='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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\winfsp_dll.vcxproj">
+      <Project>{4a7c0b21-9e10-4c81-92de-1493efcf24eb}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\fsptool\fsptool.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\src\fsptool\fsptool-version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/VStudio/tools/fsptool.vcxproj.filters

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Include">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\fsptool\fsptool.c">
+      <Filter>Source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\src\fsptool\fsptool-version.rc">
+      <Filter>Source</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

build/VStudio/tools/launchctl.vcxproj

@@ -20,7 +20,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{73EAAEDA-557B-48D5-A137-328934720FB4}</ProjectGuid>
+    <ProjectGuid>{264A5D09-126F-4760-A3F1-4B3B95C925AA}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>launchctl</RootNamespace>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

build/VStudio/tools/launcher.vcxproj

@@ -20,7 +20,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A5EFD487-0140-4184-8C54-FFAEC2F85E35}</ProjectGuid>
+    <ProjectGuid>{6CDF9411-B852-4EAC-822D-8F930675F17B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>launcher</RootNamespace>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

build/VStudio/version.properties

@@ -7,7 +7,8 @@
         <!-- git revision -->
         <MyGitRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .git/HEAD))</MyGitRoot>
         <MyGitHead>$([System.IO.File]::ReadAllText($(MyGitRoot)/.git/HEAD).Trim())</MyGitHead>
-        <MyGitRevision Condition="$(MyGitHead.StartsWith(ref: ))">$([System.IO.File]::ReadAllText($(MyGitRoot)/.git/$(MyGitHead.Substring(5))).Trim().Substring(0, 7))</MyGitRevision>
+        <MyGitRevision Condition="$(MyGitHead.StartsWith(ref: )) And  Exists('$(MyGitRoot)/.git/$(MyGitHead.Substring(5))')">$([System.IO.File]::ReadAllText($(MyGitRoot)/.git/$(MyGitHead.Substring(5))).Trim().Substring(0, 7))</MyGitRevision>
+        <MyGitRevision Condition="$(MyGitHead.StartsWith(ref: )) And !Exists('$(MyGitRoot)/.git/$(MyGitHead.Substring(5))')">$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText($(MyGitRoot)/.git/packed-refs)), '[0-9a-fA-F]{40,}.*$(MyGitHead.Substring(5))').Value.Substring(0, 7))</MyGitRevision>
         <MyGitRevision Condition="!$(MyGitHead.StartsWith(ref: ))">$(MyGitHead.Substring(0, 7))</MyGitRevision>
 
         <MyProductName>WinFsp</MyProductName>
@@ -15,14 +16,17 @@
         <MyCompanyName>Navimatics Corporation</MyCompanyName>
         <MyCopyright>2015-$([System.DateTime]::Now.ToString(`yyyy`)) Bill Zissimopoulos</MyCopyright>
 
-        <MyCanonicalVersion>1.0</MyCanonicalVersion>
+        <MyCanonicalVersion>1.2</MyCanonicalVersion>
 
-        <MyProductVersion>2017</MyProductVersion>
+        <MyProductVersion>2017.2</MyProductVersion>
         <MyProductStage>Gold</MyProductStage>
 
         <MyVersion>$(MyCanonicalVersion).$(MyBuildNumber)</MyVersion>
         <MyVersionWithCommas>$(MyVersion.Replace('.',',')),0</MyVersionWithCommas>
         <MyFullVersion>$(MyCanonicalVersion).$(MyBuildNumber).$(MyGitRevision)</MyFullVersion>
+
+        <MyAssemblyPolicyVersion>$(MyCanonicalVersion.Substring(0,$(MyVersion.IndexOf('.')))).0</MyAssemblyPolicyVersion>
+        <MyAssemblyVersion>$(MyAssemblyPolicyVersion).0.0</MyAssemblyVersion>
     </PropertyGroup>
 
     <ItemDefinitionGroup>

build/VStudio/winfsp.sln

@@ -32,19 +32,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "winfsp_msi", "installer\win
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CustomActions", "installer\CustomActions\CustomActions.vcxproj", "{95C223E6-B5F1-4FD0-9376-41CDBC824445}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "launcher", "launcher", "{FD28A504-431E-49B9-BB8C-DCA0E7019F66}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "launcher", "launcher\launcher.vcxproj", "{A5EFD487-0140-4184-8C54-FFAEC2F85E35}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB} = {4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}
-		{C85C26BA-8C22-4D30-83DA-46C3548E6332} = {C85C26BA-8C22-4D30-83DA-46C3548E6332}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "launchctl", "launcher\launchctl.vcxproj", "{73EAAEDA-557B-48D5-A137-328934720FB4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35} = {A5EFD487-0140-4184-8C54-FFAEC2F85E35}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fscrash", "testing\fscrash.vcxproj", "{10757011-749D-4954-873B-AE38D8145472}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB} = {4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}
@@ -53,146 +40,256 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fscrash", "testing\fscrash.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fsbench", "testing\fsbench.vcxproj", "{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winfsp.net", "dotnet\winfsp.net.csproj", "{94580219-CC8D-4FE5-A3BE-437B0B3481E1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB} = {4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332} = {C85C26BA-8C22-4D30-83DA-46C3548E6332}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{A998CEC4-4B34-43DC-8457-F7761228BA67}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "memfs-dotnet", "testing\memfs-dotnet.csproj", "{4920E350-D496-4652-AE98-6C4208AEC1D8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{04A4762C-FAB9-4196-9AC8-0757F3E8AB79}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "launcher", "tools\launcher.vcxproj", "{6CDF9411-B852-4EAC-822D-8F930675F17B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "launchctl", "tools\launchctl.vcxproj", "{264A5D09-126F-4760-A3F1-4B3B95C925AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fsptool", "tools\fsptool.vcxproj", "{1E997BEC-1642-4A5C-B252-852DA094E11E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Installer.Debug|Any CPU = Installer.Debug|Any CPU
 		Installer.Debug|x64 = Installer.Debug|x64
 		Installer.Debug|x86 = Installer.Debug|x86
+		Installer.Release|Any CPU = Installer.Release|Any CPU
 		Installer.Release|x64 = Installer.Release|x64
 		Installer.Release|x86 = Installer.Release|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|x64.ActiveCfg = Debug|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|x64.Build.0 = Debug|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|x86.ActiveCfg = Debug|Win32
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|x86.Build.0 = Debug|Win32
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Debug|Any CPU.ActiveCfg = Release|Win32
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Release|Any CPU.ActiveCfg = Release|Win32
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Release|x64.ActiveCfg = Release|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|Any CPU.ActiveCfg = Release|Win32
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|x64.ActiveCfg = Release|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|x64.Build.0 = Release|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|x86.ActiveCfg = Release|Win32
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|x86.Build.0 = Release|Win32
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|x64.ActiveCfg = Debug|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|x64.Build.0 = Debug|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|x86.ActiveCfg = Debug|Win32
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|x86.Build.0 = Debug|Win32
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Debug|Any CPU.ActiveCfg = Release|Win32
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Release|Any CPU.ActiveCfg = Release|Win32
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Release|x64.ActiveCfg = Release|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|Any CPU.ActiveCfg = Release|Win32
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x64.ActiveCfg = Release|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x64.Build.0 = Release|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x86.ActiveCfg = Release|Win32
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x86.Build.0 = Release|Win32
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x64.ActiveCfg = Debug|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x64.Build.0 = Debug|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x86.ActiveCfg = Debug|Win32
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x86.Build.0 = Debug|Win32
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Debug|Any CPU.ActiveCfg = Release|Win32
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Release|Any CPU.ActiveCfg = Release|Win32
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Release|x64.ActiveCfg = Release|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|Any CPU.ActiveCfg = Release|Win32
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x64.ActiveCfg = Release|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x64.Build.0 = Release|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x86.ActiveCfg = Release|Win32
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x86.Build.0 = Release|Win32
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x64.ActiveCfg = Debug|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x64.Build.0 = Debug|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x86.ActiveCfg = Debug|Win32
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x86.Build.0 = Debug|Win32
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Debug|Any CPU.ActiveCfg = Release|Win32
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Release|Any CPU.ActiveCfg = Release|Win32
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Release|x64.ActiveCfg = Release|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|Any CPU.ActiveCfg = Release|Win32
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x64.ActiveCfg = Release|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x64.Build.0 = Release|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.ActiveCfg = Release|Win32
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.Build.0 = Release|Win32
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|x64.ActiveCfg = Debug|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|x86.ActiveCfg = Debug|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|Any CPU.ActiveCfg = Release|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|Any CPU.Build.0 = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|x64.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|x64.Build.0 = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|x86.ActiveCfg = Debug|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|x86.Build.0 = Debug|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|Any CPU.ActiveCfg = Release|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|Any CPU.Build.0 = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|x64.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|x64.Build.0 = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|x86.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|x86.Build.0 = Release|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|Any CPU.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|x64.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|x86.ActiveCfg = Release|x86
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Debug|x64.ActiveCfg = Debug|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Debug|x86.ActiveCfg = Debug|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|Any CPU.ActiveCfg = Release|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|Any CPU.Build.0 = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|x64.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|x64.Build.0 = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|x86.ActiveCfg = Debug|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|x86.Build.0 = Debug|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|Any CPU.ActiveCfg = Release|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|Any CPU.Build.0 = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|x64.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|x64.Build.0 = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|x86.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|x86.Build.0 = Release|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Release|Any CPU.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Release|x64.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Release|x86.ActiveCfg = Release|Win32
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Debug|x64.ActiveCfg = Debug|x64
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Debug|x64.Build.0 = Debug|x64
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Debug|x86.ActiveCfg = Debug|Win32
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Debug|x86.Build.0 = Debug|Win32
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Installer.Debug|x64.ActiveCfg = Debug|x64
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Installer.Debug|x86.ActiveCfg = Debug|Win32
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Installer.Release|x64.ActiveCfg = Release|x64
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Installer.Release|x86.ActiveCfg = Release|Win32
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Release|x64.ActiveCfg = Release|x64
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Release|x64.Build.0 = Release|x64
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Release|x86.ActiveCfg = Release|Win32
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35}.Release|x86.Build.0 = Release|Win32
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Debug|x64.ActiveCfg = Debug|x64
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Debug|x64.Build.0 = Debug|x64
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Debug|x86.ActiveCfg = Debug|Win32
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Debug|x86.Build.0 = Debug|Win32
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Installer.Debug|x64.ActiveCfg = Debug|x64
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Installer.Debug|x86.ActiveCfg = Debug|Win32
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Installer.Release|x64.ActiveCfg = Release|x64
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Installer.Release|x86.ActiveCfg = Release|Win32
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Release|x64.ActiveCfg = Release|x64
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Release|x64.Build.0 = Release|x64
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Release|x86.ActiveCfg = Release|Win32
-		{73EAAEDA-557B-48D5-A137-328934720FB4}.Release|x86.Build.0 = Release|Win32
+		{10757011-749D-4954-873B-AE38D8145472}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{10757011-749D-4954-873B-AE38D8145472}.Debug|x64.ActiveCfg = Debug|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Debug|x64.Build.0 = Debug|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Debug|x86.ActiveCfg = Debug|Win32
 		{10757011-749D-4954-873B-AE38D8145472}.Debug|x86.Build.0 = Debug|Win32
+		{10757011-749D-4954-873B-AE38D8145472}.Installer.Debug|Any CPU.ActiveCfg = Release|Win32
 		{10757011-749D-4954-873B-AE38D8145472}.Installer.Debug|x64.ActiveCfg = Debug|x64
-		{10757011-749D-4954-873B-AE38D8145472}.Installer.Debug|x64.Build.0 = Debug|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Installer.Debug|x86.ActiveCfg = Debug|Win32
-		{10757011-749D-4954-873B-AE38D8145472}.Installer.Debug|x86.Build.0 = Debug|Win32
+		{10757011-749D-4954-873B-AE38D8145472}.Installer.Release|Any CPU.ActiveCfg = Release|Win32
 		{10757011-749D-4954-873B-AE38D8145472}.Installer.Release|x64.ActiveCfg = Release|x64
-		{10757011-749D-4954-873B-AE38D8145472}.Installer.Release|x64.Build.0 = Release|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Installer.Release|x86.ActiveCfg = Release|Win32
-		{10757011-749D-4954-873B-AE38D8145472}.Installer.Release|x86.Build.0 = Release|Win32
+		{10757011-749D-4954-873B-AE38D8145472}.Release|Any CPU.ActiveCfg = Release|Win32
 		{10757011-749D-4954-873B-AE38D8145472}.Release|x64.ActiveCfg = Release|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Release|x64.Build.0 = Release|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Release|x86.ActiveCfg = Release|Win32
 		{10757011-749D-4954-873B-AE38D8145472}.Release|x86.Build.0 = Release|Win32
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|x64.ActiveCfg = Debug|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|x64.Build.0 = Debug|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|x86.ActiveCfg = Debug|Win32
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|x86.Build.0 = Debug|Win32
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Debug|Any CPU.ActiveCfg = Release|Win32
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Debug|x64.ActiveCfg = Debug|x64
-		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Debug|x64.Build.0 = Debug|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Debug|x86.ActiveCfg = Debug|Win32
-		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Debug|x86.Build.0 = Debug|Win32
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Release|Any CPU.ActiveCfg = Release|Win32
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Release|x64.ActiveCfg = Release|x64
-		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Release|x64.Build.0 = Release|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Release|x86.ActiveCfg = Release|Win32
-		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Release|x86.Build.0 = Release|Win32
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|Any CPU.ActiveCfg = Release|Win32
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|x64.ActiveCfg = Release|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|x64.Build.0 = Release|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|x86.ActiveCfg = Release|Win32
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|x86.Build.0 = Release|Win32
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Debug|x64.ActiveCfg = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Release|x64.ActiveCfg = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Release|x86.ActiveCfg = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|x64.Build.0 = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|x86.Build.0 = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Release|x64.ActiveCfg = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Release|x86.ActiveCfg = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|x64.Build.0 = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|x86.Build.0 = Release|Any CPU
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|x64.ActiveCfg = Debug|x64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|x64.Build.0 = Debug|x64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|x86.ActiveCfg = Debug|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|x86.Build.0 = Debug|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Debug|Any CPU.ActiveCfg = Release|x64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Debug|x64.ActiveCfg = Debug|x64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Release|Any CPU.ActiveCfg = Release|x64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Release|x64.ActiveCfg = Release|x64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|Any CPU.ActiveCfg = Release|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|x64.ActiveCfg = Release|x64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|x64.Build.0 = Release|x64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|x86.ActiveCfg = Release|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|x86.Build.0 = Release|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|x64.ActiveCfg = Debug|x64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|x64.Build.0 = Debug|x64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|x86.ActiveCfg = Debug|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|x86.Build.0 = Debug|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Debug|Any CPU.ActiveCfg = Release|x64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Debug|x64.ActiveCfg = Debug|x64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Release|Any CPU.ActiveCfg = Release|x64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Release|x64.ActiveCfg = Release|x64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|Any CPU.ActiveCfg = Release|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|x64.ActiveCfg = Release|x64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|x64.Build.0 = Release|x64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|x86.ActiveCfg = Release|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|x86.Build.0 = Release|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|x64.ActiveCfg = Debug|x64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|x64.Build.0 = Debug|x64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|x86.ActiveCfg = Debug|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|x86.Build.0 = Debug|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Debug|Any CPU.ActiveCfg = Release|x64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Debug|x64.ActiveCfg = Debug|x64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Release|Any CPU.ActiveCfg = Release|x64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Release|x64.ActiveCfg = Release|x64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|Any CPU.ActiveCfg = Release|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|x64.ActiveCfg = Release|x64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|x64.Build.0 = Release|x64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|x86.ActiveCfg = Release|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -202,9 +299,12 @@ Global
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1} = {69439FD1-C07D-4BF1-98DC-3CCFECE53A49}
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594} = {B464EF06-42AE-4674-81BB-FDDE80204822}
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445} = {B464EF06-42AE-4674-81BB-FDDE80204822}
-		{A5EFD487-0140-4184-8C54-FFAEC2F85E35} = {FD28A504-431E-49B9-BB8C-DCA0E7019F66}
-		{73EAAEDA-557B-48D5-A137-328934720FB4} = {FD28A504-431E-49B9-BB8C-DCA0E7019F66}
 		{10757011-749D-4954-873B-AE38D8145472} = {69439FD1-C07D-4BF1-98DC-3CCFECE53A49}
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB} = {69439FD1-C07D-4BF1-98DC-3CCFECE53A49}
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1} = {A998CEC4-4B34-43DC-8457-F7761228BA67}
+		{4920E350-D496-4652-AE98-6C4208AEC1D8} = {69439FD1-C07D-4BF1-98DC-3CCFECE53A49}
+		{6CDF9411-B852-4EAC-822D-8F930675F17B} = {04A4762C-FAB9-4196-9AC8-0757F3E8AB79}
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA} = {04A4762C-FAB9-4196-9AC8-0757F3E8AB79}
+		{1E997BEC-1642-4A5C-B252-852DA094E11E} = {04A4762C-FAB9-4196-9AC8-0757F3E8AB79}
 	EndGlobalSection
 EndGlobal

build/VStudio/winfsp_dll.vcxproj

@@ -26,6 +26,7 @@
     <ClInclude Include="..\..\inc\fuse\winfsp_fuse.h" />
     <ClInclude Include="..\..\inc\winfsp\fsctl.h" />
     <ClInclude Include="..\..\inc\winfsp\winfsp.h" />
+    <ClInclude Include="..\..\inc\winfsp\winfsp.hpp" />
     <ClInclude Include="..\..\src\dll\fuse\library.h" />
     <ClInclude Include="..\..\src\dll\library.h" />
     <ClInclude Include="..\..\src\shared\minimal.h" />

build/VStudio/winfsp_dll.vcxproj.filters

@@ -50,6 +50,9 @@
     <ClInclude Include="..\..\src\dll\fuse\library.h">
       <Filter>Source\fuse</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\inc\winfsp\winfsp.hpp">
+      <Filter>Include\winfsp</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\dll\library.c">

build/choco/LICENSE.txt

@@ -0,0 +1,4 @@
+From: https://github.com/billziss-gh/winfsp/blob/master/License.txt
+
+LICENSE
+

build/choco/VERIFICATION.txt

@@ -0,0 +1,15 @@
+VERIFICATION
+Verification is intended to assist the Chocolatey moderators and community
+in verifying that this package's contents are trustworthy.
+
+WinFsp GitHub repository: https://github.com/billziss-gh/winfsp
+WinFsp MSI releases     : https://github.com/billziss-gh/winfsp/releases
+
+You may use the Windows certutil utility to confirm the hash of the MSI
+included in this package against the WinFsp MSI release of the same version.
+For example, for WinFsp version 1.0.17072 the command line to use is:
+
+    certutil -hashfile winfsp-1.0.17072.msi SHA256
+
+The certutil output of the MSI in this package is included below.
+

build/choco/chocolateyHelper.ps1

@@ -28,7 +28,7 @@ if ($key.Count -eq 1) {
             -File "$file"
     }
 } elseif ($key.Count -eq 0) {
-    Write-Warning "$packageName has already been uninstalled by other means."
+    # Write-Warning "$packageName is not installed"
 } elseif ($key.Count -gt 1) {
     Write-Warning "Too many matching packages found! Package may not be uninstalled."
     Write-Warning "Please alert package maintainer the following packages were matched:"

build/choco/chocolateyInstall.ps1

@@ -1,16 +1,14 @@
 $ErrorActionPreference = 'Stop';
 
-$toolsDir           = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-$fileLocation       = @(Get-ChildItem $toolsDir -filter winfsp-*.msi)[0].FullName
+$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+. "$toolsdir\chocolateyHelper.ps1"
 
 $packageArgs = @{
     packageName     = 'winfsp'
     fileType        = 'msi'
-    file            = $fileLocation
+    file            = @(Get-ChildItem $toolsDir -filter winfsp-*.msi)[0].FullName
     silentArgs      = "/qn /norestart INSTALLLEVEL=1000"
     validExitCodes  = @(0, 3010, 1641)
 }
-
 Install-ChocolateyInstallPackage @packageArgs
-
 Remove-Item -Force $packageArgs.file

build/choco/chocolateyUninstall.ps1

@@ -0,0 +1,4 @@
+$ErrorActionPreference = 'Stop';
+
+$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+. "$toolsdir\chocolateyHelper.ps1"

build/choco/winfsp.nuspec

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
     <metadata>
         <id>winfsp</id>
         <version>$version$</version>
         <packageSourceUrl>https://github.com/billziss-gh/winfsp/tree/master/build/choco</packageSourceUrl>
-        <owners>Bill Zissimopoulos &lt;billziss at navimatics.com&gt;</owners>
+        <owners>Bill Zissimopoulos</owners>
 
         <title>WinFsp</title>
-        <authors>Bill Zissimopoulos &lt;billziss at navimatics.com&gt;</authors>
+        <authors>Bill Zissimopoulos</authors>
         <projectUrl>https://github.com/billziss-gh/winfsp</projectUrl>
         <iconUrl>https://github.com/billziss-gh/winfsp/raw/master/art/winfsp-solid.png</iconUrl>
         <copyright>Bill Zissimopoulos</copyright>
@@ -31,6 +31,13 @@ Some of the benefits of using WinFsp are listed below:
 * FUSE compatibility layer for native Windows and Cygwin.
 * Signed drivers provided on every release.
 * Available under the GPLv3 license with a special exception for Free/Libre and Open Source Software.
+
+To verify installation:
+
+* For 64-bit Windows: `net use m: \\memfs64\share` from the command prompt.
+* For 32-bit Windows: `net use m: \\memfs32\share`
+* For Cygwin: `net use m: '\\memfs64\share'`
+* To delete the drive: `net use m: /delete`
         </description>
         <releaseNotes>https://github.com/billziss-gh/winfsp/blob/master/Changelog.asciidoc</releaseNotes>
 
@@ -40,8 +47,11 @@ Some of the benefits of using WinFsp are listed below:
     </metadata>
 
     <files>
+        <file src="LICENSE.txt" target="tools" />
+        <file src="VERIFICATION.txt" target="tools" />
         <file src="chocolateyInstall.ps1" target="tools" />
-        <file src="chocolateyBeforeModify.ps1" target="tools" />
+        <file src="chocolateyUninstall.ps1" target="tools" />
+        <file src="chocolateyHelper.ps1" target="tools" />
         <file src="winfsp-$version$.msi" target="tools" />
     </files>
 </package>

doc/Frequently-Asked-Questions.asciidoc

@@ -0,0 +1,56 @@
+= Frequently Asked Questions
+
+== General
+
+[qanda]
+
+I am running Windows 7 and I am finding that the installed driver is not signed. [@efeat]::
+
+	Your Windows 7 OS is missing SHA-2 Code Signing Support. You need to install the following security advisory that will rectify the problem:
+	https://technet.microsoft.com/en-us/library/security/3033929.aspx
+
+
+Disconnecting (unmapping) a network drive does not work. [@carlreinke]::
+
+    You may have Dokany installed. Dokany installs its own Network Provider DLL that unfortunately interferes with the WinFsp handling of network drives. The solution is to change your system's Network Provider order and ensure that the WinFsp Network Provider runs before the Dokany one. Instructions on how to change the Network Provider order can be found in this http://blogs.interfacett.com/changing-the-network-provider-order-in-windows-10[article].
+
+
+Why is the DLL not installed in the Windows system directories? [@netheril96]::
+
+    It is true that this would make it convenient to load the DLL, because the Windows loader looks into the Windows system directories when it loads DLL's. However, in the opinion of the WinFsp author, software that does not ship with the OS should not be installing components in the system directories.
++
+There are a few alternative methods to overcome this problem. WinFsp recommends marking the WinFsp DLL as "delay load" and then using `FspLoad` to dynamically load the DLL during process initialization. For more information see the WinFsp Tutorial.
+
+
+Does WinFsp provide debugging symbols? [@netheril96]::
+
+    Public debugging symbols are already included in the installer. You need to install the "Developer" feature; the symbols can be found in the `sym` directory under the WinFsp installation directory.
+
+
+Is there a maximum number of concurrent file systems? [@efeat]::
+
+    WinFsp does not have a hard limit of how many file systems can be created or how many processes can create file systems.
++
+As of the commits required to fix issue #55, there is however a hash table inside the FSD that uses PID's (Process ID's) as keys. This hash table currently expects that in general there will not be more than 50 processes creating file systems. However this is not a hard limit.
+
+
+== FUSE
+
+[qanda]
+
+Which version of FUSE does WinFsp-FUSE support?::
+
+    Currently it supports FUSE 2.8.
+
+
+FUSE on UNIX systems mounts file systems over an existing directory. When mounting a WinFsp-FUSE file system on a directory, the directory is created and later deleted when the file system goes away. What is the reason for this incompatibility? [@efeat]::
+
+    It would be preferrable if WinFsp-FUSE behaved like FUSE on UNIX in this instance. However there are a number of reasons that this is not the case.
++
+When mounting over directories in Windows, WinFsp-FUSE uses a special construct called a reparse point. Reparse points are a general mechanism for adding special behavior to files and directories. One of the possible reparse points is the "mountpoint" reparse point (often called "junction"), which converts a directory into a mount point.
++
+With this in mind here are the reasons for the current WinFsp-FUSE behavior:
++
+- Symmetry with mounting on a drive. On Windows drives are created when the file system comes into existence and deleted when it is gone.
+- Inability to mount over a non-empty directory on Windows. On FUSE/UNIX this is possible, but not on Windows because NTFS disallows the creation of (mountpoint) reparse points on non-empty directories.
+- Most importantly: inability to guarantee that the mount point will cease to exist if the file system crashes. WinFsp attempts to guarantee that all resources used by a file system will get cleaned up. This is certainly true for the kernel-mode FSD, but an attempt is made to do so also in user mode. For this reason, drive symbolic links are marked as temporary and (importantly for our discussion) mount directories are opened with `FILE_FLAG_DELETE_ON_CLOSE`. There is no way to guarantee the removal of a reparse point in the same way.

doc/Home.md

@@ -0,0 +1,33 @@
+# WinFsp - Windows File System Proxy
+
+[[WinFsp-Icon.png]]
+
+Developing file systems is a challenging proposition. Developing file systems for Windows is an order of magnitude more difficult. WinFsp eases the task of writing a new file system for Windows. WinFsp file systems are user mode programs and they can be written in a variety of languages and frameworks.
+
+The documentation available here discusses various aspects of WinFsp.
+
+## Programming
+
+- The [[Tutorial|WinFsp-Tutorial]] describes how to create a simple, but complete file system in C/C++.
+- The [[API Reference|winfsp.h]] describes the native WinFsp API. This external [[link|http://www.secfs.net/winfsp/apiref/]] may be easier to browse for some people.
+- There is also a FUSE compatibility layer for native Windows and Cygwin. See fuse.h in the source repository.
+- This [[document|Native-API-vs-FUSE]] discusses the need for both a native API and FUSE and gives some pointers on which one to choose.
+
+## Design
+
+- The [[Design|WinFsp-Design]] document describes the high-level design of WinFsp.
+- The [[IPC|WinFsp-as-an-IPC-Mechanism]] document offers insights into the WinFsp Inter-Process Communication mechanism.
+- The [[Queued Events|Queued-Events]] document discusses a low-level synchronization primitive that is largely responsible for the excellent performance of the WinFsp IPC mechanism.
+- The [[Service Architecture|WinFsp-Service-Architecture]] document discusses how to intergrate a file system into Windows as a service and the reasons to do so.
+- The [[SSHFS Port Case Study|SSHFS-Port-Case-Study]] document chronicles the creation of the WinFsp-FUSE compatibility layer and the decisions that led to its design.
+
+## Testing
+
+- The [[Testing|WinFsp-Testing]] document discusses the WinFsp testing strategy and how WinFsp achieves correctness and stability.
+- The [[Performance|WinFsp-Performance-Testing]] document compares WinFsp performance against other file systems.
+
+## Compatibility
+
+- The [[Compatibility|NTFS-Compatibility]] document discusses current WinFsp compatibility with NTFS.
+
+WinFsp is available under the GPLv3 license with a special exception for Free/Libre and Open Source Software.

doc/Known-File-Systems.asciidoc

@@ -0,0 +1,21 @@
+= Known File Systems and File System Libraries
+
+This document contains a list of known file systems and file system libraries that run on WinFsp. Please contact the WinFsp project to have your file system solution added to this list.
+
+== File Systems
+
+- https://github.com/ihaveamac/fuse-3ds[fuse-3ds] - FUSE Filesystem Python scripts for Nintendo 3DS files
+- https://github.com/FrKaram/KS2.Drive[KS2.Drive] - Mount a webDAV/AOS server as a local drive
+- https://github.com/billziss-gh/nfs-win[nfs-win] - NFS for Windows
+- https://github.com/ncw/rclone[rclone] - rsync for cloud storage
+- https://github.com/hasse69/rar2fs[rar2fs] - FUSE file system for reading RAR archives
+- https://github.com/billziss-gh/redditfs[redditfs] - ls -l /r/programming
+- https://github.com/netheril96/securefs[securefs] - Filesystem in userspace (FUSE) with transparent authenticated encryption
+- https://github.com/billziss-gh/sshfs-win[sshfs-win] - SSHFS for Windows
+
+== File System Libraries
+
+- https://github.com/billziss-gh/cgofuse[Go: cgofuse] - Cross-platform FUSE library for Go
+- https://github.com/DuroSoft/fuse-bindings[Nodejs: fuse-bindings] - Fully maintained FUSE bindings for Node that aims to cover the entire FUSE api
+- https://github.com/SerCeMan/jnr-fuse[Java: jnr-fuse] - FUSE implementation in Java using Java Native Runtime (JNR)
+- https://github.com/billziss-gh/fusepy[Python: fusepy] - Simple ctypes bindings for FUSE

doc/Queued-Events.asciidoc

@@ -0,0 +1,105 @@
+= Queued Events - Windows kernel events with IOCP scheduling characteristics
+
+In this article I am discussing _Queued Events_. _Queued Events_ are a Windows kernel synchronization mechanism that I invented for https://github.com/billziss-gh/winfsp[WinFsp - FUSE for Windows]. _Queued Events_ behave like kernel Synchronization Events (i.e. Win32 auto-reset events), but provide scheduling characteristics similar to those of I/O Completion Ports.
+
+== The Problem
+
+During the later stages of WinFsp development I decided to do some performance testing to understand its behavior and find opportunities for optimization. I found out that WinFsp performed very well in most tested scenarios, but there was one test that seemed to have bad performance for no particular reason.
+
+I ended up profiling this issue using xperf (included in the https://docs.microsoft.com/en-us/windows-hardware/test/wpt/[Windows Performance Toolkit]), which allows for kernel-level profiling. I spent considerable time looking at the profiling results, but could identify no obvious issue with my code.
+
+After a day or two of doing this and being stumped I finally had a lightbulb moment: what if the issue is not with my code, but with how the OS schedules threads? Sure enough I had xperf trace context switches and found that on good runs the OS would context switch my file system threads relatively rarely; on bad runs the OS would context switch my threads excessively.
+
+After contemplating this issue I realized that this was happening because the OS was trying to schedule my threads in a "fair" manner. Windows in general tries to give every thread a chance to run. This can be counter-productive in server-like programs (such as file systems), where all server threads are equivalent and it is actually better to reuse the same thread (if possible) to avoid context switching and other negative effects.
+
+== The Solution
+
+One way of looking at WinFsp is as an IPC (Inter-Process Communication) mechanism. The Windows kernel packages file system operations (open, close, read, write) as IRP's (I/O Request Packets) which it sends to WinFsp. WinFsp places them in an _I/O Queue_; at a later time the threads in a user mode file system retrieve the IRP's from the _I/O Queue_ and service them.
+
+The _I/O Queue_ had gone through multiple iterations, but at the time I was looking at this issue it was using Windows kernel Synchronization Event's (Win32 auto-reset events) for managing threads. The problem was that a wait on a Synchronization Event would be satisfied in a "fair" manner, thus resulting to excessive context switching and bad performance in some circumstances. I needed to find a way to convince Windows to schedule my threads in an "unfair" manner, giving preference to the same thread as much as possible.
+
+I started considering different schemes where I would associate a different event per thread thus being able to wake up the "correct" thread myself and effectively writing my own mini-scheduler. Luckily I had another lightbulb moment: I/O completion ports already do this better than I would ever be able to!
+
+The kernel portion of an I/O Completion Port is called a https://msdn.microsoft.com/en-us/library/windows/hardware/ff549547(v=vs.85).aspx[KQUEUE]. KQUEUE's are (unfortunately) not directly exposed to user mode, however they are at the core of the user mode I/O Completion Ports. KQUEUE's are the main reason I/O Completion Ports are so fast as they provide the following scheduling characteristics:
+
+- They have a Last-In First-Out (LIFO) wait discipline.
+- They limit the number of threads that can be satisfied concurrently.
+
+I briefly considered the idea of building _I/O Queues_ directly on top of KQUEUE's, but soon dismissed this idea because _I/O Queues_ are not simple queues but provide additional services, such as IRP cancelation, IRP expiration, etc.
+
+== Queued Events
+
+In an ideal scenario I wanted to continue using my implementation of _I/O Queues_ which had undergone considerable testing and I knew it worked. But somehow I had to convince the Windows kernel to change the scheduling characteristics of Synchronization Events to mirror those of a KQUEUE.
+
+Then I had lightbulb no 3: _Queued Events_ or how to make a queue behave like a Synchronization Event.
+
+Here is how _Queued Events_ work. A _Queued Event_ consists of a KQUEUE and a spin lock. There is also a single dummy item that can be placed in the KQUEUE.
+
+The KQUEUE is guaranteed to contain either 0 or 1 items. When the KQUEUE contains 0 items the _Queued Event_ is considered non-signaled. When the KQUEUE contains 1 items the _Queued Event_ is considered signaled.
+
+ifdef::env-browser[]
+[ditaa,file="Queued-Events/states.png"]
+--
+        Non signaled                                    Signaled
++---------------------------+                 +---------------------------+
+| Queued Event              |                 | Queued Event              |
++---------------------------+                 +---------------------------+
+|                           |                 |               +---------+ |
+|   KQUEUE        (empty)   |                 |   KQUEUE      |  DUMMY  | |
+|                           |                 |               +---------+ |
++---------------------------+                 +---------------------------+
+--
+endif::env-browser[]
+ifndef::env-browser[image::Queued-Events/states.png[]]
+
+To transition from the non-signaled to the signaled state, we acquire the spin lock and then insert the dummy item in the KQUEUE using https://msdn.microsoft.com/en-us/library/windows/hardware/ff549570(v=vs.85).aspx[KeInsertQueue]. To transition from the signaled to the non-signaled state, we simply (wait and) remove the dummy item from the KQUEUE using https://msdn.microsoft.com/en-us/library/windows/hardware/ff549605(v=vs.85).aspx[KeRemoveQueue] (without the use of the spin lock).
+
+----
+EventSet:
+    AcquireSpinLock
+    if (0 == KeReadState())          // if KQUEUE is empty
+        KeInsertQueue(DUMMY);
+    ReleaseSpinLock
+
+EventWait:
+    KeRemoveQueue();                 // (wait and) remove item
+----
+
+First notice that EventSet is serialized by the use of the spin lock. This guarantees that the dummy item can be only inserted ONCE in the KQUEUE and that the only possible signaled state transitions for EventSet are 0->1 and 1->1. This is how https://msdn.microsoft.com/en-us/library/windows/hardware/ff553253(v=vs.85).aspx[KeSetEvent] works for a Synchronization Event.
+
+Second notice that EventWait is not protected by the spin lock, which means that it can happen at any time including concurrently with EventSet or another EventWait. Notice also that for EventWait the only possible transitions are 1->0 or 0->0 (0->block->0). This is how https://msdn.microsoft.com/en-us/library/windows/hardware/ff553350(v=vs.85).aspx[KeWaitForSingleObject] works for a Synchronization Event.
+
+ifdef::env-browser[]
+[ditaa,file="Queued-Events/transitions.png"]
+--
+        Non signaled                                    Signaled
++---------------------------+                 +---------------------------+
+| Queued Event              |                 | Queued Event              |
++---------------------------+                 +---------------------------+
+|                           | ---EventSet --> |               +---------+ |
+|   KQUEUE        (empty)   |                 |   KQUEUE      |  DUMMY  | |
+|                           | <--EventWait--- |               +---------+ |
++---------------------------+                 +---------------------------+
+--
+endif::env-browser[]
+ifndef::env-browser[image::Queued-Events/transitions.png[]]
+
+We now have to consider what happens when we have one EventSet concurrently with one or more EventWait's:
+
+1. The EventWait(s) happen before https://msdn.microsoft.com/en-us/library/windows/hardware/ff549591(v=vs.85).aspx[KeReadState]. If the KQUEUE has an item one EventWait gets satisfied, otherwise it blocks. In this case KeReadState will read the KQUEUE's state as 0 and KeInsertQueue will insert the dummy item, which will unblock the EventWait.
+2. The EventWait(s) happen after KeReadState, but before KeInsertQueue. If the dummy item was already in the KQUEUE the KeReadState test will fail and KeInsertQueue will not be executed, but EventWait will be satisfied immediately. If the dummy item was not in the KQUEUE the KeReadState will succeed and EventWait will momentarily block until KeInsertQueue releases it.
+3. The EventWait(s) happen after KeInsertQueue. In this case the dummy item in is the KQUEUE already and one EventWait will be satisfied immediately.
+
+NOTE: _Queued Events_ cannot cleanly support an EventClear operation. The obvious choice of using KeRemoveQueue with a 0 timeout is insufficient because it would associate the current thread with the KQUEUE and that is not desirable. KeRundownQueue cannot be used either because it disassociates all threads from the KQUEUE.
+
+The complete implementation of _Queued Events_ within WinFsp can be found here: https://github.com/billziss-gh/winfsp/blob/v1.1/src/sys/driver.h#L655-L795
+
+== Queued Events Scheduling Characteristics
+
+Queued Events encapsulate KQUEUE's and therefore inherit their scheduling characteristics:
+
+- They have a Last-In First-Out (LIFO) wait discipline.
+- They limit the number of threads that can be satisfied concurrently.
+
+These characteristics are desirable because they reduce the number of context switches thus speeding up the WinFsp IPC implementation. Performance testing immediately after the incorporation of _Queued Events_ into WinFsp showed significant performance improvements; profiling with xperf showed that context switches among file system threads were now a relatively rare event!
+

doc/WinFsp-Service-Architecture.asciidoc

@@ -38,7 +38,7 @@ For example, the MEMFS sample adds the following registry entries in a 64-bit sy
     "Security"="D:P(A;;RPWPLC;;;WD)"
     "JobControl"=dword:00000001
 
-When the WinFsp.Launcher starts up it creates a named pipe that applications can use to start, stop, get information about and list service instances. A small command line utility (`launchctl`) can be used to issue those commands. The CallNamedPipeW API can be used as well.
+When the WinFsp.Launcher starts up it creates a named pipe that applications can use to start, stop, get information about and list service instances. A small command line utility (`launchctl`) can be used to issue those commands. The `CallNamedPipeW` API can be used as well.
 
 One final note regarding security. Notice the `Security` registry value in the example above. This registry value uses SDDL syntax to instruct WinFsp.Launcher to allow Everyone (`WD`) to start (`RP`), stop (`WP`) and get information (`LC`) about the service instance. If the `Security` registry value is missing the default is to allow only LocalSystem and Administrators to control the service instance.
 
@@ -47,3 +47,13 @@ One final note regarding security. Notice the `Security` registry value in the e
 WinFsp includes a Network Provider that integrates with Windows and can be used to start and stop user mode file systems from the Windows shell. To achieve this the Network Provider (implemented as part of the WinFsp DLL) works closely with the WinFsp.Launcher service.
 
 For example, if a user uses the Windows Explorer to map `\\memfs64\share` to the `Z:` drive, the Network Provider will instruct the WinFsp.Launcher to start an instance of the memfs64 service with command line `-i -F NTFS -n 65536 -s 67108864 -u \\memfs64\share -m Z:`. When the user disconnects the `Z:` drive, the Network Provider will instruct the WinFsp.Launcher to stop the previously started instance of the memfs64 service.
+
+== File System Credential Support
+
+Some file systems require credentials in order to allow access and be mounted. Such file systems must add a registry value `Credentials`:
+
+    "Credentials"=dword:00000001
+
+This will instruct the WinFsp Network Provider to request a password from the user prior to starting the file system. This password will then be securely passed to the WinFsp Launcher which in turn will pass it to the user mode file system on its standard input. The user mode file system must respond `OK` if the password is correct and allows access to the user mode file system. Any other response from the user mode file system (including a timeout without a response) is interpreted as an authentication failure.
+
+NOTE: During password entry the user may also choose to "remember" the password in which case it will be saved in the Windows Credential Manager.

doc/WinFsp-Testing.asciidoc

@@ -95,7 +95,7 @@ if (!Success)
 
 In Release builds the +DEBUGTEST(90)+ macro will evaluate to +TRUE+ and the Cache Manager will be asked directly via +CcCanIWrite+ whether a WRITE should be deferred. In Debug builds the +DEBUGTEST(90)+ macro will evaluate to +FALSE+ sometimes (10% of the time) and the WRITE will be deferred, thus allowing us to test the retry code path.
 
-== Compatibility Testing
+== NTFS Compatibility Testing
 
 WinFsp allows the creation of user mode file systems that exhibit behavior similar to NTFS. This means that Windows applications that use such a file system should not be able to tell the difference between NTFS and the WinFsp-based file system. OTOH specialized applications (such as Defrag) will not work properly on WinFsp file systems.
 
@@ -123,6 +123,12 @@ The goal of performance testing is to evaluate and understand how software behav
 
 WinFsp uses a tool called fsbench for this purpose. Fsbench is able to test specific scenarios, for example: "how long does it take to delete 1000 files?" Fsbench has been very useful for WinFsp and has helped improve its performance: in one situation it helped identify quadratic behavior with the MEMFS ReadDirectory operation, in another situation it helped fine tune the performance of the WinFsp I/O Queue.
 
+== Backwards Compatibility testing
+
+As the WinFsp API's mature it is important to verify that they remain backwards compatible with existing file system binaries. For this purpose binaries that have been compiled against earlier versions of WinFsp are used to verify that they run correctly against the latest version.
+
+For example, in version v1.2B3 of WinFsp an +FSP_FUSE_CAP_STAT_EX+ FUSE extension was introduced. This can change the layout of +struct fuse_stat+ and is therefore a potentially dangerous change. To test against inadvertent breakage a FUSE file system binary that was compiled against v1.2B2 is regularly used to verify backwards compatibility.
+
 == Code Analysis
 
 WinFsp is regularly run under the Visual Studio's Code Analyzer. Any issues found are examined and if necessary acted upon.

inc/fuse/fuse.h

@@ -39,54 +39,82 @@ typedef int (*fuse_dirfil_t)(fuse_dirh_t h, const char *name,
 
 struct fuse_operations
 {
-    int (*getattr)(const char *path, struct fuse_stat *stbuf);
-    int (*getdir)(const char *path, fuse_dirh_t h, fuse_dirfil_t filler);
-    int (*readlink)(const char *path, char *buf, size_t size);
-    int (*mknod)(const char *path, fuse_mode_t mode, fuse_dev_t dev);
-    int (*mkdir)(const char *path, fuse_mode_t mode);
-    int (*unlink)(const char *path);
-    int (*rmdir)(const char *path);
-    int (*symlink)(const char *dstpath, const char *srcpath);
-    int (*rename)(const char *oldpath, const char *newpath);
-    int (*link)(const char *srcpath, const char *dstpath);
-    int (*chmod)(const char *path, fuse_mode_t mode);
-    int (*chown)(const char *path, fuse_uid_t uid, fuse_gid_t gid);
-    int (*truncate)(const char *path, fuse_off_t size);
-    int (*utime)(const char *path, struct fuse_utimbuf *timbuf);
-    int (*open)(const char *path, struct fuse_file_info *fi);
-    int (*read)(const char *path, char *buf, size_t size, fuse_off_t off,
+    /* S - supported by WinFsp */
+    /* S */ int (*getattr)(const char *path, struct fuse_stat *stbuf);
+    /* S */ int (*getdir)(const char *path, fuse_dirh_t h, fuse_dirfil_t filler);
+    /* S */ int (*readlink)(const char *path, char *buf, size_t size);
+    /* S */ int (*mknod)(const char *path, fuse_mode_t mode, fuse_dev_t dev);
+    /* S */ int (*mkdir)(const char *path, fuse_mode_t mode);
+    /* S */ int (*unlink)(const char *path);
+    /* S */ int (*rmdir)(const char *path);
+    /* S */ int (*symlink)(const char *dstpath, const char *srcpath);
+    /* S */ int (*rename)(const char *oldpath, const char *newpath);
+    /* _ */ int (*link)(const char *srcpath, const char *dstpath);
+    /* S */ int (*chmod)(const char *path, fuse_mode_t mode);
+    /* S */ int (*chown)(const char *path, fuse_uid_t uid, fuse_gid_t gid);
+    /* S */ int (*truncate)(const char *path, fuse_off_t size);
+    /* S */ int (*utime)(const char *path, struct fuse_utimbuf *timbuf);
+    /* S */ int (*open)(const char *path, struct fuse_file_info *fi);
+    /* S */ int (*read)(const char *path, char *buf, size_t size, fuse_off_t off,
         struct fuse_file_info *fi);
-    int (*write)(const char *path, const char *buf, size_t size, fuse_off_t off,
+    /* S */ int (*write)(const char *path, const char *buf, size_t size, fuse_off_t off,
         struct fuse_file_info *fi);
-    int (*statfs)(const char *path, struct fuse_statvfs *stbuf);
-    int (*flush)(const char *path, struct fuse_file_info *fi);
-    int (*release)(const char *path, struct fuse_file_info *fi);
-    int (*fsync)(const char *path, int datasync, struct fuse_file_info *fi);
-    int (*setxattr)(const char *path, const char *name, const char *value, size_t size,
+    /* S */ int (*statfs)(const char *path, struct fuse_statvfs *stbuf);
+    /* S */ int (*flush)(const char *path, struct fuse_file_info *fi);
+    /* S */ int (*release)(const char *path, struct fuse_file_info *fi);
+    /* S */ int (*fsync)(const char *path, int datasync, struct fuse_file_info *fi);
+    /* _ */ int (*setxattr)(const char *path, const char *name, const char *value, size_t size,
         int flags);
-    int (*getxattr)(const char *path, const char *name, char *value, size_t size);
-    int (*listxattr)(const char *path, char *namebuf, size_t size);
-    int (*removexattr)(const char *path, const char *name);
-    int (*opendir)(const char *path, struct fuse_file_info *fi);
-    int (*readdir)(const char *path, void *buf, fuse_fill_dir_t filler, fuse_off_t off,
+    /* _ */ int (*getxattr)(const char *path, const char *name, char *value, size_t size);
+    /* _ */ int (*listxattr)(const char *path, char *namebuf, size_t size);
+    /* _ */ int (*removexattr)(const char *path, const char *name);
+    /* S */ int (*opendir)(const char *path, struct fuse_file_info *fi);
+    /* S */ int (*readdir)(const char *path, void *buf, fuse_fill_dir_t filler, fuse_off_t off,
         struct fuse_file_info *fi);
-    int (*releasedir)(const char *path, struct fuse_file_info *fi);
-    int (*fsyncdir)(const char *path, int datasync, struct fuse_file_info *fi);
-    void *(*init)(struct fuse_conn_info *conn);
-    void (*destroy)(void *data);
-    int (*access)(const char *path, int mask);
-    int (*create)(const char *path, fuse_mode_t mode, struct fuse_file_info *fi);
-    int (*ftruncate)(const char *path, fuse_off_t off, struct fuse_file_info *fi);
-    int (*fgetattr)(const char *path, struct fuse_stat *stbuf, struct fuse_file_info *fi);
-    int (*lock)(const char *path, struct fuse_file_info *fi, int cmd, struct fuse_flock *lock);
-    int (*utimens)(const char *path, const struct fuse_timespec tv[2]);
-    int (*bmap)(const char *path, size_t blocksize, uint64_t *idx);
-    unsigned int flag_nullpath_ok:1;
-    unsigned int flag_reserved:31;
-    int (*ioctl)(const char *path, int cmd, void *arg, struct fuse_file_info *fi,
+    /* S */ int (*releasedir)(const char *path, struct fuse_file_info *fi);
+    /* S */ int (*fsyncdir)(const char *path, int datasync, struct fuse_file_info *fi);
+    /* S */ void *(*init)(struct fuse_conn_info *conn);
+    /* S */ void (*destroy)(void *data);
+    /* _ */ int (*access)(const char *path, int mask);
+    /* S */ int (*create)(const char *path, fuse_mode_t mode, struct fuse_file_info *fi);
+    /* S */ int (*ftruncate)(const char *path, fuse_off_t off, struct fuse_file_info *fi);
+    /* S */ int (*fgetattr)(const char *path, struct fuse_stat *stbuf, struct fuse_file_info *fi);
+    /* _ */ int (*lock)(const char *path,
+        struct fuse_file_info *fi, int cmd, struct fuse_flock *lock);
+    /* S */ int (*utimens)(const char *path, const struct fuse_timespec tv[2]);
+    /* _ */ int (*bmap)(const char *path, size_t blocksize, uint64_t *idx);
+    /* _ */ unsigned int flag_nullpath_ok:1;
+    /* _ */ unsigned int flag_nopath:1;
+    /* _ */ unsigned int flag_utime_omit_ok:1;
+    /* _ */ unsigned int flag_reserved:29;
+    /* _ */ int (*ioctl)(const char *path, int cmd, void *arg, struct fuse_file_info *fi,
         unsigned int flags, void *data);
-    int (*poll)(const char *path, struct fuse_file_info *fi,
+    /* _ */ int (*poll)(const char *path, struct fuse_file_info *fi,
         struct fuse_pollhandle *ph, unsigned *reventsp);
+    /* FUSE 2.9 */
+    /* _ */ int (*write_buf)(const char *path,
+        struct fuse_bufvec *buf, fuse_off_t off, struct fuse_file_info *fi);
+    /* _ */ int (*read_buf)(const char *path,
+        struct fuse_bufvec **bufp, size_t size, fuse_off_t off, struct fuse_file_info *fi);
+    /* _ */ int (*flock)(const char *path, struct fuse_file_info *, int op);
+    /* _ */ int (*fallocate)(const char *path, int mode, fuse_off_t off, fuse_off_t len,
+        struct fuse_file_info *fi);
+    /* OSXFUSE */
+    /* _ */ int (*reserved00)();
+    /* _ */ int (*reserved01)();
+    /* _ */ int (*reserved02)();
+    /* _ */ int (*statfs_x)(const char *path, struct fuse_statfs *stbuf);
+    /* _ */ int (*setvolname)(const char *volname);
+    /* _ */ int (*exchange)(const char *oldpath, const char *newpath, unsigned long flags);
+    /* _ */ int (*getxtimes)(const char *path,
+        struct fuse_timespec *bkuptime, struct fuse_timespec *crtime);
+    /* _ */ int (*setbkuptime)(const char *path, const struct fuse_timespec *tv);
+    /* S */ int (*setchgtime)(const char *path, const struct fuse_timespec *tv);
+    /* S */ int (*setcrtime)(const char *path, const struct fuse_timespec *tv);
+    /* S */ int (*chflags)(const char *path, uint32_t flags);
+    /* _ */ int (*setattr_x)(const char *path, struct fuse_setattr_x *attr);
+    /* _ */ int (*fsetattr_x)(const char *path, struct fuse_setattr_x *attr,
+        struct fuse_file_info *fi);
 };
 
 struct fuse_context
@@ -118,6 +146,8 @@ FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_loop_mt)(struct fsp_fuse_env *env,
     struct fuse *f);
 FSP_FUSE_API void FSP_FUSE_API_NAME(fsp_fuse_exit)(struct fsp_fuse_env *env,
     struct fuse *f);
+FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_exited)(struct fsp_fuse_env *env,
+    struct fuse *f);
 FSP_FUSE_API struct fuse_context *FSP_FUSE_API_NAME(fsp_fuse_get_context)(struct fsp_fuse_env *env);
 
 FSP_FUSE_SYM(
@@ -171,6 +201,13 @@ void fuse_exit(struct fuse *f),
         (fsp_fuse_env(), f);
 })
 
+FSP_FUSE_SYM(
+int fuse_exited(struct fuse *f),
+{
+    return FSP_FUSE_API_CALL(fsp_fuse_exited)
+        (fsp_fuse_env(), f);
+})
+
 FSP_FUSE_SYM(
 struct fuse_context *fuse_get_context(void),
 {

inc/fuse/fuse_common.h

@@ -49,6 +49,7 @@ extern "C" {
 
 #define FSP_FUSE_CAP_READDIR_PLUS       (1 << 21)   /* file system supports enhanced readdir */
 #define FSP_FUSE_CAP_READ_ONLY          (1 << 22)   /* file system is marked read-only */
+#define FSP_FUSE_CAP_STAT_EX            (1 << 23)   /* file system supports fuse_stat_ex */
 #define FSP_FUSE_CAP_CASE_INSENSITIVE   FUSE_CAP_CASE_INSENSITIVE
 
 #define FUSE_IOCTL_COMPAT               (1 << 0)
@@ -56,6 +57,24 @@ extern "C" {
 #define FUSE_IOCTL_RETRY                (1 << 2)
 #define FUSE_IOCTL_MAX_IOV              256
 
+/* from FreeBSD */
+#define FSP_FUSE_UF_HIDDEN              0x00008000
+#define FSP_FUSE_UF_READONLY            0x00001000
+#define FSP_FUSE_UF_SYSTEM              0x00000080
+#define FSP_FUSE_UF_ARCHIVE             0x00000800
+#if !defined(UF_HIDDEN)
+#define UF_HIDDEN                       FSP_FUSE_UF_HIDDEN
+#endif
+#if !defined(UF_READONLY)
+#define UF_READONLY                     FSP_FUSE_UF_READONLY
+#endif
+#if !defined(UF_SYSTEM)
+#define UF_SYSTEM                       FSP_FUSE_UF_SYSTEM
+#endif
+#if !defined(UF_ARCHIVE)
+#define UF_ARCHIVE                      FSP_FUSE_UF_ARCHIVE
+#endif
+
 struct fuse_file_info
 {
     int flags;
@@ -85,6 +104,9 @@ struct fuse_conn_info
 struct fuse_session;
 struct fuse_chan;
 struct fuse_pollhandle;
+struct fuse_bufvec;
+struct fuse_statfs;
+struct fuse_setattr_x;
 
 FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_version)(struct fsp_fuse_env *env);
 FSP_FUSE_API struct fuse_chan *FSP_FUSE_API_NAME(fsp_fuse_mount)(struct fsp_fuse_env *env,

inc/fuse/winfsp_fuse.h

@@ -65,6 +65,27 @@ extern "C" {
  * to be usable from Cygwin.
  */
 
+#define FSP_FUSE_STAT_FIELD_DEFN        \
+    fuse_dev_t st_dev;                  \
+    fuse_ino_t st_ino;                  \
+    fuse_mode_t st_mode;                \
+    fuse_nlink_t st_nlink;              \
+    fuse_uid_t st_uid;                  \
+    fuse_gid_t st_gid;                  \
+    fuse_dev_t st_rdev;                 \
+    fuse_off_t st_size;                 \
+    struct fuse_timespec st_atim;       \
+    struct fuse_timespec st_mtim;       \
+    struct fuse_timespec st_ctim;       \
+    fuse_blksize_t st_blksize;          \
+    fuse_blkcnt_t st_blocks;            \
+    struct fuse_timespec st_birthtim;
+#define FSP_FUSE_STAT_EX_FIELD_DEFN     \
+    FSP_FUSE_STAT_FIELD_DEFN            \
+    uint32_t st_flags;                  \
+    uint32_t st_reserved32[3];          \
+    uint64_t st_reserved64[2];
+
 #if defined(_WIN64) || defined(_WIN32)
 
 typedef uint32_t fuse_uid_t;
@@ -111,23 +132,17 @@ struct fuse_timespec
 };
 #endif
 
+#if !defined(FSP_FUSE_USE_STAT_EX)
 struct fuse_stat
 {
-    fuse_dev_t st_dev;
-    fuse_ino_t st_ino;
-    fuse_mode_t st_mode;
-    fuse_nlink_t st_nlink;
-    fuse_uid_t st_uid;
-    fuse_gid_t st_gid;
-    fuse_dev_t st_rdev;
-    fuse_off_t st_size;
-    struct fuse_timespec st_atim;
-    struct fuse_timespec st_mtim;
-    struct fuse_timespec st_ctim;
-    fuse_blksize_t st_blksize;
-    fuse_blkcnt_t st_blocks;
-    struct fuse_timespec st_birthtim;
+    FSP_FUSE_STAT_FIELD_DEFN
 };
+#else
+struct fuse_stat
+{
+    FSP_FUSE_STAT_EX_FIELD_DEFN
+};
+#endif
 
 #if defined(_WIN64)
 struct fuse_statvfs
@@ -178,6 +193,8 @@ struct fuse_flock
         fsp_fuse_daemonize,             \
         fsp_fuse_set_signal_handlers,   \
         0/*conv_to_win_path*/,          \
+        0/*winpid_to_pid*/,             \
+        { 0 },                          \
     }
 #else
 #define FSP_FUSE_ENV_INIT               \
@@ -187,6 +204,8 @@ struct fuse_flock
         fsp_fuse_daemonize,             \
         fsp_fuse_set_signal_handlers,   \
         0/*conv_to_win_path*/,          \
+        0/*winpid_to_pid*/,             \
+        { 0 },                          \
     }
 #endif
 
@@ -218,7 +237,14 @@ struct fuse_flock
 #define fuse_utimbuf                    utimbuf
 #define fuse_timespec                   timespec
 
+#if !defined(FSP_FUSE_USE_STAT_EX)
 #define fuse_stat                       stat
+#else
+struct fuse_stat
+{
+    FSP_FUSE_STAT_EX_FIELD_DEFN
+};
+#endif
 #define fuse_statvfs                    statvfs
 #define fuse_flock                      flock
 
@@ -229,6 +255,8 @@ struct fuse_flock
         fsp_fuse_daemonize,             \
         fsp_fuse_set_signal_handlers,   \
         fsp_fuse_conv_to_win_path,      \
+        fsp_fuse_winpid_to_pid,         \
+        { 0 },                          \
     }
 
 /*
@@ -240,6 +268,11 @@ struct fuse_flock
 #error unsupported environment
 #endif
 
+struct fuse_stat_ex
+{
+    FSP_FUSE_STAT_EX_FIELD_DEFN
+};
+
 struct fsp_fuse_env
 {
     unsigned environment;
@@ -248,7 +281,8 @@ struct fsp_fuse_env
     int (*daemonize)(int);
     int (*set_signal_handlers)(void *);
     char *(*conv_to_win_path)(const char *);
-    void (*reserved[3])();
+    fuse_pid_t (*winpid_to_pid)(uint32_t);
+    void (*reserved[2])();
 };
 
 FSP_FUSE_API void FSP_FUSE_API_NAME(fsp_fuse_signal_handler)(int sig);
@@ -359,6 +393,13 @@ static inline char *fsp_fuse_conv_to_win_path(const char *path)
         0/*CCP_POSIX_TO_WIN_A*/ | 0x100/*CCP_RELATIVE*/,
         path);
 }
+
+static inline fuse_pid_t fsp_fuse_winpid_to_pid(uint32_t winpid)
+{
+    pid_t cygwin_winpid_to_pid(int winpid);
+    pid_t pid = cygwin_winpid_to_pid(winpid);
+    return -1 != pid ? pid : (fuse_pid_t)winpid;
+}
 #endif
 
 

inc/winfsp/fsctl.h

@@ -78,6 +78,9 @@ FSP_FSCTL_STATIC_ASSERT(FSP_FSCTL_VOLUME_NAME_SIZEMAX <= 260 * sizeof(WCHAR),
 #define FSP_FSCTL_TRANSACT_BATCH_BUFFER_SIZEMIN (64 * 1024)
 #define FSP_FSCTL_TRANSACT_BUFFER_SIZEMIN       FSP_FSCTL_TRANSACT_REQ_SIZEMAX
 
+#define FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(T)  ((HANDLE)((T) & 0xffffffff))
+#define FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(T)     ((UINT32)(((T) >> 32) & 0xffffffff))
+
 /* marshalling */
 #pragma warning(push)
 #pragma warning(disable:4200)           /* zero-sized array in struct/union */
@@ -149,7 +152,8 @@ typedef struct
     UINT32 PostCleanupWhenModifiedOnly:1;   /* post Cleanup when a file was modified/deleted */
     UINT32 PassQueryDirectoryPattern:1;     /* pass Pattern during QueryDirectory operations */
     UINT32 AlwaysUseDoubleBuffering:1;
-    UINT32 KmReservedFlags:3;
+    UINT32 PassQueryDirectoryFileName:1;    /* pass FileName during QueryDirectory (GetDirInfoByName) */
+    UINT32 KmReservedFlags:2;
     /* user-mode flags */
     UINT32 UmFileContextIsUserContext2:1;   /* user mode: FileContext parameter is UserContext2 */
     UINT32 UmFileContextIsFullContext:1;    /* user mode: FileContext parameter is FullContext */
@@ -222,7 +226,7 @@ typedef struct
             UINT32 FileAttributes;      /* file attributes for new files */
             FSP_FSCTL_TRANSACT_BUF SecurityDescriptor; /* security descriptor for new files */
             UINT64 AllocationSize;      /* initial allocation size */
-            UINT64 AccessToken;         /* request access token (HANDLE) */
+            UINT64 AccessToken;         /* request access token (PID,HANDLE) */
             UINT32 DesiredAccess;       /* FILE_{READ_DATA,WRITE_DATA,etc.} */
             UINT32 GrantedAccess;       /* FILE_{READ_DATA,WRITE_DATA,etc.} */
             UINT32 ShareAccess;         /* FILE_SHARE_{READ,WRITE,DELETE} */
@@ -315,7 +319,7 @@ typedef struct
                 struct
                 {
                     FSP_FSCTL_TRANSACT_BUF NewFileName;
-                    UINT64 AccessToken; /* request access token (HANDLE) */
+                    UINT64 AccessToken; /* request access token (PID,HANDLE) */
                 } Rename;
             } Info;
         } SetInformation;
@@ -344,6 +348,7 @@ typedef struct
             FSP_FSCTL_TRANSACT_BUF Pattern;
             FSP_FSCTL_TRANSACT_BUF Marker;
             UINT32 CaseSensitive:1;     /* FileName comparisons should be case-sensitive */
+            UINT32 PatternIsFileName:1; /* Pattern does not contain wildcards */
         } QueryDirectory;
         struct
         {

inc/winfsp/winfsp.h

@@ -802,12 +802,32 @@ typedef struct _FSP_FILE_SYSTEM_INTERFACE
     NTSTATUS (*GetStreamInfo)(FSP_FILE_SYSTEM *FileSystem,
         PVOID FileContext, PVOID Buffer, ULONG Length,
         PULONG PBytesTransferred);
+    /**
+     * Get directory information for a single file or directory within a parent directory.
+     *
+     * @param FileSystem
+     *     The file system on which this request is posted.
+     * @param FileContext
+     *     The file context of the parent directory.
+     * @param FileName
+     *     The name of the file or directory to get information for. This name is relative
+     *     to the parent directory and is a single path component.
+     * @param DirInfo [out]
+     *     Pointer to a structure that will receive the directory information on successful
+     *     return from this call. This information includes the file name, but also file
+     *     attributes, file times, etc.
+     * @return
+     *     STATUS_SUCCESS or error code.
+     */
+    NTSTATUS (*GetDirInfoByName)(FSP_FILE_SYSTEM *FileSystem,
+        PVOID FileContext, PWSTR FileName,
+        FSP_FSCTL_DIR_INFO *DirInfo);
 
     /*
      * This ensures that this interface will always contain 64 function pointers.
      * Please update when changing the interface as it is important for future compatibility.
      */
-    NTSTATUS (*Reserved[40])();
+    NTSTATUS (*Reserved[39])();
 } FSP_FILE_SYSTEM_INTERFACE;
 FSP_FSCTL_STATIC_ASSERT(sizeof(FSP_FILE_SYSTEM_INTERFACE) == 64 * sizeof(NTSTATUS (*)()),
     "FSP_FILE_SYSTEM_INTERFACE must have 64 entries.");
@@ -966,6 +986,7 @@ PWSTR FspFileSystemMountPoint(FSP_FILE_SYSTEM *FileSystem)
 {
     return FileSystem->MountPoint;
 }
+FSP_API PWSTR FspFileSystemMountPointF(FSP_FILE_SYSTEM *FileSystem);
 static inline
 NTSTATUS FspFileSystemEnterOperation(FSP_FILE_SYSTEM *FileSystem,
     FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response)
@@ -975,6 +996,8 @@ NTSTATUS FspFileSystemEnterOperation(FSP_FILE_SYSTEM *FileSystem,
 
     return FileSystem->EnterOperation(FileSystem, Request, Response);
 }
+FSP_API NTSTATUS FspFileSystemEnterOperationF(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response);
 static inline
 NTSTATUS FspFileSystemLeaveOperation(FSP_FILE_SYSTEM *FileSystem,
     FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response)
@@ -984,6 +1007,8 @@ NTSTATUS FspFileSystemLeaveOperation(FSP_FILE_SYSTEM *FileSystem,
 
     return FileSystem->LeaveOperation(FileSystem, Request, Response);
 }
+FSP_API NTSTATUS FspFileSystemLeaveOperationF(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response);
 static inline
 VOID FspFileSystemSetOperationGuard(FSP_FILE_SYSTEM *FileSystem,
     FSP_FILE_SYSTEM_OPERATION_GUARD *EnterOperation,
@@ -992,6 +1017,9 @@ VOID FspFileSystemSetOperationGuard(FSP_FILE_SYSTEM *FileSystem,
     FileSystem->EnterOperation = EnterOperation;
     FileSystem->LeaveOperation = LeaveOperation;
 }
+FSP_API VOID FspFileSystemSetOperationGuardF(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FILE_SYSTEM_OPERATION_GUARD *EnterOperation,
+    FSP_FILE_SYSTEM_OPERATION_GUARD *LeaveOperation);
 /**
  * Set file system locking strategy.
  *
@@ -1008,6 +1036,8 @@ VOID FspFileSystemSetOperationGuardStrategy(FSP_FILE_SYSTEM *FileSystem,
 {
     FileSystem->OpGuardStrategy = GuardStrategy;
 }
+FSP_API VOID FspFileSystemSetOperationGuardStrategyF(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY GuardStrategy);
 static inline
 VOID FspFileSystemSetOperation(FSP_FILE_SYSTEM *FileSystem,
     ULONG Index,
@@ -1015,6 +1045,9 @@ VOID FspFileSystemSetOperation(FSP_FILE_SYSTEM *FileSystem,
 {
     FileSystem->Operations[Index] = Operation;
 }
+FSP_API VOID FspFileSystemSetOperationF(FSP_FILE_SYSTEM *FileSystem,
+    ULONG Index,
+    FSP_FILE_SYSTEM_OPERATION *Operation);
 static inline
 VOID FspFileSystemGetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
     NTSTATUS *PDispatcherResult)
@@ -1023,6 +1056,8 @@ VOID FspFileSystemGetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
     *PDispatcherResult = FileSystem->DispatcherResult;
     MemoryBarrier();
 }
+FSP_API VOID FspFileSystemGetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
+    NTSTATUS *PDispatcherResult);
 static inline
 VOID FspFileSystemSetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
     NTSTATUS DispatcherResult)
@@ -1031,12 +1066,16 @@ VOID FspFileSystemSetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
         return;
     InterlockedCompareExchange(&FileSystem->DispatcherResult, DispatcherResult, 0);
 }
+FSP_API VOID FspFileSystemSetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
+    NTSTATUS DispatcherResult);
 static inline
 VOID FspFileSystemSetDebugLog(FSP_FILE_SYSTEM *FileSystem,
     UINT32 DebugLog)
 {
     FileSystem->DebugLog = DebugLog;
 }
+FSP_API VOID FspFileSystemSetDebugLogF(FSP_FILE_SYSTEM *FileSystem,
+    UINT32 DebugLog);
 static inline
 BOOLEAN FspFileSystemIsOperationCaseSensitive(VOID)
 {
@@ -1045,6 +1084,29 @@ BOOLEAN FspFileSystemIsOperationCaseSensitive(VOID)
         FspFsctlTransactCreateKind == Request->Kind && Request->Req.Create.CaseSensitive ||
         FspFsctlTransactQueryDirectoryKind == Request->Kind && Request->Req.QueryDirectory.CaseSensitive;
 }
+FSP_API BOOLEAN FspFileSystemIsOperationCaseSensitiveF(VOID);
+/**
+ * Gets the originating process ID.
+ *
+ * Valid only during Create, Open and Rename requests when the target exists.
+ */
+static inline
+UINT32 FspFileSystemOperationProcessId(VOID)
+{
+    FSP_FSCTL_TRANSACT_REQ *Request = FspFileSystemGetOperationContext()->Request;
+    switch (Request->Kind)
+    {
+    case FspFsctlTransactCreateKind:
+        return FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.Create.AccessToken);
+    case FspFsctlTransactSetInformationKind:
+        if (10/*FileRenameInformation*/ == Request->Req.SetInformation.FileInformationClass)
+            return FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.SetInformation.Info.Rename.AccessToken);
+        /* fall through! */
+    default:
+        return 0;
+    }
+}
+FSP_API UINT32 FspFileSystemOperationProcessIdF(VOID);
 
 /*
  * Operations
@@ -1410,6 +1472,21 @@ NTSTATUS FspPosixMapPosixToWindowsPath(const char *PosixPath, PWSTR *PWindowsPat
 FSP_API VOID FspPosixDeletePath(void *Path);
 FSP_API VOID FspPosixEncodeWindowsPath(PWSTR WindowsPath, ULONG Size);
 FSP_API VOID FspPosixDecodeWindowsPath(PWSTR WindowsPath, ULONG Size);
+static inline
+VOID FspPosixFileTimeToUnixTime(UINT64 FileTime0, __int3264 UnixTime[2])
+{
+    INT64 FileTime = (INT64)FileTime0 - 116444736000000000LL;
+    UnixTime[0] = (__int3264)(FileTime / 10000000);
+    UnixTime[1] = (__int3264)(FileTime % 10000000 * 100);
+        /* may produce negative nsec for times before UNIX epoch; strictly speaking this is incorrect */
+}
+static inline
+VOID FspPosixUnixTimeToFileTime(const __int3264 UnixTime[2], PUINT64 PFileTime)
+{
+    INT64 FileTime = (INT64)UnixTime[0] * 10000000 + (INT64)UnixTime[1] / 100 +
+        116444736000000000LL;
+    *PFileTime = FileTime;
+}
 
 /*
  * Path Handling

opt/cygfuse/Makefile

@@ -18,3 +18,13 @@ cygport:
 			> opt/cygfuse/winfsp-work.tar.gz\
 	)
 	CYGPORT_SRC_URI=winfsp-work.tar.gz CYGPORT_SRC_DIR=winfsp-work cygport fuse.cygport download prep compile install package
+
+dist: cygport
+	case $(shell uname -m) in \
+	x86_64)\
+		mkdir -p dist/x64 && \
+		cp fuse-*/dist/fuse/fuse-*[0-9].tar.xz dist/x64 ;;\
+	*)\
+		mkdir -p dist/x86 && \
+		cp fuse-*/dist/fuse/fuse-*[0-9].tar.xz dist/x86 ;;\
+	esac

opt/cygfuse/cygfuse.c

@@ -17,22 +17,39 @@
 
 #include <dlfcn.h>
 #include <pthread.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/cygwin.h>
 
+static void *cygfuse_init_slow(int force);
 static void *cygfuse_init_winfsp();
-static void *cygfuse_init_fail();
 
 static pthread_mutex_t cygfuse_mutex = PTHREAD_MUTEX_INITIALIZER;
 static void *cygfuse_handle = 0;
 
-static inline void cygfuse_init(int force)
+static inline void *cygfuse_init_fast(void)
 {
+    void *handle = cygfuse_handle;
+    __sync_synchronize(); /* memory barrier */
+    if (0 == handle)
+        handle = cygfuse_init_slow(0);
+    return handle;
+}
+
+static void *cygfuse_init_slow(int force)
+{
+    void *handle;
     pthread_mutex_lock(&cygfuse_mutex);
-    if (force || 0 == cygfuse_handle)
-        cygfuse_handle = cygfuse_init_winfsp();
+    handle = cygfuse_handle;
+    if (force || 0 == handle)
+    {
+        handle = cygfuse_init_winfsp();
+        __sync_synchronize(); /* memory barrier */
+        cygfuse_handle = handle;
+    }
     pthread_mutex_unlock(&cygfuse_mutex);
+    return handle;
 }
 
 /*
@@ -50,7 +67,7 @@ static inline int cygfuse_daemon(int nochdir, int noclose)
         return -1;
 
     /* force reload of WinFsp DLL to workaround fork() problems */
-    cygfuse_init(1);
+    cygfuse_init_slow(1);
 
     return 0;
 }
@@ -58,7 +75,7 @@ static inline int cygfuse_daemon(int nochdir, int noclose)
 
 #define FSP_FUSE_API                    static
 #define FSP_FUSE_API_NAME(api)          (* pfn_ ## api)
-#define FSP_FUSE_API_CALL(api)          (cygfuse_init(0), pfn_ ## api)
+#define FSP_FUSE_API_CALL(api)          (cygfuse_init_fast(), pfn_ ## api)
 #define FSP_FUSE_SYM(proto, ...)        __attribute__ ((visibility("default"))) proto { __VA_ARGS__ }
 #include <fuse_common.h>
 #include <fuse.h>
@@ -74,6 +91,7 @@ static inline int cygfuse_daemon(int nochdir, int noclose)
     if (0 == (*(void **)&(pfn_ ## n) = dlsym(h, #n)))\
         return cygfuse_init_fail();
 
+static void *cygfuse_init_fail();
 static void *cygfuse_init_winfsp()
 {
     void *h;
@@ -125,6 +143,7 @@ static void *cygfuse_init_winfsp()
     CYGFUSE_GET_API(h, fsp_fuse_loop);
     CYGFUSE_GET_API(h, fsp_fuse_loop_mt);
     CYGFUSE_GET_API(h, fsp_fuse_exit);
+    CYGFUSE_GET_API(h, fsp_fuse_exited);
     CYGFUSE_GET_API(h, fsp_fuse_get_context);
 
     /* fuse_opt.h */
@@ -141,6 +160,7 @@ static void *cygfuse_init_winfsp()
 
 static void *cygfuse_init_fail()
 {
-    abort();
+    fprintf(stderr, "cygfuse: initialization failed: " CYGFUSE_WINFSP_NAME " not found\n");
+    exit(1);
     return 0;
 }

opt/cygfuse/dist/install.sh

@@ -0,0 +1,8 @@
+cd "$(dirname "$0")"
+case $(uname -m) in
+x86_64)
+    tar -C/ -xaf x64/fuse-2.8-*.tar.xz ;;
+*)
+    tar -C/ -xaf x86/fuse-2.8-*.tar.xz ;;
+esac
+echo FUSE for Cygwin installed.

opt/cygfuse/dist/uninstall.sh

@@ -0,0 +1,8 @@
+cd "$(dirname "$0")"
+case $(uname -m) in
+x86_64)
+    tar -taf x64/fuse-2.8-*.tar.xz | sed -e '/\/$/d' -e 's/.*/\/&/' | xargs rm -f ;;
+*)
+    tar -taf x86/fuse-2.8-*.tar.xz | sed -e '/\/$/d' -e 's/.*/\/&/' | xargs rm -f ;;
+esac
+echo FUSE for Cygwin uninstalled.

opt/cygfuse/fuse.cygport

@@ -1,6 +1,6 @@
 NAME="fuse"
 VERSION=2.8
-RELEASE=4
+RELEASE=7
 CATEGORY="Utils"
 SUMMARY="WinFsp-FUSE compatibility layer"
 DESCRIPTION="WinFsp-FUSE enables FUSE file systems to be run on Cygwin."

src/dll/debug.c

@@ -302,7 +302,7 @@ FSP_API VOID FspDebugLogRequest(FSP_FSCTL_TRANSACT_REQ *Request)
         FspDebugLog("%S[TID=%04lx]: %p: >>Create [%c%c%c%c%c%c] \"%S\", "
             "%s, CreateOptions=%lx, FileAttributes=%lx, Security=%s%s%s, "
             "AllocationSize=%lx:%lx, "
-            "AccessToken=%p, DesiredAccess=%lx, GrantedAccess=%lx, "
+            "AccessToken=%p[PID=%lx], DesiredAccess=%lx, GrantedAccess=%lx, "
             "ShareAccess=%lx\n",
             FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
             Request->Req.Create.UserMode ? 'U' : 'K',
@@ -319,7 +319,8 @@ FSP_API VOID FspDebugLogRequest(FSP_FSCTL_TRANSACT_REQ *Request)
             Sddl ? Sddl : "NULL",
             Sddl ? "\"" : "",
             MAKE_UINT32_PAIR(Request->Req.Create.AllocationSize),
-            (PVOID)Request->Req.Create.AccessToken,
+            FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.Create.AccessToken),
+            FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.Create.AccessToken),
             Request->Req.Create.DesiredAccess,
             Request->Req.Create.GrantedAccess,
             Request->Req.Create.ShareAccess);
@@ -459,7 +460,7 @@ FSP_API VOID FspDebugLogRequest(FSP_FSCTL_TRANSACT_REQ *Request)
             break;
         case 10/*FileRenameInformation*/:
             FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Rename] %s%S%s%s, "
-                "NewFileName=\"%S\", AccessToken=%p\n",
+                "NewFileName=\"%S\", AccessToken=%p[PID=%lx]\n",
                 FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
                 Request->FileName.Size ? "\"" : "",
                 Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
@@ -468,7 +469,8 @@ FSP_API VOID FspDebugLogRequest(FSP_FSCTL_TRANSACT_REQ *Request)
                     Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
                     UserContextBuf),
                 (PWSTR)(Request->Buffer + Request->Req.SetInformation.Info.Rename.NewFileName.Offset),
-                (PVOID)Request->Req.SetInformation.Info.Rename.AccessToken);
+                FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.SetInformation.Info.Rename.AccessToken),
+                FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.SetInformation.Info.Rename.AccessToken));
             break;
         default:
             FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [INVALID] %s%S%s%s\n",

src/dll/fs.c

@@ -619,3 +619,72 @@ FSP_API FSP_FILE_SYSTEM_OPERATION_CONTEXT *FspFileSystemGetOperationContext(VOID
 {
     return (FSP_FILE_SYSTEM_OPERATION_CONTEXT *)TlsGetValue(FspFileSystemTlsKey);
 }
+
+/*
+ * Out-of-Line
+ */
+
+FSP_API PWSTR FspFileSystemMountPointF(FSP_FILE_SYSTEM *FileSystem)
+{
+    return FspFileSystemMountPoint(FileSystem);
+}
+
+FSP_API NTSTATUS FspFileSystemEnterOperationF(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response)
+{
+    return FspFileSystemEnterOperation(FileSystem, Request, Response);
+}
+
+FSP_API NTSTATUS FspFileSystemLeaveOperationF(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response)
+{
+    return FspFileSystemLeaveOperation(FileSystem, Request, Response);
+}
+
+FSP_API VOID FspFileSystemSetOperationGuardF(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FILE_SYSTEM_OPERATION_GUARD *EnterOperation,
+    FSP_FILE_SYSTEM_OPERATION_GUARD *LeaveOperation)
+{
+    FspFileSystemSetOperationGuard(FileSystem, EnterOperation, LeaveOperation);
+}
+
+FSP_API VOID FspFileSystemSetOperationGuardStrategyF(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY GuardStrategy)
+{
+    FspFileSystemSetOperationGuardStrategy(FileSystem, GuardStrategy);
+}
+
+FSP_API VOID FspFileSystemSetOperationF(FSP_FILE_SYSTEM *FileSystem,
+    ULONG Index,
+    FSP_FILE_SYSTEM_OPERATION *Operation)
+{
+    FspFileSystemSetOperation(FileSystem, Index, Operation);
+}
+
+FSP_API VOID FspFileSystemGetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
+    NTSTATUS *PDispatcherResult)
+{
+    FspFileSystemGetDispatcherResult(FileSystem, PDispatcherResult);
+}
+
+FSP_API VOID FspFileSystemSetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
+    NTSTATUS DispatcherResult)
+{
+    FspFileSystemSetDispatcherResult(FileSystem, DispatcherResult);
+}
+
+FSP_API VOID FspFileSystemSetDebugLogF(FSP_FILE_SYSTEM *FileSystem,
+    UINT32 DebugLog)
+{
+    FspFileSystemSetDebugLog(FileSystem, DebugLog);
+}
+
+FSP_API BOOLEAN FspFileSystemIsOperationCaseSensitiveF(VOID)
+{
+    return FspFileSystemIsOperationCaseSensitive();
+}
+
+FSP_API UINT32 FspFileSystemOperationProcessIdF(VOID)
+{
+    return FspFileSystemOperationProcessId();
+}

src/dll/fsctl.c

@@ -355,10 +355,18 @@ static NTSTATUS FspFsctlFixServiceSecurity(HANDLE SvcHandle)
     {
         LastError = GetEffectiveRightsFromAclW(Dacl, &AccessEntry.Trustee, &AccessRights);
         if (0 != LastError)
-        {
-            Result = FspNtStatusFromWin32(LastError);
-            goto exit;
-        }
+            /*
+             * Apparently GetEffectiveRightsFromAclW can fail with ERROR_CIRCULAR_DEPENDENCY
+             * in some rare circumstances. Calling GetEffectiveRightsFromAclW is not essential
+             * in this instance. It is only done to check whether the "Everyone/World" SID
+             * already has the access required to start the FSD; if it does not have those
+             * rights already they are added. It is probably safe to just assume that the
+             * required rights are not there if GetEffectiveRightsFromAclW fails; the worst
+             * that can happen is that the rights get added twice (which is benign).
+             *
+             * See https://github.com/billziss-gh/winfsp/issues/62
+             */
+            AccessRights = 0;
     }
 
     /* do we have the required access rights? */

src/dll/fsop.c

@@ -1121,6 +1121,36 @@ FSP_API NTSTATUS FspFileSystemOpSetVolumeInformation(FSP_FILE_SYSTEM *FileSystem
     return STATUS_SUCCESS;
 }
 
+static NTSTATUS FspFileSystemOpQueryDirectory_GetDirInfoByName(FSP_FILE_SYSTEM *FileSystem,
+    PVOID FileContext, PWSTR FileName,
+    PVOID Buffer, ULONG Length, PULONG PBytesTransferred)
+{
+    NTSTATUS Result;
+    union
+    {
+        FSP_FSCTL_DIR_INFO V;
+        UINT8 B[sizeof(FSP_FSCTL_DIR_INFO) + 255 * sizeof(WCHAR)];
+    } DirInfoBuf;
+    FSP_FSCTL_DIR_INFO *DirInfo = &DirInfoBuf.V;
+
+    /* The FSD will never send us a Marker that we need to worry about! */
+
+    memset(DirInfo, 0, sizeof *DirInfo);
+    Result = FileSystem->Interface->GetDirInfoByName(FileSystem, FileContext, FileName, DirInfo);
+    if (NT_SUCCESS(Result))
+    {
+        if (FspFileSystemAddDirInfo(DirInfo, Buffer, Length, PBytesTransferred))
+            FspFileSystemAddDirInfo(0, Buffer, Length, PBytesTransferred);
+    }
+    else if (STATUS_OBJECT_NAME_NOT_FOUND == Result)
+    {
+        Result = STATUS_SUCCESS;
+        FspFileSystemAddDirInfo(0, Buffer, Length, PBytesTransferred);
+    }
+
+    return Result;
+}
+
 FSP_API NTSTATUS FspFileSystemOpQueryDirectory(FSP_FILE_SYSTEM *FileSystem,
     FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response)
 {
@@ -1131,15 +1161,24 @@ FSP_API NTSTATUS FspFileSystemOpQueryDirectory(FSP_FILE_SYSTEM *FileSystem,
         return STATUS_INVALID_DEVICE_REQUEST;
 
     BytesTransferred = 0;
-    Result = FileSystem->Interface->ReadDirectory(FileSystem,
-        (PVOID)ValOfFileContext(Request->Req.QueryDirectory),
-        0 != Request->Req.QueryDirectory.Pattern.Size ?
-            (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Pattern.Offset) : 0,
-        0 != Request->Req.QueryDirectory.Marker.Size ?
-            (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Marker.Offset) : 0,
-        (PVOID)Request->Req.QueryDirectory.Address,
-        Request->Req.QueryDirectory.Length,
-        &BytesTransferred);
+    if (0 != FileSystem->Interface->GetDirInfoByName &&
+        0 != Request->Req.QueryDirectory.Pattern.Size && Request->Req.QueryDirectory.PatternIsFileName)
+        Result = FspFileSystemOpQueryDirectory_GetDirInfoByName(FileSystem,
+            (PVOID)ValOfFileContext(Request->Req.QueryDirectory),
+            (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Pattern.Offset),
+            (PVOID)Request->Req.QueryDirectory.Address,
+            Request->Req.QueryDirectory.Length,
+            &BytesTransferred);
+    else
+        Result = FileSystem->Interface->ReadDirectory(FileSystem,
+            (PVOID)ValOfFileContext(Request->Req.QueryDirectory),
+            0 != Request->Req.QueryDirectory.Pattern.Size ?
+                (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Pattern.Offset) : 0,
+            0 != Request->Req.QueryDirectory.Marker.Size ?
+                (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Marker.Offset) : 0,
+            (PVOID)Request->Req.QueryDirectory.Address,
+            Request->Req.QueryDirectory.Length,
+            &BytesTransferred);
     if (!NT_SUCCESS(Result))
         return Result;
 

src/dll/fuse/fuse.c

@@ -40,7 +40,12 @@ struct fsp_fuse_core_opt_data
         rellinks;
     int set_FileInfoTimeout;
     FSP_FSCTL_VOLUME_PARAMS VolumeParams;
+    UINT16 VolumeLabelLength;
+    WCHAR VolumeLabel[sizeof ((FSP_FSCTL_VOLUME_INFO *)0)->VolumeLabel / sizeof(WCHAR)];
 };
+FSP_FSCTL_STATIC_ASSERT(
+    sizeof ((struct fuse *)0)->VolumeLabel == sizeof ((struct fsp_fuse_core_opt_data *)0)->VolumeLabel,
+    "fuse::VolumeLabel and fsp_fuse_core_opt_data::VolumeLabel: sizeof must be same.");
 
 static struct fuse_opt fsp_fuse_core_opts[] =
 {
@@ -82,6 +87,7 @@ static struct fuse_opt fsp_fuse_core_opts[] =
     FSP_FUSE_CORE_OPT("norellinks", rellinks, 0),
 
     FUSE_OPT_KEY("fstypename=", 'F'),
+    FUSE_OPT_KEY("volname=", 'v'),
 
     FSP_FUSE_CORE_OPT("SectorSize=%hu", VolumeParams.SectorSize, 4096),
     FSP_FUSE_CORE_OPT("SectorsPerAllocationUnit=%hu", VolumeParams.SectorsPerAllocationUnit, 1),
@@ -90,8 +96,11 @@ static struct fuse_opt fsp_fuse_core_opts[] =
     FSP_FUSE_CORE_OPT("VolumeSerialNumber=%lx", VolumeParams.VolumeSerialNumber, 0),
     FSP_FUSE_CORE_OPT("FileInfoTimeout=", set_FileInfoTimeout, 1),
     FSP_FUSE_CORE_OPT("FileInfoTimeout=%d", VolumeParams.FileInfoTimeout, 0),
+    FUSE_OPT_KEY("UNC=", 'U'),
     FUSE_OPT_KEY("--UNC=", 'U'),
+    FUSE_OPT_KEY("VolumePrefix=", 'U'),
     FUSE_OPT_KEY("--VolumePrefix=", 'U'),
+    FUSE_OPT_KEY("FileSystemName=", 'F'),
     FUSE_OPT_KEY("--FileSystemName=", 'F'),
 
     FUSE_OPT_END,
@@ -274,6 +283,7 @@ static NTSTATUS fsp_fuse_svcstart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
     context->private_data = f->data;
     context->uid = -1;
     context->gid = -1;
+    context->pid = -1;
 
     memset(&conn, 0, sizeof conn);
     conn.proto_major = 7;               /* pretend that we are FUSE kernel protocol 7.12 */
@@ -289,12 +299,21 @@ static NTSTATUS fsp_fuse_svcstart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
         FUSE_CAP_DONT_MASK |
         FSP_FUSE_CAP_READDIR_PLUS |
         FSP_FUSE_CAP_READ_ONLY |
+        FSP_FUSE_CAP_STAT_EX |
         FSP_FUSE_CAP_CASE_INSENSITIVE;
     if (0 != f->ops.init)
     {
         context->private_data = f->data = f->ops.init(&conn);
         f->VolumeParams.ReadOnlyVolume = 0 != (conn.want & FSP_FUSE_CAP_READ_ONLY);
         f->VolumeParams.CaseSensitiveSearch = 0 == (conn.want & FSP_FUSE_CAP_CASE_INSENSITIVE);
+        if (!f->VolumeParams.CaseSensitiveSearch)
+            /*
+             * Disable GetDirInfoByName when file system is case-insensitive.
+             * The reason is that Windows always sends us queries with uppercase
+             * file names in GetDirInfoByName and we have no way in FUSE to normalize
+             * those file names when embedding them in FSP_FSCTL_DIR_INFO.
+             */
+            f->VolumeParams.PassQueryDirectoryFileName = FALSE;
         f->conn_want = conn.want;
     }
     f->fsinit = TRUE;
@@ -322,7 +341,7 @@ static NTSTATUS fsp_fuse_svcstart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
     }
     if (0 != f->ops.getattr)
     {
-        struct fuse_stat stbuf;
+        struct fuse_stat_ex stbuf;
         int err;
 
         memset(&stbuf, 0, sizeof stbuf);
@@ -336,14 +355,12 @@ static NTSTATUS fsp_fuse_svcstart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
         if (0 == f->VolumeParams.VolumeCreationTime)
         {
             if (0 != stbuf.st_birthtim.tv_sec)
-                f->VolumeParams.VolumeCreationTime =
-                    Int32x32To64(stbuf.st_birthtim.tv_sec, 10000000) + 116444736000000000 +
-                    stbuf.st_birthtim.tv_nsec / 100;
+                FspPosixUnixTimeToFileTime((void *)&stbuf.st_birthtim,
+                    &f->VolumeParams.VolumeCreationTime);
             else
             if (0 != stbuf.st_ctim.tv_sec)
-                f->VolumeParams.VolumeCreationTime =
-                    Int32x32To64(stbuf.st_ctim.tv_sec, 10000000) + 116444736000000000 +
-                    stbuf.st_ctim.tv_nsec / 100;
+                FspPosixUnixTimeToFileTime((void *)&stbuf.st_ctim,
+                    &f->VolumeParams.VolumeCreationTime);
         }
     }
 
@@ -451,17 +468,27 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
     default:
         return 1;
     case 'h':
+        /* Note: The limit on FspServiceLog messages is 1024 bytes. This is getting close. */
         FspServiceLog(EVENTLOG_ERROR_TYPE, L""
             FSP_FUSE_LIBRARY_NAME " options:\n"
-            "    -o DebugLog=FILE           debug log file (deflt: stderr)\n"
-            "    -o SectorSize=N            sector size for Windows (512-4096, deflt: 4096)\n"
-            "    -o SectorsPerAllocationUnit=N  sectors per allocation unit (deflt: 1)\n"
-            "    -o MaxComponentLength=N    max file name component length (deflt: 255)\n"
-            "    -o VolumeCreationTime=T    volume creation time (FILETIME hex format)\n"
-            "    -o VolumeSerialNumber=N    32-bit wide\n"
-            "    -o FileInfoTimeout=N       FileInfo/Security/VolumeInfo timeout (millisec)\n"
-            "    --UNC=U --VolumePrefix=U   UNC prefix (\\Server\\Share)\n"
-            "    --FileSystemName=FSN       Name of user mode file system\n");
+            "    -o umask=MASK              set file permissions (octal)\n"
+            "    -o uid=N                   set file owner (-1 for mounting user id)\n"
+            "    -o gid=N                   set file group (-1 for mounting user group)\n"
+            "    -o rellinks                interpret absolute symlinks as volume relative\n"
+            "    -o volname=NAME            set volume label\n"
+            "    -o VolumePrefix=UNC        set UNC prefix (/Server/Share)\n"
+            "        --VolumePrefix=UNC     set UNC prefix (\\Server\\Share)\n"
+            "    -o FileSystemName=NAME     set file system name\n"
+            "    -o DebugLog=FILE           debug log file (requires -d)\n"
+            "\n"
+            FSP_FUSE_LIBRARY_NAME " advanced options:\n"
+            "    -o FileInfoTimeout=N       metadata timeout (millis, -1 for data caching)\n"
+            "    -o SectorSize=N            (512-4096, deflt: 4096)\n"
+            "    -o SectorsPerAllocationUnit=N  (deflt: 1)\n"
+            "    -o MaxComponentLength=N    (deflt: 255)\n"
+            "    -o VolumeCreationTime=T    (FILETIME hex format)\n"
+            "    -o VolumeSerialNumber=N    (32-bit wide)\n"
+            );
         opt_data->help = 1;
         return 1;
     case 'V':
@@ -482,8 +509,12 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
             0);
         return 0;
     case 'U':
-        if ('U' == arg[2])
+        if ('U' == arg[0])
+            arg += sizeof "UNC=" - 1;
+        else if ('U' == arg[2])
             arg += sizeof "--UNC=" - 1;
+        else if ('V' == arg[0])
+            arg += sizeof "VolumePrefix=" - 1;
         else if ('V' == arg[2])
             arg += sizeof "--VolumePrefix=" - 1;
         if (0 == MultiByteToWideChar(CP_UTF8, 0, arg, -1,
@@ -491,20 +522,33 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
             return -1;
         opt_data->VolumeParams.Prefix
             [sizeof opt_data->VolumeParams.Prefix / sizeof(WCHAR) - 1] = L'\0';
+        for (PWSTR P = opt_data->VolumeParams.Prefix; *P; P++)
+            if (L'/' == *P)
+                *P = '\\';
         return 0;
     case 'F':
         if ('f' == arg[0])
             arg += sizeof "fstypename=" - 1;
+        else if ('F' == arg[0])
+            arg += sizeof "FileSystemName=" - 1;
         else if ('F' == arg[2])
             arg += sizeof "--FileSystemName=" - 1;
         if (0 == MultiByteToWideChar(CP_UTF8, 0, arg, -1,
             opt_data->VolumeParams.FileSystemName + 5,
-            sizeof opt_data->VolumeParams.FileSystemName / sizeof(WCHAR)) - 5)
+            sizeof opt_data->VolumeParams.FileSystemName / sizeof(WCHAR) - 5))
             return -1;
         opt_data->VolumeParams.FileSystemName
             [sizeof opt_data->VolumeParams.FileSystemName / sizeof(WCHAR) - 1] = L'\0';
         memcpy(opt_data->VolumeParams.FileSystemName, L"FUSE-", 5 * sizeof(WCHAR));
         return 0;
+    case 'v':
+        arg += sizeof "volname=" - 1;
+        opt_data->VolumeLabelLength = (UINT16)(sizeof(WCHAR) *
+            MultiByteToWideChar(CP_UTF8, 0, arg, lstrlenA(arg),
+            opt_data->VolumeLabel, sizeof opt_data->VolumeLabel / sizeof(WCHAR)));
+        if (0 == opt_data->VolumeLabelLength)
+            return -1;
+        return 0;
     }
 }
 
@@ -566,12 +610,14 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
     if (!opt_data.set_FileInfoTimeout && opt_data.set_attr_timeout)
         opt_data.VolumeParams.FileInfoTimeout = opt_data.set_attr_timeout * 1000;
     opt_data.VolumeParams.CaseSensitiveSearch = TRUE;
+    opt_data.VolumeParams.CasePreservedNames = TRUE;
     opt_data.VolumeParams.PersistentAcls = TRUE;
     opt_data.VolumeParams.ReparsePoints = TRUE;
     opt_data.VolumeParams.ReparsePointsAccessCheck = FALSE;
     opt_data.VolumeParams.NamedStreams = FALSE;
     opt_data.VolumeParams.ReadOnlyVolume = FALSE;
     opt_data.VolumeParams.PostCleanupWhenModifiedOnly = TRUE;
+    opt_data.VolumeParams.PassQueryDirectoryFileName = TRUE;
     opt_data.VolumeParams.UmFileContextIsUserContext2 = TRUE;
     if (L'\0' == opt_data.VolumeParams.FileSystemName[0])
         memcpy(opt_data.VolumeParams.FileSystemName, L"FUSE", 5 * sizeof(WCHAR));
@@ -589,6 +635,8 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
     f->data = data;
     f->DebugLog = opt_data.debug ? -1 : 0;
     memcpy(&f->VolumeParams, &opt_data.VolumeParams, sizeof opt_data.VolumeParams);
+    f->VolumeLabelLength = opt_data.VolumeLabelLength;
+    memcpy(&f->VolumeLabel, &opt_data.VolumeLabel, opt_data.VolumeLabelLength);
 
     Size = (lstrlenW(ch->MountPoint) + 1) * sizeof(WCHAR);
     f->MountPoint = fsp_fuse_obj_alloc(env, Size);
@@ -671,6 +719,13 @@ FSP_FUSE_API void fsp_fuse_exit(struct fsp_fuse_env *env,
 {
     if (0 != f->Service)
         FspServiceStop(f->Service);
+    f->exited = 1;
+}
+
+FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_exited)(struct fsp_fuse_env *env,
+    struct fuse *f)
+{
+    return f->exited;
 }
 
 FSP_FUSE_API struct fuse_context *fsp_fuse_get_context(struct fsp_fuse_env *env)
@@ -692,7 +747,6 @@ FSP_FUSE_API struct fuse_context *fsp_fuse_get_context(struct fsp_fuse_env *env)
             return 0;
 
         context = FSP_FUSE_CONTEXT_FROM_HDR(contexthdr);
-        context->pid = -1;
 
         TlsSetValue(fsp_fuse_tlskey, context);
     }

src/dll/fuse/fuse_intf.c

@@ -112,10 +112,10 @@ NTSTATUS fsp_fuse_op_enter(FSP_FILE_SYSTEM *FileSystem,
     struct fuse_context *context;
     struct fsp_fuse_context_header *contexthdr;
     char *PosixPath = 0;
-    UINT32 Uid = -1, Gid = -1;
+    UINT32 Uid = -1, Gid = -1, Pid = -1;
     PWSTR FileName = 0, Suffix;
     WCHAR Root[2] = L"\\";
-    HANDLE Token = 0;
+    UINT64 AccessToken = 0;
     NTSTATUS Result;
 
     if (FspFsctlTransactCreateKind == Request->Kind)
@@ -124,13 +124,13 @@ NTSTATUS fsp_fuse_op_enter(FSP_FILE_SYSTEM *FileSystem,
             FspPathSuffix((PWSTR)Request->Buffer, &FileName, &Suffix, Root);
         else
             FileName = (PWSTR)Request->Buffer;
-        Token = (HANDLE)Request->Req.Create.AccessToken;
+        AccessToken = Request->Req.Create.AccessToken;
     }
     else if (FspFsctlTransactSetInformationKind == Request->Kind &&
         10/*FileRenameInformation*/ == Request->Req.SetInformation.FileInformationClass)
     {
         FileName = (PWSTR)(Request->Buffer + Request->Req.SetInformation.Info.Rename.NewFileName.Offset);
-        Token = (HANDLE)Request->Req.SetInformation.Info.Rename.AccessToken;
+        AccessToken = Request->Req.SetInformation.Info.Rename.AccessToken;
     }
 
     if (0 != FileName)
@@ -142,11 +142,16 @@ NTSTATUS fsp_fuse_op_enter(FSP_FILE_SYSTEM *FileSystem,
             goto exit;
     }
 
-    if (0 != Token)
+    if (0 != AccessToken)
     {
-        Result = fsp_fuse_get_token_uidgid(Token, TokenUser, &Uid, &Gid);
+        Result = fsp_fuse_get_token_uidgid(
+            FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(AccessToken),
+            TokenUser,
+            &Uid, &Gid);
         if (!NT_SUCCESS(Result))
             goto exit;
+
+        Pid = FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(AccessToken);
     }
 
     context = fsp_fuse_get_context(f->env);
@@ -162,6 +167,7 @@ NTSTATUS fsp_fuse_op_enter(FSP_FILE_SYSTEM *FileSystem,
     context->private_data = f->data;
     context->uid = Uid;
     context->gid = Gid;
+    context->pid = 0 != f->env->winpid_to_pid ? f->env->winpid_to_pid(Pid) : Pid;
 
     contexthdr = FSP_FUSE_HDR_FROM_CONTEXT(context);
     contexthdr->PosixPath = PosixPath;
@@ -189,6 +195,7 @@ NTSTATUS fsp_fuse_op_leave(FSP_FILE_SYSTEM *FileSystem,
     context->private_data = 0;
     context->uid = -1;
     context->gid = -1;
+    context->pid = -1;
 
     contexthdr = FSP_FUSE_HDR_FROM_CONTEXT(context);
     if (0 != contexthdr->PosixPath)
@@ -212,7 +219,7 @@ static NTSTATUS fsp_fuse_intf_NewHiddenName(FSP_FILE_SYSTEM *FileSystem,
         struct { UINT32 V[4]; } Values;
         UUID Uuid;
     } UuidBuf;
-    struct fuse_stat stbuf;
+    struct fuse_stat_ex stbuf;
     int err, maxtries = 3;
 
     *PPosixHiddenPath = 0;
@@ -284,7 +291,7 @@ static BOOLEAN fsp_fuse_intf_CheckSymlinkDirectory(FSP_FILE_SYSTEM *FileSystem,
     struct fuse *f = FileSystem->UserContext;
     char *PosixDotPath = 0;
     size_t Length;
-    struct fuse_stat stbuf;
+    struct fuse_stat_ex stbuf;
     int err;
     BOOLEAN Result = FALSE;
 
@@ -297,6 +304,7 @@ static BOOLEAN fsp_fuse_intf_CheckSymlinkDirectory(FSP_FILE_SYSTEM *FileSystem,
         PosixDotPath[Length + 1] = '.';
         PosixDotPath[Length + 2] = '\0';
 
+        memset(&stbuf, 0, sizeof stbuf);
         if (0 != f->ops.getattr)
             err = f->ops.getattr(PosixDotPath, (void *)&stbuf);
         else
@@ -310,25 +318,57 @@ static BOOLEAN fsp_fuse_intf_CheckSymlinkDirectory(FSP_FILE_SYSTEM *FileSystem,
     return Result;
 }
 
+static inline uint32_t fsp_fuse_intf_MapFileAttributesToFlags(UINT32 FileAttributes)
+{
+    uint32_t flags = 0;
+
+    if (FileAttributes & FILE_ATTRIBUTE_READONLY)
+        flags |= FSP_FUSE_UF_READONLY;
+    if (FileAttributes & FILE_ATTRIBUTE_HIDDEN)
+        flags |= FSP_FUSE_UF_HIDDEN;
+    if (FileAttributes & FILE_ATTRIBUTE_SYSTEM)
+        flags |= FSP_FUSE_UF_SYSTEM;
+    if (FileAttributes & FILE_ATTRIBUTE_ARCHIVE)
+        flags |= FSP_FUSE_UF_ARCHIVE;
+
+    return flags;
+}
+
+static inline UINT32 fsp_fuse_intf_MapFlagsToFileAttributes(uint32_t flags)
+{
+    UINT32 FileAttributes = 0;
+
+    if (flags & FSP_FUSE_UF_READONLY)
+        FileAttributes |= FILE_ATTRIBUTE_READONLY;
+    if (flags & FSP_FUSE_UF_HIDDEN)
+        FileAttributes |= FILE_ATTRIBUTE_HIDDEN;
+    if (flags & FSP_FUSE_UF_SYSTEM)
+        FileAttributes |= FILE_ATTRIBUTE_SYSTEM;
+    if (flags & FSP_FUSE_UF_ARCHIVE)
+        FileAttributes |= FILE_ATTRIBUTE_ARCHIVE;
+
+    return FileAttributes;
+}
+
 #define fsp_fuse_intf_GetFileInfoEx(FileSystem, PosixPath, fi, PUid, PGid, PMode, FileInfo)\
     fsp_fuse_intf_GetFileInfoFunnel(FileSystem, PosixPath, fi, 0, PUid, PGid, PMode, 0, FileInfo)
 static NTSTATUS fsp_fuse_intf_GetFileInfoFunnel(FSP_FILE_SYSTEM *FileSystem,
-    const char *PosixPath, struct fuse_file_info *fi, const struct fuse_stat *stbufp,
+    const char *PosixPath, struct fuse_file_info *fi, const void *stbufp,
     PUINT32 PUid, PUINT32 PGid, PUINT32 PMode, PUINT32 PDev,
     FSP_FSCTL_FILE_INFO *FileInfo)
 {
     struct fuse *f = FileSystem->UserContext;
     UINT64 AllocationUnit;
-    struct fuse_stat stbuf;
+    struct fuse_stat_ex stbuf;
+    BOOLEAN StatEx = 0 != (f->conn_want & FSP_FUSE_CAP_STAT_EX);
 
+    memset(&stbuf, 0, sizeof stbuf);
     if (0 != stbufp)
-        memcpy(&stbuf, stbufp, sizeof stbuf);
+        memcpy(&stbuf, stbufp, StatEx ? sizeof(struct fuse_stat_ex) : sizeof(struct fuse_stat));
     else
     {
         int err;
 
-        memset(&stbuf, 0, sizeof stbuf);
-
         if (0 != f->ops.fgetattr && 0 != fi && -1 != fi->fh)
             err = f->ops.fgetattr(PosixPath, (void *)&stbuf, fi);
         else if (0 != f->ops.getattr)
@@ -383,21 +423,15 @@ static NTSTATUS fsp_fuse_intf_GetFileInfoFunnel(FSP_FILE_SYSTEM *FileSystem,
         FileInfo->ReparseTag = 0;
         break;
     }
+    if (StatEx)
+        FileInfo->FileAttributes |= fsp_fuse_intf_MapFlagsToFileAttributes(stbuf.st_flags);
     FileInfo->FileSize = stbuf.st_size;
     FileInfo->AllocationSize =
         (FileInfo->FileSize + AllocationUnit - 1) / AllocationUnit * AllocationUnit;
-    FileInfo->CreationTime =
-        Int32x32To64(stbuf.st_birthtim.tv_sec, 10000000) + 116444736000000000 +
-        stbuf.st_birthtim.tv_nsec / 100;
-    FileInfo->LastAccessTime =
-        Int32x32To64(stbuf.st_atim.tv_sec, 10000000) + 116444736000000000 +
-        stbuf.st_atim.tv_nsec / 100;
-    FileInfo->LastWriteTime =
-        Int32x32To64(stbuf.st_mtim.tv_sec, 10000000) + 116444736000000000 +
-        stbuf.st_mtim.tv_nsec / 100;
-    FileInfo->ChangeTime =
-        Int32x32To64(stbuf.st_ctim.tv_sec, 10000000) + 116444736000000000 +
-        stbuf.st_ctim.tv_nsec / 100;
+    FspPosixUnixTimeToFileTime((void *)&stbuf.st_birthtim, &FileInfo->CreationTime);
+    FspPosixUnixTimeToFileTime((void *)&stbuf.st_atim, &FileInfo->LastAccessTime);
+    FspPosixUnixTimeToFileTime((void *)&stbuf.st_mtim, &FileInfo->LastWriteTime);
+    FspPosixUnixTimeToFileTime((void *)&stbuf.st_ctim, &FileInfo->ChangeTime);
     FileInfo->IndexNumber = stbuf.st_ino;
 
     return STATUS_SUCCESS;
@@ -646,8 +680,8 @@ static NTSTATUS fsp_fuse_intf_GetVolumeInfo(FSP_FILE_SYSTEM *FileSystem,
 
     VolumeInfo->TotalSize = (UINT64)stbuf.f_blocks * (UINT64)stbuf.f_frsize;
     VolumeInfo->FreeSize = (UINT64)stbuf.f_bfree * (UINT64)stbuf.f_frsize;
-    VolumeInfo->VolumeLabelLength = 0;
-    VolumeInfo->VolumeLabel[0] = L'\0';
+    VolumeInfo->VolumeLabelLength = f->VolumeLabelLength;
+    memcpy(&VolumeInfo->VolumeLabel, &f->VolumeLabel, f->VolumeLabelLength);
 
     return STATUS_SUCCESS;
 }
@@ -731,9 +765,9 @@ static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
 
     memset(&fi, 0, sizeof fi);
     if ('C' == f->env->environment) /* Cygwin */
-        fi.flags = 0x0200 | 2 /*O_CREAT|O_RDWR*/;
+        fi.flags = 0x0200 | 0x0800 | 2 /*O_CREAT|O_EXCL|O_RDWR*/;
     else
-        fi.flags = 0x0100 | 2 /*O_CREAT|O_RDWR*/;
+        fi.flags = 0x0100 | 0x0400 | 2 /*O_CREAT|O_EXCL|O_RDWR*/;
 
     if (CreateOptions & FILE_DIRECTORY_FILE)
     {
@@ -787,22 +821,30 @@ static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
 
     Opened = TRUE;
 
-    if (Uid != context->uid || Gid != context->gid)
-        if (0 != f->ops.chown)
-        {
-            err = f->ops.chown(contexthdr->PosixPath, Uid, Gid);
-            if (0 != err)
-            {
-                Result = fsp_fuse_ntstatus_from_errno(f->env, err);
-                goto exit;
-            }
-        }
+    if (0 != FileAttributes &&
+        0 != (f->conn_want & FSP_FUSE_CAP_STAT_EX) && 0 != f->ops.chflags)
+    {
+        err = f->ops.chflags(contexthdr->PosixPath,
+            fsp_fuse_intf_MapFileAttributesToFlags(CreateOptions & FILE_DIRECTORY_FILE ?
+                FileAttributes : FileAttributes | FILE_ATTRIBUTE_ARCHIVE));
+        Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+        if (!NT_SUCCESS(Result) && STATUS_INVALID_DEVICE_REQUEST != Result)
+            goto exit;
+    }
+
+    if ((Uid != context->uid || Gid != context->gid) &&
+        0 != f->ops.chown)
+    {
+        err = f->ops.chown(contexthdr->PosixPath, Uid, Gid);
+        Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+        if (!NT_SUCCESS(Result) && STATUS_INVALID_DEVICE_REQUEST != Result)
+            goto exit;
+    }
 
     /*
-     * Ignore fuse_file_info::direct_io, fuse_file_info::keep_cache
-     * WinFsp does not currently support disabling the cache manager
-     * for an individual file although it should not be hard to add
-     * if required.
+     * Ignore fuse_file_info::direct_io, fuse_file_info::keep_cache.
+     * NOTE: Originally WinFsp dit not support disabling the cache manager
+     * for an individual file. This is now possible and we should revisit.
      *
      * Ignore fuse_file_info::nonseekable.
      */
@@ -982,6 +1024,22 @@ static NTSTATUS fsp_fuse_intf_Overwrite(FSP_FILE_SYSTEM *FileSystem,
     if (!NT_SUCCESS(Result))
         return Result;
 
+    if (0 != FileAttributes &&
+        0 != (f->conn_want & FSP_FUSE_CAP_STAT_EX) && 0 != f->ops.chflags)
+    {
+        /*
+         * The code below is not strictly correct. File attributes should be
+         * replaced when ReplaceFileAttributes is TRUE and merged (or'ed) when
+         * ReplaceFileAttributes is FALSE. I am punting on this detail for now.
+         */
+
+        err = f->ops.chflags(filedesc->PosixPath,
+            fsp_fuse_intf_MapFileAttributesToFlags(FileAttributes | FILE_ATTRIBUTE_ARCHIVE));
+        Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+        if (!NT_SUCCESS(Result) && STATUS_INVALID_DEVICE_REQUEST != Result)
+            return Result;
+    }
+
     return fsp_fuse_intf_GetFileInfoEx(FileSystem, filedesc->PosixPath, &fi,
         &Uid, &Gid, &Mode, FileInfo);
 }
@@ -1141,7 +1199,8 @@ static NTSTATUS fsp_fuse_intf_Write(FSP_FILE_SYSTEM *FileSystem,
 
     AllocationUnit = (UINT64)f->VolumeParams.SectorSize *
         (UINT64)f->VolumeParams.SectorsPerAllocationUnit;
-    FileInfoBuf.FileSize = Offset + bytes;
+    if (Offset + bytes > FileInfoBuf.FileSize)
+        FileInfoBuf.FileSize = Offset + bytes;
     FileInfoBuf.AllocationSize =
         (FileInfoBuf.FileSize + AllocationUnit - 1) / AllocationUnit * AllocationUnit;
 
@@ -1234,67 +1293,74 @@ static NTSTATUS fsp_fuse_intf_SetBasicInfo(FSP_FILE_SYSTEM *FileSystem,
     int err;
     NTSTATUS Result;
 
-    if (0 == f->ops.utimens && 0 == f->ops.utime)
-        return STATUS_SUCCESS; /* liar! */
-
-    /* no way to set FileAttributes, CreationTime! */
-    if (0 == LastAccessTime && 0 == LastWriteTime)
-        return STATUS_SUCCESS;
-
     memset(&fi, 0, sizeof fi);
     fi.flags = filedesc->OpenFlags;
     fi.fh = filedesc->FileHandle;
 
-    Result = fsp_fuse_intf_GetFileInfoEx(FileSystem, filedesc->PosixPath, &fi,
-        &Uid, &Gid, &Mode, &FileInfoBuf);
-    if (!NT_SUCCESS(Result))
-        return Result;
-
-    if (0 != LastAccessTime)
-        FileInfoBuf.LastAccessTime = LastAccessTime;
-    if (0 != LastWriteTime)
-        FileInfoBuf.LastWriteTime = LastWriteTime;
-
-    /* UNIX epoch in 100-ns intervals */
-    LastAccessTime = FileInfoBuf.LastAccessTime - 116444736000000000;
-    LastWriteTime = FileInfoBuf.LastWriteTime - 116444736000000000;
-
-    if (0 != f->ops.utimens)
+    if (INVALID_FILE_ATTRIBUTES != FileAttributes &&
+        0 != (f->conn_want & FSP_FUSE_CAP_STAT_EX) && 0 != f->ops.chflags)
     {
-#if defined(_WIN64)
-        tv[0].tv_sec = (int64_t)(LastAccessTime / 10000000);
-        tv[0].tv_nsec = (int64_t)(LastAccessTime % 10000000) * 100;
-        tv[1].tv_sec = (int64_t)(LastWriteTime / 10000000);
-        tv[1].tv_nsec = (int64_t)(LastWriteTime % 10000000) * 100;
-#else
-        tv[0].tv_sec = (int32_t)(LastAccessTime / 10000000);
-        tv[0].tv_nsec = (int32_t)(LastAccessTime % 10000000) * 100;
-        tv[1].tv_sec = (int32_t)(LastWriteTime / 10000000);
-        tv[1].tv_nsec = (int32_t)(LastWriteTime % 10000000) * 100;
-#endif
-
-        err = f->ops.utimens(filedesc->PosixPath, tv);
+        err = f->ops.chflags(filedesc->PosixPath,
+            fsp_fuse_intf_MapFileAttributesToFlags(FileAttributes));
         Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+        if (!NT_SUCCESS(Result))
+            return Result;
     }
-    else
+
+    if ((0 != LastAccessTime || 0 != LastWriteTime) &&
+        (0 != f->ops.utimens || 0 != f->ops.utime))
     {
-#if defined(_WIN64)
-        timbuf.actime = (int64_t)(LastAccessTime / 10000000);
-        timbuf.modtime = (int64_t)(LastWriteTime / 10000000);
-#else
-        timbuf.actime = (int32_t)(LastAccessTime / 10000000);
-        timbuf.modtime = (int32_t)(LastWriteTime / 10000000);
-#endif
+        if (0 == LastAccessTime || 0 == LastWriteTime)
+        {
+            Result = fsp_fuse_intf_GetFileInfoEx(FileSystem, filedesc->PosixPath, &fi,
+                &Uid, &Gid, &Mode, &FileInfoBuf);
+            if (!NT_SUCCESS(Result))
+                return Result;
 
-        err = f->ops.utime(filedesc->PosixPath, &timbuf);
-        Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+            if (0 == LastAccessTime)
+                LastAccessTime = FileInfoBuf.LastAccessTime;
+            if (0 == LastWriteTime)
+                LastWriteTime = FileInfoBuf.LastWriteTime;
+        }
+
+        FspPosixFileTimeToUnixTime(LastAccessTime, (void *)&tv[0]);
+        FspPosixFileTimeToUnixTime(LastWriteTime, (void *)&tv[1]);
+        if (0 != f->ops.utimens)
+        {
+            err = f->ops.utimens(filedesc->PosixPath, tv);
+            Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+        }
+        else
+        {
+            timbuf.actime = tv[0].tv_sec;
+            timbuf.modtime = tv[1].tv_sec;
+            err = f->ops.utime(filedesc->PosixPath, &timbuf);
+            Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+        }
+        if (!NT_SUCCESS(Result))
+            return Result;
     }
-    if (!NT_SUCCESS(Result))
-        return Result;
 
-    memcpy(FileInfo, &FileInfoBuf, sizeof FileInfoBuf);
+    if (0 != CreationTime && 0 != f->ops.setcrtime)
+    {
+        FspPosixFileTimeToUnixTime(CreationTime, (void *)&tv[0]);
+        err = f->ops.setcrtime(filedesc->PosixPath, &tv[0]);
+        Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+        if (!NT_SUCCESS(Result))
+            return Result;
+    }
 
-    return STATUS_SUCCESS;
+    if (0 != ChangeTime && 0 != f->ops.setchgtime)
+    {
+        FspPosixFileTimeToUnixTime(ChangeTime, (void *)&tv[0]);
+        err = f->ops.setchgtime(filedesc->PosixPath, &tv[0]);
+        Result = fsp_fuse_ntstatus_from_errno(f->env, err);
+        if (!NT_SUCCESS(Result))
+            return Result;
+    }
+
+    return fsp_fuse_intf_GetFileInfoEx(FileSystem, filedesc->PosixPath, &fi,
+        &Uid, &Gid, &Mode, FileInfo);
 }
 
 static NTSTATUS fsp_fuse_intf_SetFileSize(FSP_FILE_SYSTEM *FileSystem,
@@ -1749,6 +1815,63 @@ static NTSTATUS fsp_fuse_intf_ReadDirectory(FSP_FILE_SYSTEM *FileSystem,
     return STATUS_SUCCESS;
 }
 
+static NTSTATUS fsp_fuse_intf_GetDirInfoByName(FSP_FILE_SYSTEM *FileSystem,
+    PVOID FileNode, PWSTR FileName,
+    FSP_FSCTL_DIR_INFO *DirInfo)
+{
+    struct fuse *f = FileSystem->UserContext;
+    struct fsp_fuse_file_desc *filedesc = FileNode;
+    char *PosixName = 0;
+    char PosixPath[FSP_FSCTL_TRANSACT_PATH_SIZEMAX / sizeof(WCHAR)];
+    int ParentLength, FSlashLength, PosixNameLength;
+    UINT32 Uid, Gid, Mode;
+    NTSTATUS Result;
+
+    Result = FspPosixMapWindowsToPosixPath(FileName, &PosixName);
+    if (!NT_SUCCESS(Result))
+    {
+        Result = STATUS_OBJECT_NAME_NOT_FOUND; //Result?
+        goto exit;
+    }
+
+    ParentLength = lstrlenA(filedesc->PosixPath);
+    FSlashLength = 1 < ParentLength;
+    PosixNameLength = lstrlenA(PosixName);
+    if (FSP_FSCTL_TRANSACT_PATH_SIZEMAX <= (ParentLength + FSlashLength + PosixNameLength) * sizeof(WCHAR))
+    {
+        Result = STATUS_OBJECT_NAME_NOT_FOUND; //STATUS_OBJECT_NAME_INVALID?
+        goto exit;
+    }
+
+    memcpy(PosixPath, filedesc->PosixPath, ParentLength);
+    memcpy(PosixPath + ParentLength, "/", FSlashLength);
+    memcpy(PosixPath + ParentLength + FSlashLength, PosixName, PosixNameLength + 1);
+
+    Result = fsp_fuse_intf_GetFileInfoEx(FileSystem, PosixPath, 0,
+        &Uid, &Gid, &Mode, &DirInfo->FileInfo);
+    if (!NT_SUCCESS(Result))
+    {
+        Result = STATUS_OBJECT_NAME_NOT_FOUND; //Result?
+        goto exit;
+    }
+
+    /*
+     * FUSE does not do FileName normalization; so just return the FileName as given to us!
+     */
+
+    //memset(DirInfo->Padding, 0, sizeof DirInfo->Padding);
+    DirInfo->Size = (UINT16)(sizeof(FSP_FSCTL_DIR_INFO) + lstrlenW(FileName) * sizeof(WCHAR));
+    memcpy(DirInfo->FileNameBuf, FileName, DirInfo->Size - sizeof(FSP_FSCTL_DIR_INFO));
+
+    Result = STATUS_SUCCESS;
+
+exit:
+    if (0 != PosixName)
+        FspPosixDeletePath(PosixName);
+
+    return Result;
+}
+
 static NTSTATUS fsp_fuse_intf_ResolveReparsePoints(FSP_FILE_SYSTEM *FileSystem,
     PWSTR FileName, UINT32 ReparsePointIndex, BOOLEAN ResolveLastPathComponent,
     PIO_STATUS_BLOCK PIoStatus, PVOID Buffer, PSIZE_T PSize)
@@ -2022,6 +2145,8 @@ FSP_FILE_SYSTEM_INTERFACE fsp_fuse_intf =
     fsp_fuse_intf_GetReparsePoint,
     fsp_fuse_intf_SetReparsePoint,
     fsp_fuse_intf_DeleteReparsePoint,
+    0,
+    fsp_fuse_intf_GetDirInfoByName,
 };
 
 /*

src/dll/fuse/library.h

@@ -45,9 +45,12 @@ struct fuse
     UINT32 DebugLog;
     FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY OpGuardStrategy;
     FSP_FSCTL_VOLUME_PARAMS VolumeParams;
+    UINT16 VolumeLabelLength;
+    WCHAR VolumeLabel[sizeof ((FSP_FSCTL_VOLUME_INFO *)0)->VolumeLabel / sizeof(WCHAR)];
     PWSTR MountPoint;
     FSP_FILE_SYSTEM *FileSystem;
     FSP_SERVICE *Service; /* weak */
+    volatile int exited;
 };
 
 struct fsp_fuse_context_header

src/dll/np.c

@@ -147,7 +147,7 @@ static inline BOOLEAN FspNpParseRemoteName(PWSTR RemoteName,
     return TRUE;
 }
 
-static inline BOOLEAN FspNpParseUserName(PWSTR RemoteName,
+static inline BOOLEAN FspNpParseRemoteUserName(PWSTR RemoteName,
     PWSTR UserName, ULONG UserNameSize/* in chars */)
 {
     PWSTR ClassName, InstanceName, P;
@@ -721,7 +721,7 @@ DWORD APIENTRY NPAddConnection3(HWND hwndOwner,
     lstrcpyW(UserName, L"UNSPECIFIED");
     Password[0] = L'\0';
     if (FSP_NP_CREDENTIALS_PASSWORD == CredentialsKind)
-        FspNpParseUserName(RemoteName, UserName, sizeof UserName / sizeof UserName[0]);
+        FspNpParseRemoteUserName(RemoteName, UserName, sizeof UserName / sizeof UserName[0]);
     do
     {
         NpResult = FspNpGetCredentials(

src/dll/security.c

@@ -172,8 +172,12 @@ FSP_API NTSTATUS FspAccessCheckEx(FSP_FILE_SYSTEM *FileSystem,
 
             if (0 < SecurityDescriptorSize)
             {
-                if (AccessCheck(SecurityDescriptor, (HANDLE)Request->Req.Create.AccessToken, FILE_TRAVERSE,
-                    &FspFileGenericMapping, PrivilegeSet, &PrivilegeSetLength, &TraverseAccess, &AccessStatus))
+                if (AccessCheck(SecurityDescriptor,
+                    FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.Create.AccessToken),
+                    FILE_TRAVERSE,
+                    &FspFileGenericMapping,
+                    PrivilegeSet, &PrivilegeSetLength,
+                    &TraverseAccess, &AccessStatus))
                     Result = AccessStatus ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
                 else
                     Result = FspNtStatusFromWin32(GetLastError());
@@ -202,8 +206,12 @@ FSP_API NTSTATUS FspAccessCheckEx(FSP_FILE_SYSTEM *FileSystem,
     {
         if (0 == DesiredAccess)
             Result = STATUS_SUCCESS;
-        else if (AccessCheck(SecurityDescriptor, (HANDLE)Request->Req.Create.AccessToken, DesiredAccess,
-            &FspFileGenericMapping, PrivilegeSet, &PrivilegeSetLength, PGrantedAccess, &AccessStatus))
+        else if (AccessCheck(SecurityDescriptor,
+            FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.Create.AccessToken),
+            DesiredAccess,
+            &FspFileGenericMapping,
+            PrivilegeSet, &PrivilegeSetLength,
+            PGrantedAccess, &AccessStatus))
             Result = AccessStatus ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
         else
             Result = FspNtStatusFromWin32(GetLastError());
@@ -244,8 +252,12 @@ FSP_API NTSTATUS FspAccessCheckEx(FSP_FILE_SYSTEM *FileSystem,
                 ((FILE_LIST_DIRECTORY & ParentAccess) ? FILE_READ_ATTRIBUTES : 0));
             if (0 != DesiredAccess2)
             {
-                if (AccessCheck(SecurityDescriptor, (HANDLE)Request->Req.Create.AccessToken, DesiredAccess2,
-                    &FspFileGenericMapping, PrivilegeSet, &PrivilegeSetLength, PGrantedAccess, &AccessStatus))
+                if (AccessCheck(SecurityDescriptor,
+                    FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.Create.AccessToken),
+                    DesiredAccess2,
+                    &FspFileGenericMapping,
+                    PrivilegeSet, &PrivilegeSetLength,
+                    PGrantedAccess, &AccessStatus))
                     Result = AccessStatus ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
                 else
                     /* any failure just becomes ACCESS DENIED at this point */
@@ -396,7 +408,7 @@ FSP_API NTSTATUS FspCreateSecurityDescriptor(FSP_FILE_SYSTEM *FileSystem,
             (PSECURITY_DESCRIPTOR)(Request->Buffer + Request->Req.Create.SecurityDescriptor.Offset) : 0,
         PSecurityDescriptor,
         0 != (Request->Req.Create.CreateOptions & FILE_DIRECTORY_FILE),
-        (HANDLE)Request->Req.Create.AccessToken,
+        FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.Create.AccessToken),
         &FspFileGenericMapping))
         return FspNtStatusFromWin32(GetLastError());
 

src/dll/service.c

@@ -79,7 +79,7 @@ FSP_API ULONG FspServiceRunEx(PWSTR ServiceName,
     if (!NT_SUCCESS(Result))
     {
         FspServiceLog(EVENTLOG_ERROR_TYPE,
-            L"The service %s cannot be created (Status=%lx).", Service->ServiceName, Result);
+            L"The service %s cannot be created (Status=%lx).", ServiceName, Result);
         return FspWin32FromNtStatus(Result);
     }
     Service->UserContext = UserContext;
@@ -92,7 +92,7 @@ FSP_API ULONG FspServiceRunEx(PWSTR ServiceName,
     if (!NT_SUCCESS(Result))
     {
         FspServiceLog(EVENTLOG_ERROR_TYPE,
-            L"The service %s has failed to run (Status=%lx).", Service->ServiceName, Result);
+            L"The service %s has failed to run (Status=%lx).", ServiceName, Result);
         return FspWin32FromNtStatus(Result);
     }
 

src/dll/util.c

@@ -175,6 +175,8 @@ FSP_API NTSTATUS FspVersion(PUINT32 PVersion)
          * Two threads competing to read the version will read
          * the same value from the Version resource.
          */
+        *PVersion = 0;
+
         extern HINSTANCE DllInstance;
         WCHAR ModuleFileName[MAX_PATH];
         PVOID VersionInfo;

src/dotnet/Service.cs

@@ -0,0 +1,187 @@
+/*
+ * dotnet/Service.cs
+ *
+ * Copyright 2015-2017 Bill Zissimopoulos
+ */
+/*
+ * This file is part of WinFsp.
+ *
+ * You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License version 3 as published by the Free Software
+ * Foundation.
+ *
+ * Licensees holding a valid commercial license may use this file in
+ * accordance with the commercial license agreement provided with the
+ * software.
+ */
+
+using System;
+
+using Fsp.Interop;
+
+namespace Fsp
+{
+
+    /// <summary>
+    /// Provides the base class for a process that can be run as a service,
+    /// command line application or under the control of the WinFsp launcher.
+    /// </summary>
+    public class Service
+    {
+        /* const */
+        public const UInt32 EVENTLOG_ERROR_TYPE = 0x0001;
+        public const UInt32 EVENTLOG_WARNING_TYPE = 0x0002;
+        public const UInt32 EVENTLOG_INFORMATION_TYPE = 0x0004;
+
+        /* ctor/dtor */
+        /// <summary>
+        /// Creates an instance of the Service class.
+        /// </summary>
+        /// <param name="ServiceName">The name of the service.</param>
+        public Service(String ServiceName)
+        {
+            Api.FspServiceCreate(ServiceName, _OnStart, _OnStop, null, out _ServicePtr);
+            if (IntPtr.Zero != _ServicePtr)
+                Api.SetUserContext(_ServicePtr, this);
+        }
+        ~Service()
+        {
+            if (IntPtr.Zero != _ServicePtr)
+            {
+                Api.DisposeUserContext(_ServicePtr);
+                Api.FspServiceDelete(_ServicePtr);
+            }
+        }
+
+        /* control */
+        /// <summary>
+        /// Runs a service.
+        /// </summary>
+        /// <returns>Service process exit code.</returns>
+        public int Run()
+        {
+            if (IntPtr.Zero == _ServicePtr)
+            {
+                const Int32 STATUS_INSUFFICIENT_RESOURCES = unchecked((Int32)0xc000009a);
+                Log(EVENTLOG_ERROR_TYPE,
+                    String.Format("The service {0} cannot be created (Status={1:X}).",
+                    GetType().FullName, STATUS_INSUFFICIENT_RESOURCES));
+                return (int)Api.FspWin32FromNtStatus(STATUS_INSUFFICIENT_RESOURCES);
+            }
+            Api.FspServiceAllowConsoleMode(_ServicePtr);
+            Int32 Result = Api.FspServiceLoop(_ServicePtr);
+            int ExitCode = (int)Api.FspServiceGetExitCode(_ServicePtr);
+            if (0 > Result)
+            {
+                Log(EVENTLOG_ERROR_TYPE,
+                    String.Format("The service {0} has failed to run (Status={1:X}).",
+                    GetType().FullName, Result));
+                return (int)Api.FspWin32FromNtStatus(Result);
+            }
+            return ExitCode;
+        }
+        /// <summary>
+        /// Stops a running service.
+        /// </summary>
+        public void Stop()
+        {
+            if (IntPtr.Zero == _ServicePtr)
+                throw new InvalidOperationException();
+            Api.FspServiceStop(_ServicePtr);
+        }
+        public void RequestTime(UInt32 Time)
+        {
+            if (IntPtr.Zero == _ServicePtr)
+                throw new InvalidOperationException();
+            Api.FspServiceRequestTime(_ServicePtr, Time);
+        }
+        /// <summary>
+        /// Gets or sets the service process exit code.
+        /// </summary>
+        public int ExitCode
+        {
+            get
+            {
+                if (IntPtr.Zero == _ServicePtr)
+                    throw new InvalidOperationException();
+                return (int)Api.FspServiceGetExitCode(_ServicePtr);
+            }
+            set
+            {
+                if (IntPtr.Zero == _ServicePtr)
+                    throw new InvalidOperationException();
+                Api.FspServiceSetExitCode(_ServicePtr, (UInt32)value);
+            }
+        }
+        public IntPtr ServiceHandle
+        {
+            get { return _ServicePtr; }
+        }
+        public static void Log(UInt32 Type, String Message)
+        {
+            Api.FspServiceLog(Type, "%s", Message);
+        }
+
+        /* start/stop */
+        /// <summary>
+        /// Provides a means to customize the returned status code when an exception happens.
+        /// </summary>
+        /// <param name="ex"></param>
+        /// <returns>STATUS_SUCCESS or error code.</returns>
+        protected virtual Int32 ExceptionHandler(Exception ex)
+        {
+            return unchecked((Int32)0xE0434f4D)/*STATUS_CLR_EXCEPTION*/;
+        }
+        /// <summary>
+        /// Occurs when the service starts.
+        /// </summary>
+        /// <param name="Args">Command line arguments passed to the service.</param>
+        protected virtual void OnStart(String[] Args)
+        {
+        }
+        /// <summary>
+        /// Occurs when the service stops.
+        /// </summary>
+        protected virtual void OnStop()
+        {
+        }
+
+        /* callbacks */
+        private static Int32 OnStart(
+            IntPtr Service,
+            UInt32 Argc,
+            String[] Argv)
+        {
+            Service self = (Service)Api.GetUserContext(Service);
+            try
+            {
+                self.OnStart(
+                    Argv);
+                return 0/*STATUS_SUCCESS*/;
+            }
+            catch (Exception ex)
+            {
+                return self.ExceptionHandler(ex);
+            }
+        }
+        private static Int32 OnStop(
+            IntPtr Service)
+        {
+            Service self = (Service)Api.GetUserContext(Service);
+            try
+            {
+                self.OnStop();
+                return 0/*STATUS_SUCCESS*/;
+            }
+            catch (Exception ex)
+            {
+                return self.ExceptionHandler(ex);
+            }
+        }
+
+        private static Api.Proto.ServiceStart _OnStart = OnStart;
+        private static Api.Proto.ServiceStop _OnStop = OnStop;
+        private IntPtr _ServicePtr;
+    }
+
+}

src/fsptool/fsptool-version.rc

@@ -0,0 +1,37 @@
+#include <winver.h>
+
+#define STR(x)                          STR_(x)
+#define STR_(x)                         #x
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION MyVersionWithCommas
+PRODUCTVERSION MyVersionWithCommas
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0
+#endif
+FILEOS VOS_NT
+FILETYPE VFT_APP
+FILESUBTYPE 0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", STR(MyCompanyName)
+            VALUE "FileDescription", STR(MyDescription)
+            VALUE "FileVersion", STR(MyFullVersion)
+            VALUE "InternalName", "fsptool.exe"
+            VALUE "LegalCopyright", STR(MyCopyright)
+            VALUE "OriginalFilename", "fsptool.exe"
+            VALUE "ProductName", STR(MyProductName)
+            VALUE "ProductVersion", STR(MyProductVersion)
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

src/fsptool/fsptool.c

@@ -0,0 +1,602 @@
+/**
+ * @file fsptool/fsptool.c
+ *
+ * @copyright 2015-2017 Bill Zissimopoulos
+ */
+/*
+ * This file is part of WinFsp.
+ *
+ * You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License version 3 as published by the Free Software
+ * Foundation.
+ *
+ * Licensees holding a valid commercial license may use this file in
+ * accordance with the commercial license agreement provided with the
+ * software.
+ */
+
+#include <winfsp/winfsp.h>
+#include <shared/minimal.h>
+#include <aclapi.h>
+#include <sddl.h>
+
+#define PROGNAME                        "fsptool"
+
+#define info(format, ...)               printlog(GetStdHandle(STD_OUTPUT_HANDLE), format, __VA_ARGS__)
+#define warn(format, ...)               printlog(GetStdHandle(STD_ERROR_HANDLE), format, __VA_ARGS__)
+#define fatal(ExitCode, format, ...)    (warn(format, __VA_ARGS__), ExitProcess(ExitCode))
+
+static void vprintlog(HANDLE h, const char *format, va_list ap)
+{
+    char buf[1024];
+        /* wvsprintf is only safe with a 1024 byte buffer */
+    size_t len;
+    DWORD BytesTransferred;
+
+    wvsprintfA(buf, format, ap);
+    buf[sizeof buf - 1] = '\0';
+
+    len = lstrlenA(buf);
+    buf[len++] = '\n';
+
+    WriteFile(h, buf, (DWORD)len, &BytesTransferred, 0);
+}
+
+static void printlog(HANDLE h, const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    vprintlog(h, format, ap);
+    va_end(ap);
+}
+
+static unsigned wcstoint(const wchar_t *p, const wchar_t **endp, int base)
+{
+    unsigned v;
+    int maxdig, maxalp;
+
+    maxdig = 10 < base ? '9' : (base - 1) + '0';
+    maxalp = 10 < base ? (base - 1 - 10) + 'a' : 0;
+
+    for (v = 0; *p; p++)
+    {
+        int c = *p;
+
+        if ('0' <= c && c <= maxdig)
+            v = base * v + (c - '0');
+        else
+        {
+            c |= 0x20;
+            if ('a' <= c && c <= maxalp)
+                v = base * v + (c - 'a') + 10;
+            else
+                break;
+        }
+    }
+
+    if (0 != endp)
+        *endp = (wchar_t *)p;
+
+    return v;
+}
+
+static void usage(void)
+{
+    fatal(ERROR_INVALID_PARAMETER,
+        "usage: %s COMMAND ARGS\n"
+        "\n"
+        "commands:\n"
+        "    lsvol                           list file system devices (volumes)\n"
+        //"    list                            list running file system processes\n"
+        //"    kill                            kill file system process\n"
+        "    id [NAME|SID|UID]               print user id\n"
+        "    perm [PATH|SDDL|UID:GID:MODE]   print permissions\n",
+        PROGNAME);
+}
+
+static NTSTATUS FspToolGetVolumeList(PWSTR DeviceName,
+    PWCHAR *PVolumeListBuf, PSIZE_T PVolumeListSize)
+{
+    NTSTATUS Result;
+    PWCHAR VolumeListBuf;
+    SIZE_T VolumeListSize;
+
+    *PVolumeListBuf = 0;
+    *PVolumeListSize = 0;
+
+    for (VolumeListSize = 1024;; VolumeListSize *= 2)
+    {
+        VolumeListBuf = MemAlloc(VolumeListSize);
+        if (0 == VolumeListBuf)
+            return STATUS_INSUFFICIENT_RESOURCES;
+
+        Result = FspFsctlGetVolumeList(DeviceName,
+            VolumeListBuf, &VolumeListSize);
+        if (NT_SUCCESS(Result))
+        {
+            *PVolumeListBuf = VolumeListBuf;
+            *PVolumeListSize = VolumeListSize;
+            return Result;
+        }
+
+        MemFree(VolumeListBuf);
+
+        if (STATUS_BUFFER_TOO_SMALL != Result)
+            return Result;
+    }
+}
+
+static WCHAR FspToolGetDriveLetter(PDWORD PLogicalDrives, PWSTR VolumeName)
+{
+    WCHAR VolumeNameBuf[MAX_PATH];
+    WCHAR LocalNameBuf[3];
+    WCHAR Drive;
+
+    if (0 == *PLogicalDrives)
+        return 0;
+
+    LocalNameBuf[1] = L':';
+    LocalNameBuf[2] = L'\0';
+
+    for (Drive = 'Z'; 'A' <= Drive; Drive--)
+        if (0 != (*PLogicalDrives & (1 << (Drive - 'A'))))
+        {
+            LocalNameBuf[0] = Drive;
+            if (QueryDosDeviceW(LocalNameBuf, VolumeNameBuf, sizeof VolumeNameBuf / sizeof(WCHAR)))
+            {
+                if (0 == invariant_wcscmp(VolumeNameBuf, VolumeName))
+                {
+                    *PLogicalDrives &= ~(1 << (Drive - 'A'));
+                    return Drive;
+                }
+            }
+        }
+
+    return 0;
+}
+
+NTSTATUS FspToolGetTokenInfo(HANDLE Token,
+    TOKEN_INFORMATION_CLASS TokenInformationClass, PVOID *PInfo)
+{
+    PVOID Info = 0;
+    DWORD Size;
+    NTSTATUS Result;
+
+    if (GetTokenInformation(Token, TokenInformationClass, 0, 0, &Size))
+    {
+        Result = STATUS_INVALID_PARAMETER;
+        goto exit;
+    }
+
+    if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    Info = MemAlloc(Size);
+    if (0 == Info)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    if (!GetTokenInformation(Token, TokenInformationClass, Info, Size, &Size))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    *PInfo = Info;
+    Result = STATUS_SUCCESS;
+
+exit:
+    if (!NT_SUCCESS(Result))
+        MemFree(Info);
+
+    return Result;
+}
+
+NTSTATUS FspToolGetNameFromSid(PSID Sid, PWSTR *PName)
+{
+    WCHAR Name[256], Domn[256];
+    DWORD NameSize, DomnSize;
+    SID_NAME_USE Use;
+    PWSTR P;
+
+    NameSize = sizeof Name / sizeof Name[0];
+    DomnSize = sizeof Domn / sizeof Domn[0];
+    if (!LookupAccountSidW(0, Sid, Name, &NameSize, Domn, &DomnSize, &Use))
+    {
+        Name[0] = L'\0';
+        Domn[0] = L'\0';
+    }
+
+    NameSize = lstrlenW(Name);
+    DomnSize = lstrlenW(Domn);
+
+    P = *PName = MemAlloc((DomnSize + 1 + NameSize + 1) * sizeof(WCHAR));
+    if (0 == P)
+        return STATUS_INSUFFICIENT_RESOURCES;
+
+    if (0 < DomnSize)
+    {
+        memcpy(P, Domn, DomnSize * sizeof(WCHAR));
+        P[DomnSize] = L'\\';
+        P += DomnSize + 1;
+    }
+    memcpy(P, Name, NameSize * sizeof(WCHAR));
+    P[NameSize] = L'\0';
+
+    return STATUS_SUCCESS;
+}
+
+NTSTATUS FspToolGetSidFromName(PWSTR Name, PSID *PSid)
+{
+    PSID Sid;
+    WCHAR Domn[256];
+    DWORD SidSize, DomnSize;
+    SID_NAME_USE Use;
+
+    SidSize = 0;
+    DomnSize = sizeof Domn / sizeof Domn[0];
+    if (LookupAccountNameW(0, Name, 0, &SidSize, Domn, &DomnSize, &Use))
+        return STATUS_INVALID_PARAMETER;
+
+    if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+        return FspNtStatusFromWin32(GetLastError());
+
+    Sid = MemAlloc(SidSize);
+    if (0 == Sid)
+        return STATUS_INSUFFICIENT_RESOURCES;
+
+    DomnSize = sizeof Domn / sizeof Domn[0];
+    if (!LookupAccountNameW(0, Name, Sid, &SidSize, Domn, &DomnSize, &Use))
+    {
+        MemFree(Sid);
+        return FspNtStatusFromWin32(GetLastError());
+    }
+
+    *PSid = Sid;
+
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS lsvol_dev(PWSTR DeviceName)
+{
+    NTSTATUS Result;
+    PWCHAR VolumeListBuf, VolumeListBufEnd;
+    SIZE_T VolumeListSize;
+    DWORD LogicalDrives;
+    WCHAR Drive[3] = L"\0:";
+
+    Result = FspToolGetVolumeList(DeviceName, &VolumeListBuf, &VolumeListSize);
+    if (!NT_SUCCESS(Result))
+        return Result;
+    VolumeListBufEnd = (PVOID)((PUINT8)VolumeListBuf + VolumeListSize);
+
+    LogicalDrives = GetLogicalDrives();
+    for (PWCHAR P = VolumeListBuf, VolumeName = P; VolumeListBufEnd > P; P++)
+        if (L'\0' == *P)
+        {
+            Drive[0] = FspToolGetDriveLetter(&LogicalDrives, VolumeName);
+            info("%-4S%S", Drive[0] ? Drive : L"", VolumeName);
+            VolumeName = P + 1;
+        }
+
+    MemFree(VolumeListBuf);
+
+    return STATUS_SUCCESS;
+}
+
+static int lsvol(int argc, wchar_t **argv)
+{
+    if (1 != argc)
+        usage();
+
+    NTSTATUS Result;
+
+    Result = lsvol_dev(L"" FSP_FSCTL_DISK_DEVICE_NAME);
+    if (!NT_SUCCESS(Result))
+        return FspWin32FromNtStatus(Result);
+
+    Result = lsvol_dev(L"" FSP_FSCTL_NET_DEVICE_NAME);
+    if (!NT_SUCCESS(Result))
+        return FspWin32FromNtStatus(Result);
+
+    return 0;
+}
+
+static NTSTATUS id_print_sid(const char *format, PSID Sid)
+{
+    PWSTR Str = 0;
+    PWSTR Name = 0;
+    UINT32 Uid;
+    NTSTATUS Result;
+
+    if (!ConvertSidToStringSidW(Sid, &Str))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    Result = FspToolGetNameFromSid(Sid, &Name);
+    if (!NT_SUCCESS(Result))
+        goto exit;
+
+    Result = FspPosixMapSidToUid(Sid, &Uid);
+    if (!NT_SUCCESS(Result))
+        goto exit;
+
+    info(format, Str, Name, Uid);
+
+    Result = STATUS_SUCCESS;
+
+exit:
+    MemFree(Name);
+    LocalFree(Str);
+
+    return Result;
+}
+
+static NTSTATUS id_name(PWSTR Name)
+{
+    PSID Sid = 0;
+    NTSTATUS Result;
+
+    Result = FspToolGetSidFromName(Name, &Sid);
+    if (!NT_SUCCESS(Result))
+        return Result;
+
+    id_print_sid("%S(%S) (uid=%u)", Sid);
+
+    MemFree(Sid);
+
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS id_sid(PWSTR SidStr)
+{
+    PSID Sid = 0;
+
+    if (!ConvertStringSidToSid(SidStr, &Sid))
+        return FspNtStatusFromWin32(GetLastError());
+
+    id_print_sid("%S(%S) (uid=%u)", Sid);
+
+    LocalFree(Sid);
+
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS id_uid(PWSTR UidStr)
+{
+    PSID Sid = 0;
+    UINT32 Uid;
+    NTSTATUS Result;
+
+    Uid = wcstoint(UidStr, &UidStr, 10);
+    if (L'\0' != *UidStr)
+        return STATUS_INVALID_PARAMETER;
+
+    Result = FspPosixMapUidToSid(Uid, &Sid);
+    if (!NT_SUCCESS(Result))
+        return Result;
+
+    id_print_sid("%S(%S) (uid=%u)", Sid);
+
+    FspDeleteSid(Sid, FspPosixMapUidToSid);
+
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS id_user(void)
+{
+    HANDLE Token = 0;
+    TOKEN_USER *Uinfo = 0;
+    TOKEN_OWNER *Oinfo = 0;
+    TOKEN_PRIMARY_GROUP *Ginfo = 0;
+    NTSTATUS Result;
+
+    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    Result = FspToolGetTokenInfo(Token, TokenUser, &Uinfo);
+    if (!NT_SUCCESS(Result))
+        goto exit;
+
+    Result = FspToolGetTokenInfo(Token, TokenOwner, &Oinfo);
+    if (!NT_SUCCESS(Result))
+        goto exit;
+
+    Result = FspToolGetTokenInfo(Token, TokenPrimaryGroup, &Ginfo);
+    if (!NT_SUCCESS(Result))
+        goto exit;
+
+    id_print_sid("User=%S(%S) (uid=%u)", Uinfo->User.Sid);
+    id_print_sid("Owner=%S(%S) (uid=%u)", Oinfo->Owner);
+    id_print_sid("Group=%S(%S) (gid=%u)", Ginfo->PrimaryGroup);
+
+    Result = STATUS_SUCCESS;
+
+exit:
+    MemFree(Ginfo);
+    MemFree(Oinfo);
+    MemFree(Uinfo);
+
+    if (0 != Token)
+        CloseHandle(Token);
+
+    return Result;
+}
+
+static int id(int argc, wchar_t **argv)
+{
+    if (2 < argc)
+        usage();
+
+    NTSTATUS Result;
+
+    if (2 == argc)
+    {
+        if (L'S' == argv[1][0] && L'-' == argv[1][1] && L'1' == argv[1][2] && L'-' == argv[1][3])
+            Result = id_sid(argv[1]);
+        else
+        {
+            Result = id_uid(argv[1]);
+            if (STATUS_INVALID_PARAMETER == Result)
+                Result = id_name(argv[1]);
+        }
+    }
+    else
+        Result = id_user();
+
+    return FspWin32FromNtStatus(Result);
+}
+
+static NTSTATUS perm_print_sd(PSECURITY_DESCRIPTOR SecurityDescriptor)
+{
+    UINT32 Uid, Gid, Mode;
+    PWSTR Sddl = 0;
+    NTSTATUS Result;
+
+    Result = FspPosixMapSecurityDescriptorToPermissions(SecurityDescriptor, &Uid, &Gid, &Mode);
+    if (!NT_SUCCESS(Result))
+        return Result;
+
+    if (!ConvertSecurityDescriptorToStringSecurityDescriptorW(
+        SecurityDescriptor, SDDL_REVISION_1,
+        OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
+        &Sddl, 0))
+        return FspNtStatusFromWin32(GetLastError());
+
+    info("%S (perm=%u:%u:%d%d%d%d)",
+        Sddl, Uid, Gid, (Mode >> 9) & 7, (Mode >> 6) & 7, (Mode >> 3) & 7, Mode & 7);
+
+    LocalFree(Sddl);
+
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS perm_path(PWSTR Path)
+{
+    PSECURITY_DESCRIPTOR SecurityDescriptor = 0;
+    int ErrorCode;
+
+    ErrorCode = GetNamedSecurityInfoW(Path, SE_FILE_OBJECT,
+        OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
+        0, 0, 0, 0, &SecurityDescriptor);
+    if (0 != ErrorCode)
+        return FspNtStatusFromWin32(ErrorCode);
+
+    perm_print_sd(SecurityDescriptor);
+
+    LocalFree(SecurityDescriptor);
+
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS perm_sddl(PWSTR Sddl)
+{
+    PSECURITY_DESCRIPTOR SecurityDescriptor = 0;
+
+    if (!ConvertStringSecurityDescriptorToSecurityDescriptorW(
+        Sddl, SDDL_REVISION_1, &SecurityDescriptor, 0))
+        return FspNtStatusFromWin32(GetLastError());
+
+    perm_print_sd(SecurityDescriptor);
+
+    LocalFree(SecurityDescriptor);
+
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS perm_mode(PWSTR PermStr)
+{
+    PSECURITY_DESCRIPTOR SecurityDescriptor = 0;
+    UINT32 Uid, Gid, Mode;
+    NTSTATUS Result;
+
+    Uid = wcstoint(PermStr, &PermStr, 10);
+    if (L':' != *PermStr)
+        return STATUS_INVALID_PARAMETER;
+    Gid = wcstoint(PermStr + 1, &PermStr, 10);
+    if (L':' != *PermStr)
+        return STATUS_INVALID_PARAMETER;
+    Mode = wcstoint(PermStr + 1, &PermStr, 8);
+    if (L'\0' != *PermStr)
+        return STATUS_INVALID_PARAMETER;
+
+    Result = FspPosixMapPermissionsToSecurityDescriptor(Uid, Gid, Mode, &SecurityDescriptor);
+    if (!NT_SUCCESS(Result))
+        return Result;
+
+    perm_print_sd(SecurityDescriptor);
+
+    FspDeleteSecurityDescriptor(SecurityDescriptor,
+        FspPosixMapPermissionsToSecurityDescriptor);
+
+    return STATUS_SUCCESS;
+}
+
+static int perm(int argc, wchar_t **argv)
+{
+    if (2 != argc)
+        usage();
+
+    NTSTATUS Result;
+    PWSTR P;
+
+    for (P = argv[1]; *P; P++)
+        if (L'\\' == *P)
+            break;
+
+    if (L'\\' == *P)
+        Result = perm_path(argv[1]);
+    else
+    {
+        Result = perm_mode(argv[1]);
+        if (STATUS_INVALID_PARAMETER == Result)
+            Result = perm_sddl(argv[1]);
+    }
+
+    return FspWin32FromNtStatus(Result);
+}
+
+int wmain(int argc, wchar_t **argv)
+{
+    argc--;
+    argv++;
+
+    if (0 == argc)
+        usage();
+
+    if (0 == invariant_wcscmp(L"lsvol", argv[0]))
+        return lsvol(argc, argv);
+    else
+    if (0 == invariant_wcscmp(L"id", argv[0]))
+        return id(argc, argv);
+    else
+    if (0 == invariant_wcscmp(L"perm", argv[0]))
+        return perm(argc, argv);
+    else
+        usage();
+
+    return 0;
+}
+
+void wmainCRTStartup(void)
+{
+    DWORD Argc;
+    PWSTR *Argv;
+
+    Argv = CommandLineToArgvW(GetCommandLineW(), &Argc);
+    if (0 == Argv)
+        ExitProcess(GetLastError());
+
+    ExitProcess(wmain(Argc, Argv));
+}

src/launcher/launcher.c

@@ -67,6 +67,76 @@ BOOL CreateOverlappedPipe(
     return TRUE;
 }
 
+static NTSTATUS GetTokenUserName(HANDLE Token, PWSTR *PUserName)
+{
+    TOKEN_USER *User = 0;
+    WCHAR Name[256], Domn[256];
+    DWORD UserSize, NameSize, DomnSize;
+    SID_NAME_USE Use;
+    PWSTR P;
+    NTSTATUS Result;
+
+    *PUserName = 0;
+
+    if (GetTokenInformation(Token, TokenUser, 0, 0, &UserSize))
+    {
+        Result = STATUS_INVALID_PARAMETER;
+        goto exit;
+    }
+    if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    User = MemAlloc(UserSize);
+    if (0 == User)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    if (!GetTokenInformation(Token, TokenUser, User, UserSize, &UserSize))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    NameSize = sizeof Name / sizeof Name[0];
+    DomnSize = sizeof Domn / sizeof Domn[0];
+    if (!LookupAccountSidW(0, User->User.Sid, Name, &NameSize, Domn, &DomnSize, &Use))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    NameSize = lstrlenW(Name);
+    DomnSize = lstrlenW(Domn);
+
+    P = *PUserName = MemAlloc((DomnSize + 1 + NameSize + 1) * sizeof(WCHAR));
+    if (0 == P)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    if (0 < DomnSize)
+    {
+        memcpy(P, Domn, DomnSize * sizeof(WCHAR));
+        P[DomnSize] = L'\\';
+        P += DomnSize + 1;
+    }
+    memcpy(P, Name, NameSize * sizeof(WCHAR));
+    P[NameSize] = L'\0';
+
+    Result = STATUS_SUCCESS;
+
+exit:
+    MemFree(User);
+
+    return Result;
+}
+
 typedef struct
 {
     HANDLE Process;
@@ -142,6 +212,17 @@ typedef struct
 static CRITICAL_SECTION SvcInstanceLock;
 static HANDLE SvcInstanceEvent;
 static LIST_ENTRY SvcInstanceList = { &SvcInstanceList, &SvcInstanceList };
+static DWORD SvcInstanceTlsKey = TLS_OUT_OF_INDEXES;
+
+static inline PWSTR SvcInstanceUserName(VOID)
+{
+    return TlsGetValue(SvcInstanceTlsKey);
+}
+
+static inline VOID SvcInstanceSetUserName(PWSTR UserName)
+{
+    TlsSetValue(SvcInstanceTlsKey, UserName);
+}
 
 static VOID CALLBACK SvcInstanceTerminated(PVOID Context, BOOLEAN Timeout);
 
@@ -210,6 +291,14 @@ static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Arg
                 else
                     Length += SvcInstanceArgumentLength(EmptyArg);
             }
+            else
+            if (L'U' == *P)
+            {
+                if (0 != SvcInstanceUserName())
+                    Length += SvcInstanceArgumentLength(SvcInstanceUserName());
+                else
+                    Length += SvcInstanceArgumentLength(EmptyArg);
+            }
             else
                 Length++;
             break;
@@ -236,6 +325,14 @@ static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Arg
                 else
                     Q = SvcInstanceArgumentCopy(Q, EmptyArg);
             }
+            else
+            if (L'U' == *P)
+            {
+                if (0 != SvcInstanceUserName())
+                    Q = SvcInstanceArgumentCopy(Q, SvcInstanceUserName());
+                else
+                    Q = SvcInstanceArgumentCopy(Q, EmptyArg);
+            }
             else
                 *Q++ = *P;
             break;
@@ -918,6 +1015,10 @@ static NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
     if (0 == SvcInstanceEvent)
         goto fail;
 
+    SvcInstanceTlsKey = TlsAlloc();
+    if (TLS_OUT_OF_INDEXES == SvcInstanceTlsKey)
+        goto fail;
+
     SvcJob = CreateJobObjectW(0, 0);
     if (0 != SvcJob)
     {
@@ -980,6 +1081,9 @@ fail:
     if (0 != SvcJob)
         CloseHandle(SvcJob);
 
+    if (TLS_OUT_OF_INDEXES != SvcInstanceTlsKey)
+        TlsFree(SvcInstanceTlsKey);
+
     if (0 != SvcInstanceEvent)
         CloseHandle(SvcInstanceEvent);
 
@@ -1023,6 +1127,9 @@ static NTSTATUS SvcStop(FSP_SERVICE *Service)
     if (0 != SvcJob)
         CloseHandle(SvcJob);
 
+    if (TLS_OUT_OF_INDEXES != SvcInstanceTlsKey)
+        TlsFree(SvcInstanceTlsKey);
+
     if (0 != SvcInstanceEvent)
         CloseHandle(SvcInstanceEvent);
 
@@ -1194,13 +1301,16 @@ static VOID SvcPipeTransact(HANDLE ClientToken, PWSTR PipeBuf, PULONG PSize)
         return;
 
     PWSTR P = PipeBuf, PipeBufEnd = PipeBuf + *PSize / sizeof(WCHAR);
-    PWSTR ClassName, InstanceName;
+    PWSTR ClassName, InstanceName, UserName;
     ULONG Argc; PWSTR Argv[9];
     BOOLEAN HasSecret = FALSE;
     NTSTATUS Result;
 
     *PSize = 0;
 
+    GetTokenUserName(ClientToken, &UserName);
+    SvcInstanceSetUserName(UserName);
+
     switch (*P++)
     {
     case LauncherSvcInstanceStartWithSecret:
@@ -1264,6 +1374,9 @@ static VOID SvcPipeTransact(HANDLE ClientToken, PWSTR PipeBuf, PULONG PSize)
         SvcPipeTransactResult(STATUS_INVALID_PARAMETER, PipeBuf, PSize);
         break;
     }
+
+    SvcInstanceSetUserName(0);
+    MemFree(UserName);
 }
 
 int wmain(int argc, wchar_t **argv)

src/sys/create.c

@@ -545,6 +545,7 @@ NTSTATUS FspFsvolCreatePrepare(
     SECURITY_CLIENT_CONTEXT SecurityClientContext;
     HANDLE UserModeAccessToken;
     PEPROCESS Process;
+    ULONG OriginatingProcessId;
     FSP_FILE_NODE *FileNode;
     FSP_FILE_DESC *FileDesc;
     PFILE_OBJECT FileObject;
@@ -579,10 +580,16 @@ NTSTATUS FspFsvolCreatePrepare(
         Process = PsGetCurrentProcess();
         ObReferenceObject(Process);
 
+        /* get the originating process ID stored in the IRP */
+        OriginatingProcessId = IoGetRequestorProcessId(Irp);
+
         /* send the user-mode handle to the user-mode file system */
         FspIopRequestContext(Request, RequestAccessToken) = UserModeAccessToken;
         FspIopRequestContext(Request, RequestProcess) = Process;
-        Request->Req.Create.AccessToken = (UINT_PTR)UserModeAccessToken;
+        ASSERT((UINT64)(UINT_PTR)UserModeAccessToken <= 0xffffffffULL);
+        ASSERT((UINT64)(UINT_PTR)OriginatingProcessId <= 0xffffffffULL);
+        Request->Req.Create.AccessToken =
+            ((UINT64)(UINT_PTR)OriginatingProcessId << 32) | (UINT64)(UINT_PTR)UserModeAccessToken;
 
         return STATUS_SUCCESS;
     }
@@ -1098,7 +1105,44 @@ static NTSTATUS FspFsvolCreateTryOpen(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Re
         return Result;
     }
 
-    FspFileNodeSetFileInfo(FileNode, FileObject, &Response->Rsp.Create.Opened.FileInfo,
+    /*
+     * FspFileNodeTrySetFileInfoOnOpen sets the FileNode's metadata to values reported
+     * by the user mode file system. It does so only if the file is not already open; the
+     * reason is that there is a subtle race condition otherwise.
+     *
+     * Consider that a file is already open and (for example) being appended to. The appends
+     * appear as WRITE IRP's and they are all synchronized by acquiring the FileNode resources
+     * exclusive. Part of the WRITE protocol involves returning an updated FileInfo for the
+     * written FileNode, which the FSD uses to update its view of the file metadata.
+     *
+     * Now consider that a file OPEN comes in. Because the FSD does not know yet which FileNode
+     * will be opened it does not acquire any FileNode. [Note that while it is possible to
+     * uniquely identify a FileNode by FileName currently, this would no longer be the case
+     * when we implement hard links.] The FSD posts the OPEN request to the user mode file system.
+     * The user mode file system processes the OPEN request successfully and responds with the
+     * opened file and its FileInfo.
+     *
+     * Prior to the FSD processing the OPEN response additional WRITE IRP's come through the
+     * original file handle. These WRITE's update the FileSize as understood by the user mode
+     * file system and the corresponding FileInfo gets reported back to the FSD. Eventually the
+     * delayed OPEN response gets processed, which now clobbers the FileInfo as understood by
+     * the FSD.
+     *
+     * The problem here is that OPEN requests have no way of locking the FileNode while the OPEN
+     * request is in transit to the user mode file system. In all other cases the user mode file
+     * system and the FSD update their view of the file's metadata in an atomic fashion. Not so
+     * in the case of OPEN.
+     *
+     * While this is a subtle race condition it can nevertheless creates a real problem. For
+     * example, Explorer often opens files to get information about them and may inappropriately
+     * update the FSD view of the file size during WRITE's.
+     *
+     * FspFileNodeTrySetFileInfoOnOpen attempts to mitigate this problem by only updating the
+     * FileInfo if the file is not already open. This avoids placing stale information in the
+     * FileNode.
+     */
+
+    FspFileNodeTrySetFileInfoOnOpen(FileNode, FileObject, &Response->Rsp.Create.Opened.FileInfo,
         FILE_CREATED == Response->IoStatus.Information);
 
     if (FlushImage)

src/sys/dirctl.c

@@ -17,15 +17,6 @@
 
 #include <sys/driver.h>
 
-/*
- * NOTE:
- *
- * FspIopCompleteIrpEx does some special processing for IRP_MJ_DIRECTORY_CONTROL /
- * IRP_MN_QUERY_DIRECTORY IRP's that come from SRV2. If the processing of this IRP
- * changes substantially (in particular if we eliminate our use of
- * Irp->AssociatedIrp.SystemBuffer) we should also revisit FspIopCompleteIrpEx.
- */
-
 static NTSTATUS FspFsvolQueryDirectoryCopy(
     PUNICODE_STRING DirectoryPattern, BOOLEAN CaseInsensitive,
     PUNICODE_STRING DirectoryMarker, PUNICODE_STRING DirectoryMarkerOut,
@@ -77,19 +68,17 @@ FSP_DRIVER_DISPATCH FspDirectoryControl;
 enum
 {
     /* QueryDirectory */
-    RequestIrp                          = 0,
+    RequestFileNode                     = 0,
     RequestCookie                       = 1,
-    RequestMdl                          = 1,
     RequestAddress                      = 2,
     RequestProcess                      = 3,
-
-    /* QueryDirectoryRetry */
-    RequestSystemBufferLength           = 0,
-
-    /* DirectoryControlComplete retry */
-    RequestDirInfoChangeNumber          = 0,
 };
-FSP_FSCTL_STATIC_ASSERT(RequestCookie == RequestMdl, "");
+
+enum
+{
+    FspFsvolQueryDirectoryLengthMax     =
+        FspFsvolDeviceDirInfoCacheItemSizeMax - FspMetaCacheItemHeaderSize,
+};
 
 static NTSTATUS FspFsvolQueryDirectoryCopy(
     PUNICODE_STRING DirectoryPattern, BOOLEAN CaseInsensitive,
@@ -362,7 +351,6 @@ static NTSTATUS FspFsvolQueryDirectoryCopyInPlace(
     PUNICODE_STRING DirectoryPattern = &FileDesc->DirectoryPattern;
     UNICODE_STRING DirectoryMarker = FileDesc->DirectoryMarker;
 
-    ASSERT(DirInfo == DestBuf);
     FSP_FSCTL_STATIC_ASSERT(
         FIELD_OFFSET(FSP_FSCTL_DIR_INFO, FileNameBuf) >=
         FIELD_OFFSET(FILE_ID_BOTH_DIR_INFORMATION, FileName),
@@ -389,77 +377,10 @@ static NTSTATUS FspFsvolQueryDirectoryCopyInPlace(
     return Result;
 }
 
-static inline NTSTATUS FspFsvolQueryDirectoryBufferUserBuffer(
-    FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension, PIRP Irp, PULONG PLength)
-{
-    if (0 != Irp->AssociatedIrp.SystemBuffer)
-        return STATUS_SUCCESS;
-
-    NTSTATUS Result;
-    ULONG Length = *PLength;
-
-    if (Length > FspFsvolDeviceDirInfoCacheItemSizeMax)
-        Length = FspFsvolDeviceDirInfoCacheItemSizeMax;
-    else if (Length < sizeof(FSP_FSCTL_DIR_INFO) +
-        FsvolDeviceExtension->VolumeParams.MaxComponentLength * sizeof(WCHAR))
-        Length = sizeof(FSP_FSCTL_DIR_INFO) +
-            FsvolDeviceExtension->VolumeParams.MaxComponentLength * sizeof(WCHAR);
-
-    Result = FspBufferUserBuffer(Irp, FSP_FSCTL_ALIGN_UP(Length, PAGE_SIZE), IoWriteAccess);
-    if (!NT_SUCCESS(Result))
-        return Result;
-
-    *PLength = Length;
-
-    return STATUS_SUCCESS;
-}
-
 static NTSTATUS FspFsvolQueryDirectoryRetry(
     PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp,
     BOOLEAN CanWait)
 {
-    /*
-     * The SystemBufferLength contains the length of the SystemBuffer that we
-     * are going to allocate (in FspFsvolQueryDirectoryBufferUserBuffer). This
-     * buffer is going to be used as the IRP SystemBuffer and it will also be
-     * mapped into the user mode file system process (in
-     * FspFsvolDirectoryControlPrepare) so that the file system can fill in the
-     * buffer.
-     *
-     * The SystemBufferLength is not the actual length that we are going to use
-     * when completing the IRP. This will be computed at IRP completion time
-     * (using FspFsvolQueryDirectoryCopy). Instead the SystemBufferLength is
-     * the size that we want the user mode file system to see and it may be
-     * different from the requested length for the following reasons:
-     *
-     *   - If the FileInfoTimeout is non-zero, then the directory maintains a
-     *     DirInfo meta cache that can be used to fulfill IRP requests without
-     *     reaching out to user mode. In this case we want the SystemBufferLength
-     *     to be FspFsvolDeviceDirInfoCacheItemSizeMax so that we read up to the
-     *     cache size maximum.
-     *
-     *   - If the requested DirectoryPattern (stored in FileDesc) is not the "*"
-     *     (MatchAll) pattern, then we want to read as many entries as possible
-     *     from the user mode file system to avoid multiple roundtrips to user
-     *     mode when doing file name matching. In this case we set again the
-     *     SystemBufferLength to be FspFsvolDeviceDirInfoCacheItemSizeMax. This
-     *     is an important optimization and without it QueryDirectory is *very*
-     *     slow without the DirInfo meta cache (i.e. when FileInfoTimeout is 0).
-     *
-     *   - If the requsted DirectoryPattern is the MatchAll pattern then we set
-     *     the SystemBufferLength to the requested (IRP) length as it is actually
-     *     counter-productive to try to read more than we need.
-     */
-#define GetSystemBufferLengthMaybeCached()\
-    (0 != FsvolDeviceExtension->VolumeParams.FileInfoTimeout && 0 == FileDesc->DirectoryMarker.Buffer) ||\
-    FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer ?\
-        FspFsvolDeviceDirInfoCacheItemSizeMax : Length
-#define GetSystemBufferLengthNonCached()\
-    FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer ?\
-        FspFsvolDeviceDirInfoCacheItemSizeMax : Length
-#define GetSystemBufferLengthBestGuess()\
-    FspFsvolDeviceDirInfoCacheItemSizeMax
-
     PAGED_CODE();
 
     NTSTATUS Result;
@@ -471,193 +392,23 @@ static NTSTATUS FspFsvolQueryDirectoryRetry(
     BOOLEAN IndexSpecified = BooleanFlagOn(IrpSp->Flags, SL_INDEX_SPECIFIED);
     BOOLEAN ReturnSingleEntry = BooleanFlagOn(IrpSp->Flags, SL_RETURN_SINGLE_ENTRY);
     FILE_INFORMATION_CLASS FileInformationClass = IrpSp->Parameters.QueryDirectory.FileInformationClass;
+    ULONG BaseInfoLen;
     PUNICODE_STRING FileName = IrpSp->Parameters.QueryDirectory.FileName;
     //ULONG FileIndex = IrpSp->Parameters.QueryDirectory.FileIndex;
-    PVOID Buffer = 0 != Irp->AssociatedIrp.SystemBuffer ?
-        Irp->AssociatedIrp.SystemBuffer : Irp->UserBuffer;
+    PVOID Buffer = 0 == Irp->MdlAddress ?
+        Irp->UserBuffer : MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority);
     ULONG Length = IrpSp->Parameters.QueryDirectory.Length;
-    ULONG SystemBufferLength;
+    ULONG QueryDirectoryLength, QueryDirectoryLengthMin;
     PVOID DirInfoBuffer;
     ULONG DirInfoSize;
     FSP_FSCTL_TRANSACT_REQ *Request = FspIrpRequest(Irp);
+    BOOLEAN PassQueryDirectoryPattern, PatternIsFileName;
     BOOLEAN Success;
 
     ASSERT(FileNode == FileDesc->FileNode);
 
-    SystemBufferLength = 0 != Request ?
-        (ULONG)(UINT_PTR)FspIopRequestContext(Request, RequestSystemBufferLength) : 0;
-
-    /* try to acquire the FileNode exclusive; Full because we may need to send a Request */
-    Success = DEBUGTEST(90) &&
-        FspFileNodeTryAcquireExclusiveF(FileNode, FspFileNodeAcquireFull, CanWait);
-    if (!Success)
-    {
-        if (0 == SystemBufferLength)
-            SystemBufferLength = GetSystemBufferLengthBestGuess();
-
-        Result = FspFsvolQueryDirectoryBufferUserBuffer(
-            FsvolDeviceExtension, Irp, &SystemBufferLength);
-        if (!NT_SUCCESS(Result))
-            return Result;
-
-        Result = FspWqCreateIrpWorkItem(Irp, FspFsvolQueryDirectoryRetry, 0);
-        if (!NT_SUCCESS(Result))
-            return Result;
-
-        Request = FspIrpRequest(Irp);
-        FspIopRequestContext(Request, RequestSystemBufferLength) =
-            (PVOID)(UINT_PTR)SystemBufferLength;
-
-        FspWqPostIrpWorkItem(Irp);
-
-        return STATUS_PENDING;
-    }
-
-    /* if we have been retried reset our work item now! */
-    if (0 != Request)
-    {
-        FspIrpDeleteRequest(Irp);
-        Request = 0;
-    }
-
-    /* reset the FileDesc */
-    Result = FspFileDescResetDirectory(FileDesc, FileName, RestartScan, IndexSpecified);
-    if (!NT_SUCCESS(Result))
-    {
-        FspFileNodeRelease(FileNode, Full);
-        return Result;
-    }
-
-    /* see if the required information is still in the cache and valid! */
-    if (FspFileNodeReferenceDirInfo(FileNode, &DirInfoBuffer, &DirInfoSize))
-    {
-        if (0 == SystemBufferLength)
-            SystemBufferLength = GetSystemBufferLengthNonCached();
-
-        Result = FspFsvolQueryDirectoryCopyCache(FileDesc,
-            IndexSpecified || RestartScan,
-            FileInformationClass, ReturnSingleEntry,
-            DirInfoBuffer, DirInfoSize, Buffer, &Length);
-
-        FspFileNodeDereferenceDirInfo(DirInfoBuffer);
-
-        if (!NT_SUCCESS(Result) || 0 != Length)
-        {
-            FspFileNodeRelease(FileNode, Full);
-            Irp->IoStatus.Information = Length;
-            return Result;
-        }
-    }
-    else
-    {
-        if (0 == SystemBufferLength)
-            SystemBufferLength = GetSystemBufferLengthMaybeCached();
-    }
-
-    FspFileNodeConvertExclusiveToShared(FileNode, Full);
-
-    /* buffer the user buffer! */
-    Result = FspFsvolQueryDirectoryBufferUserBuffer(
-        FsvolDeviceExtension, Irp, &SystemBufferLength);
-    if (!NT_SUCCESS(Result))
-    {
-        FspFileNodeRelease(FileNode, Full);
-        return Result;
-    }
-
-    /* create request */
-    Result = FspIopCreateRequestEx(Irp, 0,
-        (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryPattern &&
-        FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer ?
-            FileDesc->DirectoryPattern.Length + sizeof(WCHAR) : 0) +
-        (FsvolDeviceExtension->VolumeParams.MaxComponentLength + 1) * sizeof(WCHAR),
-        FspFsvolQueryDirectoryRequestFini, &Request);
-    if (!NT_SUCCESS(Result))
-    {
-        FspFileNodeRelease(FileNode, Full);
-        return Result;
-    }
-
-    Request->Kind = FspFsctlTransactQueryDirectoryKind;
-    Request->Req.QueryDirectory.UserContext = FileNode->UserContext;
-    Request->Req.QueryDirectory.UserContext2 = FileDesc->UserContext2;
-    Request->Req.QueryDirectory.Length = SystemBufferLength;
-    Request->Req.QueryDirectory.CaseSensitive = FileDesc->CaseSensitive;
-
-    if (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryPattern &&
-        FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer)
-    {
-        Request->Req.QueryDirectory.Pattern.Offset =
-            Request->FileName.Size;
-        Request->Req.QueryDirectory.Pattern.Size =
-            FileDesc->DirectoryPattern.Length + sizeof(WCHAR);
-        RtlCopyMemory(Request->Buffer + Request->Req.QueryDirectory.Pattern.Offset,
-            FileDesc->DirectoryPattern.Buffer, FileDesc->DirectoryPattern.Length);
-        *(PWSTR)(Request->Buffer +
-            Request->Req.QueryDirectory.Pattern.Offset +
-            FileDesc->DirectoryPattern.Length) = L'\0';
-    }
-
-    if (0 != FileDesc->DirectoryMarker.Buffer)
-    {
-        ASSERT(
-            FsvolDeviceExtension->VolumeParams.MaxComponentLength >=
-            FileDesc->DirectoryMarker.Length);
-
-        Request->Req.QueryDirectory.Marker.Offset =
-            Request->FileName.Size + Request->Req.QueryDirectory.Pattern.Size;
-        Request->Req.QueryDirectory.Marker.Size =
-            FileDesc->DirectoryMarker.Length + sizeof(WCHAR);
-        RtlCopyMemory(Request->Buffer + Request->Req.QueryDirectory.Marker.Offset,
-            FileDesc->DirectoryMarker.Buffer, FileDesc->DirectoryMarker.Length);
-        *(PWSTR)(Request->Buffer +
-            Request->Req.QueryDirectory.Marker.Offset +
-            FileDesc->DirectoryMarker.Length) = L'\0';
-    }
-
-    FspFileNodeSetOwner(FileNode, Full, Request);
-    FspIopRequestContext(Request, RequestIrp) = Irp;
-
-    return FSP_STATUS_IOQ_POST;
-
-#undef GetSystemBufferLengthBestGuess
-#undef GetSystemBufferLengthNonCached
-#undef GetSystemBufferLengthMaybeCached
-}
-
-static NTSTATUS FspFsvolQueryDirectory(
-    PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp)
-{
-    PAGED_CODE();
-
-    /* is this a valid FileObject? */
-    if (!FspFileNodeIsValid(IrpSp->FileObject->FsContext))
-        return STATUS_INVALID_DEVICE_REQUEST;
-
-    NTSTATUS Result;
-    FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(FsvolDeviceObject);
-    PFILE_OBJECT FileObject = IrpSp->FileObject;
-    FSP_FILE_NODE *FileNode = FileObject->FsContext;
-    FILE_INFORMATION_CLASS FileInformationClass = IrpSp->Parameters.QueryDirectory.FileInformationClass;
-    PUNICODE_STRING FileName = IrpSp->Parameters.QueryDirectory.FileName;
-    ULONG Length = IrpSp->Parameters.QueryDirectory.Length;
-    ULONG BaseInfoLen;
-
-    /* SystemBuffer must be NULL as we are going to be using it! */
-    if (0 != Irp->AssociatedIrp.SystemBuffer)
-    {
-        ASSERT(0);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    /* only directory files can be queried */
-    if (!FileNode->IsDirectory)
-        return STATUS_INVALID_PARAMETER;
-
-    /* check that FileName is valid (if supplied) */
-    if (0 != FileName &&
-        !FspFileNameIsValidPattern(FileName, FsvolDeviceExtension->VolumeParams.MaxComponentLength))
-        return STATUS_INVALID_PARAMETER;
+    if (0 == Buffer)
+        return 0 == Irp->MdlAddress ? STATUS_INVALID_PARAMETER : STATUS_INSUFFICIENT_RESOURCES;
 
     /* is this an allowed file information class? */
     switch (FileInformationClass)
@@ -683,12 +434,227 @@ static NTSTATUS FspFsvolQueryDirectory(
     default:
         return STATUS_INVALID_INFO_CLASS;
     }
+
     if (BaseInfoLen >= Length)
         return STATUS_BUFFER_TOO_SMALL;
 
-    Result = FspFsvolQueryDirectoryRetry(FsvolDeviceObject, Irp, IrpSp, IoIsOperationSynchronous(Irp));
+    /* try to acquire the FileNode exclusive; Full because we may need to send a Request */
+    Success = DEBUGTEST(90) &&
+        FspFileNodeTryAcquireExclusiveF(FileNode, FspFileNodeAcquireFull, CanWait);
+    if (!Success)
+        return FspWqRepostIrpWorkItem(Irp, FspFsvolQueryDirectoryRetry, 0);
 
-    return Result;
+    /* if we have been retried reset our work item now! */
+    if (0 != Request)
+    {
+        FspIrpDeleteRequest(Irp);
+        Request = 0;
+    }
+
+    /* reset the FileDesc */
+    Result = FspFileDescResetDirectory(FileDesc, FileName, RestartScan, IndexSpecified);
+    if (!NT_SUCCESS(Result))
+    {
+        FspFileNodeRelease(FileNode, Full);
+        return Result;
+    }
+
+    /* see if the required information is still in the cache and valid! */
+    if (FspFileNodeReferenceDirInfo(FileNode, &DirInfoBuffer, &DirInfoSize))
+    {
+        Result = FspFsvolQueryDirectoryCopyCache(FileDesc,
+            IndexSpecified || RestartScan,
+            FileInformationClass, ReturnSingleEntry,
+            DirInfoBuffer, DirInfoSize, Buffer, &Length);
+
+        FspFileNodeDereferenceDirInfo(DirInfoBuffer);
+
+        if (!NT_SUCCESS(Result) || 0 != Length)
+        {
+            FspFileNodeRelease(FileNode, Full);
+            Irp->IoStatus.Information = Length;
+            return Result;
+        }
+
+        /* reset Length! */
+        Length = IrpSp->Parameters.QueryDirectory.Length;
+    }
+
+    FspFileNodeConvertExclusiveToShared(FileNode, Full);
+
+    /* special handling when pattern is filename */
+    PatternIsFileName = FsvolDeviceExtension->VolumeParams.PassQueryDirectoryFileName &&
+        !FsRtlDoesNameContainWildCards(&FileDesc->DirectoryPattern);
+    PassQueryDirectoryPattern = PatternIsFileName ||
+        (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryPattern &&
+            FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer);
+    if (PatternIsFileName &&
+        0 != FileDesc->DirectoryMarker.Buffer &&
+        0 == FspFileNameCompare(&FileDesc->DirectoryPattern, &FileDesc->DirectoryMarker,
+            !FileDesc->CaseSensitive, 0))
+    {
+        FspFileNodeRelease(FileNode, Full);
+        return !FileDesc->DirectoryHasSuchFile ?
+            STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES;
+    }
+
+    /* probe and lock the user buffer */
+    Result = FspLockUserBuffer(Irp, Length, IoWriteAccess);
+    if (!NT_SUCCESS(Result))
+    {
+        FspFileNodeRelease(FileNode, Full);
+        return Result;
+    }
+
+    /* create request */
+    Result = FspIopCreateRequestEx(Irp, 0,
+        (PassQueryDirectoryPattern ? FileDesc->DirectoryPattern.Length + sizeof(WCHAR) : 0) +
+        (FsvolDeviceExtension->VolumeParams.MaxComponentLength + 1) * sizeof(WCHAR),
+        FspFsvolQueryDirectoryRequestFini, &Request);
+    if (!NT_SUCCESS(Result))
+    {
+        FspFileNodeRelease(FileNode, Full);
+        return Result;
+    }
+
+    /*
+     * Compute QueryDirectoryLength
+     *
+     * How much data to request from the file system varies according to the following matrix:
+     *
+     * Pattern                  | NoCache | Cache+1st | Cache+2nd
+     * -------------------------+---------+-----------+----------
+     * Full Wild                | Ratio   | Maximum   | Ratio
+     * Partial Wild w/o PassQDP | Maximum | Maximum   | Maximum
+     * Partial Wild w/  PassQDP | Ratio   | Ratio     | Ratio
+     * File Name w/o PassQDF    | Maximum | Maximum   | Maximum
+     * File Name w/  PassQDF    | Minimum | Minimum   | Minimum
+     *
+     * NoCache means DirInfo caching disabled. Cache+1st means DirInfo caching enabled, but
+     * cache not primed. Cache+2nd means DirInfo caching enabled, cache is primed, but missed.
+     * [If there is no cache miss, there is no need to send the request to the file system.]
+     *
+     * Maximum means to request the maximum size allowed by the FSD. Minimum means the size that
+     * is guaranteed to contain at least one entry. Ratio means to compute how many directory
+     * entries to request from the file system based on an estimate of how many entries the FSD
+     * is supposed to deliver.
+     *
+     * The Ratio computation is as follows: Assume that N is the size of the average file name,
+     * taken to be 24 * sizeof(WCHAR). Let M be the number of entries that can fit in the passed
+     * buffer:
+     *
+     * M := Length / (BaseInfoLen + N) = QueryDirectoryLength / (sizeof(FSP_FSCTL_DIR_INFO) + N)
+     * => QueryDirectoryLength = Length * (sizeof(FSP_FSCTL_DIR_INFO) + N) / (BaseInfoLen + N)
+     */
+
+    QueryDirectoryLengthMin = sizeof(FSP_FSCTL_DIR_INFO) +
+        FsvolDeviceExtension->VolumeParams.MaxComponentLength * sizeof(WCHAR);
+    QueryDirectoryLengthMin = FSP_FSCTL_ALIGN_UP(QueryDirectoryLengthMin, 8);
+    ASSERT(QueryDirectoryLengthMin < FspFsvolQueryDirectoryLengthMax);
+    if (0 != FsvolDeviceExtension->VolumeParams.FileInfoTimeout &&
+        0 == FileDesc->DirectoryMarker.Buffer)
+    {
+        if (PatternIsFileName)
+            QueryDirectoryLength = QueryDirectoryLengthMin;
+        else if (PassQueryDirectoryPattern)
+        {
+            QueryDirectoryLength = Length *
+                (sizeof(FSP_FSCTL_DIR_INFO) + 24 * sizeof(WCHAR)) / (BaseInfoLen + 24 * sizeof(WCHAR));
+            QueryDirectoryLength = FSP_FSCTL_ALIGN_UP(QueryDirectoryLength, 8);
+            if (QueryDirectoryLength < QueryDirectoryLengthMin)
+                QueryDirectoryLength = QueryDirectoryLengthMin;
+            else if (QueryDirectoryLength > FspFsvolQueryDirectoryLengthMax)
+                QueryDirectoryLength = FspFsvolQueryDirectoryLengthMax;
+        }
+        else
+            QueryDirectoryLength = FspFsvolQueryDirectoryLengthMax;
+    }
+    else
+    {
+        if (PatternIsFileName)
+            QueryDirectoryLength = QueryDirectoryLengthMin;
+        else if (PassQueryDirectoryPattern ||
+            FspFileDescDirectoryPatternMatchAll == FileDesc->DirectoryPattern.Buffer)
+        {
+            QueryDirectoryLength = Length *
+                (sizeof(FSP_FSCTL_DIR_INFO) + 24 * sizeof(WCHAR)) / (BaseInfoLen + 24 * sizeof(WCHAR));
+            QueryDirectoryLength = FSP_FSCTL_ALIGN_UP(QueryDirectoryLength, 8);
+            if (QueryDirectoryLength < QueryDirectoryLengthMin)
+                QueryDirectoryLength = QueryDirectoryLengthMin;
+            else if (QueryDirectoryLength > FspFsvolQueryDirectoryLengthMax)
+                QueryDirectoryLength = FspFsvolQueryDirectoryLengthMax;
+        }
+        else
+            QueryDirectoryLength = FspFsvolQueryDirectoryLengthMax;
+    }
+
+    Request->Kind = FspFsctlTransactQueryDirectoryKind;
+    Request->Req.QueryDirectory.UserContext = FileNode->UserContext;
+    Request->Req.QueryDirectory.UserContext2 = FileDesc->UserContext2;
+    Request->Req.QueryDirectory.Length = QueryDirectoryLength;
+    Request->Req.QueryDirectory.CaseSensitive = FileDesc->CaseSensitive;
+
+    if (PassQueryDirectoryPattern)
+    {
+        Request->Req.QueryDirectory.PatternIsFileName = PatternIsFileName;
+        Request->Req.QueryDirectory.Pattern.Offset =
+            Request->FileName.Size;
+        Request->Req.QueryDirectory.Pattern.Size =
+            FileDesc->DirectoryPattern.Length + sizeof(WCHAR);
+        RtlCopyMemory(Request->Buffer + Request->Req.QueryDirectory.Pattern.Offset,
+            FileDesc->DirectoryPattern.Buffer, FileDesc->DirectoryPattern.Length);
+        *(PWSTR)(Request->Buffer +
+            Request->Req.QueryDirectory.Pattern.Offset +
+            FileDesc->DirectoryPattern.Length) = L'\0';
+    }
+
+    if (0 != FileDesc->DirectoryMarker.Buffer)
+    {
+        ASSERT(
+            FsvolDeviceExtension->VolumeParams.MaxComponentLength * sizeof(WCHAR) >=
+            FileDesc->DirectoryMarker.Length);
+
+        Request->Req.QueryDirectory.Marker.Offset =
+            Request->FileName.Size + Request->Req.QueryDirectory.Pattern.Size;
+        Request->Req.QueryDirectory.Marker.Size =
+            FileDesc->DirectoryMarker.Length + sizeof(WCHAR);
+        RtlCopyMemory(Request->Buffer + Request->Req.QueryDirectory.Marker.Offset,
+            FileDesc->DirectoryMarker.Buffer, FileDesc->DirectoryMarker.Length);
+        *(PWSTR)(Request->Buffer +
+            Request->Req.QueryDirectory.Marker.Offset +
+            FileDesc->DirectoryMarker.Length) = L'\0';
+    }
+
+    FspFileNodeSetOwner(FileNode, Full, Request);
+    FspIopRequestContext(Request, RequestFileNode) = FileNode;
+
+    return FSP_STATUS_IOQ_POST;
+}
+
+static NTSTATUS FspFsvolQueryDirectory(
+    PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp)
+{
+    PAGED_CODE();
+
+    /* is this a valid FileObject? */
+    if (!FspFileNodeIsValid(IrpSp->FileObject->FsContext))
+        return STATUS_INVALID_DEVICE_REQUEST;
+
+    FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(FsvolDeviceObject);
+    PFILE_OBJECT FileObject = IrpSp->FileObject;
+    FSP_FILE_NODE *FileNode = FileObject->FsContext;
+    PUNICODE_STRING FileName = IrpSp->Parameters.QueryDirectory.FileName;
+
+    /* only directory files can be queried */
+    if (!FileNode->IsDirectory)
+        return STATUS_INVALID_PARAMETER;
+
+    /* check that FileName is valid (if supplied) */
+    if (0 != FileName &&
+        !FspFileNameIsValidPattern(FileName, FsvolDeviceExtension->VolumeParams.MaxComponentLength))
+        return STATUS_INVALID_PARAMETER;
+
+    return FspFsvolQueryDirectoryRetry(FsvolDeviceObject, Irp, IrpSp, IoIsOperationSynchronous(Irp));
 }
 
 typedef struct
@@ -835,67 +801,26 @@ NTSTATUS FspFsvolDirectoryControlPrepare(
 {
     PAGED_CODE();
 
-    if (FspQueryDirectoryIrpShouldUseProcessBuffer(Irp, Request->Req.QueryDirectory.Length))
-    {
-        NTSTATUS Result;
-        PVOID Cookie;
-        PVOID Address;
-        PEPROCESS Process;
+    NTSTATUS Result;
+    PVOID Cookie;
+    PVOID Address;
+    PEPROCESS Process;
 
-        Result = FspProcessBufferAcquire(Request->Req.QueryDirectory.Length, &Cookie, &Address);
-        if (!NT_SUCCESS(Result))
-            return Result;
+    Result = FspProcessBufferAcquire(Request->Req.QueryDirectory.Length, &Cookie, &Address);
+    if (!NT_SUCCESS(Result))
+        return Result;
 
-        /* get a pointer to the current process so that we can release the buffer later */
-        Process = PsGetCurrentProcess();
-        ObReferenceObject(Process);
+    /* get a pointer to the current process so that we can release the buffer later */
+    Process = PsGetCurrentProcess();
+    ObReferenceObject(Process);
 
-        Request->Req.QueryDirectory.Address = (UINT64)(UINT_PTR)Address;
+    Request->Req.QueryDirectory.Address = (UINT64)(UINT_PTR)Address;
 
-        FspIopRequestContext(Request, RequestCookie) = (PVOID)((UINT_PTR)Cookie | 1);
-        FspIopRequestContext(Request, RequestAddress) = Address;
-        FspIopRequestContext(Request, RequestProcess) = Process;
+    FspIopRequestContext(Request, RequestCookie) = (PVOID)((UINT_PTR)Cookie | 1);
+    FspIopRequestContext(Request, RequestAddress) = Address;
+    FspIopRequestContext(Request, RequestProcess) = Process;
 
-        return STATUS_SUCCESS;
-    }
-    else
-    {
-        NTSTATUS Result;
-        PMDL Mdl = 0;
-        PVOID Address;
-        PEPROCESS Process;
-
-        Mdl = IoAllocateMdl(
-            Irp->AssociatedIrp.SystemBuffer,
-            Request->Req.QueryDirectory.Length,
-            FALSE, FALSE, 0);
-        if (0 == Mdl)
-            return STATUS_INSUFFICIENT_RESOURCES;
-
-        MmBuildMdlForNonPagedPool(Mdl);
-
-        /* map the MDL into user-mode */
-        Result = FspMapLockedPagesInUserMode(Mdl, &Address, 0);
-        if (!NT_SUCCESS(Result))
-        {
-            if (0 != Mdl)
-                IoFreeMdl(Mdl);
-
-            return Result;
-        }
-
-        /* get a pointer to the current process so that we can unmap the address later */
-        Process = PsGetCurrentProcess();
-        ObReferenceObject(Process);
-
-        Request->Req.QueryDirectory.Address = (UINT64)(UINT_PTR)Address;
-
-        FspIopRequestContext(Request, RequestMdl) = Mdl;
-        FspIopRequestContext(Request, RequestAddress) = Address;
-        FspIopRequestContext(Request, RequestProcess) = Process;
-
-        return STATUS_SUCCESS;
-    }
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS FspFsvolDirectoryControlComplete(
@@ -920,9 +845,8 @@ NTSTATUS FspFsvolDirectoryControlComplete(
     FSP_FILE_DESC *FileDesc = FileObject->FsContext2;
     BOOLEAN ReturnSingleEntry = BooleanFlagOn(IrpSp->Flags, SL_RETURN_SINGLE_ENTRY);
     FILE_INFORMATION_CLASS FileInformationClass = IrpSp->Parameters.QueryDirectory.FileInformationClass;
-    PVOID Buffer = Irp->AssociatedIrp.SystemBuffer;
+    PVOID Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority);
     ULONG Length = IrpSp->Parameters.QueryDirectory.Length;
-    ULONG DirInfoChangeNumber;
     PVOID DirInfoBuffer;
     ULONG DirInfoSize;
     BOOLEAN Success;
@@ -936,33 +860,14 @@ NTSTATUS FspFsvolDirectoryControlComplete(
         FSP_RETURN();
     }
 
-    if (FspFsctlTransactQueryDirectoryKind == Request->Kind)
+    if (0 != FspIopRequestContext(Request, RequestFileNode))
     {
-        if ((UINT_PTR)FspIopRequestContext(Request, RequestCookie) & 1)
-        {
-            PVOID Address = FspIopRequestContext(Request, RequestAddress);
+        FspIopRequestContext(Request, FspIopRequestExtraContext) = (PVOID)
+            FspFileNodeDirInfoChangeNumber(FileNode);
+        FspIopRequestContext(Request, RequestFileNode) = 0;
 
-            ASSERT(0 != Address);
-            try
-            {
-                RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, Address, Response->IoStatus.Information);
-            }
-            except (EXCEPTION_EXECUTE_HANDLER)
-            {
-                Result = GetExceptionCode();
-                Result = FsRtlIsNtstatusExpected(Result) ? STATUS_INVALID_USER_BUFFER : Result;
-                FSP_RETURN();
-            }
-        }
-
-        DirInfoChangeNumber = FspFileNodeDirInfoChangeNumber(FileNode);
-        Request->Kind = FspFsctlTransactReservedKind;
-        FspIopResetRequest(Request, 0);
-        FspIopRequestContext(Request, RequestDirInfoChangeNumber) = (PVOID)DirInfoChangeNumber;
+        FspFileNodeReleaseOwner(FileNode, Full, Request);
     }
-    else
-        DirInfoChangeNumber =
-            (ULONG)(UINT_PTR)FspIopRequestContext(Request, RequestDirInfoChangeNumber);
 
     /* acquire FileNode exclusive Full (because we may need to go back to user-mode) */
     Success = DEBUGTEST(90) && FspFileNodeTryAcquireExclusive(FileNode, Full);
@@ -975,9 +880,9 @@ NTSTATUS FspFsvolDirectoryControlComplete(
     if (0 == Request->Req.QueryDirectory.Pattern.Size &&
         0 == Request->Req.QueryDirectory.Marker.Size &&
         FspFileNodeTrySetDirInfo(FileNode,
-            Irp->AssociatedIrp.SystemBuffer,
+            (PVOID)(UINT_PTR)Request->Req.QueryDirectory.Address,
             (ULONG)Response->IoStatus.Information,
-            DirInfoChangeNumber) &&
+            (ULONG)(UINT_PTR)FspIopRequestContext(Request, FspIopRequestExtraContext)) &&
         FspFileNodeReferenceDirInfo(FileNode, &DirInfoBuffer, &DirInfoSize))
     {
         Result = FspFsvolQueryDirectoryCopyCache(FileDesc,
@@ -989,7 +894,7 @@ NTSTATUS FspFsvolDirectoryControlComplete(
     }
     else
     {
-        DirInfoBuffer = Irp->AssociatedIrp.SystemBuffer;
+        DirInfoBuffer = (PVOID)(UINT_PTR)Request->Req.QueryDirectory.Address;
         DirInfoSize = (ULONG)Response->IoStatus.Information;
         Result = FspFsvolQueryDirectoryCopyInPlace(FileDesc,
             FileInformationClass, ReturnSingleEntry,
@@ -1008,7 +913,6 @@ NTSTATUS FspFsvolDirectoryControlComplete(
 
         FspFileNodeConvertExclusiveToShared(FileNode, Full);
 
-        Request->Kind = FspFsctlTransactQueryDirectoryKind;
         FspIopResetRequest(Request, FspFsvolQueryDirectoryRequestFini);
 
         Request->Req.QueryDirectory.Address = 0;
@@ -1017,7 +921,7 @@ NTSTATUS FspFsvolDirectoryControlComplete(
         if (0 != FileDesc->DirectoryMarker.Buffer)
         {
             ASSERT(
-                FsvolDeviceExtension->VolumeParams.MaxComponentLength >=
+                FsvolDeviceExtension->VolumeParams.MaxComponentLength * sizeof(WCHAR) >=
                 FileDesc->DirectoryMarker.Length);
 
             Request->Req.QueryDirectory.Marker.Offset =
@@ -1032,7 +936,7 @@ NTSTATUS FspFsvolDirectoryControlComplete(
         }
 
         FspFileNodeSetOwner(FileNode, Full, Request);
-        FspIopRequestContext(Request, RequestIrp) = Irp;
+        FspIopRequestContext(Request, RequestFileNode) = FileNode;
 
         FspIoqPostIrp(FsvolDeviceExtension->Ioq, Irp, &Result);
     }
@@ -1054,65 +958,30 @@ static VOID FspFsvolQueryDirectoryRequestFini(FSP_FSCTL_TRANSACT_REQ *Request, P
 {
     PAGED_CODE();
 
-    PIRP Irp = Context[RequestIrp];
+    FSP_FILE_NODE *FileNode = Context[RequestFileNode];
+    PVOID Cookie = (PVOID)((UINT_PTR)Context[RequestCookie] & ~1);
+    PVOID Address = Context[RequestAddress];
+    PEPROCESS Process = Context[RequestProcess];
 
-    if ((UINT_PTR)Context[RequestCookie] & 1)
+    if (0 != Address)
     {
-        PVOID Cookie = (PVOID)((UINT_PTR)Context[RequestCookie] & ~1);
-        PVOID Address = Context[RequestAddress];
-        PEPROCESS Process = Context[RequestProcess];
+        KAPC_STATE ApcState;
+        BOOLEAN Attach;
 
-        if (0 != Address)
-        {
-            KAPC_STATE ApcState;
-            BOOLEAN Attach;
+        ASSERT(0 != Process);
+        Attach = Process != PsGetCurrentProcess();
 
-            ASSERT(0 != Process);
-            Attach = Process != PsGetCurrentProcess();
+        if (Attach)
+            KeStackAttachProcess(Process, &ApcState);
+        FspProcessBufferRelease(Cookie, Address);
+        if (Attach)
+            KeUnstackDetachProcess(&ApcState);
 
-            if (Attach)
-                KeStackAttachProcess(Process, &ApcState);
-            FspProcessBufferRelease(Cookie, Address);
-            if (Attach)
-                KeUnstackDetachProcess(&ApcState);
-
-            ObDereferenceObject(Process);
-        }
-    }
-    else
-    {
-        PMDL Mdl = Context[RequestMdl];
-        PVOID Address = Context[RequestAddress];
-        PEPROCESS Process = Context[RequestProcess];
-
-        if (0 != Address)
-        {
-            KAPC_STATE ApcState;
-            BOOLEAN Attach;
-
-            ASSERT(0 != Process);
-            Attach = Process != PsGetCurrentProcess();
-
-            if (Attach)
-                KeStackAttachProcess(Process, &ApcState);
-            MmUnmapLockedPages(Address, Mdl);
-            if (Attach)
-                KeUnstackDetachProcess(&ApcState);
-
-            ObDereferenceObject(Process);
-        }
-
-        if (0 != Mdl)
-            IoFreeMdl(Mdl);
+        ObDereferenceObject(Process);
     }
 
-    if (0 != Irp)
-    {
-        PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
-        FSP_FILE_NODE *FileNode = IrpSp->FileObject->FsContext;
-
+    if (0 != FileNode)
         FspFileNodeReleaseOwner(FileNode, Full, Request);
-    }
 }
 
 NTSTATUS FspDirectoryControl(

src/sys/driver.h

@@ -837,6 +837,10 @@ PIRP FspIoqNextCompleteIrp(FSP_IOQ *Ioq, PIRP BoundaryIrp);
 ULONG FspIoqRetriedIrpCount(FSP_IOQ *Ioq);
 
 /* meta cache */
+enum
+{
+    FspMetaCacheItemHeaderSize = MEMORY_ALLOCATION_ALIGNMENT,
+};
 typedef struct
 {
     KSPIN_LOCK SpinLock;
@@ -1144,11 +1148,13 @@ BOOLEAN FspWriteIrpShouldUseProcessBuffer(PIRP Irp, SIZE_T BufferSize)
     return FspProcessBufferSizeMax >= BufferSize;
 #endif
 }
+#if 0
 static inline
 BOOLEAN FspQueryDirectoryIrpShouldUseProcessBuffer(PIRP Irp, SIZE_T BufferSize)
 {
     return FspReadIrpShouldUseProcessBuffer(Irp, BufferSize);
 }
+#endif
 
 /* volume management */
 #define FspVolumeTransactEarlyTimeout   (1 * 10000ULL)
@@ -1350,6 +1356,8 @@ VOID FspFileNodeGetFileInfo(FSP_FILE_NODE *FileNode, FSP_FSCTL_FILE_INFO *FileIn
 BOOLEAN FspFileNodeTryGetFileInfo(FSP_FILE_NODE *FileNode, FSP_FSCTL_FILE_INFO *FileInfo);
 VOID FspFileNodeSetFileInfo(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
     const FSP_FSCTL_FILE_INFO *FileInfo, BOOLEAN TruncateOnClose);
+BOOLEAN FspFileNodeTrySetFileInfoOnOpen(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
+    const FSP_FSCTL_FILE_INFO *FileInfo, BOOLEAN TruncateOnClose);
 BOOLEAN FspFileNodeTrySetFileInfo(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
     const FSP_FSCTL_FILE_INFO *FileInfo, ULONG InfoChangeNumber);
 VOID FspFileNodeInvalidateFileInfo(FSP_FILE_NODE *FileNode);

src/sys/file.c

@@ -58,6 +58,8 @@ VOID FspFileNodeGetFileInfo(FSP_FILE_NODE *FileNode, FSP_FSCTL_FILE_INFO *FileIn
 BOOLEAN FspFileNodeTryGetFileInfo(FSP_FILE_NODE *FileNode, FSP_FSCTL_FILE_INFO *FileInfo);
 VOID FspFileNodeSetFileInfo(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
     const FSP_FSCTL_FILE_INFO *FileInfo, BOOLEAN TruncateOnClose);
+BOOLEAN FspFileNodeTrySetFileInfoOnOpen(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
+    const FSP_FSCTL_FILE_INFO *FileInfo, BOOLEAN TruncateOnClose);
 BOOLEAN FspFileNodeTrySetFileInfo(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
     const FSP_FSCTL_FILE_INFO *FileInfo, ULONG InfoChangeNumber);
 VOID FspFileNodeInvalidateFileInfo(FSP_FILE_NODE *FileNode);
@@ -129,6 +131,7 @@ VOID FspFileNodeOplockComplete(PVOID Context, PIRP Irp);
 #pragma alloc_text(PAGE, FspFileNodeGetFileInfo)
 #pragma alloc_text(PAGE, FspFileNodeTryGetFileInfo)
 #pragma alloc_text(PAGE, FspFileNodeSetFileInfo)
+#pragma alloc_text(PAGE, FspFileNodeTrySetFileInfoOnOpen)
 #pragma alloc_text(PAGE, FspFileNodeTrySetFileInfo)
 #pragma alloc_text(PAGE, FspFileNodeInvalidateFileInfo)
 #pragma alloc_text(PAGE, FspFileNodeReferenceSecurity)
@@ -1660,6 +1663,43 @@ VOID FspFileNodeSetFileInfo(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
     }
 }
 
+BOOLEAN FspFileNodeTrySetFileInfoOnOpen(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
+    const FSP_FSCTL_FILE_INFO *FileInfo, BOOLEAN TruncateOnClose)
+{
+    PAGED_CODE();
+
+    BOOLEAN EarlyExit;
+
+    FspFsvolDeviceLockContextTable(FileNode->FsvolDeviceObject);
+    EarlyExit = 1 < FileNode->OpenCount;
+    FspFsvolDeviceUnlockContextTable(FileNode->FsvolDeviceObject);
+
+    if (EarlyExit)
+    {
+        if (TruncateOnClose)
+        {
+            FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension =
+                FspFsvolDeviceExtension(FileNode->FsvolDeviceObject);
+            UINT64 AllocationSize = FileInfo->AllocationSize > FileInfo->FileSize ?
+                FileInfo->AllocationSize : FileInfo->FileSize;
+            UINT64 AllocationUnit;
+
+            AllocationUnit = FsvolDeviceExtension->VolumeParams.SectorSize *
+                FsvolDeviceExtension->VolumeParams.SectorsPerAllocationUnit;
+            AllocationSize = (AllocationSize + AllocationUnit - 1) / AllocationUnit * AllocationUnit;
+
+            if ((UINT64)FileNode->Header.AllocationSize.QuadPart != AllocationSize ||
+                (UINT64)FileNode->Header.FileSize.QuadPart != FileInfo->FileSize)
+                FileNode->TruncateOnClose = TRUE;
+        }
+
+        return FALSE;
+    }
+
+    FspFileNodeSetFileInfo(FileNode, CcFileObject, FileInfo, TruncateOnClose);
+    return TRUE;
+}
+
 BOOLEAN FspFileNodeTrySetFileInfo(FSP_FILE_NODE *FileNode, PFILE_OBJECT CcFileObject,
     const FSP_FSCTL_FILE_INFO *FileInfo, ULONG InfoChangeNumber)
 {
@@ -2126,7 +2166,7 @@ NTSTATUS FspFileDescSetDirectoryMarker(FSP_FILE_DESC *FileDesc,
         FspFsvolDeviceExtension(FileDesc->FileNode->FsvolDeviceObject);
     UNICODE_STRING DirectoryMarker;
 
-    if (FsvolDeviceExtension->VolumeParams.MaxComponentLength < FileName->Length)
+    if (FsvolDeviceExtension->VolumeParams.MaxComponentLength * sizeof(WCHAR) < FileName->Length)
         return STATUS_OBJECT_NAME_INVALID;
 
     DirectoryMarker.Length = DirectoryMarker.MaximumLength = FileName->Length;

src/sys/fileinfo.c

@@ -1573,6 +1573,7 @@ NTSTATUS FspFsvolSetInformationPrepare(
     SECURITY_CLIENT_CONTEXT SecurityClientContext;
     HANDLE UserModeAccessToken;
     PEPROCESS Process;
+    ULONG OriginatingProcessId;
 
     SecuritySubjectContext = FspIopRequestContext(Request, RequestSubjectContextOrAccessToken);
 
@@ -1605,10 +1606,16 @@ NTSTATUS FspFsvolSetInformationPrepare(
     Process = PsGetCurrentProcess();
     ObReferenceObject(Process);
 
+    /* get the originating process ID stored in the IRP */
+    OriginatingProcessId = IoGetRequestorProcessId(Irp);
+
     /* send the user-mode handle to the user-mode file system */
     FspIopRequestContext(Request, RequestSubjectContextOrAccessToken) = UserModeAccessToken;
     FspIopRequestContext(Request, RequestProcess) = Process;
-    Request->Req.SetInformation.Info.Rename.AccessToken = (UINT_PTR)UserModeAccessToken;
+    ASSERT((UINT64)(UINT_PTR)UserModeAccessToken <= 0xffffffffULL);
+    ASSERT((UINT64)(UINT_PTR)OriginatingProcessId <= 0xffffffffULL);
+    Request->Req.SetInformation.Info.Rename.AccessToken =
+        ((UINT64)(UINT_PTR)OriginatingProcessId << 32) | (UINT64)(UINT_PTR)UserModeAccessToken;
 
     return STATUS_SUCCESS;
 }

src/sys/iop.c

@@ -306,47 +306,6 @@ VOID FspIopCompleteIrpEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceDereference)
             }
         }
     }
-    else
-    /*
-     * HACK:
-     *
-     * Turns out that SRV2 sends an undocumented flavor of IRP_MJ_DIRECTORY_CONTROL /
-     * IRP_MN_QUERY_DIRECTORY. These IRP's have a non-NULL Irp->MdlAddress. They expect
-     * the FSD to fill the buffer pointed by Irp->MdlAddress and they cannot handle
-     * completed IRP's with a non-NULL Irp->AssociatedIrp.SystemBuffer. So we have to
-     * provide special support for these IRPs.
-     *
-     * While this processing is IRP_MJ_DIRECTORY_CONTROL specific, we do this here for
-     * these reasons:
-     *
-     * 1.  There may be other IRP's that have similar completion requirements under SRV2.
-     *     If/when such IRP's are discovered the completion processing can be centralized
-     *     here.
-     * 2.  IRP_MJ_DIRECTORY_CONTROL has a few different ways that it can complete IRP's.
-     *     It is far simpler to do this processing here, even if not academically correct.
-     *
-     * This will have to be revisited if IRP_MJ_DIRECTORY_CONTROL processing changes
-     * substantially (e.g. to no longer use Irp->AssociatedIrp.SystemBuffer).
-     */
-    if (IRP_MJ_DIRECTORY_CONTROL == IrpSp->MajorFunction &&
-        IRP_MN_QUERY_DIRECTORY == IrpSp->MinorFunction &&
-        0 != Irp->MdlAddress && /* SRV2 queries have this set */
-        0 != Irp->AssociatedIrp.SystemBuffer &&
-        FlagOn(Irp->Flags, IRP_BUFFERED_IO))
-    {
-        if (STATUS_SUCCESS == Result)
-        {
-            PVOID Address = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority);
-            if (0 != Address)
-                RtlCopyMemory(Address, Irp->AssociatedIrp.SystemBuffer, Irp->IoStatus.Information);
-            else
-                Result = STATUS_INSUFFICIENT_RESOURCES;
-        }
-
-        FspFreeExternal(Irp->AssociatedIrp.SystemBuffer);
-        Irp->AssociatedIrp.SystemBuffer = 0;
-        ClearFlag(Irp->Flags, IRP_INPUT_OPERATION | IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER);
-    }
 
     if (STATUS_SUCCESS != Result &&
         STATUS_REPARSE != Result &&

src/sys/meta.c

@@ -33,6 +33,8 @@ typedef struct
     ULONG Size;
     __declspec(align(MEMORY_ALLOCATION_ALIGNMENT)) UINT8 Buffer[];
 } FSP_META_CACHE_ITEM_BUFFER;
+FSP_FSCTL_STATIC_ASSERT(FIELD_OFFSET(FSP_META_CACHE_ITEM_BUFFER, Buffer) == FspMetaCacheItemHeaderSize,
+    "FspMetaCacheItemHeaderSize must match offset of FSP_META_CACHE_ITEM_BUFFER::Buffer");
 
 static inline VOID FspMetaCacheDereferenceItem(FSP_META_CACHE_ITEM *Item)
 {
@@ -218,7 +220,16 @@ UINT64 FspMetaCacheAddItem(FSP_META_CACHE *MetaCache, PCVOID Buffer, ULONG Size)
     Item->RefCount = 1;
     ItemBuffer->Item = Item;
     ItemBuffer->Size = Size;
-    RtlCopyMemory(ItemBuffer->Buffer, Buffer, Size);
+    try
+    {
+        RtlCopyMemory(ItemBuffer->Buffer, Buffer, Size);
+    }
+    except (EXCEPTION_EXECUTE_HANDLER)
+    {
+        FspFree(ItemBuffer);
+        FspFree(Item);
+        return 0;
+    }
     KeAcquireSpinLock(&MetaCache->SpinLock, &Irql);
     if (MetaCache->ItemCount >= MetaCache->MetaCapacity)
         FspMetaCacheRemoveExpiredItemAtDpcLevel(MetaCache, (UINT64)-1LL);

src/sys/wq.c

@@ -32,7 +32,7 @@ static VOID FspWqWorkRoutine(PVOID Context);
 static inline
 NTSTATUS FspWqPrepareIrpWorkItem(PIRP Irp)
 {
-    NTSTATUS Result;
+    NTSTATUS Result = STATUS_SUCCESS;
     PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
 
     /* lock/buffer the user buffer */
@@ -43,11 +43,12 @@ NTSTATUS FspWqPrepareIrpWorkItem(PIRP Irp)
             Result = FspLockUserBuffer(Irp, IrpSp->Parameters.Read.Length, IoWriteAccess);
         else
             Result = FspLockUserBuffer(Irp, IrpSp->Parameters.Write.Length, IoReadAccess);
-        if (!NT_SUCCESS(Result))
-            return Result;
     }
+    else
+    if (IRP_MJ_DIRECTORY_CONTROL == IrpSp->MajorFunction)
+        Result = FspLockUserBuffer(Irp, IrpSp->Parameters.QueryDirectory.Length, IoWriteAccess);
 
-    return STATUS_SUCCESS;
+    return Result;
 }
 
 NTSTATUS FspWqCreateAndPostIrpWorkItem(PIRP Irp,

tools/build-sample.bat

@@ -12,20 +12,26 @@ if X!ProjDir!==X (echo usage: build-sample Config Arch Sample ProjDir >&2 & goto
 
 call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
 
-set RegKey="HKLM\SOFTWARE\WinFsp"
-set RegVal="InstallDir"
-reg query !RegKey! /v !RegVal! /reg:32 >nul 2>&1
-if !ERRORLEVEL! equ 0 (
-    for /f "tokens=2,*" %%i in ('reg query !RegKey! /v !RegVal! /reg:32 ^| findstr !RegVal!') do (
-        set InstallDir=%%j
-    )
+if X!FSP_SAMPLE_DIR!==X (
+	set RegKey="HKLM\SOFTWARE\WinFsp"
+	set RegVal="InstallDir"
+	reg query !RegKey! /v !RegVal! /reg:32 >nul 2>&1
+	if !ERRORLEVEL! equ 0 (
+	    for /f "tokens=2,*" %%i in ('reg query !RegKey! /v !RegVal! /reg:32 ^| findstr !RegVal!') do (
+	        set InstallDir=%%j
+	    )
+	)
+	if not exist "!InstallDir!" (echo cannot find WinFsp installation >&2 & goto fail)
+	if not exist "!InstallDir!samples\!Sample!" (echo cannot find WinFsp sample !Sample! >&2 & goto fail)
+
+	set SampleDir=!InstallDir!samples
+) else (
+	set SampleDir=!FSP_SAMPLE_DIR!
 )
-if not exist "!InstallDir!" (echo cannot find WinFsp installation >&2 & goto fail)
-if not exist "!InstallDir!samples\!Sample!" (echo cannot find WinFsp sample !Sample! >&2 & goto fail)
 
 if exist "!ProjDir!" rmdir /s/q "!ProjDir!"
 mkdir "!ProjDir!"
-xcopy /s/e/q/y "!InstallDir!samples\!Sample!" "!ProjDir!"
+xcopy /s/e/q/y "!SampleDir!\!Sample!" "!ProjDir!"
 
 devenv "!ProjDir!\!Sample!.sln" /build "!Config!|!Arch!"
 if !ERRORLEVEL! neq 0 goto :fail

tools/build.bat

@@ -89,6 +89,8 @@ if %ERRORLEVEL% equ 0 (
     set Version=!Version:winfsp-=!
 
     copy ..\choco\* build\%Configuration%
+    copy ..\choco\LICENSE.TXT /B + ..\..\License.txt /B build\%Configuration%\LICENSE.txt /B
+    certutil -hashfile build\%Configuration%\winfsp-!Version!.msi SHA256 >>build\%Configuration%\VERIFICATION.txt
     choco pack build\%Configuration%\winfsp.nuspec --version=!Version! --outputdirectory=build\%Configuration%
     if errorlevel 1 goto fail
 )

tools/run-tests.bat

@@ -17,12 +17,16 @@ launchctl-x64 start memfs64 testdsk ""            M: >nul
 launchctl-x64 start memfs64 testnet \memfs64\test N: >nul
 launchctl-x64 start memfs32 testdsk ""            O: >nul
 launchctl-x64 start memfs32 testnet \memfs32\test P: >nul
+launchctl-x64 start memfs-dotnet testdsk ""                 Q: >nul
+launchctl-x64 start memfs-dotnet testnet \memfs-dotnet\test R: >nul
 rem Cannot use timeout under cygwin/mintty: "Input redirection is not supported"
 waitfor 7BF47D72F6664550B03248ECFE77C7DD /t 3 2>nul
 cd M: >nul 2>nul || (echo === Unable to find drive M: >&2 & goto fail)
 cd N: >nul 2>nul || (echo === Unable to find drive N: >&2 & goto fail)
 cd O: >nul 2>nul || (echo === Unable to find drive O: >&2 & goto fail)
 cd P: >nul 2>nul || (echo === Unable to find drive P: >&2 & goto fail)
+cd Q: >nul 2>nul || (echo === Unable to find drive Q: >&2 & goto fail)
+cd R: >nul 2>nul || (echo === Unable to find drive R: >&2 & goto fail)
 
 set dfl_tests=^
     winfsp-tests-x64 ^
@@ -31,9 +35,11 @@ set dfl_tests=^
     winfsp-tests-x64-mountpoint-dir ^
     winfsp-tests-x64-no-traverse ^
     winfsp-tests-x64-oplock ^
+    winfsp-tests-x64-external ^
     winfsp-tests-x64-external-share ^
     fsx-memfs-x64-disk ^
     fsx-memfs-x64-net ^
+    fsx-memfs-x64-slowio ^
     standby-memfs-x64-disk ^
     standby-memfs-x64-net ^
     net-use-memfs-x64 ^
@@ -46,22 +52,39 @@ set dfl_tests=^
     winfsp-tests-x86-mountpoint-dir ^
     winfsp-tests-x86-no-traverse ^
     winfsp-tests-x86-oplock ^
+    winfsp-tests-x86-external ^
     winfsp-tests-x86-external-share ^
     fsx-memfs-x86-disk ^
     fsx-memfs-x86-net ^
+    fsx-memfs-x86-slowio ^
     standby-memfs-x86-disk ^
     standby-memfs-x86-net ^
     net-use-memfs-x86 ^
     winfstest-memfs-x86-disk ^
     winfstest-memfs-x86-net ^
-    fscrash-x86
+    fscrash-x86 ^
+    winfsp-tests-dotnet-external ^
+    winfsp-tests-dotnet-external-share ^
+    fsx-memfs-dotnet-disk ^
+    fsx-memfs-dotnet-net ^
+    winfstest-memfs-dotnet-disk ^
+    winfstest-memfs-dotnet-net
 set opt_tests=^
     ifstest-memfs-x64-disk ^
     ifstest-memfs-x86-disk ^
+    ifstest-memfs-dotnet-disk ^
     sample-passthrough-x64 ^
     sample-passthrough-x86 ^
     sample-passthrough-fuse-x64 ^
-    sample-passthrough-fuse-x86
+    sample-fsx-passthrough-fuse-x64 ^
+    sample-passthrough-fuse-x86 ^
+    sample-fsx-passthrough-fuse-x86 ^
+    sample-passthrough-dotnet ^
+    compat-v1.1-passthrough-fuse-x64 ^
+    compat-v1.1-passthrough-fuse-x86 ^
+    avast-tests-x64 ^
+    avast-tests-x86 ^
+    avast-tests-dotnet
 
 set tests=
 for %%f in (%dfl_tests%) do (
@@ -118,6 +141,8 @@ launchctl-x64 stop memfs64 testdsk >nul
 launchctl-x64 stop memfs64 testnet >nul
 launchctl-x64 stop memfs32 testdsk >nul
 launchctl-x64 stop memfs32 testnet >nul
+launchctl-x64 stop memfs-dotnet testdsk >nul
+launchctl-x64 stop memfs-dotnet testnet >nul
 rem Cannot use timeout under cygwin/mintty: "Input redirection is not supported"
 waitfor 7BF47D72F6664550B03248ECFE77C7DD /t 3 2>nul
 
@@ -192,10 +217,30 @@ winfsp-tests-x86 --oplock=filter --resilient
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:winfsp-tests-x64-external
+M:
+fltmc instances -v M: | findstr aswSnx >nul
+if !ERRORLEVEL! neq 0 (
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --resilient
+) else (
+    REM Avast present
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --resilient ^
+        -querydir_buffer_overflow_test
+)
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :winfsp-tests-x64-external-share
 M:
-"%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --share=winfsp-tests-share=M:\ --resilient ^
-    -reparse_symlink*
+fltmc instances -v M: | findstr aswSnx >nul
+if !ERRORLEVEL! neq 0 (
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --share=winfsp-tests-share=M:\ --resilient ^
+        -reparse_symlink*
+) else (
+    REM Avast present
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --share=winfsp-tests-share=M:\ --resilient ^
+        -reparse_symlink* -querydir_buffer_overflow_test
+)
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
@@ -239,10 +284,30 @@ net use L: /delete
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:winfsp-tests-x86-external
+O:
+fltmc instances -v O: | findstr aswSnx >nul
+if !ERRORLEVEL! neq 0 (
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x86.exe" --external --resilient
+) else (
+    REM Avast present
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x86.exe" --external --resilient ^
+        -querydir_buffer_overflow_test
+)
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :winfsp-tests-x86-external-share
 O:
-"%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x86.exe" --external --share=winfsp-tests-share=O:\ --resilient ^
-    -reparse_symlink*
+fltmc instances -v O: | findstr aswSnx >nul
+if !ERRORLEVEL! neq 0 (
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x86.exe" --external --share=winfsp-tests-share=O:\ --resilient ^
+        -reparse_symlink*
+) else (
+    REM Avast present
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x86.exe" --external --share=winfsp-tests-share=O:\ --resilient ^
+        -reparse_symlink* -querydir_buffer_overflow_test
+)
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
@@ -348,6 +413,90 @@ fscrash-x86 --huge-alloc-size --cached >nul 2>&1
 if !ERRORLEVEL! neq 1 goto fail
 exit /b 0
 
+:winfsp-tests-dotnet-external
+Q:
+fltmc instances -v Q: | findstr aswSnx >nul
+if !ERRORLEVEL! neq 0 (
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --resilient
+) else (
+    REM Avast present
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --resilient ^
+        -querydir_buffer_overflow_test
+)
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:winfsp-tests-dotnet-external-share
+Q:
+fltmc instances -v Q: | findstr aswSnx >nul
+if !ERRORLEVEL! neq 0 (
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --share=winfsp-tests-share=Q:\ --resilient ^
+        -reparse_symlink*
+) else (
+    REM Avast present
+    "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --share=winfsp-tests-share=Q:\ --resilient ^
+        -reparse_symlink* -querydir_buffer_overflow_test
+)
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:fsx-memfs-dotnet-disk
+Q:
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 goto fail
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -f foo -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:fsx-memfs-dotnet-net
+R:
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 goto fail
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -f foo -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:fsx-memfs-x64-slowio
+call :__run_fsx_memfs_slowio_test memfs64-slowio memfs-x64
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:fsx-memfs-x86-slowio
+call :__run_fsx_memfs_slowio_test memfs32-slowio memfs-x86
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:__run_fsx_memfs_slowio_test
+set RunSampleTestExit=0
+call "%ProjRoot%\tools\fsreg" %1 "%ProjRoot%\build\VStudio\build\%Configuration%\%2.exe" "-u %%%%1 -m %%%%2 -M 50 -P 10 -R 5" "D:P(A;;RPWPLC;;;WD)"
+echo net use L: "\\%1\share"
+net use L: "\\%1\share"
+if !ERRORLEVEL! neq 0 goto fail
+echo net use ^| findstr L:
+net use | findstr L:
+pushd >nul
+cd L: >nul 2>nul || (echo Unable to find drive L: >&2 & goto fail)
+L:
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 set RunSampleTestExit=1
+popd
+echo net use L: /delete
+net use L: /delete
+call "%ProjRoot%\tools\fsreg" -u %1
+exit /b !RunSampleTestExit!
+
+:winfstest-memfs-dotnet-disk
+Q:
+call "%ProjRoot%\ext\test\winfstest\run-winfstest.bat"
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:winfstest-memfs-dotnet-net
+R:
+call "%ProjRoot%\ext\test\winfstest\run-winfstest.bat"
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :ifstest-memfs-x64-disk
 call :__ifstest-memfs M: \Device\WinFsp.Disk C:
 if !ERRORLEVEL! neq 0 goto fail
@@ -358,23 +507,28 @@ call :__ifstest-memfs O: \Device\WinFsp.Disk C:
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:ifstest-memfs-dotnet-disk
+call :__ifstest-memfs Q: \Device\WinFsp.Disk C:
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :__ifstest-memfs
 %1
 set IfsTestDirectories=^
-	securit^
-	opcreatg^
-	opcreatp^
-	closedel^
-	volinfo^
-	fileinfo^
-	dirinfo^
-	filelock^
-	oplocks^
-	chgnotif^
-	readwr^
-	seccache^
-	reparspt^
-	estream
+    securit^
+    opcreatg^
+    opcreatp^
+    closedel^
+    volinfo^
+    fileinfo^
+    dirinfo^
+    filelock^
+    oplocks^
+    chgnotif^
+    readwr^
+    seccache^
+    reparspt^
+    estream
 set IfsTestMemfsExit=0
 call :__ifstest %1 /g Security
 if !ERRORLEVEL! neq 0 set IfsTestMemfsExit=1
@@ -418,7 +572,7 @@ rem StreamEnhancements.StreamNotifyNameTest: WinFsp does not notify when streams
 call :__ifstest %1 /g StreamEnhancements -t StreamRenameTest -t StreamNotifyNameTest
 if !ERRORLEVEL! neq 0 set IfsTestMemfsExit=1
 for %%d in (!IfsTestDirectories!) do  (
-	if exist %%d (echo :ifstest directory %%d still exists & set IfsTestMemfsExit=1)
+    if exist %%d (echo :ifstest directory %%d still exists & set IfsTestMemfsExit=1)
 )
 exit /b !IfsTestMemfsExit!
 
@@ -482,82 +636,185 @@ if not X!IfsTestFound!==XYES set IfsTestExit=1
 exit /b !IfsTestExit!
 
 :sample-passthrough-x64
-call :__sample-passthrough x64
+call :__run_sample_test passthrough x64 passthrough-x64 winfsp-tests-x64
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
 :sample-passthrough-x86
-call :__sample-passthrough x86
+call :__run_sample_test passthrough x86 passthrough-x86 winfsp-tests-x86
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
-:__sample-passthrough
-set SamplePassthroughExit=0
-call %ProjRoot%\tools\build-sample %Configuration% %1 passthrough "%TMP%\passthrough-%1"
+:sample-passthrough-cpp-x64
+call :__run_sample_test passthrough-cpp x64 passthrough-cpp-x64 winfsp-tests-x64
 if !ERRORLEVEL! neq 0 goto fail
-mkdir "%TMP%\passthrough-%1\test"
-call "%ProjRoot%\tools\fsreg" passthrough "%TMP%\passthrough-%1\build\%Configuration%\passthrough-%1.exe" "-u %%%%1 -m %%%%2" "D:P(A;;RPWPLC;;;WD)"
-echo net use L: "\\passthrough\%TMP::=$%\passthrough-%1\test"
-net use L: "\\passthrough\%TMP::=$%\passthrough-%1\test"
+exit /b 0
+
+:sample-passthrough-cpp-x86
+call :__run_sample_test passthrough-cpp x86 passthrough-cpp-x86 winfsp-tests-x86
 if !ERRORLEVEL! neq 0 goto fail
-echo net use ^| findstr L:
-net use | findstr L:
-pushd >nul
-cd L: >nul 2>nul || (echo Unable to find drive L: >&2 & goto fail)
-L:
+exit /b 0
 
-"%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-%1.exe" ^
-    --external --resilient --case-insensitive-cmp --share-prefix="\passthrough\%TMP::=$%\passthrough-%1\test" ^
-    -create_allocation_test -getfileinfo_name_test -rename_flipflop_test -rename_mmap_test -exec_rename_dir_test ^
-    -reparse* -stream*
-if !ERRORLEVEL! neq 0 set SamplePassthroughExit=1
-
-popd
-echo net use L: /delete
-net use L: /delete
-call "%ProjRoot%\tools\fsreg" -u passthrough
-rmdir /s/q "%TMP%\passthrough-%1"
-exit /b !SamplePassthroughExit!
+:sample-passthrough-dotnet
+call :__run_sample_test passthrough-dotnet anycpu passthrough-dotnet winfsp-tests-x64 ^
+    "-create_backup_test -create_restore_test -create_namelen_test -delete_access_test -querydir_namelen_test"
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
 
 :sample-passthrough-fuse-x64
-call :__sample-passthrough-fuse x64
+call :__run_sample_fuse_test passthrough-fuse x64 passthrough-fuse-x64 winfsp-tests-x64
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
 :sample-passthrough-fuse-x86
-call :__sample-passthrough-fuse x86
+call :__run_sample_fuse_test passthrough-fuse x86 passthrough-fuse-x86 winfsp-tests-x86
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
-:__sample-passthrough-fuse
-set SamplePassthroughExit=0
-call %ProjRoot%\tools\build-sample %Configuration% %1 passthrough-fuse "%TMP%\passthrough-fuse-%1"
+:sample-fsx-passthrough-fuse-x64
+call :__run_sample_fsx_fuse_test passthrough-fuse x64 passthrough-fuse-x64 fsx
 if !ERRORLEVEL! neq 0 goto fail
-mkdir "%TMP%\passthrough-fuse-%1\test"
-call "%ProjRoot%\tools\fsreg" passthrough-fuse "%TMP%\passthrough-fuse-%1\build\%Configuration%\passthrough-fuse-%1.exe" ^
-    "-ouid=65792,gid=65792 --VolumePrefix=%%%%1 %%%%2" "D:P(A;;RPWPLC;;;WD)"
-echo net use L: "\\passthrough-fuse\%TMP::=$%\passthrough-fuse-%1\test"
-net use L: "\\passthrough-fuse\%TMP::=$%\passthrough-fuse-%1\test"
+exit /b 0
+
+:sample-fsx-passthrough-fuse-x86
+call :__run_sample_fsx_fuse_test passthrough-fuse x86 passthrough-fuse-x86 fsx
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:__run_sample_test
+set RunSampleTestExit=0
+call %ProjRoot%\tools\build-sample %Configuration% %2 %1 "%TMP%\%1"
+if !ERRORLEVEL! neq 0 goto fail
+mkdir "%TMP%\%1\test"
+call "%ProjRoot%\tools\fsreg" %1 "%TMP%\%1\build\%Configuration%\%3.exe" "-u %%%%1 -m %%%%2" "D:P(A;;RPWPLC;;;WD)"
+echo net use L: "\\%1\%TMP::=$%\%1\test"
+net use L: "\\%1\%TMP::=$%\%1\test"
 if !ERRORLEVEL! neq 0 goto fail
 echo net use ^| findstr L:
 net use | findstr L:
 pushd >nul
 cd L: >nul 2>nul || (echo Unable to find drive L: >&2 & goto fail)
 L:
-
-"%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-%1.exe" ^
-    --external --resilient --case-insensitive-cmp --share-prefix="\passthrough-fuse\%TMP::=$%\passthrough-fuse-%1\test" ^
-    -create_allocation_test -create_notraverse_test -create_backup_test -create_restore_test -create_namelen_test ^
-    -getfileinfo_name_test -setfileinfo_test -delete_access_test -delete_mmap_test -rename_flipflop_test -rename_mmap_test -setsecurity_test -exec_rename_dir_test ^
-    -reparse* -stream*
-if !ERRORLEVEL! neq 0 set SamplePassthroughExit=1
-
+"%ProjRoot%\build\VStudio\build\%Configuration%\%4.exe" ^
+    --external --resilient --case-insensitive-cmp --share-prefix="\%1\%TMP::=$%\%1\test" ^
+    -create_allocation_test -getfileinfo_name_test -rename_flipflop_test -rename_mmap_test -exec_rename_dir_test ^
+    -reparse* -stream* %~5
+if !ERRORLEVEL! neq 0 set RunSampleTestExit=1
 popd
 echo net use L: /delete
 net use L: /delete
-call "%ProjRoot%\tools\fsreg" -u passthrough-fuse
-rmdir /s/q "%TMP%\passthrough-fuse-%1"
-exit /b !SamplePassthroughExit!
+call "%ProjRoot%\tools\fsreg" -u %1
+rmdir /s/q "%TMP%\%1"
+exit /b !RunSampleTestExit!
+
+:__run_sample_fuse_test
+set RunSampleTestExit=0
+call %ProjRoot%\tools\build-sample %Configuration% %2 %1 "%TMP%\%1"
+if !ERRORLEVEL! neq 0 goto fail
+mkdir "%TMP%\%1\test"
+call "%ProjRoot%\tools\fsreg" %1 "%TMP%\%1\build\%Configuration%\%3.exe" ^
+    "-ouid=11,gid=65792 --VolumePrefix=%%%%1 %%%%2" "D:P(A;;RPWPLC;;;WD)"
+echo net use L: "\\%1\%TMP::=$%\%1\test"
+net use L: "\\%1\%TMP::=$%\%1\test"
+if !ERRORLEVEL! neq 0 goto fail
+echo net use ^| findstr L:
+net use | findstr L:
+pushd >nul
+cd L: >nul 2>nul || (echo Unable to find drive L: >&2 & goto fail)
+L:
+"%ProjRoot%\build\VStudio\build\%Configuration%\%4.exe" ^
+    --external --resilient --case-insensitive-cmp --share-prefix="\%1\%TMP::=$%\%1\test" ^
+    -create_allocation_test -create_notraverse_test -create_backup_test -create_restore_test -create_namelen_test ^
+    -getfileinfo_name_test -delete_access_test -delete_mmap_test -rename_flipflop_test -rename_mmap_test -setsecurity_test -querydir_namelen_test -exec_rename_dir_test ^
+    -reparse* -stream*
+if !ERRORLEVEL! neq 0 set RunSampleTestExit=1
+popd
+echo net use L: /delete
+net use L: /delete
+call "%ProjRoot%\tools\fsreg" -u %1
+rmdir /s/q "%TMP%\%1"
+exit /b !RunSampleTestExit!
+
+:__run_sample_fsx_fuse_test
+set RunSampleTestExit=0
+call %ProjRoot%\tools\build-sample %Configuration% %2 %1 "%TMP%\%1"
+if !ERRORLEVEL! neq 0 goto fail
+mkdir "%TMP%\%1\test"
+call "%ProjRoot%\tools\fsreg" %1 "%TMP%\%1\build\%Configuration%\%3.exe" ^
+    "-ouid=11,gid=65792 --VolumePrefix=%%%%1 %%%%2" "D:P(A;;RPWPLC;;;WD)"
+echo net use L: "\\%1\%TMP::=$%\%1\test"
+net use L: "\\%1\%TMP::=$%\%1\test"
+if !ERRORLEVEL! neq 0 goto fail
+echo net use ^| findstr L:
+net use | findstr L:
+pushd >nul
+cd L: >nul 2>nul || (echo Unable to find drive L: >&2 & goto fail)
+L:
+"%ProjRoot%\ext\test\fstools\src\fsx\%4.exe" -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 set RunSampleTestExit=1
+popd
+echo net use L: /delete
+net use L: /delete
+call "%ProjRoot%\tools\fsreg" -u %1
+rmdir /s/q "%TMP%\%1"
+exit /b !RunSampleTestExit!
+
+:compat-v1.1-passthrough-fuse-x64
+call :__run_compat_fuse_test passthrough-fuse v1.1\passthrough-fuse\passthrough-fuse-x64 winfsp-tests-x64
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:compat-v1.1-passthrough-fuse-x86
+call :__run_compat_fuse_test passthrough-fuse v1.1\passthrough-fuse\passthrough-fuse-x86 winfsp-tests-x86
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:__run_compat_fuse_test
+set RunSampleTestExit=0
+mkdir "%TMP%\%1\test"
+call "%ProjRoot%\tools\fsreg" %1 "%ProjRoot%\tst\compat\%2.exe" ^
+    "-ouid=11,gid=65792 --VolumePrefix=%%%%1 %%%%2" "D:P(A;;RPWPLC;;;WD)"
+echo net use L: "\\%1\%TMP::=$%\%1\test"
+net use L: "\\%1\%TMP::=$%\%1\test"
+if !ERRORLEVEL! neq 0 goto fail
+echo net use ^| findstr L:
+net use | findstr L:
+pushd >nul
+cd L: >nul 2>nul || (echo Unable to find drive L: >&2 & goto fail)
+L:
+"%ProjRoot%\build\VStudio\build\%Configuration%\%3.exe" ^
+    --external --resilient --case-insensitive-cmp --share-prefix="\%1\%TMP::=$%\%1\test" ^
+    -create_fileattr_test -create_allocation_test -create_notraverse_test -create_backup_test -create_restore_test -create_namelen_test ^
+    -getfileinfo_name_test -setfileinfo_test -delete_access_test -delete_mmap_test -rename_flipflop_test -rename_mmap_test -setsecurity_test -querydir_namelen_test -exec_rename_dir_test ^
+    -reparse* -stream*
+if !ERRORLEVEL! neq 0 set RunSampleTestExit=1
+popd
+echo net use L: /delete
+net use L: /delete
+call "%ProjRoot%\tools\fsreg" -u %1
+rmdir /s/q "%TMP%\%1"
+exit /b !RunSampleTestExit!
+
+:avast-tests-x64
+call :winfsp-tests-x64-external
+if !ERRORLEVEL! neq 0 goto fail
+call :winfsp-tests-x64-external-share
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:avast-tests-x86
+call :winfsp-tests-x86-external
+if !ERRORLEVEL! neq 0 goto fail
+call :winfsp-tests-x86-external-share
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:avast-tests-dotnet
+call :winfsp-tests-dotnet-external
+if !ERRORLEVEL! neq 0 goto fail
+call :winfsp-tests-dotnet-external-share
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
 
 :leak-test
 for /F "tokens=1,2 delims=:" %%i in ('verifier /query ^| findstr ^

tools/version-info.bat

@@ -0,0 +1,15 @@
+@echo off
+
+setlocal
+setlocal EnableDelayedExpansion
+
+for %%f in (%*) do (
+	set file="%%~f"
+	if exist !file! (
+		echo version-info: !file!
+		powershell -command "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(""!file!"") | fl -property ProductName, ProductVersion, ProductVersionRaw, LegalCopyright, CompanyName, FileDescription, FileVersionRaw, FileVersion"
+		powershell -command "try { [System.Reflection.AssemblyName]::GetAssemblyName(""!file!"") | fl -property FullName, Version } catch {}"
+	) else (
+		echo version-info: file !file! not found
+	)
+)

tst/compat/v1.1/passthrough-fuse/README.md

@@ -0,0 +1,3 @@
+This directory contains binaries of `passthrough-fuse` from release `v1.2B2`. Both `x64` and `x86` binaries are provided.
+
+The WinFsp-FUSE layer added support for `struct fuse_stat_ex` in `v1.2B3` which was a potentially breaking change for backwards compatibility. These binaries are used to verify that WinFsp-FUSE remains backwards compatible.

tst/fsbench/fsbench.c

@@ -75,6 +75,41 @@ static void file_list_test(void)
         ASSERT(Success);
     }
 }
+static void file_list_single_test(void)
+{
+    HANDLE Handle;
+    BOOL Success;
+    WCHAR FileName[MAX_PATH];
+    WIN32_FIND_DATAW FindData;
+
+    for (ULONG ListIndex = 0; OptListCount > ListIndex; ListIndex++)
+        for (ULONG Index = 0; OptFileCount > Index; Index++)
+        {
+            StringCbPrintfW(FileName, sizeof FileName, L"fsbench-file%lu", Index);
+            Handle = FindFirstFileW(FileName, &FindData);
+            ASSERT(INVALID_HANDLE_VALUE != Handle);
+            do
+            {
+            } while (FindNextFileW(Handle, &FindData));
+            Success = FindClose(Handle);
+            ASSERT(Success);
+        }
+}
+static void file_list_none_test(void)
+{
+    HANDLE Handle;
+    WCHAR FileName[MAX_PATH];
+    WIN32_FIND_DATAW FindData;
+
+    for (ULONG ListIndex = 0; OptListCount > ListIndex; ListIndex++)
+        for (ULONG Index = 0; OptFileCount > Index; Index++)
+        {
+            StringCbPrintfW(FileName, sizeof FileName, L"{5F849D7F-73AF-49AC-B7C3-657B36EAD5C4}");
+            Handle = FindFirstFileW(FileName, &FindData);
+            ASSERT(INVALID_HANDLE_VALUE == Handle);
+            ASSERT(ERROR_FILE_NOT_FOUND == GetLastError());
+        }
+}
 static void file_delete_test(void)
 {
     BOOL Success;
@@ -117,6 +152,8 @@ static void file_tests(void)
     TEST(file_open_test);
     TEST(file_overwrite_test);
     TEST(file_list_test);
+    TEST(file_list_single_test);
+    TEST(file_list_none_test);
     TEST(file_delete_test);
     TEST(file_mkdir_test);
     TEST(file_rmdir_test);

tst/memfs/memfs-main.c

@@ -44,6 +44,9 @@ NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
     ULONG FileInfoTimeout = INFINITE;
     ULONG MaxFileNodes = 1024;
     ULONG MaxFileSize = 16 * 1024 * 1024;
+    ULONG SlowioMaxDelay = 0;       /* -M: maximum slow IO delay in millis */
+    ULONG SlowioPercentDelay = 0;   /* -P: percent of slow IO to make pending */
+    ULONG SlowioRarefyDelay = 0;    /* -R: adjust the rarity of pending slow IO */
     PWSTR FileSystemName = 0;
     PWSTR MountPoint = 0;
     PWSTR VolumePrefix = 0;
@@ -75,9 +78,18 @@ NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
         case L'm':
             argtos(MountPoint);
             break;
+        case L'M':
+            argtol(SlowioMaxDelay);
+            break;
         case L'n':
             argtol(MaxFileNodes);
             break;
+        case L'P':
+            argtol(SlowioPercentDelay);
+            break;
+        case L'R':
+            argtol(SlowioRarefyDelay);
+            break;
         case L'S':
             argtos(RootSddl);
             break;
@@ -130,6 +142,9 @@ NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
         FileInfoTimeout,
         MaxFileNodes,
         MaxFileSize,
+        SlowioMaxDelay,
+        SlowioPercentDelay,
+        SlowioRarefyDelay,
         FileSystemName,
         VolumePrefix,
         RootSddl,
@@ -189,6 +204,9 @@ usage:
         "    -t FileInfoTimeout  [millis]\n"
         "    -n MaxFileNodes\n"
         "    -s MaxFileSize      [bytes]\n"
+        "    -M MaxDelay         [maximum slow IO delay in millis]\n"
+        "    -P PercentDelay     [percent of slow IO to make pending]\n"
+        "    -R RarefyDelay      [adjust the rarity of pending slow IO]\n"
         "    -F FileSystemName\n"
         "    -S RootSddl         [file rights: FA, etc; NO generic rights: GA, etc.]\n"
         "    -u \\Server\\Share    [UNC prefix (single backslash)]\n"

tst/memfs/memfs.cpp

@@ -23,6 +23,9 @@
 #include <map>
 #include <unordered_map>
 
+/* SLOWIO */
+#include <thread>
+
 #define MEMFS_MAX_PATH                  512
 FSP_FSCTL_STATIC_ASSERT(MEMFS_MAX_PATH > MAX_PATH,
     "MEMFS_MAX_PATH must be greater than MAX_PATH.");
@@ -42,6 +45,16 @@ FSP_FSCTL_STATIC_ASSERT(MEMFS_MAX_PATH > MAX_PATH,
  */
 #define MEMFS_NAMED_STREAMS
 
+/*
+ * Define the MEMFS_DIRINFO_BY_NAME macro to include GetDirInfoByName.
+ */
+#define MEMFS_DIRINFO_BY_NAME
+
+/*
+ * Define the MEMFS_SLOWIO macro to include delayed I/O response support.
+ */
+#define MEMFS_SLOWIO
+
 /*
  * Define the DEBUG_BUFFER_CHECK macro on Windows 8 or above. This includes
  * a check for the Write buffer to ensure that it is read-only.
@@ -137,20 +150,85 @@ UINT64 MemfsGetSystemTime(VOID)
 }
 
 static inline
-int MemfsCompareString(PWSTR a, int alen, PWSTR b, int blen, BOOLEAN CaseInsensitive)
+int MemfsFileNameCompare(PWSTR a0, int alen, PWSTR b0, int blen, BOOLEAN CaseInsensitive)
 {
+    /*
+     * HACKFIX GITHUB ISSUE #103
+     *
+     * MEMFS stores the whole file system in a single map. This was to keep the file system
+     * "simple", but in retrospect it was probably a bad decision as it creates multiple problems.
+     *
+     * One of these problems was what caused GitHub issue #103. A directory that had both "Firefox"
+     * and "Firefox64" subdirectories in it would cause directory listings of "Firefox" to fail,
+     * because "Firefox\\" (and "Firefox:") comes *after* "Firefox64" in case-sensitive or
+     * case-insensitive order!
+     *
+     * The hackfix is this: copy our input strings into temporary buffers and then translate ':' to
+     * '\x1' and '\\' to '\x2' so they always order the FileName map properly.
+     */
+
+    WCHAR a[MEMFS_MAX_PATH], b[MEMFS_MAX_PATH];
     int len, res;
 
     if (-1 == alen)
-        alen = (int)wcslen(a);
+    {
+        PWSTR p = a0, q = a;
+        for (; *p; p++, q++)
+            if (L':' == *p)
+                *q = L'\x1';
+            else if (L'\\' == *p)
+                *q = L'\x2';
+            else
+                *q = *p;
+        alen = (int)(p - a0);
+    }
+    else
+    {
+        PWSTR p = a0, q = a;
+        for (PWSTR endp = p + alen; endp > p; p++, q++)
+            if (L':' == *p)
+                *q = L'\x1';
+            else if (L'\\' == *p)
+                *q = L'\x2';
+            else
+                *q = *p;
+    }
+
     if (-1 == blen)
-        blen = (int)wcslen(b);
+    {
+        PWSTR p = b0, q = b;
+        for (; *p; p++, q++)
+            if (L':' == *p)
+                *q = L'\x1';
+            else if (L'\\' == *p)
+                *q = L'\x2';
+            else
+                *q = *p;
+        blen = (int)(p - b0);
+    }
+    else
+    {
+        PWSTR p = b0, q = b;
+        for (PWSTR endp = p + blen; endp > p; p++, q++)
+            if (L':' == *p)
+                *q = L'\x1';
+            else if (L'\\' == *p)
+                *q = L'\x2';
+            else
+                *q = *p;
+    }
 
     len = alen < blen ? alen : blen;
 
-    /* we should still be in the C locale */
     if (CaseInsensitive)
-        res = _wcsnicmp(a, b, len);
+    {
+        /* better Unicode comparison when case-insensitive */
+        res = CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, a, alen, b, blen);
+        if (0 != res)
+            res -= 2;
+        else
+            res = _wcsnicmp(a, b, len);
+    }
     else
         res = wcsncmp(a, b, len);
 
@@ -160,19 +238,13 @@ int MemfsCompareString(PWSTR a, int alen, PWSTR b, int blen, BOOLEAN CaseInsensi
     return res;
 }
 
-static inline
-int MemfsFileNameCompare(PWSTR a, PWSTR b, BOOLEAN CaseInsensitive)
-{
-    return MemfsCompareString(a, -1, b, -1, CaseInsensitive);
-}
-
 static inline
 BOOLEAN MemfsFileNameHasPrefix(PWSTR a, PWSTR b, BOOLEAN CaseInsensitive)
 {
     int alen = (int)wcslen(a);
     int blen = (int)wcslen(b);
 
-    return alen >= blen && 0 == MemfsCompareString(a, blen, b, blen, CaseInsensitive) &&
+    return alen >= blen && 0 == MemfsFileNameCompare(a, blen, b, blen, CaseInsensitive) &&
         (alen == blen || (1 == blen && L'\\' == b[0]) ||
 #if defined(MEMFS_NAMED_STREAMS)
             (L'\\' == a[blen] || L':' == a[blen]));
@@ -192,7 +264,7 @@ typedef struct _MEMFS_FILE_NODE
     SIZE_T ReparseDataSize;
     PVOID ReparseData;
 #endif
-    ULONG RefCount;
+    volatile LONG RefCount;
 #if defined(MEMFS_NAMED_STREAMS)
     struct _MEMFS_FILE_NODE *MainFileNode;
 #endif
@@ -205,7 +277,7 @@ struct MEMFS_FILE_NODE_LESS
     }
     bool operator()(PWSTR a, PWSTR b) const
     {
-        return 0 > MemfsFileNameCompare(a, b, CaseInsensitive);
+        return 0 > MemfsFileNameCompare(a, -1, b, -1, CaseInsensitive);
     }
     BOOLEAN CaseInsensitive;
 };
@@ -217,6 +289,12 @@ typedef struct _MEMFS
     MEMFS_FILE_NODE_MAP *FileNodeMap;
     ULONG MaxFileNodes;
     ULONG MaxFileSize;
+#ifdef MEMFS_SLOWIO
+    ULONG SlowioMaxDelay;
+    ULONG SlowioPercentDelay;
+    ULONG SlowioRarefyDelay;
+    volatile LONG SlowioThreadsRunning;
+#endif
     UINT16 VolumeLabelLength;
     WCHAR VolumeLabel[32];
 } MEMFS;
@@ -260,13 +338,13 @@ VOID MemfsFileNodeDelete(MEMFS_FILE_NODE *FileNode)
 static inline
 VOID MemfsFileNodeReference(MEMFS_FILE_NODE *FileNode)
 {
-    FileNode->RefCount++;
+    InterlockedIncrement(&FileNode->RefCount);
 }
 
 static inline
 VOID MemfsFileNodeDereference(MEMFS_FILE_NODE *FileNode)
 {
-    if (0 == --FileNode->RefCount)
+    if (0 == InterlockedDecrement(&FileNode->RefCount))
         MemfsFileNodeDelete(FileNode);
 }
 
@@ -446,7 +524,7 @@ BOOLEAN MemfsFileNodeMapHasChild(MEMFS_FILE_NODE_MAP *FileNodeMap, MEMFS_FILE_NO
             continue;
 #endif
         FspPathSuffix(iter->second->FileName, &Remain, &Suffix, Root);
-        Result = 0 == MemfsFileNameCompare(Remain, FileNode->FileName,
+        Result = 0 == MemfsFileNameCompare(Remain, -1, FileNode->FileName, -1,
             MemfsFileNodeMapIsCaseInsensitive(FileNodeMap));
         FspPathCombine(iter->second->FileName, Suffix);
         break;
@@ -483,7 +561,7 @@ BOOLEAN MemfsFileNodeMapEnumerateChildren(MEMFS_FILE_NODE_MAP *FileNodeMap, MEMF
             MemfsFileNodeMapIsCaseInsensitive(FileNodeMap)))
             break;
         FspPathSuffix(iter->second->FileName, &Remain, &Suffix, Root);
-        IsDirectoryChild = 0 == MemfsFileNameCompare(Remain, FileNode->FileName,
+        IsDirectoryChild = 0 == MemfsFileNameCompare(Remain, -1, FileNode->FileName, -1,
             MemfsFileNodeMapIsCaseInsensitive(FileNodeMap));
 #if defined(MEMFS_NAMED_STREAMS)
         IsDirectoryChild = IsDirectoryChild && 0 == wcschr(Suffix, L':');
@@ -582,6 +660,126 @@ VOID MemfsFileNodeMapEnumerateFree(MEMFS_FILE_NODE_MAP_ENUM_CONTEXT *Context)
     free(Context->FileNodes);
 }
 
+#ifdef MEMFS_SLOWIO
+/*
+ * SLOWIO
+ *
+ * This is included for two uses:
+ *
+ * 1) For testing winfsp, by allowing memfs to act more like a non-ram file system,
+ *    with some IO taking many milliseconds, and some IO completion delayed.
+ *
+ * 2) As sample code for how to use winfsp's STATUS_PENDING capabilities.
+ * 
+ */
+
+static inline UINT64 Hash(UINT64 x)
+{
+    x = (x ^ (x >> 30)) * 0xbf58476d1ce4e5b9ull;
+    x = (x ^ (x >> 27)) * 0x94d049bb133111ebull;
+    x =  x ^ (x >> 31);
+    return x;
+}
+
+static inline ULONG PseudoRandom(ULONG to)
+{
+    /* John Oberschelp's PRNG */
+    static UINT64 spin = 0;
+    InterlockedIncrement(&spin);
+    return Hash(spin) % to;
+}
+
+static inline BOOLEAN SlowioReturnPending(FSP_FILE_SYSTEM *FileSystem)
+{
+    MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
+    if (0 == Memfs->SlowioMaxDelay)
+        return FALSE;
+    return PseudoRandom(100) < Memfs->SlowioPercentDelay;
+}
+
+static inline VOID SlowioSnooze(FSP_FILE_SYSTEM *FileSystem)
+{
+    MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
+    if (0 == Memfs->SlowioMaxDelay)
+        return;
+    ULONG millis = PseudoRandom(Memfs->SlowioMaxDelay + 1) >> PseudoRandom(Memfs->SlowioRarefyDelay + 1);
+    Sleep(millis);
+}
+
+void SlowioReadThread(
+    FSP_FILE_SYSTEM *FileSystem,
+    MEMFS_FILE_NODE *FileNode,
+    PVOID Buffer, 
+    UINT64 Offset, 
+    UINT64 EndOffset,
+    UINT64 RequestHint)
+{
+    SlowioSnooze(FileSystem);
+
+    memcpy(Buffer, (PUINT8)FileNode->FileData + Offset, (size_t)(EndOffset - Offset));
+    UINT32 BytesTransferred = (ULONG)(EndOffset - Offset);
+
+    FSP_FSCTL_TRANSACT_RSP ResponseBuf;
+    memset(&ResponseBuf, 0, sizeof ResponseBuf);
+    ResponseBuf.Size = sizeof ResponseBuf;
+    ResponseBuf.Kind = FspFsctlTransactReadKind;
+    ResponseBuf.Hint = RequestHint;                         // IRP that is being completed
+    ResponseBuf.IoStatus.Status = STATUS_SUCCESS;
+    ResponseBuf.IoStatus.Information = BytesTransferred;    // bytes read
+    FspFileSystemSendResponse(FileSystem, &ResponseBuf);
+
+    MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
+    InterlockedDecrement(&Memfs->SlowioThreadsRunning);
+}
+
+void SlowioWriteThread(
+    FSP_FILE_SYSTEM *FileSystem,
+    MEMFS_FILE_NODE *FileNode,
+    PVOID Buffer, 
+    UINT64 Offset, 
+    UINT64 EndOffset,
+    UINT64 RequestHint)
+{
+    SlowioSnooze(FileSystem);
+
+    memcpy((PUINT8)FileNode->FileData + Offset, Buffer, (size_t)(EndOffset - Offset));
+    UINT32 BytesTransferred = (ULONG)(EndOffset - Offset);
+
+    FSP_FSCTL_TRANSACT_RSP ResponseBuf;
+    memset(&ResponseBuf, 0, sizeof ResponseBuf);
+    ResponseBuf.Size = sizeof ResponseBuf;
+    ResponseBuf.Kind = FspFsctlTransactWriteKind;
+    ResponseBuf.Hint = RequestHint;                         // IRP that is being completed
+    ResponseBuf.IoStatus.Status = STATUS_SUCCESS;
+    ResponseBuf.IoStatus.Information = BytesTransferred;    // bytes written
+    MemfsFileNodeGetFileInfo(FileNode, &ResponseBuf.Rsp.Write.FileInfo);
+    FspFileSystemSendResponse(FileSystem, &ResponseBuf);
+
+    MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
+    InterlockedDecrement(&Memfs->SlowioThreadsRunning);
+}
+
+void SlowioReadDirectoryThread(
+    FSP_FILE_SYSTEM *FileSystem,
+    ULONG BytesTransferred,
+    UINT64 RequestHint)
+{
+    SlowioSnooze(FileSystem);
+
+    FSP_FSCTL_TRANSACT_RSP ResponseBuf;
+    memset(&ResponseBuf, 0, sizeof ResponseBuf);
+    ResponseBuf.Size = sizeof ResponseBuf;
+    ResponseBuf.Kind = FspFsctlTransactQueryDirectoryKind;
+    ResponseBuf.Hint = RequestHint;                         // IRP that is being completed
+    ResponseBuf.IoStatus.Status = STATUS_SUCCESS;
+    ResponseBuf.IoStatus.Information = BytesTransferred;    // bytes of directory info read
+    FspFileSystemSendResponse(FileSystem, &ResponseBuf);
+
+    MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
+    InterlockedDecrement(&Memfs->SlowioThreadsRunning);
+}
+#endif
+
 /*
  * FSP_FILE_SYSTEM_INTERFACE
  */
@@ -726,7 +924,7 @@ static NTSTATUS Create(FSP_FILE_SYSTEM *FileSystem,
         size_t RemainLength, BSlashLength, SuffixLength;
 
         FspPathSuffix(FileName, &Remain, &Suffix, Root);
-        assert(0 == MemfsCompareString(Remain, -1, ParentNode->FileName, -1, TRUE));
+        assert(0 == MemfsFileNameCompare(Remain, -1, ParentNode->FileName, -1, TRUE));
         FspPathCombine(FileName, Suffix);
 
         RemainLength = wcslen(ParentNode->FileName);
@@ -850,14 +1048,18 @@ static NTSTATUS Overwrite(FSP_FILE_SYSTEM *FileSystem,
     NTSTATUS Result;
 
 #if defined(MEMFS_NAMED_STREAMS)
-    MEMFS_FILE_NODE_MAP_ENUM_CONTEXT Context = { FALSE };
+    MEMFS_FILE_NODE_MAP_ENUM_CONTEXT Context = { TRUE };
     ULONG Index;
 
     MemfsFileNodeMapEnumerateNamedStreams(Memfs->FileNodeMap, FileNode,
         MemfsFileNodeMapEnumerateFn, &Context);
     for (Index = 0; Context.Count > Index; Index++)
-        if (1 >= Context.FileNodes[Index]->RefCount)
+    {
+        LONG RefCount = Context.FileNodes[Index]->RefCount;
+        MemoryBarrier();
+        if (2 >= RefCount)
             MemfsFileNodeMapRemove(Memfs->FileNodeMap, Context.FileNodes[Index]);
+    }
     MemfsFileNodeMapEnumerateFree(&Context);
 #endif
 
@@ -961,6 +1163,27 @@ static NTSTATUS Read(FSP_FILE_SYSTEM *FileSystem,
     if (EndOffset > FileNode->FileInfo.FileSize)
         EndOffset = FileNode->FileInfo.FileSize;
 
+#ifdef MEMFS_SLOWIO
+    if (SlowioReturnPending(FileSystem))
+    {
+        MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
+        try
+        {
+            InterlockedIncrement(&Memfs->SlowioThreadsRunning);
+            std::thread(SlowioReadThread,
+                FileSystem, FileNode, Buffer, Offset, EndOffset,
+                FspFileSystemGetOperationContext()->Request->Hint).
+                detach();
+            return STATUS_PENDING;
+        }
+        catch (...)
+        {
+            InterlockedDecrement(&Memfs->SlowioThreadsRunning);
+        }
+    }
+    SlowioSnooze(FileSystem);
+#endif
+
     memcpy(Buffer, (PUINT8)FileNode->FileData + Offset, (size_t)(EndOffset - Offset));
 
     *PBytesTransferred = (ULONG)(EndOffset - Offset);
@@ -1014,6 +1237,27 @@ static NTSTATUS Write(FSP_FILE_SYSTEM *FileSystem,
         }
     }
 
+#ifdef MEMFS_SLOWIO
+    if (SlowioReturnPending(FileSystem))
+    {
+        MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
+        try
+        {
+            InterlockedIncrement(&Memfs->SlowioThreadsRunning);
+            std::thread(SlowioWriteThread,
+                FileSystem, FileNode, Buffer, Offset, EndOffset,
+                FspFileSystemGetOperationContext()->Request->Hint).
+                detach();
+            return STATUS_PENDING;
+        }
+        catch (...)
+        {
+            InterlockedDecrement(&Memfs->SlowioThreadsRunning);
+        }
+    }
+    SlowioSnooze(FileSystem);
+#endif
+
     memcpy((PUINT8)FileNode->FileData + Offset, Buffer, (size_t)(EndOffset - Offset));
 
     *PBytesTransferred = (ULONG)(EndOffset - Offset);
@@ -1346,6 +1590,8 @@ static NTSTATUS ReadDirectory(FSP_FILE_SYSTEM *FileSystem,
     PVOID FileNode0, PWSTR Pattern, PWSTR Marker,
     PVOID Buffer, ULONG Length, PULONG PBytesTransferred)
 {
+    assert(0 == Pattern);
+
     MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
     MEMFS_FILE_NODE *FileNode = (MEMFS_FILE_NODE *)FileNode0;
     MEMFS_FILE_NODE *ParentNode;
@@ -1381,9 +1627,71 @@ static NTSTATUS ReadDirectory(FSP_FILE_SYSTEM *FileSystem,
         ReadDirectoryEnumFn, &Context))
         FspFileSystemAddDirInfo(0, Buffer, Length, PBytesTransferred);
 
+#ifdef MEMFS_SLOWIO
+    if (SlowioReturnPending(FileSystem))
+    {
+        try
+        {
+            InterlockedIncrement(&Memfs->SlowioThreadsRunning);
+            std::thread(SlowioReadDirectoryThread,
+                FileSystem, *PBytesTransferred,
+                FspFileSystemGetOperationContext()->Request->Hint).
+                detach();
+            return STATUS_PENDING;
+        }
+        catch (...)
+        {
+            InterlockedDecrement(&Memfs->SlowioThreadsRunning);
+        }
+    }
+    SlowioSnooze(FileSystem);
+#endif
+
     return STATUS_SUCCESS;
 }
 
+#if defined(MEMFS_DIRINFO_BY_NAME)
+static NTSTATUS GetDirInfoByName(FSP_FILE_SYSTEM *FileSystem,
+    PVOID ParentNode0, PWSTR FileName,
+    FSP_FSCTL_DIR_INFO *DirInfo)
+{
+    MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
+    MEMFS_FILE_NODE *ParentNode = (MEMFS_FILE_NODE *)ParentNode0;
+    MEMFS_FILE_NODE *FileNode;
+    WCHAR FileNameBuf[MEMFS_MAX_PATH];
+    size_t ParentLength, BSlashLength, FileNameLength;
+    WCHAR Root[2] = L"\\";
+    PWSTR Remain, Suffix;
+
+    ParentLength = wcslen(ParentNode->FileName);
+    BSlashLength = 1 < ParentLength;
+    FileNameLength = wcslen(FileName);
+    if (MEMFS_MAX_PATH <= ParentLength + BSlashLength + FileNameLength)
+        return STATUS_OBJECT_NAME_NOT_FOUND; //STATUS_OBJECT_NAME_INVALID?
+
+    memcpy(FileNameBuf, ParentNode->FileName, ParentLength * sizeof(WCHAR));
+    memcpy(FileNameBuf + ParentLength, L"\\", BSlashLength * sizeof(WCHAR));
+    memcpy(FileNameBuf + ParentLength + BSlashLength, FileName, (FileNameLength + 1) * sizeof(WCHAR));
+
+    FileName = FileNameBuf;
+
+    FileNode = MemfsFileNodeMapGet(Memfs->FileNodeMap, FileName);
+    if (0 == FileNode)
+        return STATUS_OBJECT_NAME_NOT_FOUND;
+
+    FspPathSuffix(FileNode->FileName, &Remain, &Suffix, Root);
+    FileName = Suffix;
+    FspPathCombine(FileNode->FileName, Suffix);
+
+    //memset(DirInfo->Padding, 0, sizeof DirInfo->Padding);
+    DirInfo->Size = (UINT16)(sizeof(FSP_FSCTL_DIR_INFO) + wcslen(FileName) * sizeof(WCHAR));
+    DirInfo->FileInfo = FileNode->FileInfo;
+    memcpy(DirInfo->FileNameBuf, FileName, DirInfo->Size - sizeof(FSP_FSCTL_DIR_INFO));
+
+    return STATUS_SUCCESS;
+}
+#endif
+
 #if defined(MEMFS_REPARSE_POINTS)
 static NTSTATUS ResolveReparsePoints(FSP_FILE_SYSTEM *FileSystem,
     PWSTR FileName, UINT32 ReparsePointIndex, BOOLEAN ResolveLastPathComponent,
@@ -1624,6 +1932,11 @@ static FSP_FILE_SYSTEM_INTERFACE MemfsInterface =
 #else
     0,
 #endif
+#if defined(MEMFS_DIRINFO_BY_NAME)
+    GetDirInfoByName,
+#else
+    0,
+#endif
 };
 
 /*
@@ -1635,6 +1948,9 @@ NTSTATUS MemfsCreateFunnel(
     ULONG FileInfoTimeout,
     ULONG MaxFileNodes,
     ULONG MaxFileSize,
+    ULONG SlowioMaxDelay,
+    ULONG SlowioPercentDelay,
+    ULONG SlowioRarefyDelay,
     PWSTR FileSystemName,
     PWSTR VolumePrefix,
     PWSTR RootSddl,
@@ -1676,6 +1992,12 @@ NTSTATUS MemfsCreateFunnel(
     AllocationUnit = MEMFS_SECTOR_SIZE * MEMFS_SECTORS_PER_ALLOCATION_UNIT;
     Memfs->MaxFileSize = (ULONG)((MaxFileSize + AllocationUnit - 1) / AllocationUnit * AllocationUnit);
 
+#ifdef MEMFS_SLOWIO
+    Memfs->SlowioMaxDelay = SlowioMaxDelay;
+    Memfs->SlowioPercentDelay = SlowioPercentDelay;
+    Memfs->SlowioRarefyDelay = SlowioRarefyDelay;
+#endif
+
     Result = MemfsFileNodeMapCreate(CaseInsensitive, &Memfs->FileNodeMap);
     if (!NT_SUCCESS(Result))
     {
@@ -1700,6 +2022,9 @@ NTSTATUS MemfsCreateFunnel(
     VolumeParams.NamedStreams = 1;
 #endif
     VolumeParams.PostCleanupWhenModifiedOnly = 1;
+#if defined(MEMFS_DIRINFO_BY_NAME)
+    VolumeParams.PassQueryDirectoryFileName = 1;
+#endif
     if (0 != VolumePrefix)
         wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), VolumePrefix);
     wcscpy_s(VolumeParams.FileSystemName, sizeof VolumeParams.FileSystemName / sizeof(WCHAR),
@@ -1775,12 +2100,21 @@ VOID MemfsDelete(MEMFS *Memfs)
 
 NTSTATUS MemfsStart(MEMFS *Memfs)
 {
+#ifdef MEMFS_SLOWIO
+    Memfs->SlowioThreadsRunning = 0;
+#endif
+
     return FspFileSystemStartDispatcher(Memfs->FileSystem, 0);
 }
 
 VOID MemfsStop(MEMFS *Memfs)
 {
     FspFileSystemStopDispatcher(Memfs->FileSystem);
+
+#ifdef MEMFS_SLOWIO
+    while (Memfs->SlowioThreadsRunning)
+        Sleep(1);
+#endif
 }
 
 FSP_FILE_SYSTEM *MemfsFileSystem(MEMFS *Memfs)

tst/memfs/memfs.h

@@ -33,13 +33,27 @@ enum
     MemfsCaseInsensitive                = 0x80,
 };
 
-#define MemfsCreate(Flags, FileInfoTimeout, MaxFileNodes, MaxFileSize, VolumePrefix, RootSddl, PMemfs)\
-    MemfsCreateFunnel(Flags, FileInfoTimeout, MaxFileNodes, MaxFileSize, 0, VolumePrefix, RootSddl, PMemfs)
+#define MemfsCreate(Flags, FileInfoTimeout, MaxFileNodes, MaxFileSize,             VolumePrefix, RootSddl, PMemfs)\
+    MemfsCreateFunnel(\
+        Flags,\
+        FileInfoTimeout,\
+        MaxFileNodes,\
+        MaxFileSize,\
+        0/*SlowioMaxDelay*/,\
+        0/*SlowioPercentDelay*/,\
+        0/*SlowioRarefyDelay*/,\
+        0/*FileSystemName*/,\
+        VolumePrefix,\
+        RootSddl,\
+        PMemfs)
 NTSTATUS MemfsCreateFunnel(
     ULONG Flags,
     ULONG FileInfoTimeout,
     ULONG MaxFileNodes,
     ULONG MaxFileSize,
+    ULONG SlowioMaxDelay,
+    ULONG SlowioPercentDelay,
+    ULONG SlowioRarefyDelay,
     PWSTR FileSystemName,
     PWSTR VolumePrefix,
     PWSTR RootSddl,

tst/passthrough-cpp/.gitignore

@@ -0,0 +1,5 @@
+build
+*.ncb
+*.suo
+*.vcproj.*
+*.vcxproj.user

tst/passthrough-cpp/passthrough-cpp.sln

@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "passthrough-cpp", "passthrough-cpp.vcxproj", "{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}.Debug|x64.ActiveCfg = Debug|x64
+		{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}.Debug|x64.Build.0 = Debug|x64
+		{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}.Debug|x86.ActiveCfg = Debug|Win32
+		{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}.Debug|x86.Build.0 = Debug|Win32
+		{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}.Release|x64.ActiveCfg = Release|x64
+		{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}.Release|x64.Build.0 = Release|x64
+		{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}.Release|x86.ActiveCfg = Release|Win32
+		{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

tst/passthrough-cpp/passthrough-cpp.vcxproj

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <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">
+    <ProjectGuid>{E8A4060D-E6A4-42CC-9BCA-DC82E6EDB2C5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>passthroughcpp</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|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)'=='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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\WinFsp\inc</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(MSBuildProgramFiles32)\WinFsp\lib\winfsp-$(PlatformTarget).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>winfsp-$(PlatformTarget).dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\WinFsp\inc</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(MSBuildProgramFiles32)\WinFsp\lib\winfsp-$(PlatformTarget).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>winfsp-$(PlatformTarget).dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\WinFsp\inc</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(MSBuildProgramFiles32)\WinFsp\lib\winfsp-$(PlatformTarget).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>winfsp-$(PlatformTarget).dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\WinFsp\inc</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(MSBuildProgramFiles32)\WinFsp\lib\winfsp-$(PlatformTarget).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>winfsp-$(PlatformTarget).dll</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="passthrough-cpp.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

tst/passthrough-cpp/passthrough-cpp.vcxproj.filters

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="passthrough-cpp.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

tst/passthrough-dotnet/.gitignore

@@ -0,0 +1,6 @@
+build
+*.ncb
+*.suo
+*.vcproj.*
+*.vcxproj.user
+*.csproj.user

tst/passthrough-dotnet/Program.cs

@@ -0,0 +1,854 @@
+/**
+ * @file Program.cs
+ *
+ * @copyright 2015-2017 Bill Zissimopoulos
+ */
+/*
+ * This file is part of WinFsp.
+ *
+ * You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License version 3 as published by the Free Software
+ * Foundation.
+ *
+ * Licensees holding a valid commercial license may use this file in
+ * accordance with the commercial license agreement provided with the
+ * software.
+ */
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+
+using Fsp;
+using VolumeInfo = Fsp.Interop.VolumeInfo;
+using FileInfo = Fsp.Interop.FileInfo;
+
+namespace passthrough
+{
+    class Ptfs : FileSystemBase
+    {
+        protected const int ALLOCATION_UNIT = 4096;
+
+        protected static void ThrowIoExceptionWithHResult(Int32 HResult)
+        {
+            throw new IOException(null, HResult);
+        }
+        protected static void ThrowIoExceptionWithWin32(Int32 Error)
+        {
+            ThrowIoExceptionWithHResult(unchecked((Int32)(0x80070000 | Error)));
+        }
+        protected static void ThrowIoExceptionWithNtStatus(Int32 Status)
+        {
+            ThrowIoExceptionWithWin32((Int32)Win32FromNtStatus(Status));
+        }
+
+        protected class FileDesc
+        {
+            public FileStream Stream;
+            public DirectoryInfo DirInfo;
+            public DictionaryEntry[] FileSystemInfos;
+
+            public FileDesc(FileStream Stream)
+            {
+                this.Stream = Stream;
+            }
+            public FileDesc(DirectoryInfo DirInfo)
+            {
+                this.DirInfo = DirInfo;
+            }
+            public static void GetFileInfoFromFileSystemInfo(
+                FileSystemInfo Info,
+                out FileInfo FileInfo)
+            {
+                FileInfo.FileAttributes = (UInt32)Info.Attributes;
+                FileInfo.ReparseTag = 0;
+                FileInfo.FileSize = Info is System.IO.FileInfo ?
+                    (UInt64)((System.IO.FileInfo)Info).Length : 0;
+                FileInfo.AllocationSize = (FileInfo.FileSize + ALLOCATION_UNIT - 1)
+                    / ALLOCATION_UNIT * ALLOCATION_UNIT;
+                FileInfo.CreationTime = (UInt64)Info.CreationTimeUtc.ToFileTimeUtc();
+                FileInfo.LastAccessTime = (UInt64)Info.LastAccessTimeUtc.ToFileTimeUtc();
+                FileInfo.LastWriteTime = (UInt64)Info.LastWriteTimeUtc.ToFileTimeUtc();
+                FileInfo.ChangeTime = FileInfo.LastWriteTime;
+                FileInfo.IndexNumber = 0;
+                FileInfo.HardLinks = 0;
+            }
+            public Int32 GetFileInfo(out FileInfo FileInfo)
+            {
+                if (null != Stream)
+                {
+                    BY_HANDLE_FILE_INFORMATION Info;
+                    if (!GetFileInformationByHandle(Stream.SafeFileHandle.DangerousGetHandle(),
+                        out Info))
+                        ThrowIoExceptionWithWin32(Marshal.GetLastWin32Error());
+                    FileInfo.FileAttributes = Info.dwFileAttributes;
+                    FileInfo.ReparseTag = 0;
+                    FileInfo.FileSize = (UInt64)Stream.Length;
+                    FileInfo.AllocationSize = (FileInfo.FileSize + ALLOCATION_UNIT - 1)
+                        / ALLOCATION_UNIT * ALLOCATION_UNIT;
+                    FileInfo.CreationTime = Info.ftCreationTime;
+                    FileInfo.LastAccessTime = Info.ftLastAccessTime;
+                    FileInfo.LastWriteTime = Info.ftLastWriteTime;
+                    FileInfo.ChangeTime = FileInfo.LastWriteTime;
+                    FileInfo.IndexNumber = 0;
+                    FileInfo.HardLinks = 0;
+                }
+                else
+                    GetFileInfoFromFileSystemInfo(DirInfo, out FileInfo);
+                return STATUS_SUCCESS;
+            }
+            public void SetBasicInfo(
+                UInt32 FileAttributes,
+                UInt64 CreationTime,
+                UInt64 LastAccessTime,
+                UInt64 LastWriteTime)
+            {
+                if (0 == FileAttributes)
+                    FileAttributes = (UInt32)System.IO.FileAttributes.Normal;
+                if (null != Stream)
+                {
+                    FILE_BASIC_INFO Info = default(FILE_BASIC_INFO);
+                    if (unchecked((UInt32)(-1)) != FileAttributes)
+                        Info.FileAttributes = FileAttributes;
+                    if (0 != CreationTime)
+                        Info.CreationTime = CreationTime;
+                    if (0 != LastAccessTime)
+                        Info.LastAccessTime = LastAccessTime;
+                    if (0 != LastWriteTime)
+                        Info.LastWriteTime = LastWriteTime;
+                    if (!SetFileInformationByHandle(Stream.SafeFileHandle.DangerousGetHandle(),
+                        0/*FileBasicInfo*/, ref Info, (UInt32)Marshal.SizeOf(Info)))
+                        ThrowIoExceptionWithWin32(Marshal.GetLastWin32Error());
+                }
+                else
+                {
+                    if (unchecked((UInt32)(-1)) != FileAttributes)
+                        DirInfo.Attributes = (System.IO.FileAttributes)FileAttributes;
+                    if (0 != CreationTime)
+                        DirInfo.CreationTimeUtc = DateTime.FromFileTimeUtc((Int64)CreationTime);
+                    if (0 != LastAccessTime)
+                        DirInfo.LastAccessTimeUtc = DateTime.FromFileTimeUtc((Int64)LastAccessTime);
+                    if (0 != LastWriteTime)
+                        DirInfo.LastWriteTimeUtc = DateTime.FromFileTimeUtc((Int64)LastWriteTime);
+                }
+            }
+            public UInt32 GetFileAttributes()
+            {
+                FileInfo FileInfo;
+                GetFileInfo(out FileInfo);
+                return FileInfo.FileAttributes;
+            }
+            public void SetFileAttributes(UInt32 FileAttributes)
+            {
+                SetBasicInfo(FileAttributes, 0, 0, 0);
+            }
+            public Byte[] GetSecurityDescriptor()
+            {
+                if (null != Stream)
+                    return Stream.GetAccessControl().GetSecurityDescriptorBinaryForm();
+                else
+                    return DirInfo.GetAccessControl().GetSecurityDescriptorBinaryForm();
+            }
+            public void SetSecurityDescriptor(AccessControlSections Sections, Byte[] SecurityDescriptor)
+            {
+                Int32 SecurityInformation = 0;
+                if (0 != (Sections & AccessControlSections.Owner))
+                    SecurityInformation |= 1/*OWNER_SECURITY_INFORMATION*/;
+                if (0 != (Sections & AccessControlSections.Group))
+                    SecurityInformation |= 2/*GROUP_SECURITY_INFORMATION*/;
+                if (0 != (Sections & AccessControlSections.Access))
+                    SecurityInformation |= 4/*DACL_SECURITY_INFORMATION*/;
+                if (0 != (Sections & AccessControlSections.Audit))
+                    SecurityInformation |= 8/*SACL_SECURITY_INFORMATION*/;
+                if (null != Stream)
+                {
+                    if (!SetKernelObjectSecurity(Stream.SafeFileHandle.DangerousGetHandle(),
+                        SecurityInformation, SecurityDescriptor))
+                        ThrowIoExceptionWithWin32(Marshal.GetLastWin32Error());
+                }
+                else
+                {
+                    if (!SetFileSecurityW(DirInfo.FullName,
+                        SecurityInformation, SecurityDescriptor))
+                        ThrowIoExceptionWithWin32(Marshal.GetLastWin32Error());
+                }
+            }
+            public void SetDisposition(Boolean Safe)
+            {
+                if (null != Stream)
+                {
+                    FILE_DISPOSITION_INFO Info;
+                    Info.DeleteFile = true;
+                    if (!SetFileInformationByHandle(Stream.SafeFileHandle.DangerousGetHandle(),
+                        4/*FileDispositionInfo*/, ref Info, (UInt32)Marshal.SizeOf(Info)))
+                        if (!Safe)
+                            ThrowIoExceptionWithWin32(Marshal.GetLastWin32Error());
+                }
+                else
+                    try
+                    {
+                        DirInfo.Delete();
+                    }
+                    catch (Exception ex)
+                    {
+                        if (!Safe)
+                            ThrowIoExceptionWithHResult(ex.HResult);
+                    }
+            }
+            public static void Rename(String FileName, String NewFileName, Boolean ReplaceIfExists)
+            {
+                if (!MoveFileExW(FileName, NewFileName, ReplaceIfExists ? 1U/*MOVEFILE_REPLACE_EXISTING*/ : 0))
+                    ThrowIoExceptionWithWin32(Marshal.GetLastWin32Error());
+            }
+
+            /* interop */
+            [StructLayout(LayoutKind.Sequential, Pack = 4)]
+            private struct BY_HANDLE_FILE_INFORMATION
+            {
+                public UInt32 dwFileAttributes;
+                public UInt64 ftCreationTime;
+                public UInt64 ftLastAccessTime;
+                public UInt64 ftLastWriteTime;
+                public UInt32 dwVolumeSerialNumber;
+                public UInt32 nFileSizeHigh;
+                public UInt32 nFileSizeLow;
+                public UInt32 nNumberOfLinks;
+                public UInt32 nFileIndexHigh;
+                public UInt32 nFileIndexLow;
+            }
+            [StructLayout(LayoutKind.Sequential)]
+            private struct FILE_BASIC_INFO
+            {
+                public UInt64 CreationTime;
+                public UInt64 LastAccessTime;
+                public UInt64 LastWriteTime;
+                public UInt64 ChangeTime;
+                public UInt32 FileAttributes;
+            }
+            [StructLayout(LayoutKind.Sequential)]
+            private struct FILE_DISPOSITION_INFO
+            {
+                public Boolean DeleteFile;
+            }
+            [DllImport("kernel32.dll", SetLastError = true)]
+            private static extern Boolean GetFileInformationByHandle(
+                IntPtr hFile,
+                out BY_HANDLE_FILE_INFORMATION lpFileInformation);
+            [DllImport("kernel32.dll", SetLastError = true)]
+            private static extern Boolean SetFileInformationByHandle(
+                IntPtr hFile,
+                Int32 FileInformationClass,
+                ref FILE_BASIC_INFO lpFileInformation,
+                UInt32 dwBufferSize);
+            [DllImport("kernel32.dll", SetLastError = true)]
+            private static extern Boolean SetFileInformationByHandle(
+                IntPtr hFile,
+                Int32 FileInformationClass,
+                ref FILE_DISPOSITION_INFO lpFileInformation,
+                UInt32 dwBufferSize);
+            [DllImport("kernel32.dll", SetLastError = true)]
+            private static extern Boolean MoveFileExW(
+                [MarshalAs(UnmanagedType.LPWStr)] String lpExistingFileName,
+                [MarshalAs(UnmanagedType.LPWStr)] String lpNewFileName,
+                UInt32 dwFlags);
+            [DllImport("advapi32.dll", SetLastError = true)]
+            private static extern Boolean SetFileSecurityW(
+                [MarshalAs(UnmanagedType.LPWStr)] String FileName,
+                Int32 SecurityInformation,
+                Byte[] SecurityDescriptor);
+            [DllImport("advapi32.dll", SetLastError = true)]
+            private static extern Boolean SetKernelObjectSecurity(
+                IntPtr Handle,
+                Int32 SecurityInformation,
+                Byte[] SecurityDescriptor);
+        }
+
+        private class DirectoryEntryComparer : IComparer
+        {
+            public int Compare(object x, object y)
+            {
+                return String.Compare(
+                    (String)((DictionaryEntry)x).Key,
+                    (String)((DictionaryEntry)y).Key);
+            }
+        }
+        private static DirectoryEntryComparer _DirectoryEntryComparer =
+            new DirectoryEntryComparer();
+
+        public Ptfs(String Path0)
+        {
+            _Path = Path.GetFullPath(Path0);
+            if (_Path.EndsWith("\\"))
+                _Path = _Path.Substring(0, _Path.Length - 1);
+        }
+        public String ConcatPath(String FileName)
+        {
+            return _Path + FileName;
+        }
+        public override Int32 ExceptionHandler(Exception ex)
+        {
+            Int32 HResult = ex.HResult; /* needs Framework 4.5 */
+            if (0x80070000 == (HResult & 0xFFFF0000))
+                return NtStatusFromWin32((UInt32)HResult & 0xFFFF);
+            return STATUS_UNEXPECTED_IO_ERROR;
+        }
+        public override Int32 Init(Object Host0)
+        {
+            FileSystemHost Host = (FileSystemHost)Host0;
+            Host.SectorSize = ALLOCATION_UNIT;
+            Host.SectorsPerAllocationUnit = 1;
+            Host.MaxComponentLength = 255;
+            Host.FileInfoTimeout = 1000;
+            Host.CaseSensitiveSearch = false;
+            Host.CasePreservedNames = true;
+            Host.UnicodeOnDisk = true;
+            Host.PersistentAcls = true;
+            Host.PostCleanupWhenModifiedOnly = true;
+            Host.PassQueryDirectoryPattern = true;
+            Host.VolumeCreationTime = (UInt64)File.GetCreationTimeUtc(_Path).ToFileTimeUtc();
+            Host.VolumeSerialNumber = 0;
+            return STATUS_SUCCESS;
+        }
+        public override Int32 GetVolumeInfo(
+            out VolumeInfo VolumeInfo)
+        {
+            VolumeInfo = default(VolumeInfo);
+            try
+            {
+                DriveInfo Info = new DriveInfo(_Path);
+                VolumeInfo.TotalSize = (UInt64)Info.TotalSize;
+                VolumeInfo.FreeSize = (UInt64)Info.TotalFreeSpace;
+            }
+            catch (ArgumentException)
+            {
+                /*
+                 * DriveInfo only supports drives and does not support UNC paths.
+                 * It would be better to use GetDiskFreeSpaceEx here.
+                 */
+            }
+            return STATUS_SUCCESS;
+        }
+        public override Int32 GetSecurityByName(
+            String FileName,
+            out UInt32 FileAttributes/* or ReparsePointIndex */,
+            ref Byte[] SecurityDescriptor)
+        {
+            FileName = ConcatPath(FileName);
+            System.IO.FileInfo Info = new System.IO.FileInfo(FileName);
+            FileAttributes = (UInt32)Info.Attributes;
+            if (null != SecurityDescriptor)
+                SecurityDescriptor = Info.GetAccessControl().GetSecurityDescriptorBinaryForm();
+            return STATUS_SUCCESS;
+        }
+        public override Int32 Create(
+            String FileName,
+            UInt32 CreateOptions,
+            UInt32 GrantedAccess,
+            UInt32 FileAttributes,
+            Byte[] SecurityDescriptor,
+            UInt64 AllocationSize,
+            out Object FileNode,
+            out Object FileDesc0,
+            out FileInfo FileInfo,
+            out String NormalizedName)
+        {
+            FileDesc FileDesc = null;
+            try
+            {
+                FileName = ConcatPath(FileName);
+                if (0 == (CreateOptions & FILE_DIRECTORY_FILE))
+                {
+                    FileSecurity Security = null;
+                    if (null != SecurityDescriptor)
+                    {
+                        Security = new FileSecurity();
+                        Security.SetSecurityDescriptorBinaryForm(SecurityDescriptor);
+                    }
+                    FileDesc = new FileDesc(
+                        new FileStream(
+                            FileName,
+                            FileMode.CreateNew,
+                            (FileSystemRights)GrantedAccess | FileSystemRights.WriteAttributes,
+                            FileShare.Read | FileShare.Write | FileShare.Delete,
+                            4096,
+                            0,
+                            Security));
+                    FileDesc.SetFileAttributes(FileAttributes | (UInt32)System.IO.FileAttributes.Archive);
+                }
+                else
+                {
+                    if (Directory.Exists(FileName))
+                        ThrowIoExceptionWithNtStatus(STATUS_OBJECT_NAME_COLLISION);
+                    DirectorySecurity Security = null;
+                    if (null != SecurityDescriptor)
+                    {
+                        Security = new DirectorySecurity();
+                        Security.SetSecurityDescriptorBinaryForm(SecurityDescriptor);
+                    }
+                    FileDesc = new FileDesc(
+                        Directory.CreateDirectory(FileName, Security));
+                    FileDesc.SetFileAttributes(FileAttributes);
+                }
+                FileNode = default(Object);
+                FileDesc0 = FileDesc;
+                NormalizedName = default(String);
+                return FileDesc.GetFileInfo(out FileInfo);
+            }
+            catch
+            {
+                if (null != FileDesc && null != FileDesc.Stream)
+                    FileDesc.Stream.Dispose();
+                throw;
+            }
+        }
+        public override Int32 Open(
+            String FileName,
+            UInt32 CreateOptions,
+            UInt32 GrantedAccess,
+            out Object FileNode,
+            out Object FileDesc0,
+            out FileInfo FileInfo,
+            out String NormalizedName)
+        {
+            FileDesc FileDesc = null;
+            try
+            {
+                FileName = ConcatPath(FileName);
+                if (!Directory.Exists(FileName))
+                {
+                    FileDesc = new FileDesc(
+                        new FileStream(
+                            FileName,
+                            FileMode.Open,
+                            (FileSystemRights)GrantedAccess,
+                            FileShare.Read | FileShare.Write | FileShare.Delete,
+                            4096,
+                            0));
+                }
+                else
+                {
+                    FileDesc = new FileDesc(
+                        new DirectoryInfo(FileName));
+                }
+                FileNode = default(Object);
+                FileDesc0 = FileDesc;
+                NormalizedName = default(String);
+                return FileDesc.GetFileInfo(out FileInfo);
+            }
+            catch
+            {
+                if (null != FileDesc && null != FileDesc.Stream)
+                    FileDesc.Stream.Dispose();
+                throw;
+            }
+        }
+        public override Int32 Overwrite(
+            Object FileNode,
+            Object FileDesc0,
+            UInt32 FileAttributes,
+            Boolean ReplaceFileAttributes,
+            UInt64 AllocationSize,
+            out FileInfo FileInfo)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            if (ReplaceFileAttributes)
+                FileDesc.SetFileAttributes(FileAttributes |
+                    (UInt32)System.IO.FileAttributes.Archive);
+            else if (0 != FileAttributes)
+                FileDesc.SetFileAttributes(FileDesc.GetFileAttributes() | FileAttributes |
+                    (UInt32)System.IO.FileAttributes.Archive);
+            FileDesc.Stream.SetLength(0);
+            return FileDesc.GetFileInfo(out FileInfo);
+        }
+        public override void Cleanup(
+            Object FileNode,
+            Object FileDesc0,
+            String FileName,
+            UInt32 Flags)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            if (0 != (Flags & CleanupDelete))
+            {
+                FileDesc.SetDisposition(true);
+                if (null != FileDesc.Stream)
+                    FileDesc.Stream.Dispose();
+            }
+        }
+        public override void Close(
+            Object FileNode,
+            Object FileDesc0)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            if (null != FileDesc.Stream)
+                FileDesc.Stream.Dispose();
+        }
+        public override Int32 Read(
+            Object FileNode,
+            Object FileDesc0,
+            IntPtr Buffer,
+            UInt64 Offset,
+            UInt32 Length,
+            out UInt32 PBytesTransferred)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            if (Offset >= (UInt64)FileDesc.Stream.Length)
+                ThrowIoExceptionWithNtStatus(STATUS_END_OF_FILE);
+            Byte[] Bytes = new byte[Length];
+            FileDesc.Stream.Seek((Int64)Offset, SeekOrigin.Begin);
+            PBytesTransferred = (UInt32)FileDesc.Stream.Read(Bytes, 0, Bytes.Length);
+            Marshal.Copy(Bytes, 0, Buffer, Bytes.Length);
+            return STATUS_SUCCESS;
+        }
+        public override Int32 Write(
+            Object FileNode,
+            Object FileDesc0,
+            IntPtr Buffer,
+            UInt64 Offset,
+            UInt32 Length,
+            Boolean WriteToEndOfFile,
+            Boolean ConstrainedIo,
+            out UInt32 PBytesTransferred,
+            out FileInfo FileInfo)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            if (ConstrainedIo)
+            {
+                if (Offset >= (UInt64)FileDesc.Stream.Length)
+                {
+                    PBytesTransferred = default(UInt32);
+                    FileInfo = default(FileInfo);
+                    return STATUS_SUCCESS;
+                }
+                if (Offset + Length > (UInt64)FileDesc.Stream.Length)
+                    Length = (UInt32)((UInt64)FileDesc.Stream.Length - Offset);
+            }
+            Byte[] Bytes = new byte[Length];
+            Marshal.Copy(Buffer, Bytes, 0, Bytes.Length);
+            if (!WriteToEndOfFile)
+                FileDesc.Stream.Seek((Int64)Offset, SeekOrigin.Begin);
+            FileDesc.Stream.Write(Bytes, 0, Bytes.Length);
+            PBytesTransferred = (UInt32)Bytes.Length;
+            return FileDesc.GetFileInfo(out FileInfo);
+        }
+        public override Int32 Flush(
+            Object FileNode,
+            Object FileDesc0,
+            out FileInfo FileInfo)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            if (null == FileDesc)
+            {
+                /* we do not flush the whole volume, so just return SUCCESS */
+                FileInfo = default(FileInfo);
+                return STATUS_SUCCESS;
+            }
+            FileDesc.Stream.Flush(true);
+            return FileDesc.GetFileInfo(out FileInfo);
+        }
+        public override Int32 GetFileInfo(
+            Object FileNode,
+            Object FileDesc0,
+            out FileInfo FileInfo)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            return FileDesc.GetFileInfo(out FileInfo);
+        }
+        public override Int32 SetBasicInfo(
+            Object FileNode,
+            Object FileDesc0,
+            UInt32 FileAttributes,
+            UInt64 CreationTime,
+            UInt64 LastAccessTime,
+            UInt64 LastWriteTime,
+            UInt64 ChangeTime,
+            out FileInfo FileInfo)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            FileDesc.SetBasicInfo(FileAttributes, CreationTime, LastAccessTime, LastWriteTime);
+            return FileDesc.GetFileInfo(out FileInfo);
+        }
+        public override Int32 SetFileSize(
+            Object FileNode,
+            Object FileDesc0,
+            UInt64 NewSize,
+            Boolean SetAllocationSize,
+            out FileInfo FileInfo)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            if (!SetAllocationSize || (UInt64)FileDesc.Stream.Length > NewSize)
+            {
+                /*
+                 * "FileInfo.FileSize > NewSize" explanation:
+                 * Ptfs does not support allocation size. However if the new AllocationSize
+                 * is less than the current FileSize we must truncate the file.
+                 */
+                FileDesc.Stream.SetLength((Int64)NewSize);
+            }
+            return FileDesc.GetFileInfo(out FileInfo);
+        }
+        public override Int32 CanDelete(
+            Object FileNode,
+            Object FileDesc0,
+            String FileName)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            FileDesc.SetDisposition(false);
+            return STATUS_SUCCESS;
+        }
+        public override Int32 Rename(
+            Object FileNode,
+            Object FileDesc0,
+            String FileName,
+            String NewFileName,
+            Boolean ReplaceIfExists)
+        {
+            FileName = ConcatPath(FileName);
+            NewFileName = ConcatPath(NewFileName);
+            FileDesc.Rename(FileName, NewFileName, ReplaceIfExists);
+            return STATUS_SUCCESS;
+        }
+        public override Int32 GetSecurity(
+            Object FileNode,
+            Object FileDesc0,
+            ref Byte[] SecurityDescriptor)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            SecurityDescriptor = FileDesc.GetSecurityDescriptor();
+            return STATUS_SUCCESS;
+        }
+        public override Int32 SetSecurity(
+            Object FileNode,
+            Object FileDesc0,
+            AccessControlSections Sections,
+            Byte[] SecurityDescriptor)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            FileDesc.SetSecurityDescriptor(Sections, SecurityDescriptor);
+            return STATUS_SUCCESS;
+        }
+        public override Boolean ReadDirectoryEntry(
+            Object FileNode,
+            Object FileDesc0,
+            String Pattern,
+            String Marker,
+            ref Object Context,
+            out String FileName,
+            out FileInfo FileInfo)
+        {
+            FileDesc FileDesc = (FileDesc)FileDesc0;
+            if (null == FileDesc.FileSystemInfos)
+            {
+                if (null != Pattern)
+                    Pattern = Pattern.Replace('<', '*').Replace('>', '?').Replace('"', '.');
+                else
+                    Pattern = "*";
+                IEnumerable Enum = FileDesc.DirInfo.EnumerateFileSystemInfos(Pattern);
+                SortedList List = new SortedList();
+                if (null != FileDesc.DirInfo && null != FileDesc.DirInfo.Parent)
+                {
+                    List.Add(".", FileDesc.DirInfo);
+                    List.Add("..", FileDesc.DirInfo.Parent);
+                }
+                foreach (FileSystemInfo Info in Enum)
+                    List.Add(Info.Name, Info);
+                FileDesc.FileSystemInfos = new DictionaryEntry[List.Count];
+                List.CopyTo(FileDesc.FileSystemInfos, 0);
+            }
+            int Index;
+            if (null == Context)
+            {
+                Index = 0;
+                if (null != Marker)
+                {
+                    Index = Array.BinarySearch(FileDesc.FileSystemInfos,
+                        new DictionaryEntry(Marker, null),
+                        _DirectoryEntryComparer);
+                    if (0 <= Index)
+                        Index++;
+                    else
+                        Index = ~Index;
+                }
+            }
+            else
+                Index = (int)Context;
+            if (FileDesc.FileSystemInfos.Length > Index)
+            {
+                Context = Index + 1;
+                FileName = (String)FileDesc.FileSystemInfos[Index].Key;
+                FileDesc.GetFileInfoFromFileSystemInfo(
+                    (FileSystemInfo)FileDesc.FileSystemInfos[Index].Value,
+                    out FileInfo);
+                return true;
+            }
+            else
+            {
+                FileName = default(String);
+                FileInfo = default(FileInfo);
+                return false;
+            }
+        }
+
+        private String _Path;
+    }
+
+    class PtfsService : Service
+    {
+        private class CommandLineUsageException : Exception
+        {
+            public CommandLineUsageException(String Message = null) : base(Message)
+            {
+                HasMessage = null != Message;
+            }
+
+            public bool HasMessage;
+        }
+
+        private const String PROGNAME = "passthrough-dotnet";
+
+        public PtfsService() : base("PtfsService")
+        {
+        }
+
+        protected override void OnStart(String[] Args)
+        {
+            try
+            {
+                String DebugLogFile = null;
+                UInt32 DebugFlags = 0;
+                String VolumePrefix = null;
+                String PassThrough = null;
+                String MountPoint = null;
+                IntPtr DebugLogHandle = (IntPtr)(-1);
+                FileSystemHost Host = null;
+                Ptfs Ptfs = null;
+                int I;
+
+                for (I = 1; Args.Length > I; I++)
+                {
+                    String Arg = Args[I];
+                    if ('-' != Arg[0])
+                        break;
+                    switch (Arg[1])
+                    {
+                    case '?':
+                        throw new CommandLineUsageException();
+                    case 'd':
+                        argtol(Args, ref I, ref DebugFlags);
+                        break;
+                    case 'D':
+                        argtos(Args, ref I, ref DebugLogFile);
+                        break;
+                    case 'm':
+                        argtos(Args, ref I, ref MountPoint);
+                        break;
+                    case 'p':
+                        argtos(Args, ref I, ref PassThrough);
+                        break;
+                    case 'u':
+                        argtos(Args, ref I, ref VolumePrefix);
+                        break;
+                    default:
+                        throw new CommandLineUsageException();
+                    }
+                }
+
+                if (Args.Length > I)
+                    throw new CommandLineUsageException();
+
+                if (null == PassThrough && null != VolumePrefix)
+                {
+                    I = VolumePrefix.IndexOf('\\');
+                    if (-1 != I && VolumePrefix.Length > I && '\\' != VolumePrefix[I + 1])
+                    {
+                        I = VolumePrefix.IndexOf('\\', I + 1);
+                        if (-1 != I &&
+                            VolumePrefix.Length > I + 1 &&
+                            (
+                            ('A' <= VolumePrefix[I + 1] && VolumePrefix[I + 1] <= 'Z') ||
+                            ('a' <= VolumePrefix[I + 1] && VolumePrefix[I + 1] <= 'z')
+                            ) &&
+                            '$' == VolumePrefix[I + 2])
+                        {
+                            PassThrough = String.Format("{0}:{1}", VolumePrefix[I + 1], VolumePrefix.Substring(I + 3));
+                        }
+                    }
+                }
+
+                if (null == PassThrough || null == MountPoint)
+                    throw new CommandLineUsageException();
+
+                if (null != DebugLogFile)
+                    if (0 > FileSystemHost.SetDebugLogFile(DebugLogFile))
+                        throw new CommandLineUsageException("cannot open debug log file");
+
+                Host = new FileSystemHost(Ptfs = new Ptfs(PassThrough));
+                Host.Prefix = VolumePrefix;
+                if (0 > Host.Mount(MountPoint, null, true, DebugFlags))
+                    throw new IOException("cannot mount file system");
+                MountPoint = Host.MountPoint();
+                _Host = Host;
+
+                Log(EVENTLOG_INFORMATION_TYPE, String.Format("{0}{1}{2} -p {3} -m {4}",
+                    PROGNAME,
+                    null != VolumePrefix && 0 < VolumePrefix.Length ? " -u " : "",
+                        null != VolumePrefix && 0 < VolumePrefix.Length ? VolumePrefix : "",
+                    PassThrough,
+                    MountPoint));
+            }
+            catch (CommandLineUsageException ex)
+            {
+                Log(EVENTLOG_ERROR_TYPE, String.Format(
+                    "{0}" +
+                    "usage: {1} OPTIONS\n" +
+                    "\n" +
+                    "options:\n" +
+                    "    -d DebugFlags       [-1: enable all debug logs]\n" +
+                    "    -D DebugLogFile     [file path; use - for stderr]\n" +
+                    "    -u \\Server\\Share    [UNC prefix (single backslash)]\n" +
+                    "    -p Directory        [directory to expose as pass through file system]\n" +
+                    "    -m MountPoint       [X:|*|directory]\n",
+                    ex.HasMessage ? ex.Message + "\n" : "",
+                    PROGNAME));
+                throw;
+            }
+            catch (Exception ex)
+            {
+                Log(EVENTLOG_ERROR_TYPE, String.Format("{0}", ex.Message));
+                throw;
+            }
+        }
+        protected override void OnStop()
+        {
+            _Host.Unmount();
+            _Host = null;
+        }
+
+        private static void argtos(String[] Args, ref int I, ref String V)
+        {
+            if (Args.Length > ++I)
+                V = Args[I];
+            else
+                throw new CommandLineUsageException();
+        }
+        private static void argtol(String[] Args, ref int I, ref UInt32 V)
+        {
+            Int32 R;
+            if (Args.Length > ++I)
+                V = Int32.TryParse(Args[I], out R) ? (UInt32)R : V;
+            else
+                throw new CommandLineUsageException();
+        }
+
+        private FileSystemHost _Host;
+    }
+
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Environment.ExitCode = new PtfsService().Run();
+        }
+    }
+}

tst/passthrough-dotnet/passthrough-dotnet.csproj

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{6EC13EBC-BD7E-4997-9B29-49D5F06103A6}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>passthrough</RootNamespace>
+    <AssemblyName>passthrough-dotnet</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="winfsp-msil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b099876d8fa9b1f3, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(MSBuildProgramFiles32)\WinFsp\bin\winfsp-msil.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

tst/passthrough-dotnet/passthrough-dotnet.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "passthrough-dotnet", "passthrough-dotnet.csproj", "{6EC13EBC-BD7E-4997-9B29-49D5F06103A6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6EC13EBC-BD7E-4997-9B29-49D5F06103A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EC13EBC-BD7E-4997-9B29-49D5F06103A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EC13EBC-BD7E-4997-9B29-49D5F06103A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EC13EBC-BD7E-4997-9B29-49D5F06103A6}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

tst/passthrough-fuse/passthrough-fuse.c

@@ -30,6 +30,8 @@
 #include <unistd.h>
 #endif
 
+#define PTFS_UTIMENS
+
 #define FSNAME                          "passthrough"
 #define PROGNAME                        "passthrough-fuse"
 
@@ -39,8 +41,8 @@
 #define fi_fh(fi, MASK)                 ((fi)->fh & (MASK))
 #define fi_setfh(fi, FH, MASK)          ((fi)->fh = (intptr_t)(FH) | (MASK))
 #define fi_fd(fi)                       (fi_fh(fi, fi_dirbit) ? \
-    dirfd((DIR *)fi_fh(fi, ~fi_dirbit)) : (int)fi_fh(fi, ~fi_dirbit))
-#define fi_dirp(fi)                     ((DIR *)fi_fh(fi, ~fi_dirbit))
+    dirfd((DIR *)(intptr_t)fi_fh(fi, ~fi_dirbit)) : (int)fi_fh(fi, ~fi_dirbit))
+#define fi_dirp(fi)                     ((DIR *)(intptr_t)fi_fh(fi, ~fi_dirbit))
 #define fi_setfd(fi, fd)                (fi_setfh(fi, fd, 0))
 #define fi_setdirp(fi, dirp)            (fi_setfh(fi, dirp, fi_dirbit))
 
@@ -112,12 +114,14 @@ static int ptfs_truncate(const char *path, fuse_off_t size)
     return -1 != truncate(path, size) ? 0 : -errno;
 }
 
+#if !defined(PTFS_UTIMENS)
 static int ptfs_utime(const char *path, struct fuse_utimbuf *timbuf)
 {
     ptfs_impl_fullpath(path);
 
     return -1 != utime(path, timbuf) ? 0 : -errno;
 }
+#endif
 
 static int ptfs_open(const char *path, struct fuse_file_info *fi)
 {
@@ -212,6 +216,10 @@ static void *ptfs_init(struct fuse_conn_info *conn)
     conn->want |= (conn->capable & FSP_FUSE_CAP_READDIR_PLUS);
 #endif
 
+#if defined(FSP_FUSE_USE_STAT_EX) && defined(FSP_FUSE_CAP_STAT_EX)
+    conn->want |= (conn->capable & FSP_FUSE_CAP_STAT_EX);
+#endif
+
 #if defined(FSP_FUSE_CAP_CASE_INSENSITIVE)
     conn->want |= (conn->capable & FSP_FUSE_CAP_CASE_INSENSITIVE);
 #endif
@@ -242,43 +250,68 @@ static int ptfs_fgetattr(const char *path, struct fuse_stat *stbuf, struct fuse_
     return -1 != fstat(fd, stbuf) ? 0 : -errno;
 }
 
+#if defined(PTFS_UTIMENS)
+static int ptfs_utimens(const char *path, const struct fuse_timespec tv[2])
+{
+    ptfs_impl_fullpath(path);
+
+    return -1 != utimensat(AT_FDCWD, path, tv, AT_SYMLINK_NOFOLLOW) ? 0 : -errno;
+}
+#endif
+
+#if defined(_WIN64) || defined(_WIN32)
+static int ptfs_setcrtime(const char *path, const struct fuse_timespec *tv)
+{
+    ptfs_impl_fullpath(path);
+
+    return -1 != setcrtime(path, tv) ? 0 : -errno;
+}
+#endif
+
+#if defined(FSP_FUSE_USE_STAT_EX)
+static int ptfs_chflags(const char *path, uint32_t flags)
+{
+    ptfs_impl_fullpath(path);
+
+    return -1 != lchflags(path, flags) ? 0 : -errno;
+}
+#endif
+
 static struct fuse_operations ptfs_ops =
 {
-    ptfs_getattr,
-    0, //getdir
-    0, //readlink
-    0, //mknod
-    ptfs_mkdir,
-    ptfs_unlink,
-    ptfs_rmdir,
-    0, //symlink
-    ptfs_rename,
-    0, //link
-    ptfs_chmod,
-    ptfs_chown,
-    ptfs_truncate,
-    ptfs_utime,
-    ptfs_open,
-    ptfs_read,
-    ptfs_write,
-    ptfs_statfs,
-    0, //flush
-    ptfs_release,
-    ptfs_fsync,
-    0, //setxattr
-    0, //getxattr
-    0, //listxattr
-    0, //removexattr
-    ptfs_opendir,
-    ptfs_readdir,
-    ptfs_releasedir,
-    0, //fsyncdir
-    ptfs_init,
-    0, //destroy
-    0, //access
-    ptfs_create,
-    ptfs_ftruncate,
-    ptfs_fgetattr,
+    .getattr = ptfs_getattr,
+    .mkdir = ptfs_mkdir,
+    .unlink = ptfs_unlink,
+    .rmdir = ptfs_rmdir,
+    .rename = ptfs_rename,
+    .chmod = ptfs_chmod,
+    .chown = ptfs_chown,
+    .truncate = ptfs_truncate,
+#if !defined(PTFS_UTIMENS)
+    .utime = ptfs_utime,
+#endif
+    .open = ptfs_open,
+    .read = ptfs_read,
+    .write = ptfs_write,
+    .statfs = ptfs_statfs,
+    .release = ptfs_release,
+    .fsync = ptfs_fsync,
+    .opendir = ptfs_opendir,
+    .readdir = ptfs_readdir,
+    .releasedir = ptfs_releasedir,
+    .init = ptfs_init,
+    .create = ptfs_create,
+    .ftruncate = ptfs_ftruncate,
+    .fgetattr = ptfs_fgetattr,
+#if defined(PTFS_UTIMENS)
+    .utimens = ptfs_utimens,
+#endif
+#if defined(_WIN64) || defined(_WIN32)
+    .setcrtime = ptfs_setcrtime,
+#endif
+#if defined(FSP_FUSE_USE_STAT_EX)
+    .chflags = ptfs_chflags,
+#endif
 };
 
 static void usage(void)

tst/passthrough-fuse/passthrough-fuse.vcxproj

@@ -99,7 +99,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FSP_FUSE_USE_STAT_EX;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\WinFsp\inc\fuse;$(MSBuildProgramFiles32)\WinFsp\inc</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -118,7 +118,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FSP_FUSE_USE_STAT_EX;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\WinFsp\inc\fuse;$(MSBuildProgramFiles32)\WinFsp\inc</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -139,7 +139,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FSP_FUSE_USE_STAT_EX;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\WinFsp\inc\fuse;$(MSBuildProgramFiles32)\WinFsp\inc</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -162,7 +162,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FSP_FUSE_USE_STAT_EX;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\WinFsp\inc\fuse;$(MSBuildProgramFiles32)\WinFsp\inc</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

tst/passthrough-fuse/winposix.c

@@ -1,5 +1,5 @@
 /**
- * @file passthrough-fuse.c
+ * @file winposix.c
  *
  * @copyright 2015-2017 Bill Zissimopoulos
  */
@@ -36,6 +36,40 @@ struct _DIR
     char path[];
 };
 
+#if defined(FSP_FUSE_USE_STAT_EX)
+static inline uint32_t MapFileAttributesToFlags(UINT32 FileAttributes)
+{
+    uint32_t flags = 0;
+
+    if (FileAttributes & FILE_ATTRIBUTE_READONLY)
+        flags |= FSP_FUSE_UF_READONLY;
+    if (FileAttributes & FILE_ATTRIBUTE_HIDDEN)
+        flags |= FSP_FUSE_UF_HIDDEN;
+    if (FileAttributes & FILE_ATTRIBUTE_SYSTEM)
+        flags |= FSP_FUSE_UF_SYSTEM;
+    if (FileAttributes & FILE_ATTRIBUTE_ARCHIVE)
+        flags |= FSP_FUSE_UF_ARCHIVE;
+
+    return flags;
+}
+
+static inline UINT32 MapFlagsToFileAttributes(uint32_t flags)
+{
+    UINT32 FileAttributes = 0;
+
+    if (flags & FSP_FUSE_UF_READONLY)
+        FileAttributes |= FILE_ATTRIBUTE_READONLY;
+    if (flags & FSP_FUSE_UF_HIDDEN)
+        FileAttributes |= FILE_ATTRIBUTE_HIDDEN;
+    if (flags & FSP_FUSE_UF_SYSTEM)
+        FileAttributes |= FILE_ATTRIBUTE_SYSTEM;
+    if (flags & FSP_FUSE_UF_ARCHIVE)
+        FileAttributes |= FILE_ATTRIBUTE_ARCHIVE;
+
+    return FileAttributes;
+}
+#endif
+
 static int maperror(int winerrno);
 
 static inline void *error0(void)
@@ -151,28 +185,22 @@ int fstat(int fd, struct fuse_stat *stbuf)
 {
     HANDLE h = (HANDLE)(intptr_t)fd;
     BY_HANDLE_FILE_INFORMATION FileInfo;
-    UINT64 CreationTime, LastAccessTime, LastWriteTime;
 
     if (!GetFileInformationByHandle(h, &FileInfo))
         return error();
 
-    CreationTime = ((PLARGE_INTEGER)(&FileInfo.ftCreationTime))->QuadPart - 116444736000000000;
-    LastAccessTime = ((PLARGE_INTEGER)(&FileInfo.ftLastAccessTime))->QuadPart - 116444736000000000;
-    LastWriteTime = ((PLARGE_INTEGER)(&FileInfo.ftLastWriteTime))->QuadPart - 116444736000000000;
-
     memset(stbuf, 0, sizeof *stbuf);
     stbuf->st_mode = 0777 |
         ((FileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 0040000/* S_IFDIR */ : 0);
     stbuf->st_nlink = 1;
     stbuf->st_size = ((UINT64)FileInfo.nFileSizeHigh << 32) | ((UINT64)FileInfo.nFileSizeLow);
-    stbuf->st_atim.tv_sec = LastAccessTime / 10000000;
-    stbuf->st_atim.tv_nsec = LastAccessTime % 10000000 * 100;
-    stbuf->st_mtim.tv_sec = LastWriteTime / 10000000;
-    stbuf->st_mtim.tv_nsec = LastWriteTime % 10000000 * 100;
-    stbuf->st_ctim.tv_sec = LastWriteTime / 10000000;
-    stbuf->st_ctim.tv_nsec = LastWriteTime % 10000000 * 100;
-    stbuf->st_birthtim.tv_sec = CreationTime / 10000000;
-    stbuf->st_birthtim.tv_nsec = CreationTime % 10000000 * 100;
+    FspPosixFileTimeToUnixTime(*(PUINT64)&FileInfo.ftCreationTime, (void *)&stbuf->st_birthtim);
+    FspPosixFileTimeToUnixTime(*(PUINT64)&FileInfo.ftLastAccessTime, (void *)&stbuf->st_atim);
+    FspPosixFileTimeToUnixTime(*(PUINT64)&FileInfo.ftLastWriteTime, (void *)&stbuf->st_mtim);
+    FspPosixFileTimeToUnixTime(*(PUINT64)&FileInfo.ftLastWriteTime, (void *)&stbuf->st_ctim);
+#if defined(FSP_FUSE_USE_STAT_EX)
+    stbuf->st_flags = MapFileAttributesToFlags(FileInfo.dwFileAttributes);
+#endif
 
     return 0;
 }
@@ -272,6 +300,21 @@ int lchown(const char *path, fuse_uid_t uid, fuse_gid_t gid)
     return 0;
 }
 
+int lchflags(const char *path, uint32_t flags)
+{
+#if defined(FSP_FUSE_USE_STAT_EX)
+    UINT32 FileAttributes = MapFlagsToFileAttributes(flags);
+
+    if (0 == FileAttributes)
+        FileAttributes = FILE_ATTRIBUTE_NORMAL;
+
+    if (!SetFileAttributesA(path, FileAttributes))
+        return error();
+#endif
+
+    return 0;
+}
+
 int truncate(const char *path, fuse_off_t size)
 {
     HANDLE h = CreateFileA(path,
@@ -290,6 +333,24 @@ int truncate(const char *path, fuse_off_t size)
 
 int utime(const char *path, const struct fuse_utimbuf *timbuf)
 {
+    if (0 == timbuf)
+        return utimensat(AT_FDCWD, path, 0, AT_SYMLINK_NOFOLLOW);
+    else
+    {
+        struct fuse_timespec times[2];
+        times[0].tv_sec = timbuf->actime;
+        times[0].tv_nsec = 0;
+        times[1].tv_sec = timbuf->modtime;
+        times[1].tv_nsec = 0;
+        return utimensat(AT_FDCWD, path, times, AT_SYMLINK_NOFOLLOW);
+    }
+}
+
+int utimensat(int dirfd, const char *path, const struct fuse_timespec times[2], int flag)
+{
+    /* ignore dirfd and assume that it is always AT_FDCWD */
+    /* ignore flag and assume that it is always AT_SYMLINK_NOFOLLOW */
+
     HANDLE h = CreateFileA(path,
         FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
         0,
@@ -297,8 +358,18 @@ int utime(const char *path, const struct fuse_utimbuf *timbuf)
     if (INVALID_HANDLE_VALUE == h)
         return error();
 
-    UINT64 LastAccessTime = timbuf->actime * 10000000 + 116444736000000000;
-    UINT64 LastWriteTime = timbuf->modtime * 10000000 + 116444736000000000;
+    UINT64 LastAccessTime, LastWriteTime;
+    if (0 == times)
+    {
+        FILETIME FileTime;
+        GetSystemTimeAsFileTime(&FileTime);
+        LastAccessTime = LastWriteTime = *(PUINT64)&FileTime;
+    }
+    else
+    {
+        FspPosixUnixTimeToFileTime((void *)&times[0], &LastAccessTime);
+        FspPosixUnixTimeToFileTime((void *)&times[1], &LastWriteTime);
+    }
 
     int res = SetFileTime(h,
         0, (PFILETIME)&LastAccessTime, (PFILETIME)&LastWriteTime) ? 0 : error();
@@ -308,6 +379,26 @@ int utime(const char *path, const struct fuse_utimbuf *timbuf)
     return res;
 }
 
+int setcrtime(const char *path, const struct fuse_timespec *tv)
+{
+    HANDLE h = CreateFileA(path,
+        FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+        0,
+        OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
+    if (INVALID_HANDLE_VALUE == h)
+        return error();
+
+    UINT64 CreationTime;
+    FspPosixUnixTimeToFileTime((void *)tv, &CreationTime);
+
+    int res = SetFileTime(h,
+        (PFILETIME)&CreationTime, 0, 0) ? 0 : error();
+
+    CloseHandle(h);
+
+    return res;
+}
+
 int unlink(const char *path)
 {
     if (!DeleteFileA(path))
@@ -388,7 +479,6 @@ void rewinddir(DIR *dirp)
 struct dirent *readdir(DIR *dirp)
 {
     WIN32_FIND_DATAA FindData;
-    UINT64 CreationTime, LastAccessTime, LastWriteTime;
     struct fuse_stat *stbuf = &dirp->de.d_stat;
 
     if (INVALID_HANDLE_VALUE == dirp->fh)
@@ -407,23 +497,18 @@ struct dirent *readdir(DIR *dirp)
         }
     }
 
-    CreationTime = ((PLARGE_INTEGER)(&FindData.ftCreationTime))->QuadPart - 116444736000000000;
-    LastAccessTime = ((PLARGE_INTEGER)(&FindData.ftLastAccessTime))->QuadPart - 116444736000000000;
-    LastWriteTime = ((PLARGE_INTEGER)(&FindData.ftLastWriteTime))->QuadPart - 116444736000000000;
-
     memset(stbuf, 0, sizeof *stbuf);
     stbuf->st_mode = 0777 |
         ((FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 0040000/* S_IFDIR */ : 0);
     stbuf->st_nlink = 1;
     stbuf->st_size = ((UINT64)FindData.nFileSizeHigh << 32) | ((UINT64)FindData.nFileSizeLow);
-    stbuf->st_atim.tv_sec = LastAccessTime / 10000000;
-    stbuf->st_atim.tv_nsec = LastAccessTime % 10000000 * 100;
-    stbuf->st_mtim.tv_sec = LastWriteTime / 10000000;
-    stbuf->st_mtim.tv_nsec = LastWriteTime % 10000000 * 100;
-    stbuf->st_ctim.tv_sec = LastWriteTime / 10000000;
-    stbuf->st_ctim.tv_nsec = LastWriteTime % 10000000 * 100;
-    stbuf->st_birthtim.tv_sec = CreationTime / 10000000;
-    stbuf->st_birthtim.tv_nsec = CreationTime % 10000000 * 100;
+    FspPosixFileTimeToUnixTime(*(PUINT64)&FindData.ftCreationTime, (void *)&stbuf->st_birthtim);
+    FspPosixFileTimeToUnixTime(*(PUINT64)&FindData.ftLastAccessTime, (void *)&stbuf->st_atim);
+    FspPosixFileTimeToUnixTime(*(PUINT64)&FindData.ftLastWriteTime, (void *)&stbuf->st_mtim);
+    FspPosixFileTimeToUnixTime(*(PUINT64)&FindData.ftLastWriteTime, (void *)&stbuf->st_ctim);
+#if defined(FSP_FUSE_USE_STAT_EX)
+    stbuf->st_flags = MapFileAttributesToFlags(FindData.dwFileAttributes);
+#endif
 
     strcpy(dirp->de.d_name, FindData.cFileName);