update changelog

dll: uses launcher to DefineDosDevice for LocalService, etc.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,12 @@
+(Enter your issue here.)
+
+----
+
+Before submitting this issue please review this checklist. Ideally all checkmarks should be checked upon submitting. (Use an x inside square brackets like so: [x])
+
+- [ ] **Issue type**: Please consider posting only bug reports or enhancement requests. Questions are better in the [WinFsp Google Group](https://groups.google.com/forum/#!forum/winfsp).
+- [ ] **No Duplicate**: Ensure that your issue has not been filed before. (Check open and closed issues.)
+- [ ] **Description**: Provide a descriptive title and a detailed explanation of the problem you are experiencing (for a bug report) or you are trying to solve (for an enhancement request).
+- [ ] **Reproduce**: For bug reports provide detailed information on how to reproduce the problem. For enhancement requests you do not need to provide this information, unless you find it relevant.
+- [ ] **Behaviors**: Provide information on the expected and actual behaviors.
+- [ ] **Environment**: For bug reports provide information about your OS version and build (e.g. 10.0.14393) and WinFsp version and build (e.g. 2017.2 or 1.2.17341). For enhancement requests you do not need to provide this information, unless you find it relevant.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,12 @@
+(Enter your PR description here.)
+
+----
+
+Before submitting this PR please review this checklist. Ideally all checkmarks should be checked upon submitting. (Use an x inside square brackets like so: [x])
+
+- [ ] **Contributing**: You MUST read and be willing to accept the [CONTRIBUTOR AGREEMENT](https://github.com/billziss-gh/winfsp/blob/master/Contributors.asciidoc). The agreement gives joint copyright interests in your contributions to you and the original WinFsp author. If you have already accepted the [CONTRIBUTOR AGREEMENT](https://github.com/billziss-gh/winfsp/blob/master/Contributors.asciidoc) you do not need to do so again.
+- [ ] **Topic branch**: Avoid creating the PR off the master branch of your fork. Consider creating a topic branch and request a pull from that. This allows you to add commits to the master branch of your fork without affecting this PR.
+- [ ] **No tabs**: Consistently use SPACES everywhere. NO TABS, unless the file format requires it (e.g. Makefile).
+- [ ] **Style**: Follow the same code style as the rest of the project.
+- [ ] **Tests**: Include tests to the extent that it is possible, especially if you add a new feature.
+- [ ] **Quality**: Your design and code should be of high quality and something that you are proud of.

Changelog.asciidoc

@@ -1,6 +1,66 @@
 = Changelog
 
 
+v1.3B1 (2018.1 B1)::
+
+Changes since v1.2POST1:
+
+- The WinFsp Launcher can now be controlled by the new `FspLaunch` API. File systems can be started, stopped, queried and listed using `FspLaunchStart`, `FspLaunchStop`, `FspLaunchGetInfo` and `FspLaunchGetNameList`.
+- The WinFsp launcher now supports new registry settings `RunAs` and `WorkDirectory`. `RunAs` allows the laucher to launch a file system process under the service accounts LocalService and NetworkService. `WorkDirectory` can be used to specify the work directory for a newly launched file system process.
+- The MEMFS sample file systems are now launched under the LocalService account.
+- The WinFsp network provider is now added first in the provider order list. Previously it was added last. (GitHub PR #131; thanks @felfert.)
+- The WinFsp installer now uses the Wix `Provides` dependency extension to provide a `WinFsp` dependency key. (GitHub PR #129; thanks @felfert.)
+
+
+v1.2POST1 (2017.2; issue #127)::
+
+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, #127
+
+
+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.

Contributors.asciidoc

@@ -55,6 +55,8 @@ CONTRIBUTOR LIST
 ----------------
 |===
 |Bill Zissimopoulos                                             |billziss at navimatics.com
+|Fritz Elfert                                                   |fritz-github at fritz-elfert.de
+|John Oberschelp                                                |john at oberschelp.net
 |Sam Kelly (DuroSoft Technologies LLC, https://durosoft.com)    |sam at durosoft.com
 |Tobias Urlaub                                                  |saibotu at outlook.de
 |===

README.md

@@ -30,21 +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.
+* `build/VStudio`: WinFsp solution and project files.
-* doc: The WinFsp design documents and additional documentation can be found here.
+* `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/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.
+* `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.
-* 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`: Source code to the WinFsp DLL.
-* src/dll/fuse: Source code to the FUSE compatibility layer.
+* `src/dll/fuse`: Source code to the FUSE compatibility layer.
-* src/dotnet: Source code to the .NET layer.
+* `src/dotnet`: Source code to the .NET layer.
-* src/launcher: Source code to the launcher service and the launchctl utility.
+* `src/fsptool`: Source code to fsptool command line utility.
-* src/sys: Source code to the WinFsp FSD.
+* `src/launcher`: Source code to the launcher service and the launchctl utility.
-* opt/cygfuse: Source code for the Cygwin FUSE package.
+* `src/sys`: Source code to the WinFsp FSD.
-* tst/memfs*: Source code to an example file system written in C/C++ (memfs) or C# (memfs-dotnet).
+* `opt/cygfuse`: Source code for the Cygwin FUSE package.
-* tst/passthrough*: Source code to additional example file systems.
+* `tst/memfs*`: Source code to an example file system written in C/C++ (memfs) or C# (memfs-dotnet).
-* tst/winfsp-tests: WinFsp test suite.
+* `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
 

appveyor.yml

@@ -6,8 +6,10 @@ environment:
     TESTING: Func
   - CONFIGURATION: Release
     TESTING: Func
-  - CONFIGURATION: Release
+  #- CONFIGURATION: Release
-    TESTING: Perf
+  #  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/installer/CustomActions/CustomActions.cpp

@@ -1,7 +1,7 @@
 /**
  * @file CustomActions.cpp
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

build/VStudio/installer/Product.wxs

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+    xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
     <Product
         Id="*"
         Name="$(var.MyProductName) $(var.MyProductVersion)"
@@ -53,8 +54,8 @@
                     Key="[P.RegistryKey]"
                     Name="InstallDir"
                     Type="string"
-                    Value="[INSTALLDIR]"
+                    Value="[INSTALLDIR]" />
-                    KeyPath="yes" />
+                <dep:Provides Key="WinFsp" />
             </Component>
             <Component Id="C.License.txt">
                 <File Name="License.txt" Source="..\..\..\License.txt" KeyPath="yes" />
@@ -187,6 +188,10 @@
                             Type="string"
                             Name="CommandLine"
                             Value="-i -F NTFS -n 65536 -s 67108864 -u %1 -m %2" />
+                        <RegistryValue
+                            Type="string"
+                            Name="RunAs"
+                            Value="LocalService" />
                         <RegistryValue
                             Type="string"
                             Name="Security"
@@ -213,6 +218,10 @@
                             Type="string"
                             Name="CommandLine"
                             Value="-i -F NTFS -n 65536 -s 67108864 -u %1 -m %2" />
+                        <RegistryValue
+                            Type="string"
+                            Name="RunAs"
+                            Value="LocalService" />
                         <RegistryValue
                             Type="string"
                             Name="Security"
@@ -239,6 +248,10 @@
                             Type="string"
                             Name="CommandLine"
                             Value="-i -F NTFS -n 65536 -s 67108864 -u %1 -m %2" />
+                        <RegistryValue
+                            Type="string"
+                            Name="RunAs"
+                            Value="LocalService" />
                         <RegistryValue
                             Type="string"
                             Name="Security"
@@ -310,12 +323,12 @@
             <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-6.tar.xz" KeyPath="yes" />
+                        <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-6.tar.xz" KeyPath="yes" />
+                        <File Id="FILE.fuse.tar.xz.x86" Name="fuse-2.8-7.tar.xz" KeyPath="yes" />
                     </Component>
                 </Directory>
                 <Component Id="C.fuse.install.sh">

build/VStudio/installer/winfsp_msi.wixproj

@@ -39,6 +39,10 @@
       <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
       <Name>WixUIExtension</Name>
     </WixExtension>
+    <WixExtension Include="WixDependencyExtension">
+      <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
+      <Name>WixDependencyExtension</Name>
+    </WixExtension>
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--

build/VStudio/tools/launcher.vcxproj

@@ -112,7 +112,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;userenv.lib</AdditionalDependencies>
       <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
@@ -134,7 +134,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;userenv.lib</AdditionalDependencies>
       <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
@@ -159,7 +159,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;userenv.lib</AdditionalDependencies>
       <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
@@ -184,7 +184,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;userenv.lib</AdditionalDependencies>
       <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>

build/VStudio/version.properties

@@ -16,9 +16,9 @@
         <MyCompanyName>Navimatics Corporation</MyCompanyName>
         <MyCopyright>2015-$([System.DateTime]::Now.ToString(`yyyy`)) Bill Zissimopoulos</MyCopyright>
 
-        <MyCanonicalVersion>1.2</MyCanonicalVersion>
+        <MyCanonicalVersion>1.3</MyCanonicalVersion>
 
-        <MyProductVersion>2017.2 B1</MyProductVersion>
+        <MyProductVersion>2018.1 B1</MyProductVersion>
         <MyProductStage>Beta</MyProductStage>
 
         <MyVersion>$(MyCanonicalVersion).$(MyBuildNumber)</MyVersion>

build/VStudio/winfsp_dll.vcxproj

@@ -39,6 +39,7 @@
     <ClCompile Include="..\..\src\dll\fuse\fuse_intf.c" />
     <ClCompile Include="..\..\src\dll\fuse\fuse_main.c" />
     <ClCompile Include="..\..\src\dll\fuse\fuse_opt.c" />
+    <ClCompile Include="..\..\src\dll\launch.c" />
     <ClCompile Include="..\..\src\dll\np.c" />
     <ClCompile Include="..\..\src\dll\posix.c" />
     <ClCompile Include="..\..\src\dll\security.c" />
@@ -51,6 +52,7 @@
     <ClCompile Include="..\..\src\dll\path.c" />
     <ClCompile Include="..\..\src\dll\service.c" />
     <ClCompile Include="..\..\src\dll\util.c" />
+    <ClCompile Include="..\..\src\dll\wksid.c" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\dll\fuse\fuse.pc.in">

build/VStudio/winfsp_dll.vcxproj.filters

@@ -112,6 +112,12 @@
     <ClCompile Include="..\..\src\dll\fuse\fuse_compat.c">
       <Filter>Source\fuse</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\dll\wksid.c">
+      <Filter>Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\dll\launch.c">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\dll\library.def">

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\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

@@ -50,7 +50,8 @@ To verify installation:
         <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/Known-File-Systems.asciidoc

@@ -4,6 +4,8 @@ This document contains a list of known file systems and file system libraries th
 
 == 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

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.

ext/tlib/callstack.c

@@ -1,7 +1,7 @@
 /**
  * @file tlib/callstack.c
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #include <tlib/callstack.h>

ext/tlib/callstack.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/callstack.h
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #ifndef TLIB_CALLSTACK_H_INCLUDED

ext/tlib/injected/allfunc.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injected/allfunc.h
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #ifndef TLIB_INJECTED_ALLFUNC_H_INCLUDED

ext/tlib/injected/curlfunc.c

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injected/curlfunc.c
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #include <tlib/injected/curlfunc.h>

ext/tlib/injected/curlfunc.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injected/curlfunc.h
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #ifndef TLIB_INJECTED_CURLFUNC_H_INCLUDED

ext/tlib/injected/stdfunc.c

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injected/stdfunc.c
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #include <tlib/injected/stdfunc.h>

ext/tlib/injected/stdfunc.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injected/stdfunc.h
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #ifndef TLIB_INJECTED_STDFUNC_H_INCLUDED

ext/tlib/injection.c

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injection.c
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #include <tlib/injection.h>

ext/tlib/injection.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injection.h
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 /* NOTE: This header may usefully be included multiple times.

ext/tlib/testsuite.c

@@ -1,7 +1,7 @@
 /**
  * @file tlib/testsuite.c
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #include <tlib/testsuite.h>

ext/tlib/testsuite.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/testsuite.h
  *
- * @copyright 2014-2017 Bill Zissimopoulos
+ * @copyright 2014-2018 Bill Zissimopoulos
  */
 
 #ifndef TLIB_TESTSUITE_H_INCLUDED

inc/fuse/fuse.h

@@ -6,7 +6,7 @@
  *     FUSE: Filesystem in Userspace
  *     Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -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);
+    /* S - supported by WinFsp */
-    int (*getdir)(const char *path, fuse_dirh_t h, fuse_dirfil_t filler);
+    /* S */ int (*getattr)(const char *path, struct fuse_stat *stbuf);
-    int (*readlink)(const char *path, char *buf, size_t size);
+    /* S */ int (*getdir)(const char *path, fuse_dirh_t h, fuse_dirfil_t filler);
-    int (*mknod)(const char *path, fuse_mode_t mode, fuse_dev_t dev);
+    /* S */ int (*readlink)(const char *path, char *buf, size_t size);
-    int (*mkdir)(const char *path, fuse_mode_t mode);
+    /* S */ int (*mknod)(const char *path, fuse_mode_t mode, fuse_dev_t dev);
-    int (*unlink)(const char *path);
+    /* S */ int (*mkdir)(const char *path, fuse_mode_t mode);
-    int (*rmdir)(const char *path);
+    /* S */ int (*unlink)(const char *path);
-    int (*symlink)(const char *dstpath, const char *srcpath);
+    /* S */ int (*rmdir)(const char *path);
-    int (*rename)(const char *oldpath, const char *newpath);
+    /* S */ int (*symlink)(const char *dstpath, const char *srcpath);
-    int (*link)(const char *srcpath, const char *dstpath);
+    /* S */ int (*rename)(const char *oldpath, const char *newpath);
-    int (*chmod)(const char *path, fuse_mode_t mode);
+    /* _ */ int (*link)(const char *srcpath, const char *dstpath);
-    int (*chown)(const char *path, fuse_uid_t uid, fuse_gid_t gid);
+    /* S */ int (*chmod)(const char *path, fuse_mode_t mode);
-    int (*truncate)(const char *path, fuse_off_t size);
+    /* S */ int (*chown)(const char *path, fuse_uid_t uid, fuse_gid_t gid);
-    int (*utime)(const char *path, struct fuse_utimbuf *timbuf);
+    /* S */ int (*truncate)(const char *path, fuse_off_t size);
-    int (*open)(const char *path, struct fuse_file_info *fi);
+    /* S */ int (*utime)(const char *path, struct fuse_utimbuf *timbuf);
-    int (*read)(const char *path, char *buf, size_t size, fuse_off_t off,
+    /* 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);
+    /* S */ int (*statfs)(const char *path, struct fuse_statvfs *stbuf);
-    int (*flush)(const char *path, struct fuse_file_info *fi);
+    /* S */ int (*flush)(const char *path, struct fuse_file_info *fi);
-    int (*release)(const char *path, struct fuse_file_info *fi);
+    /* S */ int (*release)(const char *path, struct fuse_file_info *fi);
-    int (*fsync)(const char *path, int datasync, 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 (*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 (*getxattr)(const char *path, const char *name, char *value, size_t size);
-    int (*listxattr)(const char *path, char *namebuf, size_t size);
+    /* _ */ int (*listxattr)(const char *path, char *namebuf, size_t size);
-    int (*removexattr)(const char *path, const char *name);
+    /* _ */ int (*removexattr)(const char *path, const char *name);
-    int (*opendir)(const char *path, struct fuse_file_info *fi);
+    /* S */ 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,
+    /* 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);
+    /* S */ int (*releasedir)(const char *path, struct fuse_file_info *fi);
-    int (*fsyncdir)(const char *path, int datasync, struct fuse_file_info *fi);
+    /* S */ int (*fsyncdir)(const char *path, int datasync, struct fuse_file_info *fi);
-    void *(*init)(struct fuse_conn_info *conn);
+    /* S */ void *(*init)(struct fuse_conn_info *conn);
-    void (*destroy)(void *data);
+    /* S */ void (*destroy)(void *data);
-    int (*access)(const char *path, int mask);
+    /* _ */ int (*access)(const char *path, int mask);
-    int (*create)(const char *path, fuse_mode_t mode, struct fuse_file_info *fi);
+    /* S */ 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);
+    /* S */ 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);
+    /* 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);
+    /* _ */ int (*lock)(const char *path,
-    int (*utimens)(const char *path, const struct fuse_timespec tv[2]);
+        struct fuse_file_info *fi, int cmd, struct fuse_flock *lock);
-    int (*bmap)(const char *path, size_t blocksize, uint64_t *idx);
+    /* S */ int (*utimens)(const char *path, const struct fuse_timespec tv[2]);
-    unsigned int flag_nullpath_ok:1;
+    /* _ */ int (*bmap)(const char *path, size_t blocksize, uint64_t *idx);
-    unsigned int flag_reserved:31;
+    /* _ */ unsigned int flag_nullpath_ok:1;
-    int (*ioctl)(const char *path, int cmd, void *arg, struct fuse_file_info *fi,
+    /* _ */ 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

inc/fuse/fuse_common.h

@@ -6,7 +6,7 @@
  *     FUSE: Filesystem in Userspace
  *     Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -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/fuse_opt.h

@@ -6,7 +6,7 @@
  *     FUSE: Filesystem in Userspace
  *     Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

inc/fuse/winfsp_fuse.h

@@ -2,7 +2,7 @@
  * @file fuse/winfsp_fuse.h
  * WinFsp FUSE compatible API.
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -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;
+    FSP_FUSE_STAT_FIELD_DEFN
-    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;
 };
+#else
+struct fuse_stat
+{
+    FSP_FUSE_STAT_EX_FIELD_DEFN
+};
+#endif
 
 #if defined(_WIN64)
 struct fuse_statvfs
@@ -222,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
 
@@ -246,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;

inc/winfsp/fsctl.h

@@ -1,7 +1,7 @@
 /**
  * @file winfsp/fsctl.h
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

inc/winfsp/winfsp.h

@@ -5,7 +5,7 @@
  * In order to use the WinFsp API the user mode file system must include <winfsp/winfsp.h>
  * and link with the winfsp_x64.dll (or winfsp_x86.dll) library.
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -981,14 +981,12 @@ FSP_API VOID FspFileSystemSendResponse(FSP_FILE_SYSTEM *FileSystem,
  *     The current operation context.
  */
 FSP_API FSP_FILE_SYSTEM_OPERATION_CONTEXT *FspFileSystemGetOperationContext(VOID);
-FSP_API PWSTR FspFileSystemMountPointF(FSP_FILE_SYSTEM *FileSystem);
 static inline
 PWSTR FspFileSystemMountPoint(FSP_FILE_SYSTEM *FileSystem)
 {
     return FileSystem->MountPoint;
 }
-FSP_API NTSTATUS FspFileSystemEnterOperationF(FSP_FILE_SYSTEM *FileSystem,
+FSP_API PWSTR FspFileSystemMountPointF(FSP_FILE_SYSTEM *FileSystem);
-    FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response);
 static inline
 NTSTATUS FspFileSystemEnterOperation(FSP_FILE_SYSTEM *FileSystem,
     FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response)
@@ -998,7 +996,7 @@ NTSTATUS FspFileSystemEnterOperation(FSP_FILE_SYSTEM *FileSystem,
 
     return FileSystem->EnterOperation(FileSystem, Request, Response);
 }
-FSP_API NTSTATUS FspFileSystemLeaveOperationF(FSP_FILE_SYSTEM *FileSystem,
+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,
@@ -1009,9 +1007,8 @@ NTSTATUS FspFileSystemLeaveOperation(FSP_FILE_SYSTEM *FileSystem,
 
     return FileSystem->LeaveOperation(FileSystem, Request, Response);
 }
-FSP_API VOID FspFileSystemSetOperationGuardF(FSP_FILE_SYSTEM *FileSystem,
+FSP_API NTSTATUS FspFileSystemLeaveOperationF(FSP_FILE_SYSTEM *FileSystem,
-    FSP_FILE_SYSTEM_OPERATION_GUARD *EnterOperation,
+    FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response);
-    FSP_FILE_SYSTEM_OPERATION_GUARD *LeaveOperation);
 static inline
 VOID FspFileSystemSetOperationGuard(FSP_FILE_SYSTEM *FileSystem,
     FSP_FILE_SYSTEM_OPERATION_GUARD *EnterOperation,
@@ -1020,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.
  *
@@ -1030,17 +1030,14 @@ VOID FspFileSystemSetOperationGuard(FSP_FILE_SYSTEM *FileSystem,
  * @see
  *     FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY
  */
-FSP_API VOID FspFileSystemSetOperationGuardStrategyF(FSP_FILE_SYSTEM *FileSystem,
-    FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY GuardStrategy);
 static inline
 VOID FspFileSystemSetOperationGuardStrategy(FSP_FILE_SYSTEM *FileSystem,
     FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY GuardStrategy)
 {
     FileSystem->OpGuardStrategy = GuardStrategy;
 }
-FSP_API VOID FspFileSystemSetOperationF(FSP_FILE_SYSTEM *FileSystem,
+FSP_API VOID FspFileSystemSetOperationGuardStrategyF(FSP_FILE_SYSTEM *FileSystem,
-    ULONG Index,
+    FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY GuardStrategy);
-    FSP_FILE_SYSTEM_OPERATION *Operation);
 static inline
 VOID FspFileSystemSetOperation(FSP_FILE_SYSTEM *FileSystem,
     ULONG Index,
@@ -1048,8 +1045,9 @@ VOID FspFileSystemSetOperation(FSP_FILE_SYSTEM *FileSystem,
 {
     FileSystem->Operations[Index] = Operation;
 }
-FSP_API VOID FspFileSystemGetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
+FSP_API VOID FspFileSystemSetOperationF(FSP_FILE_SYSTEM *FileSystem,
-    NTSTATUS *PDispatcherResult);
+    ULONG Index,
+    FSP_FILE_SYSTEM_OPERATION *Operation);
 static inline
 VOID FspFileSystemGetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
     NTSTATUS *PDispatcherResult)
@@ -1058,8 +1056,8 @@ VOID FspFileSystemGetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
     *PDispatcherResult = FileSystem->DispatcherResult;
     MemoryBarrier();
 }
-FSP_API VOID FspFileSystemSetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
+FSP_API VOID FspFileSystemGetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
-    NTSTATUS DispatcherResult);
+    NTSTATUS *PDispatcherResult);
 static inline
 VOID FspFileSystemSetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
     NTSTATUS DispatcherResult)
@@ -1068,15 +1066,16 @@ VOID FspFileSystemSetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
         return;
     InterlockedCompareExchange(&FileSystem->DispatcherResult, DispatcherResult, 0);
 }
-FSP_API VOID FspFileSystemSetDebugLogF(FSP_FILE_SYSTEM *FileSystem,
+FSP_API VOID FspFileSystemSetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
-    UINT32 DebugLog);
+    NTSTATUS DispatcherResult);
 static inline
 VOID FspFileSystemSetDebugLog(FSP_FILE_SYSTEM *FileSystem,
     UINT32 DebugLog)
 {
     FileSystem->DebugLog = DebugLog;
 }
-FSP_API BOOLEAN FspFileSystemIsOperationCaseSensitiveF(VOID);
+FSP_API VOID FspFileSystemSetDebugLogF(FSP_FILE_SYSTEM *FileSystem,
+    UINT32 DebugLog);
 static inline
 BOOLEAN FspFileSystemIsOperationCaseSensitive(VOID)
 {
@@ -1085,7 +1084,12 @@ BOOLEAN FspFileSystemIsOperationCaseSensitive(VOID)
         FspFsctlTransactCreateKind == Request->Kind && Request->Req.Create.CaseSensitive ||
         FspFsctlTransactQueryDirectoryKind == Request->Kind && Request->Req.QueryDirectory.CaseSensitive;
 }
-FSP_API UINT32 FspFileSystemOperationProcessIdF(VOID);
+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)
 {
@@ -1102,6 +1106,7 @@ UINT32 FspFileSystemOperationProcessId(VOID)
         return 0;
     }
 }
+FSP_API UINT32 FspFileSystemOperationProcessIdF(VOID);
 
 /*
  * Operations
@@ -1467,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
@@ -1655,6 +1675,19 @@ FSP_API VOID FspServiceStop(FSP_SERVICE *Service);
  *     TRUE if the process is running in running user interactive mode.
  */
 FSP_API BOOLEAN FspServiceIsInteractive(VOID);
+/**
+ * Check if the supplied token is from the service context.
+ *
+ * @param Token
+ *     Token to check. Pass NULL to check the current process token.
+ * @param PIsLocalSystem
+ *     Pointer to a boolean that will receive a TRUE value if the token belongs to LocalSystem
+ *     and FALSE otherwise. May be NULL.
+ * @return
+ *     STATUS_SUCCESS if the token is from the service context. STATUS_ACCESS_DENIED if it is not.
+ *     Other error codes are possible.
+ */
+FSP_API NTSTATUS FspServiceContextCheck(HANDLE Token, PBOOLEAN PIsLocalSystem);
 /**
  * Log a service message.
  *
@@ -1670,6 +1703,133 @@ FSP_API BOOLEAN FspServiceIsInteractive(VOID);
 FSP_API VOID FspServiceLog(ULONG Type, PWSTR Format, ...);
 FSP_API VOID FspServiceLogV(ULONG Type, PWSTR Format, va_list ap);
 
+/**
+ * @group Launch Control
+ */
+/**
+ * Call launcher pipe.
+ *
+ * This function is used to send a command to the launcher and receive a response.
+ *
+ * @param Command
+ *     Launcher command to send. For example, the 'L' launcher command instructs
+ *     the launcher to list all running service instances.
+ * @param Argc
+ *     Command argument count. May be 0.
+ * @param Argv
+ *     Command argument array. May be NULL.
+ * @param Argl
+ *     Command argument length array. May be NULL. If this is NULL all command arguments
+ *     are assumed to be NULL-terminated strings. It is also possible for specific arguments
+ *     to be NULL-terminated; in this case pass -1 in the corresponding Argl position.
+ * @param Buffer
+ *     Buffer that receives the command response. May be NULL.
+ * @param PSize
+ *     Pointer to a ULONG. On input it contains the size of the Buffer. On output it
+ *     contains the number of bytes transferred. May be NULL.
+ * @param PLauncherError
+ *     Receives the launcher error if any. This is always a Win32 error code. May not be NULL.
+ * @return
+ *     STATUS_SUCCESS if the command is sent successfully to the launcher, even if the launcher
+ *     returns an error. Other status codes indicate a communication error. Launcher errors are
+ *     reported through PLauncherError.
+ */
+FSP_API NTSTATUS FspLaunchCallLauncherPipe(
+    WCHAR Command, ULONG Argc, PWSTR *Argv, ULONG *Argl,
+    PWSTR Buffer, PULONG PSize, PULONG PLauncherError);
+/**
+ * Start a service instance.
+ *
+ * @param ClassName
+ *     Class name of the service instance to start.
+ * @param InstanceName
+ *     Instance name of the service instance to start.
+ * @param Argc
+ *     Service instance argument count. May be 0.
+ * @param Argv
+ *     Service instance argument array. May be NULL.
+ * @param HasSecret
+ *     Whether the last argument in Argv is assumed to be a secret (e.g. password) or not.
+ *     Secrets are passed to service instances through standard input rather than the command
+ *     line.
+ * @param PLauncherError
+ *     Receives the launcher error if any. This is always a Win32 error code. May not be NULL.
+ * @return
+ *     STATUS_SUCCESS if the command is sent successfully to the launcher, even if the launcher
+ *     returns an error. Other status codes indicate a communication error. Launcher errors are
+ *     reported through PLauncherError.
+ */
+FSP_API NTSTATUS FspLaunchStart(
+    PWSTR ClassName, PWSTR InstanceName, ULONG Argc, PWSTR *Argv0,
+    BOOLEAN HasSecret,
+    PULONG PLauncherError);
+/**
+ * Stop a service instance.
+ *
+ * @param ClassName
+ *     Class name of the service instance to stop.
+ * @param InstanceName
+ *     Instance name of the service instance to stop.
+ * @param PLauncherError
+ *     Receives the launcher error if any. This is always a Win32 error code. May not be NULL.
+ * @return
+ *     STATUS_SUCCESS if the command is sent successfully to the launcher, even if the launcher
+ *     returns an error. Other status codes indicate a communication error. Launcher errors are
+ *     reported through PLauncherError.
+ */
+FSP_API NTSTATUS FspLaunchStop(
+    PWSTR ClassName, PWSTR InstanceName,
+    PULONG PLauncherError);
+/**
+ * Get information about a service instance.
+ *
+ * The information is a list of NULL-terminated strings: the class name of the service instance,
+ * the instance name of the service instance and the full command line used to start the service
+ * instance.
+ *
+ * @param ClassName
+ *     Class name of the service instance to stop.
+ * @param InstanceName
+ *     Instance name of the service instance to stop.
+ * @param Buffer
+ *     Buffer that receives the command response. May be NULL.
+ * @param PSize
+ *     Pointer to a ULONG. On input it contains the size of the Buffer. On output it
+ *     contains the number of bytes transferred. May be NULL.
+ * @param PLauncherError
+ *     Receives the launcher error if any. This is always a Win32 error code. May not be NULL.
+ * @return
+ *     STATUS_SUCCESS if the command is sent successfully to the launcher, even if the launcher
+ *     returns an error. Other status codes indicate a communication error. Launcher errors are
+ *     reported through PLauncherError.
+ */
+FSP_API NTSTATUS FspLaunchGetInfo(
+    PWSTR ClassName, PWSTR InstanceName,
+    PWSTR Buffer, PULONG PSize,
+    PULONG PLauncherError);
+/**
+ * List service instances.
+ *
+ * The information is a list of pairs of NULL-terminated strings. Each pair contains the class
+ * name and instance name of a service instance. All currently running service instances are
+ * listed.
+ *
+ * @param Buffer
+ *     Buffer that receives the command response. May be NULL.
+ * @param PSize
+ *     Pointer to a ULONG. On input it contains the size of the Buffer. On output it
+ *     contains the number of bytes transferred. May be NULL.
+ * @param PLauncherError
+ *     Receives the launcher error if any. This is always a Win32 error code. May not be NULL.
+ * @return
+ *     STATUS_SUCCESS if the command is sent successfully to the launcher, even if the launcher
+ *     returns an error. Other status codes indicate a communication error. Launcher errors are
+ *     reported through PLauncherError.
+ */
+FSP_API NTSTATUS FspLaunchGetNameList(
+    PWSTR Buffer, PULONG PSize,
+    PULONG PLauncherError);
+
 /*
  * Utility
  */
@@ -1680,6 +1840,7 @@ FSP_API VOID FspEventLogV(ULONG Type, PWSTR Format, va_list ap);
 FSP_API VOID FspDebugLogSetHandle(HANDLE Handle);
 FSP_API VOID FspDebugLog(const char *Format, ...);
 FSP_API VOID FspDebugLogSD(const char *Format, PSECURITY_DESCRIPTOR SecurityDescriptor);
+FSP_API VOID FspDebugLogSid(const char *format, PSID Sid);
 FSP_API VOID FspDebugLogFT(const char *Format, PFILETIME FileTime);
 FSP_API VOID FspDebugLogRequest(FSP_FSCTL_TRANSACT_REQ *Request);
 FSP_API VOID FspDebugLogResponse(FSP_FSCTL_TRANSACT_RSP *Response);

inc/winfsp/winfsp.hpp

@@ -2,7 +2,7 @@
  * @file winfsp/winfsp.hpp
  * WinFsp C++ Layer.
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

opt/cygfuse/Makefile

@@ -22,7 +22,9 @@ cygport:
 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

@@ -1,7 +1,7 @@
 /**
  * @file cygfuse/cygfuse.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

opt/cygfuse/fuse.cygport

@@ -1,6 +1,6 @@
 NAME="fuse"
 VERSION=2.8
-RELEASE=6
+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

@@ -1,7 +1,7 @@
 /**
  * @file dll/debug.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -63,6 +63,21 @@ FSP_API VOID FspDebugLogSD(const char *format, PSECURITY_DESCRIPTOR SecurityDesc
         FspDebugLog(format, "invalid security descriptor");
 }
 
+FSP_API VOID FspDebugLogSid(const char *format, PSID Sid)
+{
+    char *S;
+
+    if (0 == Sid)
+        FspDebugLog(format, "null SID");
+    else if (ConvertSidToStringSidA(Sid, &S))
+    {
+        FspDebugLog(format, S);
+        LocalFree(S);
+    }
+    else
+        FspDebugLog(format, "invalid SID");
+}
+
 FSP_API VOID FspDebugLogFT(const char *format, PFILETIME FileTime)
 {
     SYSTEMTIME SystemTime;

src/dll/dirbuf.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/dirbuf.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/eventlog.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/eventlog.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fs.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fs.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -187,17 +187,62 @@ FSP_API VOID FspFileSystemDelete(FSP_FILE_SYSTEM *FileSystem)
     MemFree(FileSystem);
 }
 
+static NTSTATUS FspFileSystemLauncherDefineDosDevice(
+    WCHAR Sign, PWSTR MountPoint, PWSTR VolumeName)
+{
+    if (2 != lstrlenW(MountPoint) ||
+        FSP_FSCTL_VOLUME_NAME_SIZEMAX / sizeof(WCHAR) <= lstrlenW(VolumeName))
+        return STATUS_INVALID_PARAMETER;
+
+    WCHAR Argv0[4];
+    PWSTR Argv[2];
+    NTSTATUS Result;
+    ULONG ErrorCode;
+
+    Argv0[0] = Sign;
+    Argv0[1] = MountPoint[0];
+    Argv0[2] = MountPoint[1];
+    Argv0[3] = L'\0';
+
+    Argv[0] = Argv0;
+    Argv[1] = VolumeName;
+
+    Result = FspLaunchCallLauncherPipe('D', 2, Argv, 0, 0, 0, &ErrorCode);
+    return !NT_SUCCESS(Result) ? Result : FspNtStatusFromWin32(ErrorCode);
+}
+
 static NTSTATUS FspFileSystemSetMountPoint_Drive(PWSTR MountPoint, PWSTR VolumeName,
     PHANDLE PMountHandle)
 {
+    NTSTATUS Result;
+    BOOLEAN IsLocalSystem, IsServiceContext;
+
     *PMountHandle = 0;
 
+    Result = FspServiceContextCheck(0, &IsLocalSystem);
+    IsServiceContext = NT_SUCCESS(Result) && !IsLocalSystem;
+    if (IsServiceContext)
+    {
+        /*
+         * If the current process is in the service context but not LocalSystem,
+         * ask the launcher to DefineDosDevice for us. This is because the launcher
+         * runs in the LocalSystem context and can create global drives.
+         *
+         * In this case the launcher will also add DELETE access to the drive symlink
+         * for us, so that we can make it temporary below.
+         */
+        Result = FspFileSystemLauncherDefineDosDevice(L'+', MountPoint, VolumeName);
+        if (!NT_SUCCESS(Result))
+            return Result;
+    }
+    else
+    {
         if (!DefineDosDeviceW(DDD_RAW_TARGET_PATH, MountPoint, VolumeName))
             return FspNtStatusFromWin32(GetLastError());
+    }
 
     if (0 != FspNtOpenSymbolicLinkObject)
     {
-        NTSTATUS Result;
         WCHAR SymlinkBuf[6];
         UNICODE_STRING Symlink;
         OBJECT_ATTRIBUTES Obja;
@@ -224,6 +269,13 @@ static NTSTATUS FspFileSystemSetMountPoint_Drive(PWSTR MountPoint, PWSTR VolumeN
         }
     }
 
+    /* HACK:
+     *
+     * Handles do not use the low 2 bits (unless they are console handles).
+     * Abuse this fact to remember that we are running in the service context.
+     */
+    *PMountHandle = (HANDLE)(UINT_PTR)((DWORD)(UINT_PTR)*PMountHandle | IsServiceContext);
+
     return STATUS_SUCCESS;
 }
 
@@ -411,6 +463,16 @@ exit:
 
 static VOID FspFileSystemRemoveMountPoint_Drive(PWSTR MountPoint, PWSTR VolumeName, HANDLE MountHandle)
 {
+    BOOLEAN IsServiceContext = 0 != ((DWORD)(UINT_PTR)MountHandle & 1);
+    MountHandle = (HANDLE)(UINT_PTR)((DWORD)(UINT_PTR)MountHandle & ~1);
+    if (IsServiceContext)
+        /*
+         * If the current process is in the service context but not LocalSystem,
+         * ask the launcher to DefineDosDevice for us. This is because the launcher
+         * runs in the LocalSystem context and can remove global drives.
+         */
+        FspFileSystemLauncherDefineDosDevice(L'-', MountPoint, VolumeName);
+    else
         DefineDosDeviceW(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE,
             MountPoint, VolumeName);
 

src/dll/fsctl.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fsctl.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -284,7 +284,7 @@ static NTSTATUS FspFsctlFixServiceSecurity(HANDLE SvcHandle)
      * This function adds an ACE that allows Everyone to start a service.
      */
 
-    PSID WorldSid = 0;
+    PSID WorldSid;
     PSECURITY_DESCRIPTOR SecurityDescriptor = 0;
     PSECURITY_DESCRIPTOR NewSecurityDescriptor = 0;
     EXPLICIT_ACCESSW AccessEntry;
@@ -296,18 +296,12 @@ static NTSTATUS FspFsctlFixServiceSecurity(HANDLE SvcHandle)
     NTSTATUS Result;
 
     /* get the Everyone (World) SID */
-    Size = SECURITY_MAX_SID_SIZE;
+    WorldSid = FspWksidGet(WinWorldSid);
-    WorldSid = MemAlloc(Size);
     if (0 == WorldSid)
     {
         Result = STATUS_INSUFFICIENT_RESOURCES;
         goto exit;
     }
-    if (!CreateWellKnownSid(WinWorldSid, 0, WorldSid, &Size))
-    {
-        Result = FspNtStatusFromWin32(GetLastError());
-        goto exit;
-    }
 
     /* get the service security descriptor DACL */
     Size = 0;
@@ -394,7 +388,6 @@ static NTSTATUS FspFsctlFixServiceSecurity(HANDLE SvcHandle)
 exit:
     LocalFree(NewSecurityDescriptor);
     MemFree(SecurityDescriptor);
-    MemFree(WorldSid);
 
     return Result;
 }

src/dll/fsop.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fsop.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse/fuse.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -299,6 +299,7 @@ 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)
     {
@@ -340,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);
@@ -354,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 =
+                FspPosixUnixTimeToFileTime((void *)&stbuf.st_birthtim,
-                    Int32x32To64(stbuf.st_birthtim.tv_sec, 10000000) + 116444736000000000 +
+                    &f->VolumeParams.VolumeCreationTime);
-                    stbuf.st_birthtim.tv_nsec / 100;
             else
             if (0 != stbuf.st_ctim.tv_sec)
-                f->VolumeParams.VolumeCreationTime =
+                FspPosixUnixTimeToFileTime((void *)&stbuf.st_ctim,
-                    Int32x32To64(stbuf.st_ctim.tv_sec, 10000000) + 116444736000000000 +
+                    &f->VolumeParams.VolumeCreationTime);
-                    stbuf.st_ctim.tv_nsec / 100;
         }
     }
 

src/dll/fuse/fuse_compat.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_compat.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse/fuse_intf.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_intf.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -219,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;
@@ -291,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;
 
@@ -304,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
@@ -317,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)
@@ -390,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 =
+    FspPosixUnixTimeToFileTime((void *)&stbuf.st_birthtim, &FileInfo->CreationTime);
-        Int32x32To64(stbuf.st_birthtim.tv_sec, 10000000) + 116444736000000000 +
+    FspPosixUnixTimeToFileTime((void *)&stbuf.st_atim, &FileInfo->LastAccessTime);
-        stbuf.st_birthtim.tv_nsec / 100;
+    FspPosixUnixTimeToFileTime((void *)&stbuf.st_mtim, &FileInfo->LastWriteTime);
-    FileInfo->LastAccessTime =
+    FspPosixUnixTimeToFileTime((void *)&stbuf.st_ctim, &FileInfo->ChangeTime);
-        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;
     FileInfo->IndexNumber = stbuf.st_ino;
 
     return STATUS_SUCCESS;
@@ -738,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)
     {
@@ -794,15 +821,24 @@ static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
 
     Opened = TRUE;
 
-    if (Uid != context->uid || Gid != context->gid)
+    if (0 != FileAttributes &&
-        if (0 != f->ops.chown)
+        0 != (f->conn_want & FSP_FUSE_CAP_STAT_EX) && 0 != f->ops.chflags)
-        {
-            err = f->ops.chown(contexthdr->PosixPath, Uid, Gid);
-            if (0 != err)
     {
+        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;
     }
 
     /*
@@ -988,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);
 }
@@ -1241,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;
 
+    if (INVALID_FILE_ATTRIBUTES != FileAttributes &&
+        0 != (f->conn_want & FSP_FUSE_CAP_STAT_EX) && 0 != f->ops.chflags)
+    {
+        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;
+    }
+
+    if ((0 != LastAccessTime || 0 != LastWriteTime) &&
+        (0 != f->ops.utimens || 0 != f->ops.utime))
+    {
+        if (0 == LastAccessTime || 0 == LastWriteTime)
+        {
             Result = fsp_fuse_intf_GetFileInfoEx(FileSystem, filedesc->PosixPath, &fi,
                 &Uid, &Gid, &Mode, &FileInfoBuf);
             if (!NT_SUCCESS(Result))
                 return Result;
 
-    if (0 != LastAccessTime)
+            if (0 == LastAccessTime)
-        FileInfoBuf.LastAccessTime = LastAccessTime;
+                LastAccessTime = FileInfoBuf.LastAccessTime;
-    if (0 != LastWriteTime)
+            if (0 == LastWriteTime)
-        FileInfoBuf.LastWriteTime = LastWriteTime;
+                LastWriteTime = FileInfoBuf.LastWriteTime;
-
+        }
-    /* UNIX epoch in 100-ns intervals */
-    LastAccessTime = FileInfoBuf.LastAccessTime - 116444736000000000;
-    LastWriteTime = FileInfoBuf.LastWriteTime - 116444736000000000;
 
+        FspPosixFileTimeToUnixTime(LastAccessTime, (void *)&tv[0]);
+        FspPosixFileTimeToUnixTime(LastWriteTime, (void *)&tv[1]);
         if (0 != f->ops.utimens)
         {
-#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);
             Result = fsp_fuse_ntstatus_from_errno(f->env, err);
         }
         else
         {
-#if defined(_WIN64)
+            timbuf.actime = tv[0].tv_sec;
-        timbuf.actime = (int64_t)(LastAccessTime / 10000000);
+            timbuf.modtime = tv[1].tv_sec;
-        timbuf.modtime = (int64_t)(LastWriteTime / 10000000);
-#else
-        timbuf.actime = (int32_t)(LastAccessTime / 10000000);
-        timbuf.modtime = (int32_t)(LastWriteTime / 10000000);
-#endif
-
             err = f->ops.utime(filedesc->PosixPath, &timbuf);
             Result = fsp_fuse_ntstatus_from_errno(f->env, err);
         }
         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,

src/dll/fuse/fuse_main.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_main.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse/fuse_opt.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_opt.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/library.h
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/launch.c

@@ -0,0 +1,152 @@
+/**
+ * @file dll/launch.c
+ *
+ * @copyright 2015-2018 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 <dll/library.h>
+#include <launcher/launcher.h>
+
+FSP_API NTSTATUS FspLaunchCallLauncherPipe(
+    WCHAR Command, ULONG Argc, PWSTR *Argv, ULONG *Argl,
+    PWSTR Buffer, PULONG PSize, PULONG PLauncherError)
+{
+    PWSTR PipeBuf = 0, P;
+    ULONG Length, BytesTransferred;
+    NTSTATUS Result;
+    ULONG ErrorCode;
+
+    if (0 != PSize)
+        *PSize = 0;
+    *PLauncherError = 0;
+
+    PipeBuf = MemAlloc(LAUNCHER_PIPE_BUFFER_SIZE);
+    if (0 == PipeBuf)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    P = PipeBuf;
+    *P++ = Command;
+    for (ULONG I = 0; Argc > I; I++)
+        if (0 != Argv[I])
+        {
+            Length = 0 == Argl || -1 == Argl[I] ? lstrlenW(Argv[I]) : Argl[I];
+            if (LAUNCHER_PIPE_BUFFER_SIZE < ((ULONG)(P - PipeBuf) + Length + 1) * sizeof(WCHAR))
+            {
+                Result = STATUS_INVALID_PARAMETER;
+                goto exit;
+            }
+            memcpy(P, Argv[I], Length * sizeof(WCHAR)); P += Length; *P++ = L'\0';
+        }
+
+    Result = FspCallNamedPipeSecurely(L"" LAUNCHER_PIPE_NAME,
+        PipeBuf, (ULONG)(P - PipeBuf) * sizeof(WCHAR), PipeBuf, LAUNCHER_PIPE_BUFFER_SIZE,
+        &BytesTransferred, NMPWAIT_USE_DEFAULT_WAIT, LAUNCHER_PIPE_OWNER);
+    if (!NT_SUCCESS(Result))
+        goto exit;
+
+    Result = STATUS_SUCCESS;
+    ErrorCode = ERROR_BROKEN_PIPE; /* protocol error! */
+    if (sizeof(WCHAR) <= BytesTransferred)
+    {
+        if (LauncherSuccess == PipeBuf[0])
+        {
+            ErrorCode = 0;
+
+            if (0 != PSize)
+            {
+                BytesTransferred -= sizeof(WCHAR);
+                memcpy(Buffer, PipeBuf, *PSize < BytesTransferred ? *PSize : BytesTransferred);
+                *PSize = BytesTransferred;
+            }
+        }
+        else if (LauncherFailure == PipeBuf[0])
+        {
+            ErrorCode = 0;
+
+            for (PWSTR P = PipeBuf + 1, EndP = PipeBuf + BytesTransferred / sizeof(WCHAR); EndP > P; P++)
+            {
+                if (L'0' > *P || *P > L'9')
+                    break;
+                ErrorCode = 10 * ErrorCode + (*P - L'0');
+            }
+
+            if (0 == ErrorCode)
+                ErrorCode = ERROR_BROKEN_PIPE; /* protocol error! */
+        }
+    }
+
+    *PLauncherError = ErrorCode;
+
+exit:
+    MemFree(PipeBuf);
+
+    return Result;
+}
+
+FSP_API NTSTATUS FspLaunchStart(
+    PWSTR ClassName, PWSTR InstanceName, ULONG Argc, PWSTR *Argv0,
+    BOOLEAN HasSecret,
+    PULONG PLauncherError)
+{
+    PWSTR Argv[9 + 2];
+
+    if (9 < Argc)
+        return STATUS_INVALID_PARAMETER;
+
+    Argv[0] = ClassName;
+    Argv[1] = InstanceName;
+    memcpy(Argv + 2, Argv, Argc * sizeof(PWSTR));
+
+    return FspLaunchCallLauncherPipe(
+        HasSecret ? LauncherSvcInstanceStartWithSecret : LauncherSvcInstanceStart,
+        Argc + 2, Argv, 0, 0, 0, PLauncherError);
+}
+
+FSP_API NTSTATUS FspLaunchStop(
+    PWSTR ClassName, PWSTR InstanceName,
+    PULONG PLauncherError)
+{
+    PWSTR Argv[2];
+
+    Argv[0] = ClassName;
+    Argv[1] = InstanceName;
+
+    return FspLaunchCallLauncherPipe(LauncherSvcInstanceStop,
+        2, Argv, 0, 0, 0, PLauncherError);
+}
+
+FSP_API NTSTATUS FspLaunchGetInfo(
+    PWSTR ClassName, PWSTR InstanceName,
+    PWSTR Buffer, PULONG PSize,
+    PULONG PLauncherError)
+{
+    PWSTR Argv[2];
+
+    Argv[0] = ClassName;
+    Argv[1] = InstanceName;
+
+    return FspLaunchCallLauncherPipe(LauncherSvcInstanceInfo,
+        2, Argv, 0, Buffer, PSize, PLauncherError);
+}
+
+FSP_API NTSTATUS FspLaunchGetNameList(
+    PWSTR Buffer, PULONG PSize,
+    PULONG PLauncherError)
+{
+    return FspLaunchCallLauncherPipe(LauncherSvcInstanceList,
+        0, 0, 0, Buffer, PSize, PLauncherError);
+}

src/dll/library.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/library.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -44,6 +44,7 @@ BOOL WINAPI DllMain(HINSTANCE Instance, DWORD Reason, PVOID Reserved)
         FspServiceFinalize(Dynamic);
         FspEventLogFinalize(Dynamic);
         FspPosixFinalize(Dynamic);
+        FspWksidFinalize(Dynamic);
         break;
 
     case DLL_THREAD_DETACH:

src/dll/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/library.h
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -31,11 +31,15 @@
     FspDebugLog("[U] " LIBRARY_NAME "!" __FUNCTION__ ": " fmt "\n", __VA_ARGS__)
 #define DEBUGLOGSD(fmt, SD)             \
     FspDebugLogSD("[U] " LIBRARY_NAME "!" __FUNCTION__ ": " fmt "\n", SD)
+#define DEBUGLOGSID(fmt, Sid)           \
+    FspDebugLogSid("[U] " LIBRARY_NAME "!" __FUNCTION__ ": " fmt "\n", Sid)
 #else
 #define DEBUGLOG(fmt, ...)              ((void)0)
 #define DEBUGLOGSD(fmt, SD)             ((void)0)
+#define DEBUGLOGSID(fmt, Sid)           ((void)0)
 #endif
 
+VOID FspWksidFinalize(BOOLEAN Dynamic);
 VOID FspPosixFinalize(BOOLEAN Dynamic);
 VOID FspEventLogFinalize(BOOLEAN Dynamic);
 VOID FspServiceFinalize(BOOLEAN Dynamic);
@@ -49,6 +53,9 @@ NTSTATUS FspNpUnregister(VOID);
 NTSTATUS FspEventLogRegister(VOID);
 NTSTATUS FspEventLogUnregister(VOID);
 
+PSID FspWksidNew(WELL_KNOWN_SID_TYPE WellKnownSidType, PNTSTATUS PResult);
+PSID FspWksidGet(WELL_KNOWN_SID_TYPE WellKnownSidType);
+
 PWSTR FspDiagIdent(VOID);
 
 VOID FspFileSystemPeekInDirectoryBuffer(PVOID *PDirBuffer,

src/dll/np.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/np.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -35,6 +35,12 @@
  */
 #define FSP_NP_CREDENTIAL_MANAGER
 
+/*
+ * Define the following macro to register ourselves as the first network provider.
+ * Otherwise we will be registered as the last network provider.
+ */
+#define FSP_NP_ORDER_FIRST
+
 enum
 {
     FSP_NP_CREDENTIALS_NONE             = 0,
@@ -147,7 +153,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;
@@ -168,39 +174,17 @@ static inline BOOLEAN FspNpParseUserName(PWSTR RemoteName,
     return FALSE;
 }
 
-static inline DWORD FspNpCallLauncherPipe(PWSTR PipeBuf, ULONG SendSize, ULONG RecvSize)
+static inline DWORD FspNpCallLauncherPipe(
+    WCHAR Command, ULONG Argc, PWSTR *Argv, ULONG *Argl,
+    PWSTR Buffer, PULONG PSize)
 {
-    DWORD NpResult;
     NTSTATUS Result;
-    DWORD BytesTransferred;
+    ULONG ErrorCode;
 
-    Result = FspCallNamedPipeSecurely(L"" LAUNCHER_PIPE_NAME, PipeBuf, SendSize, PipeBuf, RecvSize,
+    Result = FspLaunchCallLauncherPipe(Command, Argc, Argv, Argl, Buffer, PSize, &ErrorCode);
-        &BytesTransferred, NMPWAIT_USE_DEFAULT_WAIT, LAUNCHER_PIPE_OWNER);
+    return !NT_SUCCESS(Result) ?
-
+        WN_NO_NETWORK :
-    if (!NT_SUCCESS(Result))
+        (ERROR_BROKEN_PIPE == ErrorCode ? WN_NO_NETWORK : ErrorCode);
-        NpResult = WN_NO_NETWORK;
-    else if (sizeof(WCHAR) > BytesTransferred)
-        NpResult = WN_NO_NETWORK;
-    else if (LauncherSuccess == PipeBuf[0])
-        NpResult = WN_SUCCESS;
-    else if (LauncherFailure == PipeBuf[0])
-    {
-        NpResult = 0;
-        for (PWSTR P = PipeBuf + 1, EndP = PipeBuf + BytesTransferred / sizeof(WCHAR); EndP > P; P++)
-        {
-            if (L'0' > *P || *P > L'9')
-                break;
-
-            NpResult = 10 * NpResult + (*P - L'0');
-        }
-
-        if (0 == NpResult)
-            NpResult = WN_NO_NETWORK;
-    }
-    else 
-        NpResult = WN_NO_NETWORK;
-
-    return NpResult;
 }
 
 static NTSTATUS FspNpGetVolumeList(
@@ -490,7 +474,9 @@ DWORD APIENTRY NPAddConnection(LPNETRESOURCEW lpNetResource, LPWSTR lpPassword,
     PWSTR ClassName, InstanceName, RemoteName, P;
     ULONG ClassNameLen, InstanceNameLen;
     DWORD CredentialsKind;
-    PWSTR PipeBuf = 0;
+    ULONG Argc;
+    PWSTR Argv[6];
+    ULONG Argl[6];
 #if defined(FSP_NP_CREDENTIAL_MANAGER)
     PCREDENTIALW Credential = 0;
 #endif
@@ -556,32 +542,24 @@ DWORD APIENTRY NPAddConnection(LPNETRESOURCEW lpNetResource, LPWSTR lpPassword,
         }
     }
 
-    PipeBuf = MemAlloc(LAUNCHER_PIPE_BUFFER_SIZE);
+    Argc = 0;
-    if (0 == PipeBuf)
+    Argv[Argc] = ClassName; Argl[Argc] = ClassNameLen; Argc++;
-    {
+    Argv[Argc] = InstanceName; Argl[Argc] = InstanceNameLen; Argc++;
-        NpResult = WN_OUT_OF_MEMORY;
+    Argv[Argc] = RemoteName; Argl[Argc] = -1; Argc++;
-        goto exit;
+    Argv[Argc] = LocalNameBuf; Argl[Argc] = -1; Argc++;
-    }
-
-    /* we do not explicitly check, but assumption is it all fits in LAUNCHER_PIPE_BUFFER_SIZE */
-    P = PipeBuf;
-    *P++ = FSP_NP_CREDENTIALS_NONE != CredentialsKind ?
-        LauncherSvcInstanceStartWithSecret : LauncherSvcInstanceStart;
-    memcpy(P, ClassName, ClassNameLen * sizeof(WCHAR)); P += ClassNameLen; *P++ = L'\0';
-    memcpy(P, InstanceName, InstanceNameLen * sizeof(WCHAR)); P += InstanceNameLen; *P++ = L'\0';
-    lstrcpyW(P, RemoteName); P += lstrlenW(RemoteName) + 1;
-    lstrcpyW(P, LocalNameBuf); P += lstrlenW(LocalNameBuf) + 1;
     if (FSP_NP_CREDENTIALS_USERPASS == CredentialsKind)
     {
-        lstrcpyW(P, lpUserName); P += lstrlenW(lpUserName) + 1;
+        Argv[Argc] = lpUserName; Argl[Argc] = -1; Argc++;
     }
     if (FSP_NP_CREDENTIALS_NONE != CredentialsKind)
     {
-        lstrcpyW(P, lpPassword); P += lstrlenW(lpPassword) + 1;
+        Argv[Argc] = lpPassword; Argl[Argc] = -1; Argc++;
     }
 
     NpResult = FspNpCallLauncherPipe(
-        PipeBuf, (ULONG)(P - PipeBuf) * sizeof(WCHAR), LAUNCHER_PIPE_BUFFER_SIZE);
+        FSP_NP_CREDENTIALS_NONE != CredentialsKind ?
+            LauncherSvcInstanceStartWithSecret : LauncherSvcInstanceStart,
+        Argc, Argv, Argl, 0, 0);
     switch (NpResult)
     {
     case WN_SUCCESS:
@@ -627,13 +605,13 @@ DWORD APIENTRY NPAddConnection(LPNETRESOURCEW lpNetResource, LPWSTR lpPassword,
                     break;
                 }
 
-                P = PipeBuf;
+                Argc = 0;
-                *P++ = LauncherSvcInstanceInfo;
+                Argv[Argc] = ClassName; Argl[Argc] = ClassNameLen; Argc++;
-                memcpy(P, ClassName, ClassNameLen * sizeof(WCHAR)); P += ClassNameLen; *P++ = L'\0';
+                Argv[Argc] = InstanceName; Argl[Argc] = InstanceNameLen; Argc++;
-                memcpy(P, InstanceName, InstanceNameLen * sizeof(WCHAR)); P += InstanceNameLen; *P++ = L'\0';
 
                 if (WN_SUCCESS != FspNpCallLauncherPipe(
-                    PipeBuf, (ULONG)(P - PipeBuf) * sizeof(WCHAR), LAUNCHER_PIPE_BUFFER_SIZE))
+                    LauncherSvcInstanceInfo,
+                    Argc, Argv, Argl, 0, 0))
                 {
                     /* looks like the file system is gone! */
                     NpResult = WN_NO_NETWORK;
@@ -677,8 +655,6 @@ DWORD APIENTRY NPAddConnection(LPNETRESOURCEW lpNetResource, LPWSTR lpPassword,
     }
 
 exit:
-    MemFree(PipeBuf);
-
 #if defined(FSP_NP_CREDENTIAL_MANAGER)
     if (0 != Credential)
         CredFree(Credential);
@@ -721,7 +697,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(
@@ -767,9 +743,11 @@ DWORD APIENTRY NPCancelConnection(LPWSTR lpName, BOOL fForce)
     DWORD NpResult;
     WCHAR RemoteNameBuf[sizeof(((FSP_FSCTL_VOLUME_PARAMS *)0)->Prefix) / sizeof(WCHAR)];
     DWORD RemoteNameSize;
-    PWSTR ClassName, InstanceName, RemoteName, P;
+    PWSTR ClassName, InstanceName, RemoteName;
     ULONG ClassNameLen, InstanceNameLen;
-    PWSTR PipeBuf = 0;
+    ULONG Argc;
+    PWSTR Argv[2];
+    ULONG Argl[2];
 
     if (FspNpCheckLocalName(lpName))
     {
@@ -789,17 +767,13 @@ DWORD APIENTRY NPCancelConnection(LPWSTR lpName, BOOL fForce)
         &ClassName, &ClassNameLen, &InstanceName, &InstanceNameLen))
         return WN_BAD_NETNAME;
 
-    PipeBuf = MemAlloc(LAUNCHER_PIPE_BUFFER_SIZE);
+    Argc = 0;
-    if (0 == PipeBuf)
+    Argv[Argc] = ClassName; Argl[Argc] = ClassNameLen; Argc++;
-        return WN_OUT_OF_MEMORY;
+    Argv[Argc] = InstanceName; Argl[Argc] = InstanceNameLen; Argc++;
-
-    P = PipeBuf;
-    *P++ = LauncherSvcInstanceStop;
-    memcpy(P, ClassName, ClassNameLen * sizeof(WCHAR)); P += ClassNameLen; *P++ = L'\0';
-    memcpy(P, InstanceName, InstanceNameLen * sizeof(WCHAR)); P += InstanceNameLen; *P++ = L'\0';
 
     NpResult = FspNpCallLauncherPipe(
-        PipeBuf, (ULONG)(P - PipeBuf) * sizeof(WCHAR), LAUNCHER_PIPE_BUFFER_SIZE);
+        LauncherSvcInstanceStop,
+        Argc, Argv, Argl, 0, 0);
     switch (NpResult)
     {
     case WN_SUCCESS:
@@ -812,8 +786,6 @@ DWORD APIENTRY NPCancelConnection(LPWSTR lpName, BOOL fForce)
         break;
     }
 
-    MemFree(PipeBuf);
-
     return NpResult;
 }
 
@@ -1016,7 +988,7 @@ NTSTATUS FspNpRegister(VOID)
     WCHAR ProviderPath[MAX_PATH];
     WCHAR RegBuffer[1024];
     PWSTR P, Part;
-    DWORD RegResult, RegType, RegBufferSize;
+    DWORD RegResult, RegType, RegBufferSize, RegBufferOffset;
     HKEY RegKey;
     BOOLEAN FoundProvider;
 
@@ -1082,15 +1054,20 @@ NTSTATUS FspNpRegister(VOID)
         return FspNtStatusFromWin32(RegResult);
 
     RegBufferSize = sizeof RegBuffer - sizeof L"," FSP_NP_NAME;
+#ifdef FSP_NP_ORDER_FIRST
+    RegBufferOffset = sizeof "" FSP_NP_NAME;
+#else
+    RegBufferOffset = 0;
+#endif
     RegResult = RegQueryValueExW(RegKey,
-        L"ProviderOrder", 0, &RegType, (PVOID)RegBuffer, &RegBufferSize);
+        L"ProviderOrder", 0, &RegType, (PVOID)&RegBuffer[RegBufferOffset], &RegBufferSize);
     if (ERROR_SUCCESS != RegResult)
         goto close_and_exit;
     RegBufferSize /= sizeof(WCHAR);
 
     FoundProvider = FALSE;
-    RegBuffer[RegBufferSize] = L'\0';
+    RegBuffer[RegBufferSize + RegBufferOffset] = L'\0';
-    P = RegBuffer, Part = P;
+    P = &RegBuffer[RegBufferOffset], Part = P;
     do
     {
         if (L',' == *P || '\0' == *P)
@@ -1107,8 +1084,11 @@ NTSTATUS FspNpRegister(VOID)
 
     if (!FoundProvider)
     {
-        P--;
+#ifdef FSP_NP_ORDER_FIRST
-        memcpy(P, L"," FSP_NP_NAME, sizeof L"," FSP_NP_NAME);
+        memcpy((PWSTR)RegBuffer, L"" FSP_NP_NAME ",", sizeof L"" FSP_NP_NAME);
+#else
+        memcpy(--P, L"," FSP_NP_NAME, sizeof L"," FSP_NP_NAME);
+#endif
 
         RegBufferSize = lstrlenW(RegBuffer);
         RegBufferSize++;

src/dll/ntstatus.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/ntstatus.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/path.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/path.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/posix.c

@@ -14,7 +14,7 @@
  * [SNAME]
  *     https://www.cygwin.com/cygwin-ug-net/using-specialnames.html
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -453,9 +453,12 @@ FSP_API NTSTATUS FspPosixMapPermissionsToSecurityDescriptor(
     if (!NT_SUCCESS(Result))
         goto exit;
 
-    Result = FspPosixMapUidToSid(0x10100, &WorldSid);
+    WorldSid = FspWksidGet(WinWorldSid);
-    if (!NT_SUCCESS(Result))
+    if (0 == WorldSid)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
         goto exit;
+    }
 
     OwnerPerm = (Mode & 0700) >> 6;
     GroupPerm = (Mode & 0070) >> 3;
@@ -579,9 +582,6 @@ exit:
 
     MemFree(Acl);
 
-    if (0 != WorldSid)
-        FspDeleteSid(WorldSid, FspPosixMapUidToSid);
-
     if (0 != GroupSid)
         FspDeleteSid(GroupSid, FspPosixMapUidToSid);
 
@@ -649,13 +649,19 @@ FSP_API NTSTATUS FspPosixMapSecurityDescriptorToPermissions(
 
     if (0 != Acl)
     {
-        Result = FspPosixMapUidToSid(0x10100, &WorldSid);
+        WorldSid = FspWksidGet(WinWorldSid);
-        if (!NT_SUCCESS(Result))
+        if (0 == WorldSid)
+        {
+            Result = STATUS_INSUFFICIENT_RESOURCES;
             goto exit;
+        }
 
-        Result = FspPosixMapUidToSid(11, &AuthUsersSid);
+        AuthUsersSid = FspWksidGet(WinAuthenticatedUserSid);
-        if (!NT_SUCCESS(Result))
+        if (0 == AuthUsersSid)
+        {
+            Result = STATUS_INSUFFICIENT_RESOURCES;
             goto exit;
+        }
 
         OwnerAllow = OwnerDeny = GroupAllow = GroupDeny = WorldAllow = WorldDeny = 0;
 
@@ -771,12 +777,6 @@ FSP_API NTSTATUS FspPosixMapSecurityDescriptorToPermissions(
     Result = STATUS_SUCCESS;
 
 exit:
-    if (0 != AuthUsersSid)
-        FspDeleteSid(AuthUsersSid, FspPosixMapUidToSid);
-
-    if (0 != WorldSid)
-        FspDeleteSid(WorldSid, FspPosixMapUidToSid);
-
     return Result;
 
 lasterror:

src/dll/security.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/security.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/service.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/service.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -566,6 +566,106 @@ FSP_API BOOLEAN FspServiceIsInteractive(VOID)
     return IsInteractive;
 }
 
+FSP_API NTSTATUS FspServiceContextCheck(HANDLE Token, PBOOLEAN PIsLocalSystem)
+{
+    NTSTATUS Result;
+    PSID LocalSystemSid, ServiceSid;
+    BOOLEAN IsLocalSystem = FALSE;
+    BOOL HasServiceSid = FALSE;
+    HANDLE ProcessToken = 0, ImpersonationToken = 0;
+    DWORD SessionId, Size;
+    union
+    {
+        TOKEN_USER V;
+        UINT8 B[128];
+    } UserInfoBuf;
+    PTOKEN_USER UserInfo = &UserInfoBuf.V;
+
+    LocalSystemSid = FspWksidGet(WinLocalSystemSid);
+    ServiceSid = FspWksidGet(WinServiceSid);
+    if (0 == LocalSystemSid || 0 == ServiceSid)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    if (0 == Token)
+    {
+        if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY | TOKEN_DUPLICATE, &ProcessToken) ||
+            !DuplicateToken(ProcessToken, SecurityImpersonation, &ImpersonationToken))
+        {
+            Result = FspNtStatusFromWin32(GetLastError());
+            goto exit;
+        }
+
+        Token = ImpersonationToken;
+    }
+
+    if (!GetTokenInformation(Token, TokenSessionId, &SessionId, sizeof SessionId, &Size))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    if (0 != SessionId)
+    {
+        Result = STATUS_ACCESS_DENIED;
+        goto exit;
+    }
+
+    if (!GetTokenInformation(Token, TokenUser, UserInfo, sizeof UserInfoBuf, &Size))
+    {
+        if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+        {
+            Result = FspNtStatusFromWin32(GetLastError());
+            goto exit;
+        }
+
+        UserInfo = MemAlloc(Size);
+        if (0 == UserInfo)
+        {
+            Result = STATUS_INSUFFICIENT_RESOURCES;
+            goto exit;
+        }
+
+        if (!GetTokenInformation(Token, TokenUser, UserInfo, Size, &Size))
+        {
+            Result = FspNtStatusFromWin32(GetLastError());
+            goto exit;
+        }
+    }
+
+    IsLocalSystem = EqualSid(LocalSystemSid, UserInfo->User.Sid);
+    if (IsLocalSystem)
+    {
+        Result = STATUS_SUCCESS;
+        goto exit;
+    }
+
+    if (!CheckTokenMembership(Token, ServiceSid, &HasServiceSid))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    Result = HasServiceSid ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
+
+exit:
+    if (0 != PIsLocalSystem)
+        *PIsLocalSystem = NT_SUCCESS(Result) ? IsLocalSystem : FALSE;
+
+    if (UserInfo != &UserInfoBuf.V)
+        MemFree(UserInfo);
+
+    if (0 != ImpersonationToken)
+        CloseHandle(ImpersonationToken);
+
+    if (0 != ProcessToken)
+        CloseHandle(ProcessToken);
+
+    return Result;
+}
+
 FSP_API VOID FspServiceLog(ULONG Type, PWSTR Format, ...)
 {
     va_list ap;

src/dll/util.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/util.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -97,26 +97,16 @@ FSP_API NTSTATUS FspCallNamedPipeSecurely(PWSTR PipeName,
     {
         PSECURITY_DESCRIPTOR SecurityDescriptor = 0;
         PSID OwnerSid, WellKnownSid = 0;
-        DWORD SidSize, LastError;
+        DWORD LastError;
 
         /* if it is a small number treat it like a well known SID */
         if (1024 > (INT_PTR)Sid)
         {
-            SidSize = SECURITY_MAX_SID_SIZE;
+            WellKnownSid = FspWksidNew((INT_PTR)Sid, &Result);
-            WellKnownSid = MemAlloc(SidSize);
             if (0 == WellKnownSid)
-            {
-                Result = STATUS_INSUFFICIENT_RESOURCES;
                 goto sid_exit;
         }
 
-            if (!CreateWellKnownSid((INT_PTR)Sid, 0, WellKnownSid, &SidSize))
-            {
-                Result = FspNtStatusFromWin32(GetLastError());
-                goto sid_exit;
-            }
-        }
-
         LastError = GetSecurityInfo(Pipe, SE_FILE_OBJECT,
             OWNER_SECURITY_INFORMATION, &OwnerSid, 0, 0, 0, &SecurityDescriptor);
         if (0 != LastError)

src/dll/wksid.c

@@ -0,0 +1,108 @@
+/**
+ * @file dll/wksid.c
+ *
+ * @copyright 2015-2018 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 <dll/library.h>
+
+static INIT_ONCE FspWksidInitOnce = INIT_ONCE_STATIC_INIT;
+static PSID FspWksidWorld;
+static PSID FspWksidAuthenticatedUser;
+static PSID FspWksidLocalSystem;
+static PSID FspWksidService;
+
+static BOOL WINAPI FspWksidInitialize(
+    PINIT_ONCE InitOnce, PVOID Parameter, PVOID *Context)
+{
+    FspWksidWorld = FspWksidNew(WinWorldSid, 0);
+    FspWksidAuthenticatedUser = FspWksidNew(WinAuthenticatedUserSid, 0);
+    FspWksidLocalSystem = FspWksidNew(WinLocalSystemSid, 0);
+    FspWksidService = FspWksidNew(WinServiceSid, 0);
+
+    //DEBUGLOGSID("FspWksidWorld=%s", FspWksidWorld);
+    //DEBUGLOGSID("FspWksidAuthenticatedUser=%s", FspWksidAuthenticatedUser);
+    //DEBUGLOGSID("FspWksidLocalSystem=%s", FspWksidLocalSystem);
+    //DEBUGLOGSID("FspWksidService=%s", FspWksidService);
+
+    return TRUE;
+}
+
+VOID FspWksidFinalize(BOOLEAN Dynamic)
+{
+    /*
+     * This function is called during DLL_PROCESS_DETACH. We must therefore keep
+     * finalization tasks to a minimum.
+     *
+     * We must deregister our event source (if any). We only do so if the library
+     * is being explicitly unloaded (rather than the process exiting).
+     */
+
+    if (Dynamic)
+    {
+        MemFree(FspWksidWorld); FspWksidWorld = 0;
+        MemFree(FspWksidAuthenticatedUser); FspWksidAuthenticatedUser = 0;
+        MemFree(FspWksidLocalSystem); FspWksidLocalSystem = 0;
+        MemFree(FspWksidService); FspWksidService = 0;
+    }
+}
+
+PSID FspWksidNew(WELL_KNOWN_SID_TYPE WellKnownSidType, PNTSTATUS PResult)
+{
+    NTSTATUS Result;
+    PSID Sid;
+    DWORD Size;
+
+    Size = SECURITY_MAX_SID_SIZE;
+    Sid = MemAlloc(Size);
+    if (0 == Sid)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    if (!CreateWellKnownSid(WellKnownSidType, 0, Sid, &Size))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        MemFree(Sid); Sid = 0;
+        goto exit;
+    }
+
+    Result = STATUS_SUCCESS;
+
+exit:
+    if (0 != PResult)
+        *PResult = Result;
+
+    return Sid;
+}
+
+PSID FspWksidGet(WELL_KNOWN_SID_TYPE WellKnownSidType)
+{
+    InitOnceExecuteOnce(&FspWksidInitOnce, FspWksidInitialize, 0, 0);
+
+    switch (WellKnownSidType)
+    {
+    case WinWorldSid:
+        return FspWksidWorld;
+    case WinAuthenticatedUserSid:
+        return FspWksidAuthenticatedUser;
+    case WinLocalSystemSid:
+        return FspWksidLocalSystem;
+    case WinServiceSid:
+        return FspWksidService;
+    default:
+        return 0;
+    }
+}

src/dotnet/FileSystemBase+Const.cs

@@ -1,7 +1,7 @@
 /*
  * dotnet/FileSystemBase+Const.cs
  *
- * Copyright 2015-2017 Bill Zissimopoulos
+ * Copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dotnet/FileSystemBase.cs

@@ -1,7 +1,7 @@
 /*
  * dotnet/FileSystemBase.cs
  *
- * Copyright 2015-2017 Bill Zissimopoulos
+ * Copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -983,6 +983,16 @@ namespace Fsp
             return Api.FspWin32FromNtStatus(Status);
         }
         /// <summary>
+        /// Gets the originating process ID.
+        /// </summary>
+        /// <remarks>
+        /// Valid only during Create, Open and Rename requests when the target exists.
+        /// </remarks>
+        public static int GetOperationProcessId()
+        {
+            return (int)Api.FspFileSystemOperationProcessId();
+        }
+        /// <summary>
         /// Modifies a security descriptor.
         /// </summary>
         /// <remarks>

src/dotnet/FileSystemHost.cs

@@ -1,7 +1,7 @@
 /*
  * dotnet/FileSystemHost.cs
  *
- * Copyright 2015-2017 Bill Zissimopoulos
+ * Copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dotnet/Interop.cs

@@ -1,7 +1,7 @@
 /*
  * dotnet/Interop.cs
  *
- * Copyright 2015-2017 Bill Zissimopoulos
+ * Copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -539,6 +539,8 @@ namespace Fsp.Interop
                 IntPtr FileSystem,
                 UInt32 DebugLog);
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+            internal delegate UInt32 FspFileSystemOperationProcessIdF();
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             [return: MarshalAs(UnmanagedType.U1)]
             internal delegate Boolean FspFileSystemAddDirInfo(
                 IntPtr DirInfo,
@@ -706,6 +708,7 @@ namespace Fsp.Interop
         internal static Proto.FspFileSystemMountPointF FspFileSystemMountPoint;
         internal static Proto.FspFileSystemSetOperationGuardStrategyF FspFileSystemSetOperationGuardStrategy;
         internal static Proto.FspFileSystemSetDebugLogF FspFileSystemSetDebugLog;
+        internal static Proto.FspFileSystemOperationProcessIdF FspFileSystemOperationProcessId;
         internal static Proto.FspFileSystemAddDirInfo _FspFileSystemAddDirInfo;
         internal static Proto.FspFileSystemFindReparsePoint FspFileSystemFindReparsePoint;
         internal static Proto.FspFileSystemResolveReparsePoints FspFileSystemResolveReparsePoints;
@@ -1015,6 +1018,7 @@ namespace Fsp.Interop
             FspFileSystemMountPoint = GetEntryPoint<Proto.FspFileSystemMountPointF>(Module);
             FspFileSystemSetOperationGuardStrategy = GetEntryPoint<Proto.FspFileSystemSetOperationGuardStrategyF>(Module);
             FspFileSystemSetDebugLog = GetEntryPoint<Proto.FspFileSystemSetDebugLogF>(Module);
+            FspFileSystemOperationProcessId = GetEntryPoint<Proto.FspFileSystemOperationProcessIdF>(Module);
             _FspFileSystemAddDirInfo = GetEntryPoint<Proto.FspFileSystemAddDirInfo>(Module);
             FspFileSystemFindReparsePoint = GetEntryPoint<Proto.FspFileSystemFindReparsePoint>(Module);
             FspFileSystemResolveReparsePoints = GetEntryPoint<Proto.FspFileSystemResolveReparsePoints>(Module);

src/dotnet/Service.cs

@@ -1,7 +1,7 @@
 /*
  * dotnet/Service.cs
  *
- * Copyright 2015-2017 Bill Zissimopoulos
+ * Copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/fsptool/fsptool.c

@@ -1,7 +1,7 @@
 /**
  * @file fsptool/fsptool.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/launcher/launchctl.c

@@ -1,7 +1,7 @@
 /**
  * @file launcher/launchctl.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/launcher/launcher.c

@@ -1,7 +1,7 @@
 /**
  * @file launcher/launcher.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -16,17 +16,30 @@
  */
 
 #include <launcher/launcher.h>
+#include <aclapi.h>
 #include <sddl.h>
+#include <userenv.h>
 
 #define PROGNAME                        "WinFsp.Launcher"
 
-BOOL CreateOverlappedPipe(
+static NTSTATUS (NTAPI *SvcNtOpenSymbolicLinkObject)(
-    PHANDLE PReadPipe, PHANDLE PWritePipe, PSECURITY_ATTRIBUTES SecurityAttributes, DWORD Size,
+    PHANDLE LinkHandle,
+    ACCESS_MASK DesiredAccess,
+    POBJECT_ATTRIBUTES ObjectAttributes);
+static NTSTATUS (NTAPI *SvcNtClose)(
+    HANDLE Handle);
+
+static BOOL CreateOverlappedPipe(
+    PHANDLE PReadPipe, PHANDLE PWritePipe,
+    DWORD Size,
+    BOOL ReadInherit, BOOL WriteInherit,
     DWORD ReadMode, DWORD WriteMode)
 {
     RPC_STATUS RpcStatus;
     UUID Uuid;
     WCHAR PipeNameBuf[MAX_PATH];
+    SECURITY_ATTRIBUTES ReadSecurityAttributes = { sizeof(SECURITY_ATTRIBUTES), 0, ReadInherit };
+    SECURITY_ATTRIBUTES WriteSecurityAttributes = { sizeof(SECURITY_ATTRIBUTES), 0, WriteInherit };
     HANDLE ReadPipe, WritePipe;
     DWORD LastError;
 
@@ -46,13 +59,13 @@ BOOL CreateOverlappedPipe(
     ReadPipe = CreateNamedPipeW(PipeNameBuf,
         PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE | ReadMode,
         PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT | PIPE_REJECT_REMOTE_CLIENTS,
-        1, Size, Size, 120 * 1000, SecurityAttributes);
+        1, Size, Size, 120 * 1000, &ReadSecurityAttributes);
     if (INVALID_HANDLE_VALUE == ReadPipe)
         return FALSE;
 
     WritePipe = CreateFileW(PipeNameBuf,
         GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
-        SecurityAttributes, OPEN_EXISTING, WriteMode, 0);
+        &WriteSecurityAttributes, OPEN_EXISTING, WriteMode, 0);
     if (INVALID_HANDLE_VALUE == WritePipe)
     {
         LastError = GetLastError();
@@ -67,6 +80,279 @@ BOOL CreateOverlappedPipe(
     return TRUE;
 }
 
+static NTSTATUS GetTokenUserName(HANDLE Token, PWSTR *PUserName)
+{
+    union
+    {
+        TOKEN_USER V;
+        UINT8 B[128];
+    } UserInfoBuf;
+    PTOKEN_USER UserInfo = &UserInfoBuf.V;
+    WCHAR Name[256], Domn[256];
+    DWORD UserSize, NameSize, DomnSize;
+    SID_NAME_USE Use;
+    PWSTR P;
+    NTSTATUS Result;
+
+    *PUserName = 0;
+
+    if (!GetTokenInformation(Token, TokenUser, UserInfo, sizeof UserInfoBuf, &UserSize))
+    {
+        if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+        {
+            Result = FspNtStatusFromWin32(GetLastError());
+            goto exit;
+        }
+
+        UserInfo = MemAlloc(UserSize);
+        if (0 == UserInfo)
+        {
+            Result = STATUS_INSUFFICIENT_RESOURCES;
+            goto exit;
+        }
+
+        if (!GetTokenInformation(Token, TokenUser, UserInfo, UserSize, &UserSize))
+        {
+            Result = FspNtStatusFromWin32(GetLastError());
+            goto exit;
+        }
+    }
+
+    NameSize = sizeof Name / sizeof Name[0];
+    DomnSize = sizeof Domn / sizeof Domn[0];
+    if (!LookupAccountSidW(0, UserInfo->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:
+    if (UserInfo != &UserInfoBuf.V)
+        MemFree(UserInfo);
+
+    return Result;
+}
+
+static NTSTATUS AddAccessForTokenUser(HANDLE Handle, DWORD Access, HANDLE Token)
+{
+    union
+    {
+        TOKEN_USER V;
+        UINT8 B[128];
+    } UserInfoBuf;
+    PTOKEN_USER UserInfo = &UserInfoBuf.V;
+    PSECURITY_DESCRIPTOR SecurityDescriptor = 0;
+    PSECURITY_DESCRIPTOR NewSecurityDescriptor = 0;
+    EXPLICIT_ACCESSW AccessEntry;
+    DWORD Size, LastError;
+    NTSTATUS Result;
+
+    if (!GetTokenInformation(Token, TokenUser, UserInfo, sizeof UserInfoBuf, &Size))
+    {
+        if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+        {
+            Result = FspNtStatusFromWin32(GetLastError());
+            goto exit;
+        }
+
+        UserInfo = MemAlloc(Size);
+        if (0 == UserInfo)
+        {
+            Result = STATUS_INSUFFICIENT_RESOURCES;
+            goto exit;
+        }
+
+        if (!GetTokenInformation(Token, TokenUser, UserInfo, Size, &Size))
+        {
+            Result = FspNtStatusFromWin32(GetLastError());
+            goto exit;
+        }
+    }
+
+    if (GetKernelObjectSecurity(Handle, DACL_SECURITY_INFORMATION, 0, 0, &Size))
+    {
+        Result = STATUS_INVALID_PARAMETER;
+        goto exit;
+    }
+    if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    SecurityDescriptor = MemAlloc(Size);
+    if (0 == SecurityDescriptor)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    if (!GetKernelObjectSecurity(Handle, DACL_SECURITY_INFORMATION, SecurityDescriptor, Size, &Size))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    AccessEntry.grfAccessPermissions = Access;
+    AccessEntry.grfAccessMode = GRANT_ACCESS;
+    AccessEntry.grfInheritance = NO_INHERITANCE;
+    AccessEntry.Trustee.pMultipleTrustee = 0;
+    AccessEntry.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+    AccessEntry.Trustee.TrusteeForm = TRUSTEE_IS_SID;
+    AccessEntry.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
+    AccessEntry.Trustee.ptstrName = UserInfo->User.Sid;
+
+    LastError = BuildSecurityDescriptorW(0, 0, 1, &AccessEntry, 0, 0, SecurityDescriptor,
+        &Size, &NewSecurityDescriptor);
+    if (0 != LastError)
+    {
+        Result = FspNtStatusFromWin32(LastError);
+        goto exit;
+    }
+
+    if (!SetKernelObjectSecurity(Handle, DACL_SECURITY_INFORMATION, NewSecurityDescriptor))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    Result = STATUS_SUCCESS;
+
+exit:
+    LocalFree(NewSecurityDescriptor);
+    MemFree(SecurityDescriptor);
+    if (UserInfo != &UserInfoBuf.V)
+        MemFree(UserInfo);
+
+    return Result;
+}
+
+static BOOL LogonCreateProcess(
+    PWSTR UserName,
+    LPCWSTR ApplicationName,
+    LPWSTR CommandLine,
+    LPSECURITY_ATTRIBUTES ProcessAttributes,
+    LPSECURITY_ATTRIBUTES ThreadAttributes,
+    BOOL InheritHandles,
+    DWORD CreationFlags,
+    LPVOID Environment,
+    LPCWSTR CurrentDirectory,
+    LPSTARTUPINFOW StartupInfo,
+    LPPROCESS_INFORMATION ProcessInformation)
+{
+    PWSTR DomainName = 0;
+
+    if (0 != UserName)
+    {
+        if (0 == invariant_wcsicmp(UserName, L"LocalSystem"))
+            UserName = 0;
+        else
+        if (0 == invariant_wcsicmp(UserName, L"LocalService") ||
+            0 == invariant_wcsicmp(UserName, L"NetworkService"))
+            DomainName = L"NT AUTHORITY";
+        else
+        {
+            SetLastError(ERROR_ACCESS_DENIED);
+            return FALSE;
+        }
+    }
+
+    if (0 == UserName)
+        /* without a user name go ahead and call CreateProcessW */
+        return CreateProcessW(
+            ApplicationName,
+            CommandLine,
+            ProcessAttributes,
+            ThreadAttributes,
+            InheritHandles,
+            CreationFlags,
+            Environment,
+            CurrentDirectory,
+            StartupInfo,
+            ProcessInformation);
+
+    HANDLE LogonToken = 0;
+    PVOID EnvironmentBlock = 0;
+    DWORD LastError;
+    BOOL Success;
+
+    Success = LogonUserW(
+        UserName,
+        DomainName,
+        0,
+        LOGON32_LOGON_SERVICE,
+        LOGON32_PROVIDER_DEFAULT,
+        &LogonToken);
+    if (!Success)
+        goto exit;
+
+    if (0 == Environment)
+    {
+        Success = CreateEnvironmentBlock(&EnvironmentBlock, LogonToken, FALSE);
+        if (!Success)
+            goto exit;
+
+        CreationFlags |= CREATE_UNICODE_ENVIRONMENT;
+        Environment = EnvironmentBlock;
+    }
+
+    Success = ImpersonateLoggedOnUser(LogonToken);
+    if (!Success)
+        goto exit;
+
+    Success = CreateProcessAsUserW(
+        LogonToken,
+        ApplicationName,
+        CommandLine,
+        ProcessAttributes,
+        ThreadAttributes,
+        InheritHandles,
+        CreationFlags,
+        Environment,
+        CurrentDirectory,
+        StartupInfo,
+        ProcessInformation);
+
+    if (!RevertToSelf())
+        /* should not happen! */
+        ExitProcess(GetLastError());
+
+exit:
+    if (!Success)
+        LastError = GetLastError();
+
+    if (0 != EnvironmentBlock)
+        DestroyEnvironmentBlock(EnvironmentBlock);
+    if (0 != LogonToken)
+        CloseHandle(LogonToken);
+
+    if (!Success)
+        SetLastError(LastError);
+
+    return Success;
+}
+
 typedef struct
 {
     HANDLE Process;
@@ -75,7 +361,7 @@ typedef struct
 
 static VOID CALLBACK KillProcessWait(PVOID Context, BOOLEAN Timeout);
 
-VOID KillProcess(ULONG ProcessId, HANDLE Process, ULONG Timeout)
+static VOID KillProcess(ULONG ProcessId, HANDLE Process, ULONG Timeout)
 {
     if (GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, ProcessId))
     {
@@ -142,6 +428,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 +507,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 +541,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;
@@ -251,6 +564,67 @@ static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Arg
     return STATUS_SUCCESS;
 }
 
+static NTSTATUS SvcInstanceAddUserRights(HANDLE Token,
+    PSECURITY_DESCRIPTOR SecurityDescriptor, PSECURITY_DESCRIPTOR *PNewSecurityDescriptor)
+{
+    PSECURITY_DESCRIPTOR NewSecurityDescriptor;
+    TOKEN_USER *User = 0;
+    EXPLICIT_ACCESSW AccessEntry;
+    DWORD Size, LastError;
+    NTSTATUS Result;
+
+    *PNewSecurityDescriptor = 0;
+
+    if (GetTokenInformation(Token, TokenUser, 0, 0, &Size))
+    {
+        Result = STATUS_INVALID_PARAMETER;
+        goto exit;
+    }
+    if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    User = MemAlloc(Size);
+    if (0 == User)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    if (!GetTokenInformation(Token, TokenUser, User, Size, &Size))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+    AccessEntry.grfAccessPermissions = SERVICE_QUERY_STATUS | SERVICE_STOP;
+    AccessEntry.grfAccessMode = GRANT_ACCESS;
+    AccessEntry.grfInheritance = NO_INHERITANCE;
+    AccessEntry.Trustee.pMultipleTrustee = 0;
+    AccessEntry.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+    AccessEntry.Trustee.TrusteeForm = TRUSTEE_IS_SID;
+    AccessEntry.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
+    AccessEntry.Trustee.ptstrName = User->User.Sid;
+
+    LastError = BuildSecurityDescriptorW(0, 0, 1, &AccessEntry, 0, 0, SecurityDescriptor,
+        &Size, &NewSecurityDescriptor);
+    if (0 != LastError)
+    {
+        Result = FspNtStatusFromWin32(LastError);
+        goto exit;
+    }
+
+    *PNewSecurityDescriptor = NewSecurityDescriptor;
+    Result = STATUS_SUCCESS;
+
+exit:
+    MemFree(User);
+
+    return Result;
+}
+
 static NTSTATUS SvcInstanceAccessCheck(HANDLE ClientToken, ULONG DesiredAccess,
     PSECURITY_DESCRIPTOR SecurityDescriptor)
 {
@@ -279,18 +653,35 @@ static NTSTATUS SvcInstanceAccessCheck(HANDLE ClientToken, ULONG DesiredAccess,
     return Result;
 }
 
-NTSTATUS SvcInstanceCreateProcess(PWSTR Executable, PWSTR CommandLine,
+static NTSTATUS SvcInstanceCreateProcess(PWSTR UserName,
+    PWSTR Executable, PWSTR CommandLine, PWSTR WorkDirectory,
     HANDLE StdioHandles[2],
     PPROCESS_INFORMATION ProcessInfo)
 {
+    WCHAR WorkDirectoryBuf[MAX_PATH];
     STARTUPINFOEXW StartupInfoEx;
     HANDLE ChildHandles[3] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0/* DO NOT CLOSE!*/ };
     HANDLE ParentHandles[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
-    SECURITY_ATTRIBUTES PipeAttributes = { sizeof(SECURITY_ATTRIBUTES), 0, TRUE };
     PPROC_THREAD_ATTRIBUTE_LIST AttrList = 0;
     SIZE_T Size;
     NTSTATUS Result;
 
+    if (0 != WorkDirectory && L'.' == WorkDirectory[0] && L'\0' == WorkDirectory[1])
+    {
+        PWSTR Backslash = 0, P;
+
+        if (0 == GetModuleFileNameW(0, WorkDirectoryBuf, MAX_PATH))
+            return FspNtStatusFromWin32(GetLastError());
+
+        for (P = WorkDirectoryBuf; *P; P++)
+            if (L'\\' == *P)
+                Backslash = P;
+        if (0 != Backslash && WorkDirectoryBuf < Backslash && L':' != Backslash[-1])
+            *Backslash = L'\0';
+
+        WorkDirectory = WorkDirectoryBuf;
+    }
+
     memset(&StartupInfoEx, 0, sizeof StartupInfoEx);
     StartupInfoEx.StartupInfo.cb = sizeof StartupInfoEx.StartupInfo;
 
@@ -304,16 +695,16 @@ NTSTATUS SvcInstanceCreateProcess(PWSTR Executable, PWSTR CommandLine,
          */
 
         /* create stdin read/write ends; make them inheritable */
-        if (!CreateOverlappedPipe(&ChildHandles[0], &ParentHandles[0], &PipeAttributes, 0,
+        if (!CreateOverlappedPipe(&ChildHandles[0], &ParentHandles[0],
-            0, 0))
+            0, TRUE, FALSE, 0, 0))
         {
             Result = FspNtStatusFromWin32(GetLastError());
             goto exit;
         }
 
         /* create stdout read/write ends; make them inheritable */
-        if (!CreateOverlappedPipe(&ParentHandles[1], &ChildHandles[1], &PipeAttributes, 0,
+        if (!CreateOverlappedPipe(&ParentHandles[1], &ChildHandles[1],
-            FILE_FLAG_OVERLAPPED, 0))
+            0, FALSE, TRUE, FILE_FLAG_OVERLAPPED, 0))
         {
             Result = FspNtStatusFromWin32(GetLastError());
             goto exit;
@@ -357,18 +748,44 @@ NTSTATUS SvcInstanceCreateProcess(PWSTR Executable, PWSTR CommandLine,
         StartupInfoEx.StartupInfo.hStdOutput = ChildHandles[1];
         StartupInfoEx.StartupInfo.hStdError = ChildHandles[2];
 
-        if (!CreateProcessW(Executable, CommandLine, 0, 0, TRUE,
+        if (!LogonCreateProcess(UserName,
-            CREATE_SUSPENDED | CREATE_NEW_PROCESS_GROUP | EXTENDED_STARTUPINFO_PRESENT, 0, 0,
+            Executable, CommandLine, 0, 0, TRUE,
+            CREATE_SUSPENDED | CREATE_NEW_PROCESS_GROUP | EXTENDED_STARTUPINFO_PRESENT,
+            0, WorkDirectory,
+            &StartupInfoEx.StartupInfo, ProcessInfo))
+        {
+            if (ERROR_NO_SYSTEM_RESOURCES != GetLastError())
+            {
+                Result = FspNtStatusFromWin32(GetLastError());
+                goto exit;
+            }
+
+            /*
+             * On Win7 CreateProcessW with EXTENDED_STARTUPINFO_PRESENT
+             * may fail with ERROR_NO_SYSTEM_RESOURCES.
+             *
+             * In that case go ahead and retry with a CreateProcessW with
+             * bInheritHandles==TRUE, but without EXTENDED_STARTUPINFO_PRESENT.
+             * Not ideal, but...
+             */
+            StartupInfoEx.StartupInfo.cb = sizeof StartupInfoEx.StartupInfo;
+            if (!LogonCreateProcess(UserName,
+                Executable, CommandLine, 0, 0, TRUE,
+                CREATE_SUSPENDED | CREATE_NEW_PROCESS_GROUP,
+                0, WorkDirectory,
                 &StartupInfoEx.StartupInfo, ProcessInfo))
             {
                 Result = FspNtStatusFromWin32(GetLastError());
                 goto exit;
             }
         }
+    }
     else
     {
-        if (!CreateProcessW(Executable, CommandLine, 0, 0, FALSE,
+        if (!LogonCreateProcess(UserName,
-            CREATE_SUSPENDED | CREATE_NEW_PROCESS_GROUP, 0, 0,
+            Executable, CommandLine, 0, 0, FALSE,
+            CREATE_SUSPENDED | CREATE_NEW_PROCESS_GROUP,
+            0, WorkDirectory,
             &StartupInfoEx.StartupInfo, ProcessInfo))
         {
             Result = FspNtStatusFromWin32(GetLastError());
@@ -411,10 +828,11 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
     HKEY RegKey = 0;
     DWORD RegResult, RegSize;
     DWORD ClassNameSize, InstanceNameSize;
-    WCHAR Executable[MAX_PATH], CommandLineBuf[512], SecurityBuf[512];
+    WCHAR Executable[MAX_PATH], CommandLineBuf[512], WorkDirectory[MAX_PATH],
+        SecurityBuf[512], RunAsBuf[64];
     PWSTR CommandLine, Security;
     DWORD JobControl, Credentials;
-    PSECURITY_DESCRIPTOR SecurityDescriptor = 0;
+    PSECURITY_DESCRIPTOR SecurityDescriptor = 0, NewSecurityDescriptor;
     PWSTR Argv[10];
     PROCESS_INFORMATION ProcessInfo;
     NTSTATUS Result;
@@ -488,6 +906,16 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
         CommandLine[-1] = L'\0';
     CommandLine = CommandLineBuf;
 
+    RegSize = sizeof WorkDirectory;
+    WorkDirectory[0] = L'\0';
+    RegResult = RegGetValueW(RegKey, ClassName, L"WorkDirectory", RRF_RT_REG_SZ, 0,
+        WorkDirectory, &RegSize);
+    if (ERROR_SUCCESS != RegResult && ERROR_FILE_NOT_FOUND != RegResult)
+    {
+        Result = FspNtStatusFromWin32(RegResult);
+        goto exit;
+    }
+
     Security = SecurityBuf + lstrlenW(SecurityBuf);
     RegSize = (DWORD)(sizeof SecurityBuf - (Security - SecurityBuf) * sizeof(WCHAR));
     RegResult = RegGetValueW(RegKey, ClassName, L"Security", RRF_RT_REG_SZ, 0,
@@ -498,6 +926,16 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
         goto exit;
     }
 
+    RegSize = sizeof RunAsBuf;
+    RunAsBuf[0] = L'\0';
+    RegResult = RegGetValueW(RegKey, ClassName, L"RunAs", RRF_RT_REG_SZ, 0,
+        RunAsBuf, &RegSize);
+    if (ERROR_SUCCESS != RegResult && ERROR_FILE_NOT_FOUND != RegResult)
+    {
+        Result = FspNtStatusFromWin32(RegResult);
+        goto exit;
+    }
+
     RegSize = sizeof JobControl;
     JobControl = 1; /* default is YES! */
     RegResult = RegGetValueW(RegKey, ClassName, L"JobControl", RRF_RT_REG_DWORD, 0,
@@ -529,6 +967,14 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
     if (!NT_SUCCESS(Result))
         goto exit;
 
+    Result = SvcInstanceAddUserRights(ClientToken, SecurityDescriptor, &NewSecurityDescriptor);
+    if (!NT_SUCCESS(Result))
+        goto exit;
+    LocalFree(SecurityDescriptor);
+    SecurityDescriptor = NewSecurityDescriptor;
+
+    //FspDebugLogSD(__FUNCTION__ ": SDDL = %s\n", SecurityDescriptor);
+
     ClassNameSize = (lstrlenW(ClassName) + 1) * sizeof(WCHAR);
     InstanceNameSize = (lstrlenW(InstanceName) + 1) * sizeof(WCHAR);
 
@@ -553,7 +999,8 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
     if (!NT_SUCCESS(Result))
         goto exit;
 
-    Result = SvcInstanceCreateProcess(Executable, SvcInstance->CommandLine,
+    Result = SvcInstanceCreateProcess(L'\0' != RunAsBuf[0] ? RunAsBuf : 0,
+        Executable, SvcInstance->CommandLine, L'\0' != WorkDirectory[0] ? WorkDirectory : 0,
         RedirectStdio ? SvcInstance->StdioHandles : 0, &ProcessInfo);
     if (!NT_SUCCESS(Result))
         goto exit;
@@ -624,6 +1071,9 @@ exit:
 
     LeaveCriticalSection(&SvcInstanceLock);
 
+    FspServiceLog(EVENTLOG_INFORMATION_TYPE,
+        L"create %s\\%s = %lx", ClassName, InstanceName, Result);
+
     return Result;
 }
 
@@ -657,6 +1107,9 @@ static VOID CALLBACK SvcInstanceTerminated(PVOID Context, BOOLEAN Timeout)
 {
     SVC_INSTANCE *SvcInstance = Context;
 
+    FspServiceLog(EVENTLOG_INFORMATION_TYPE,
+        L"terminated %s\\%s", SvcInstance->ClassName, SvcInstance->InstanceName);
+
     SvcInstanceRelease(SvcInstance);
 }
 
@@ -752,6 +1205,10 @@ exit:
 
     SvcInstanceRelease(SvcInstance);
 
+    if (STATUS_TIMEOUT == Result)
+        /* convert to an error! */
+        Result = 0x80070000 | ERROR_TIMEOUT;
+
     return Result;
 }
 
@@ -885,6 +1342,53 @@ NTSTATUS SvcInstanceStopAndWaitAll(VOID)
     return STATUS_SUCCESS;
 }
 
+NTSTATUS SvcDefineDosDevice(HANDLE ClientToken,
+    PWSTR DeviceName, PWSTR TargetPath)
+{
+    NTSTATUS Result;
+
+    if (L'+' != DeviceName[0] && L'-' != DeviceName[0])
+        return STATUS_INVALID_PARAMETER;
+
+    Result = FspServiceContextCheck(ClientToken, 0);
+    if (!NT_SUCCESS(Result))
+        return Result;
+
+    if (!DefineDosDeviceW(
+        DDD_RAW_TARGET_PATH |
+            (L'+' == DeviceName[0] ? 0 : DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE),
+        DeviceName + 1, TargetPath))
+        return FspNtStatusFromWin32(GetLastError());
+
+    if (L'+' == DeviceName[0] && 0 != SvcNtOpenSymbolicLinkObject)
+    {
+        /* The drive symlink now exists; add DELETE access to it for the ClientToken. */
+        WCHAR SymlinkBuf[6];
+        UNICODE_STRING Symlink;
+        OBJECT_ATTRIBUTES Obja;
+        HANDLE MountHandle;
+
+        memcpy(SymlinkBuf, L"\\??\\X:", sizeof SymlinkBuf);
+        SymlinkBuf[4] = DeviceName[1];
+        Symlink.Length = Symlink.MaximumLength = sizeof SymlinkBuf;
+        Symlink.Buffer = SymlinkBuf;
+
+        memset(&Obja, 0, sizeof Obja);
+        Obja.Length = sizeof Obja;
+        Obja.ObjectName = &Symlink;
+        Obja.Attributes = OBJ_CASE_INSENSITIVE;
+
+        Result = SvcNtOpenSymbolicLinkObject(&MountHandle, READ_CONTROL | WRITE_DAC, &Obja);
+        if (NT_SUCCESS(Result))
+        {
+            AddAccessForTokenUser(MountHandle, DELETE, ClientToken);
+            SvcNtClose(MountHandle);
+        }
+    }
+
+    return STATUS_SUCCESS;
+}
+
 static HANDLE SvcJob, SvcThread, SvcEvent;
 static DWORD SvcThreadId;
 static HANDLE SvcPipe = INVALID_HANDLE_VALUE;
@@ -918,6 +1422,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 +1488,9 @@ fail:
     if (0 != SvcJob)
         CloseHandle(SvcJob);
 
+    if (TLS_OUT_OF_INDEXES != SvcInstanceTlsKey)
+        TlsFree(SvcInstanceTlsKey);
+
     if (0 != SvcInstanceEvent)
         CloseHandle(SvcInstanceEvent);
 
@@ -1023,6 +1534,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 +1708,17 @@ 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;
+    PWSTR DeviceName, TargetPath;
     ULONG Argc; PWSTR Argv[9];
     BOOLEAN HasSecret = FALSE;
     NTSTATUS Result;
 
     *PSize = 0;
 
+    GetTokenUserName(ClientToken, &UserName);
+    SvcInstanceSetUserName(UserName);
+
     switch (*P++)
     {
     case LauncherSvcInstanceStartWithSecret:
@@ -1253,6 +1771,17 @@ static VOID SvcPipeTransact(HANDLE ClientToken, PWSTR PipeBuf, PULONG PSize)
         SvcPipeTransactResult(Result, PipeBuf, PSize);
         break;
 
+    case LauncherDefineDosDevice:
+        DeviceName = SvcPipeTransactGetPart(&P, PipeBufEnd);
+        TargetPath = SvcPipeTransactGetPart(&P, PipeBufEnd);
+
+        Result = STATUS_INVALID_PARAMETER;
+        if (0 != DeviceName && 0 != TargetPath)
+            Result = SvcDefineDosDevice(ClientToken, DeviceName, TargetPath);
+
+        SvcPipeTransactResult(Result, PipeBuf, PSize);
+        break;
+
 #if !defined(NDEBUG)
     case LauncherQuit:
         SetEvent(SvcEvent);
@@ -1264,10 +1793,26 @@ 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)
 {
+    HANDLE Handle = GetModuleHandleW(L"ntdll.dll");
+    if (0 != Handle)
+    {
+        SvcNtOpenSymbolicLinkObject = (PVOID)GetProcAddress(Handle, "NtOpenSymbolicLinkObject");
+        SvcNtClose = (PVOID)GetProcAddress(Handle, "NtClose");
+
+        if (0 == SvcNtOpenSymbolicLinkObject || 0 == SvcNtClose)
+        {
+            SvcNtOpenSymbolicLinkObject = 0;
+            SvcNtClose = 0;
+        }
+    }
+
     return FspServiceRun(L"" PROGNAME, SvcStart, SvcStop, 0);
 }
 

src/launcher/launcher.h

@@ -1,7 +1,7 @@
 /**
  * @file launcher/launcher.h
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -29,7 +29,7 @@
 
 #define LAUNCHER_PIPE_NAME              "\\\\.\\pipe\\WinFsp.{14E7137D-22B4-437A-B0C1-D21D1BDF3767}"
 #define LAUNCHER_PIPE_BUFFER_SIZE       4096
-#define LAUNCHER_PIPE_DEFAULT_TIMEOUT   3000
+#define LAUNCHER_PIPE_DEFAULT_TIMEOUT   (2 * 15000 + 1000)
 
 #define LAUNCHER_START_WITH_SECRET_TIMEOUT 15000
 
@@ -62,6 +62,7 @@ enum
     LauncherSvcInstanceStop             = 'T',  /* requires: SERVICE_STOP */
     LauncherSvcInstanceInfo             = 'I',  /* requires: SERVICE_QUERY_STATUS */
     LauncherSvcInstanceList             = 'L',  /* requires: none*/
+    LauncherDefineDosDevice             = 'D',
     LauncherQuit                        = 'Q',  /* DEBUG version only */
 
     LauncherSuccess                     = '$',

src/shared/minimal.h

@@ -1,7 +1,7 @@
 /**
  * @file shared/minimal.h
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/callbacks.c

@@ -2,7 +2,7 @@
  * @file sys/callbacks.c
  * Fast I/O and resource acquisition callbacks.
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/cleanup.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/cleanup.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/close.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/close.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/create.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/create.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -545,7 +545,7 @@ NTSTATUS FspFsvolCreatePrepare(
     SECURITY_CLIENT_CONTEXT SecurityClientContext;
     HANDLE UserModeAccessToken;
     PEPROCESS Process;
-    HANDLE ProcessId;
+    ULONG OriginatingProcessId;
     FSP_FILE_NODE *FileNode;
     FSP_FILE_DESC *FileDesc;
     PFILE_OBJECT FileObject;
@@ -579,15 +579,17 @@ NTSTATUS FspFsvolCreatePrepare(
         /* get a pointer to the current process so that we can close the impersonation token later */
         Process = PsGetCurrentProcess();
         ObReferenceObject(Process);
-        ProcessId = PsGetProcessId(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;
         ASSERT((UINT64)(UINT_PTR)UserModeAccessToken <= 0xffffffffULL);
-        ASSERT((UINT64)(UINT_PTR)ProcessId <= 0xffffffffULL);
+        ASSERT((UINT64)(UINT_PTR)OriginatingProcessId <= 0xffffffffULL);
         Request->Req.Create.AccessToken =
-            ((UINT64)(UINT_PTR)ProcessId << 32) | (UINT64)(UINT_PTR)UserModeAccessToken;
+            ((UINT64)(UINT_PTR)OriginatingProcessId << 32) | (UINT64)(UINT_PTR)UserModeAccessToken;
 
         return STATUS_SUCCESS;
     }

src/sys/debug.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/debug.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/devctl.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/devctl.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/device.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/device.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/dirctl.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/dirctl.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -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,12 +392,13 @@ 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 ?
+    PVOID Buffer = 0 == Irp->MdlAddress ?
-        Irp->AssociatedIrp.SystemBuffer : Irp->UserBuffer;
+        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);
@@ -485,194 +407,8 @@ static NTSTATUS FspFsvolQueryDirectoryRetry(
 
     ASSERT(FileNode == FileDesc->FileNode);
 
-    SystemBufferLength = 0 != Request ?
+    if (0 == Buffer)
-        (ULONG)(UINT_PTR)FspIopRequestContext(Request, RequestSystemBufferLength) : 0;
+        return 0 == Irp->MdlAddress ? STATUS_INVALID_PARAMETER : STATUS_INSUFFICIENT_RESOURCES;
-
-    /* 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);
-
-    /* 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;
-    }
-
-    /* buffer the user buffer! */
-    Result = FspFsvolQueryDirectoryBufferUserBuffer(
-        FsvolDeviceExtension, Irp, &SystemBufferLength);
-    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;
-    }
-
-    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 (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 >=
-            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;
 
     /* is this an allowed file information class? */
     switch (FileInformationClass)
@@ -698,14 +434,229 @@ 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);
 
+    /* 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
 {
     PDEVICE_OBJECT FsvolDeviceObject;
@@ -850,8 +801,6 @@ NTSTATUS FspFsvolDirectoryControlPrepare(
 {
     PAGED_CODE();
 
-    if (FspQueryDirectoryIrpShouldUseProcessBuffer(Irp, Request->Req.QueryDirectory.Length))
-    {
     NTSTATUS Result;
     PVOID Cookie;
     PVOID Address;
@@ -873,45 +822,6 @@ NTSTATUS FspFsvolDirectoryControlPrepare(
 
     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;
-    }
-}
 
 NTSTATUS FspFsvolDirectoryControlComplete(
     PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response)
@@ -935,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;
@@ -951,33 +860,14 @@ NTSTATUS FspFsvolDirectoryControlComplete(
         FSP_RETURN();
     }
 
-    if (FspFsctlTransactQueryDirectoryKind == Request->Kind)
+    if (0 != FspIopRequestContext(Request, RequestFileNode))
     {
-        if ((UINT_PTR)FspIopRequestContext(Request, RequestCookie) & 1)
+        FspIopRequestContext(Request, FspIopRequestExtraContext) = (PVOID)
-        {
+            FspFileNodeDirInfoChangeNumber(FileNode);
-            PVOID Address = FspIopRequestContext(Request, RequestAddress);
+        FspIopRequestContext(Request, RequestFileNode) = 0;
 
-            ASSERT(0 != Address);
+        FspFileNodeReleaseOwner(FileNode, Full, Request);
-            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;
-    }
-    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);
@@ -990,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,
@@ -1004,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,
@@ -1023,7 +913,6 @@ NTSTATUS FspFsvolDirectoryControlComplete(
 
         FspFileNodeConvertExclusiveToShared(FileNode, Full);
 
-        Request->Kind = FspFsctlTransactQueryDirectoryKind;
         FspIopResetRequest(Request, FspFsvolQueryDirectoryRequestFini);
 
         Request->Req.QueryDirectory.Address = 0;
@@ -1032,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 =
@@ -1047,7 +936,7 @@ NTSTATUS FspFsvolDirectoryControlComplete(
         }
 
         FspFileNodeSetOwner(FileNode, Full, Request);
-        FspIopRequestContext(Request, RequestIrp) = Irp;
+        FspIopRequestContext(Request, RequestFileNode) = FileNode;
 
         FspIoqPostIrp(FsvolDeviceExtension->Ioq, Irp, &Result);
     }
@@ -1069,10 +958,7 @@ static VOID FspFsvolQueryDirectoryRequestFini(FSP_FSCTL_TRANSACT_REQ *Request, P
 {
     PAGED_CODE();
 
-    PIRP Irp = Context[RequestIrp];
+    FSP_FILE_NODE *FileNode = Context[RequestFileNode];
-
-    if ((UINT_PTR)Context[RequestCookie] & 1)
-    {
     PVOID Cookie = (PVOID)((UINT_PTR)Context[RequestCookie] & ~1);
     PVOID Address = Context[RequestAddress];
     PEPROCESS Process = Context[RequestProcess];
@@ -1093,42 +979,10 @@ static VOID FspFsvolQueryDirectoryRequestFini(FSP_FSCTL_TRANSACT_REQ *Request, P
 
         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);
-    }
-
-    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(
     PDEVICE_OBJECT DeviceObject, PIRP Irp)

src/sys/driver.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/driver.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/driver.h

@@ -1,7 +1,7 @@
 /**
  * @file sys/driver.h
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -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)

src/sys/ea.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/ea.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/file.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/file.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -2166,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

@@ -1,7 +1,7 @@
 /**
  * @file sys/fileinfo.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -1573,7 +1573,7 @@ NTSTATUS FspFsvolSetInformationPrepare(
     SECURITY_CLIENT_CONTEXT SecurityClientContext;
     HANDLE UserModeAccessToken;
     PEPROCESS Process;
-    HANDLE ProcessId;
+    ULONG OriginatingProcessId;
 
     SecuritySubjectContext = FspIopRequestContext(Request, RequestSubjectContextOrAccessToken);
 
@@ -1605,15 +1605,17 @@ NTSTATUS FspFsvolSetInformationPrepare(
     /* get a pointer to the current process so that we can close the impersonation token later */
     Process = PsGetCurrentProcess();
     ObReferenceObject(Process);
-    ProcessId = PsGetProcessId(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;
     ASSERT((UINT64)(UINT_PTR)UserModeAccessToken <= 0xffffffffULL);
-    ASSERT((UINT64)(UINT_PTR)ProcessId <= 0xffffffffULL);
+    ASSERT((UINT64)(UINT_PTR)OriginatingProcessId <= 0xffffffffULL);
     Request->Req.SetInformation.Info.Rename.AccessToken =
-        ((UINT64)(UINT_PTR)ProcessId << 32) | (UINT64)(UINT_PTR)UserModeAccessToken;
+        ((UINT64)(UINT_PTR)OriginatingProcessId << 32) | (UINT64)(UINT_PTR)UserModeAccessToken;
 
     return STATUS_SUCCESS;
 }

src/sys/flush.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/flush.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/fsctl.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/fsctl.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/iop.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/iop.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -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/ioq.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/ioq.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/lockctl.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/lockctl.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/meta.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/meta.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -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;
+    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/name.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/name.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/psbuffer.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/psbuffer.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/read.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/read.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/security.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/security.c
  *
- * @copyright 2015-2017 Bill Zissimopoulos
+ * @copyright 2015-2018 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.