update changelog

When the kernel sends a `Create` message the WinFsp-FUSE layer creates
and opens the file (as per Windows semantics). Sometimes an additional
operation needs to be performed after the file has been opened, which
may fail. In this case the just opened file must be released.

In this particular case the WinFsp-FUSE layer used to call `release`
with an uninitialized path. This commit fixes the problem.

This problem was originally reported in cgofuse (billziss-gh/cgofuse#58)

.github/workflows/avm.yml

@@ -13,3 +13,4 @@ jobs:
         files: |
             https://github.com/billziss-gh/winfsp/releases/download/v1.6/winfsp-1.6.20027.msi
             https://github.com/billziss-gh/winfsp/releases/download/v1.7B1/winfsp-1.7.20038.msi
+            https://github.com/billziss-gh/winfsp/releases/download/v1.8/winfsp-1.8.20304.msi

Changelog.asciidoc

@@ -1,6 +1,104 @@
 = Changelog
 
 
+v1.10B2 (2021.1 Beta2)::
+
+Changes since v1.9:
+
+* [NEW] WinFsp now supports rebranding of the build products. This is primarily useful to commercial licensees. See https://github.com/billziss-gh/winfsp/wiki/WinFsp-Rebranding for more information.
+
+* [NEW] WinFsp-FUSE has a new method for determining file access in the case where the user's primary SID (Windows Security Identifier) and group SID are the same (for example, this can happen when someone uses a Microsoft account as their primary login).
+** Previously when the user SID and group SID were the same WinFsp-FUSE looked at the UNIX permissions for the owner and the UNIX permissions for the group and used the MOST restrictive permissions, which often resulted in inadvertent "access denied" errors. (For example, if the owner permission was `rw-` and the group permission was `---` the result was `---` and therefore access denied).
+** Going forward this behavior will change. The user and group mode permissions will not be considered together even in the case where the user SID and group SID are the same. This will resolve the access denied errors.
+** However to preserve backward compatibility (there might be some file systems that rely on the old behavior) we will do so in stages. For release v1.10 (2021.1) there is a new registry setting under `HKLM\SOFTWARE\WinFsp` (or `HKLM\SOFTWARE\WOW6432Node\WinFsp` on a 64-bit system) called `DistinctPermsForSameOwnerGroup`, which if set to 1 will direct WinFsp-FUSE to use the new behavior. The default value is 0 which directs WinFsp-FUSE to use the old behavior. This default will change in a future release.
+
+* [FIX] File share access when overwriting a file (e.g. when using `TRUNCATE_EXISTING`) is now done in a manner compatible with NTFS (previously there were cases when overwriting a file where behavior diverged from the NTFS one). (See GitHub issue #364.)
+
+* [FIX] Fixed a problem in the file system shutdown protocol which resolves an occasional access violation in the user mode file system process. Previously it was possible for a file system to crash when stopping itself using `FspFileSystemStopDispatcher`; this problem has been rectified. (See GitHub issue #369.)
+
+* [FIX] Fixed a problem in the FUSE layer where in some rare circumstances the `release` operation could be called with an uninitialized `path` argument. (See GitHub issue billziss-gh/cgofuse#58 and commit f51bdef53427d1bba688fb6c768792fdc22ffc7b).
+
+* [FIX] The `winfsp.h` header no longer defines `FILE_FULL_EA_INFORMATION` when compiled under mingw. This is because the mingw tool chain already includes a definition of this type. (GitHub PR #371. Thanks @lemourin.)
+
+
+v1.10B1 (2021.1 Beta1)::
+
+Changes since v1.9:
+
+* [NEW] WinFsp now supports rebranding of the build products. This is primarily useful to commercial licensees. See https://github.com/billziss-gh/winfsp/wiki/WinFsp-Rebranding for more information.
+
+* [NEW] WinFsp-FUSE has a new method for determining file access in the case where the user's primary SID (Windows Security Identifier) and group SID are the same (for example, this can happen when someone uses a Microsoft account as their primary login).
+** Previously when the user SID and group SID were the same WinFsp-FUSE looked at the UNIX permissions for the owner and the UNIX permissions for the group and used the MOST restrictive permissions, which often resulted in inadvertent "access denied" errors. (For example, if the owner permission was `rw-` and the group permission was `---` the result was `---` and therefore access denied).
+** Going forward this behavior will change. The user and group mode permissions will not be considered together even in the case where the user SID and group SID are the same. This will resolve the access denied errors.
+** However to preserve backward compatibility (there might be some file systems that rely on the old behavior) we will do so in stages. For release v1.10 (2021.1) there is a new registry setting under `HKLM\SOFTWARE\WinFsp` (or `HKLM\SOFTWARE\WOW6432Node\WinFsp` on a 64-bit system) called `DistinctPermsForSameOwnerGroup`, which if set to 1 will direct WinFsp-FUSE to use the new behavior. The default value is 0 which directs WinFsp-FUSE to use the old behavior. This default will change in a future release.
+
+* [FIX] File share access when overwriting a file (e.g. when using `TRUNCATE_EXISTING`) is now done in a manner compatible with NTFS (previously there were cases when overwriting a file where behavior diverged from the NTFS one). (See GitHub issue #364.)
+
+* [FIX] Fixed a problem in the file system shutdown protocol which resolves an occasional access violation in the user mode file system process. Previously it was possible for a file system to crash when stopping itself using `FspFileSystemStopDispatcher`; this problem has been rectified. (See GitHub issue #369.)
+
+* [FIX] The `winfsp.h` header no longer defines `FILE_FULL_EA_INFORMATION` when compiled under mingw. This is because the mingw tool chain already includes a definition of this type. (GitHub PR #371. Thanks @lemourin.)
+
+
+v1.9 (2021)::
+
+Changes since v1.8:
+
+* [NEW] WinFsp now supports file change notifications and cache invalidations. This functionality is offered via the following new API's:
+** Native API: `FspFileSystemNotify`
+** FUSE API: `fuse_notify`
+** .NET API: `FileSystemHost.Notify`
+
+* [NEW] A native file system (notifyfs) and a .NET file system (notifyfs-dotnet) have been added to showcase the new file change notification API.
+
+* [NEW] A new WinFsp-FUSE option `FileSecurity` has been added that allows the complete specification of file security descriptors using SDDL. (See GitHub issue https://github.com/rclone/rclone/issues/4717#issuecomment-767723287.)
+
+* [FIX] The FSD now correctly handles a rare situation where receiving too many CLOSE calls from the OS (e.g. when caching thousands of files) could result in a bogus "insufficient resources" error. (See commit 0af0bfbe7c45e353d693a2a45965d99fa81f2163.)
+
+* [FIX] WinFsp-FUSE correctly maps SID's from trusted domains to POSIX UID's in a multi-domain environment (using the "trustPosixOffset" attribute). Previously WinFsp-FUSE only handled SID's from the primary domain correctly.
+
+* [FIX] WinFsp-FUSE options such as `volname`, `VolumePrefix`, `FileSystemName`, `ExactFileSystemName` are now truncated when too long. (See GitHub issue #311.)
+
+* [FIX] The WinFsp driver is now started in a thread-safe manner if it is not already running. (See GitHub issue billziss-gh/cgofuse#51.)
+
+* [FIX] Credentials entered in the Credentials dialog (when mapping network drives) are no longer saved by default. (See GitHub PR #342. Thanks @gaotxg.)
+
+
+v1.9B2 (2021 Beta2)::
+
+Changes since v1.8:
+
+* [NEW] WinFsp now supports file change notifications and cache invalidations. This functionality is offered via the following new API's:
+** Native API: `FspFileSystemNotify`
+** FUSE API: `fuse_notify`
+** .NET API: `FileSystemHost.Notify`
+
+* [NEW] A native file system (notifyfs) and a .NET file system (notifyfs-dotnet) have been added to showcase the new file change notification API.
+
+* [NEW] A new WinFsp-FUSE option `FileSecurity` has been added that allows the complete specification of file security descriptors using SDDL. (See GitHub issue https://github.com/rclone/rclone/issues/4717#issuecomment-767723287.)
+
+* [FIX] The FSD now correctly handles a rare situation where receiving too many CLOSE calls from the OS (e.g. when caching thousands of files) could result in a bogus "insufficient resources" error. (See commit 0af0bfbe7c45e353d693a2a45965d99fa81f2163.)
+
+* [FIX] WinFsp-FUSE correctly maps SID's from trusted domains to POSIX UID's in a multi-domain environment (using the "trustPosixOffset" attribute). Previously WinFsp-FUSE only handled SID's from the primary domain correctly.
+
+* [FIX] WinFsp-FUSE options such as `volname`, `VolumePrefix`, `FileSystemName`, `ExactFileSystemName` are now truncated when too long. (See GitHub issue #311.)
+
+* [FIX] The WinFsp driver is now started in a thread-safe manner if it is not already running. (See GitHub issue billziss-gh/cgofuse#51.)
+
+* [FIX] Credentials entered in the Credentials dialog (when mapping network drives) are no longer saved by default. (See GitHub PR #342. Thanks @gaotxg.)
+
+
+v1.9B1 (2021 Beta1)::
+
+Changes since v1.8:
+
+* [NEW] WinFsp now supports file change notifications and cache invalidations. This functionality is offered via the following new API's:
+** Native API: `FspFileSystemNotify`
+** FUSE API: `fuse_notify`
+** .NET API: `FileSystemHost.Notify`
+
+* [FIX] WinFsp-FUSE correctly maps SID's from trusted domains to POSIX UID's in a multi-domain environment (using the "trustPosixOffset" attribute). Previously WinFsp-FUSE only handled SID's from the primary domain correctly.
+
+
 v1.8 (2020.2)::
 
 Changes since v1.7:

Contributors.asciidoc

@@ -54,6 +54,7 @@ This CONTRIBUTOR AGREEMENT applies to any contribution that you make to the WinF
 CONTRIBUTOR LIST
 ----------------
 |===
+|Alberto Alonso                                                 |alberto at alonso.xyz
 |Ben Rubson                                                     |ben.rubson at gmail.com
 |Bill Zissimopoulos                                             |billziss at navimatics.com
 |Brett Dutro                                                    |brett.dutro at gmail.com
@@ -64,8 +65,10 @@ CONTRIBUTOR LIST
 |Gal Hammer (Red Hat, https://www.redhat.com)                   |ghammer at redhat.com
 |John Oberschelp                                                |john at oberschelp.net
 |John Tyner                                                     |jtyner at gmail.com
+|Paweł Wegner (Google LLC, https://google.com)                  |lemourin at google.com
 |Pedro Frejo (Arpa System, https://arpasystem.com)              |pedro.frejo at arpasystem.com
 |Sam Kelly (DuroSoft Technologies LLC, https://durosoft.com)    |sam at durosoft.com
 |Santiago Ganis                                                 |sganis at gmail.com
 |Tobias Urlaub                                                  |saibotu at outlook.de
+|Victor Gao                                                     |victgm at outlook.com
 |===

README.md

@@ -1,8 +1,8 @@
 <h1 align="center">
+    <img src="art/winfsp-glow.png" width="256"/>
+    <br/>
+    <br/>
     WinFsp &middot; Windows File System Proxy
-    <a href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fgithub.com%2Fbillziss-gh%2Fwinfsp&text=Do%20you%20want%20to%20write%20a%20file%20system%20on%20Windows%3F%20WinFsp%20is%20well%20tested%2C%20very%20fast%20and%20easy%20to%20use%21&hashtags=windows%2Cfilesystem">
-        <img src="https://img.shields.io/twitter/url/http/shields.io.svg?style=social&label=Share"/>
-    </a>
 </h1>
 
 <p align="center">
@@ -17,24 +17,12 @@
         <img src="https://img.shields.io/badge/choco-install%20winfsp-black.svg?style=for-the-badge"/>
     </a>
     <br/>
-    <b>Quick Links</b><br/>
-    <a href="#benefits">Benefits</a> |
-    <a href="https://github.com/billziss-gh/winfsp/wiki">Wiki</a> |
-    <a href="https://groups.google.com/forum/#!forum/winfsp">Questions</a> |
-    <a href="https://twitter.com/BZissimopoulos">Author's Twitter</a>
-    <br/>
     <br/>
     <a href="https://ci.appveyor.com/project/billziss-gh/winfsp">
         <img src="https://img.shields.io/appveyor/ci/billziss-gh/winfsp.svg"/>
     </a>
     <br/>
     <br/>
-    <b>Check out my new kernel driver project <a href="https://github.com/billziss-gh/winspd">WinSpd</a>.</b>
-    <br/>
-    <br/>
-</p>
-
-<p align="center">
     WinFsp is a set of software components for Windows computers that allows the creation of user mode file systems. In this sense it is similar to FUSE (Filesystem in Userspace), which provides the same functionality on UNIX-like computers.
     <br/>
     <br/>

appveyor.yml

@@ -1,6 +1,8 @@
 version: '{build}'
 
 environment:
+  # Disable the winfsp-tests built-in exception filter to allow WER to collect dumps.
+  WINFSP_TESTS_EXCEPTION_FILTER_DISABLE: 1
   matrix:
   - CONFIGURATION: Debug
     TESTING: Func
@@ -15,18 +17,25 @@ init:
 #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 install:
+# Hack to make WDK 1903 work on VS2015.
+# See https://github.com/appveyor-tests/WDK-10.0.14393.0/blob/31cf12217fe0c92b218c70d7027dfe145be4f4cb/appveyor.yml#L7
 - ps: |
-    # Hack to make WDK 1903 work on VS2015.
-    # See https://github.com/appveyor-tests/WDK-10.0.14393.0/blob/31cf12217fe0c92b218c70d7027dfe145be4f4cb/appveyor.yml#L7
     [xml]$targets = get-content "C:\Program Files (x86)\Windows Kits\10\build\WindowsDriver.Common.targets"
     $usingTask = $targets.ChildNodes[1].UsingTask | ? {$_.TaskName -eq "ValidateNTTargetVersion"}
     $usingTask.AssemblyFile = '$(WDKContentRoot)build\bin\Microsoft.DriverKit.Build.Tasks.16.0.dll'
     $targets.Save("C:\Program Files (x86)\Windows Kits\10\build\WindowsDriver.Common.targets")
+# Submodules
 - git submodule update --init --recursive
+# Kernel and user mode dumps
+- if exist %SystemRoot%\memory.dmp del %SystemRoot%\memory.dmp
+- if exist C:\projects\LocalDumps rmdir /s/q C:\projects\LocalDumps
+- mkdir C:\projects\LocalDumps
+- reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps" /v DumpFolder /t REG_EXPAND_SZ /d C:\projects\LocalDumps /f
+- reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps" /v DumpType /t REG_DWORD /d 2 /f
+# Boot configuration
 - appveyor AddMessage "Change boot configuration and reboot" -Category Information
 - bcdedit /set testsigning on
 - if %TESTING%==Func verifier /standard /driver winfsp-x64.sys
-- if exist %SystemRoot%\memory.dmp del %SystemRoot%\memory.dmp
 - ps: Restart-Computer -Force
 - ps: Start-Sleep -s 60
 
@@ -53,9 +62,11 @@ test_script:
 - 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
 
 on_finish:
-- if exist %SystemRoot%\memory.dmp (7z a memory.dmp.zip %SystemRoot%\memory.dmp && appveyor PushArtifact memory.dmp.zip)
 - verifier /query
+- if exist %SystemRoot%\memory.dmp (7z a km.dmp.zip %SystemRoot%\memory.dmp && appveyor PushArtifact km.dmp.zip)
+- dir /a/b C:\projects\LocalDumps | findstr "^" && (7z a um.dmp.zip C:\projects\LocalDumps && appveyor PushArtifact um.dmp.zip) || ver>nul
+- if exist *.dmp.zip (7z a sym.pdb.zip build\VStudio\build\%CONFIGURATION%\*.pdb && appveyor PushArtifact sym.pdb.zip)
+- if exist *.dmp.zip exit 1
 #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

build/VStudio/dotnet/winfsp.net.csproj

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <ProjectName>winfsp.net</ProjectName>
     <RootNamespace>Fsp</RootNamespace>
-    <AssemblyName>winfsp-msil</AssemblyName>
+    <AssemblyName>$(MyProductFileName)-msil</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -25,7 +25,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\winfsp-msil.xml</DocumentationFile>
+    <DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\$(MyProductFileName)-msil.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -38,7 +38,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\winfsp-msil.xml</DocumentationFile>
+    <DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\$(MyProductFileName)-msil.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup>

build/VStudio/installer/CustomActions/CustomActions.cpp

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

build/VStudio/installer/Product.wxs

@@ -20,7 +20,7 @@
             AllowSameVersionUpgrades="no"
             DisallowUpgradeErrorMessage="An older version of $(var.MyProductName) is already installed. You must uninstall it before you can install this version."
             DowngradeErrorMessage="A newer version of $(var.MyProductName) is already installed." />
-        <Media Id="1" Cabinet="WinFsp.cab" EmbedCab="yes" />
+        <Media Id="1" Cabinet="$(var.MyProductName).cab" EmbedCab="yes" />
 
         <Property Id="P.LauncherName">$(var.MyProductName).Launcher</Property>
         <Property Id="P.LauncherRegistryKey">Software\$(var.MyProductName)\Services</Property>
@@ -36,7 +36,7 @@
 
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLDIR" Name="WinFsp">
+                <Directory Id="INSTALLDIR" Name="$(var.MyProductName)">
                     <Directory Id="BINDIR" Name="bin" />
                     <Directory Id="INCDIR" Name="inc" />
                     <Directory Id="LIBDIR" Name="lib" />
@@ -55,54 +55,54 @@
                     Name="InstallDir"
                     Type="string"
                     Value="[INSTALLDIR]" />
-                <dep:Provides Key="WinFsp" />
+                <dep:Provides Key="$(var.MyProductName)" />
             </Component>
             <Component Id="C.License.txt">
                 <File Name="License.txt" Source="..\..\..\License.txt" KeyPath="yes" />
             </Component>
         </DirectoryRef>
         <DirectoryRef Id="BINDIR" FileSource="..\build\$(var.Configuration)">
-            <Component Id="C.winfsp_x64.sys">
+            <Component Id="C.$(var.MyProductFileName)_x64.sys">
-                <File Name="winfsp-x64.sys" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x64.sys" KeyPath="yes" />
             </Component>
-            <Component Id="C.winfsp_x86.sys">
+            <Component Id="C.$(var.MyProductFileName)_x86.sys">
-                <File Name="winfsp-x86.sys" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x86.sys" KeyPath="yes" />
             </Component>
 
-            <!-- On Win64 register winfsp-x64.dll -->
+            <!-- On Win64 register $(var.MyProductFileName)-x64.dll -->
-            <Component Id="C.winfsp_x64.dll.selfreg" Guid="F0A67746-1A9C-4976-8EC0-882E9407FA6D">
+            <Component Id="C.$(var.MyProductFileName)_x64.dll.selfreg" Guid="F0A67746-1A9C-4976-8EC0-882E9407FA6D">
-                <File Id="FILE.winfsp_x64.dll.selfreg" Name="winfsp-x64.dll" KeyPath="yes" SelfRegCost="1" />
+                <File Id="FILE.$(var.MyProductFileName)_x64.dll.selfreg" Name="$(var.MyProductFileName)-x64.dll" KeyPath="yes" SelfRegCost="1" />
                 <Condition>VersionNT64</Condition>
             </Component>
-            <Component Id="C.winfsp_x86.dll" Guid="950492FB-12F7-4E27-9124-8325A2BC9927">
+            <Component Id="C.$(var.MyProductFileName)_x86.dll" Guid="950492FB-12F7-4E27-9124-8325A2BC9927">
-                <File Name="winfsp-x86.dll" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x86.dll" KeyPath="yes" />
                 <Condition>VersionNT64</Condition>
             </Component>
 
-            <!-- On Win32 register winfsp-x86.dll -->
+            <!-- On Win32 register $(var.MyProductFileName)-x86.dll -->
-            <Component Id="C.winfsp_x64.dll" Guid="4D6E7A8E-0CA6-49BE-B312-1EDADE725756">
+            <Component Id="C.$(var.MyProductFileName)_x64.dll" Guid="4D6E7A8E-0CA6-49BE-B312-1EDADE725756">
-                <File Name="winfsp-x64.dll" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x64.dll" KeyPath="yes" />
                 <Condition>NOT VersionNT64</Condition>
             </Component>
-            <Component Id="C.winfsp_x86.dll.selfreg" Guid="F0DEF7A6-AF55-419F-A58A-DF4018C6FA73">
+            <Component Id="C.$(var.MyProductFileName)_x86.dll.selfreg" Guid="F0DEF7A6-AF55-419F-A58A-DF4018C6FA73">
-                <File Id="FILE.winfsp_x86.dll.selfreg" Name="winfsp-x86.dll" KeyPath="yes" SelfRegCost="1" />
+                <File Id="FILE.$(var.MyProductFileName)_x86.dll.selfreg" Name="$(var.MyProductFileName)-x86.dll" KeyPath="yes" SelfRegCost="1" />
                 <Condition>NOT VersionNT64</Condition>
             </Component>
 
             <!-- install assembly -->
-            <Component Id="C.winfsp_msil.dll" Guid="0D8BA6AE-9F87-402B-AE1A-95B0AE3BE179">
+            <Component Id="C.$(var.MyProductFileName)_msil.dll" Guid="0D8BA6AE-9F87-402B-AE1A-95B0AE3BE179">
-                <File Id="FILE.winfsp_msil.dll" Name="winfsp-msil.dll" KeyPath="yes" />
+                <File Id="FILE.$(var.MyProductFileName)_msil.dll" Name="$(var.MyProductFileName)-msil.dll" KeyPath="yes" />
             </Component>
-            <Component Id="C.winfsp_msil.xml" Guid="1657F707-C112-454C-91AE-0FDEBBF454AB">
+            <Component Id="C.$(var.MyProductFileName)_msil.xml" Guid="1657F707-C112-454C-91AE-0FDEBBF454AB">
-                <File Id="FILE.winfsp_msil.xml" Name="winfsp-msil.xml" KeyPath="yes" />
+                <File Id="FILE.$(var.MyProductFileName)_msil.xml" Name="$(var.MyProductFileName)-msil.xml" KeyPath="yes" />
             </Component>
             <!--
-            <Component Id="C.winfsp_msil.dll.GAC" Guid="6469467D-8C90-4889-8138-4028F9DA6E85">
+            <Component Id="C.$(var.MyProductFileName)_msil.dll.GAC" Guid="6469467D-8C90-4889-8138-4028F9DA6E85">
-                <File Id="FILE.winfsp_msil.dll.GAC" Name="winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
+                <File Id="FILE.$(var.MyProductFileName)_msil.dll.GAC" Name="$(var.MyProductFileName)-msil.dll" KeyPath="yes" Assembly=".net" />
             </Component>
-            <Component Id="C.policy.winfsp_msil.dll.GAC">
+            <Component Id="C.policy.$(var.MyProductFileName)_msil.dll.GAC">
-                <File Name="policy.1.0.winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
+                <File Name="policy.1.0.$(var.MyProductFileName)-msil.dll" KeyPath="yes" Assembly=".net" />
-                <File Name="policy.1.0.winfsp-msil.config" KeyPath="no" />
+                <File Name="policy.1.0.$(var.MyProductFileName)-msil.config" KeyPath="no" />
             </Component>
             -->
 
@@ -297,11 +297,11 @@
             </Directory>
         </DirectoryRef>
         <DirectoryRef Id="LIBDIR" FileSource="..\build\$(var.Configuration)">
-            <Component Id="C.winfsp_x64.lib">
+            <Component Id="C.$(var.MyProductFileName)_x64.lib">
-                <File Name="winfsp-x64.lib" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x64.lib" KeyPath="yes" />
             </Component>
-            <Component Id="C.winfsp_x86.lib">
+            <Component Id="C.$(var.MyProductFileName)_x86.lib">
-                <File Name="winfsp-x86.lib" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x86.lib" KeyPath="yes" />
             </Component>
 
             <!-- On Win64 copy fuse-x64.pc -->
@@ -538,19 +538,44 @@
                     <File Name="passthrough-dotnet.csproj" KeyPath="yes" />
                 </Component>
             </Directory>
+            <Directory Id="SMPDIR.notifyfs" Name="notifyfs">
+                <Component Id="C.notifyfs.c">
+                    <File Name="notifyfs.c" KeyPath="yes" />
+                </Component>
+                <Component Id="C.notifyfs.sln">
+                    <File Name="notifyfs.sln" KeyPath="yes" />
+                </Component>
+                <Component Id="C.notifyfs.vcxproj">
+                    <File Name="notifyfs.vcxproj" KeyPath="yes" />
+                </Component>
+                <Component Id="C.notifyfs.vcxproj.filters">
+                    <File Name="notifyfs.vcxproj.filters" KeyPath="yes" />
+                </Component>
+            </Directory>
+            <Directory Id="SMPDIR.notifyfs_dotnet" Name="notifyfs-dotnet">
+                <Component Id="C.notifyfs_dotnet.Program.cs">
+                    <File Id="FILE.notifyfs_dotnet.Program.cs" Name="Program.cs" KeyPath="yes" />
+                </Component>
+                <Component Id="C.notifyfs_dotnet.sln">
+                    <File Name="notifyfs-dotnet.sln" KeyPath="yes" />
+                </Component>
+                <Component Id="C.notifyfs_dotnet.csproj">
+                    <File Name="notifyfs-dotnet.csproj" KeyPath="yes" />
+                </Component>
+            </Directory>
         </DirectoryRef>
         <DirectoryRef Id="SYMDIR">
-            <Component Id="C.winfsp_x64.sys.pdb">
+            <Component Id="C.$(var.MyProductFileName)_x64.sys.pdb">
-                <File Name="winfsp-x64.sys.pdb" Source="..\build\$(var.Configuration)\winfsp-x64.sys.public.pdb" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x64.sys.pdb" Source="..\build\$(var.Configuration)\$(var.MyProductFileName)-x64.sys.public.pdb" KeyPath="yes" />
             </Component>
-            <Component Id="C.winfsp_x86.sys.pdb">
+            <Component Id="C.$(var.MyProductFileName)_x86.sys.pdb">
-                <File Name="winfsp-x86.sys.pdb" Source="..\build\$(var.Configuration)\winfsp-x86.sys.public.pdb" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x86.sys.pdb" Source="..\build\$(var.Configuration)\$(var.MyProductFileName)-x86.sys.public.pdb" KeyPath="yes" />
             </Component>
-            <Component Id="C.winfsp_x64.dll.pdb">
+            <Component Id="C.$(var.MyProductFileName)_x64.dll.pdb">
-                <File Name="winfsp-x64.dll.pdb" Source="..\build\$(var.Configuration)\winfsp-x64.dll.public.pdb" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x64.dll.pdb" Source="..\build\$(var.Configuration)\$(var.MyProductFileName)-x64.dll.public.pdb" KeyPath="yes" />
             </Component>
-            <Component Id="C.winfsp_x86.dll.pdb">
+            <Component Id="C.$(var.MyProductFileName)_x86.dll.pdb">
-                <File Name="winfsp-x86.dll.pdb" Source="..\build\$(var.Configuration)\winfsp-x86.dll.public.pdb" KeyPath="yes" />
+                <File Name="$(var.MyProductFileName)-x86.dll.pdb" Source="..\build\$(var.Configuration)\$(var.MyProductFileName)-x86.dll.public.pdb" KeyPath="yes" />
             </Component>
             <Component Id="C.launcher_x64.pdb">
                 <File Name="launcher-x64.pdb" Source="..\build\$(var.Configuration)\launcher-x64.public.pdb" KeyPath="yes" />
@@ -578,13 +603,13 @@
             </Component>
         </DirectoryRef>
 
-        <ComponentGroup Id="C.WinFsp.bin">
+        <ComponentGroup Id="C.$(var.MyProductName).bin">
-            <ComponentRef Id="C.winfsp_x64.sys" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.sys" />
-            <ComponentRef Id="C.winfsp_x86.sys" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.sys" />
-            <ComponentRef Id="C.winfsp_x64.dll.selfreg" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll.selfreg" />
-            <ComponentRef Id="C.winfsp_x86.dll" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.dll" />
-            <ComponentRef Id="C.winfsp_x64.dll" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll" />
-            <ComponentRef Id="C.winfsp_x86.dll.selfreg" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.dll.selfreg" />
             <ComponentRef Id="C.launcher_x64.exe.svcinst" />
             <ComponentRef Id="C.launcher_x86.exe" />
             <ComponentRef Id="C.launcher_x64.exe" />
@@ -596,7 +621,7 @@
             <ComponentRef Id="C.diag.bat" />
             <ComponentRef Id="C.fsreg.bat" />
         </ComponentGroup>
-        <ComponentGroup Id="C.WinFsp.inc">
+        <ComponentGroup Id="C.$(var.MyProductName).inc">
             <ComponentRef Id="C.fsctl.h" />
             <ComponentRef Id="C.winfsp.h" />
             <ComponentRef Id="C.launch.h" />
@@ -610,15 +635,15 @@
             <ComponentRef Id="C.fuse3_opt.h" />
             <ComponentRef Id="C.winfsp_fuse3.h" />
         </ComponentGroup>
-        <ComponentGroup Id="C.WinFsp.lib">
+        <ComponentGroup Id="C.$(var.MyProductName).lib">
-            <ComponentRef Id="C.winfsp_x64.lib" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.lib" />
-            <ComponentRef Id="C.winfsp_x86.lib" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.lib" />
             <ComponentRef Id="C.fuse_x64.pc" />
             <ComponentRef Id="C.fuse_x86.pc" />
             <ComponentRef Id="C.fuse3_x64.pc" />
             <ComponentRef Id="C.fuse3_x86.pc" />
         </ComponentGroup>
-        <ComponentGroup Id="C.WinFsp.opt.fuse">
+        <ComponentGroup Id="C.$(var.MyProductName).opt.fuse">
             <ComponentRef Id="C.fuse.tar.xz.x64" />
             <ComponentRef Id="C.fuse.tar.xz.x86" />
             <ComponentRef Id="C.fuse3.tar.xz.x64" />
@@ -626,12 +651,12 @@
             <ComponentRef Id="C.fuse.install.sh" />
             <ComponentRef Id="C.fuse.uninstall.sh" />
         </ComponentGroup>
-        <ComponentGroup Id="C.WinFsp.opt.fsext">
+        <ComponentGroup Id="C.$(var.MyProductName).opt.fsext">
             <ComponentRef Id="C.fsext.h" />
             <ComponentRef Id="C.fsext.winfsp_x64.lib" />
             <ComponentRef Id="C.fsext.winfsp_x86.lib" />
         </ComponentGroup>
-        <ComponentGroup Id="C.WinFsp.smp">
+        <ComponentGroup Id="C.$(var.MyProductName).smp">
             <ComponentRef Id="C.memfs_x64.exe" />
             <ComponentRef Id="C.memfs_x86.exe" />
             <ComponentRef Id="C.memfs.h" />
@@ -674,12 +699,16 @@
             <ComponentRef Id="C.passthrough_fuse3.vcxproj.filters" />
             <ComponentRef Id="C.passthrough_fuse3.Makefile" />
             <ComponentRef Id="C.passthrough_fuse3.README.md" />
+            <ComponentRef Id="C.notifyfs.c" />
+            <ComponentRef Id="C.notifyfs.sln" />
+            <ComponentRef Id="C.notifyfs.vcxproj" />
+            <ComponentRef Id="C.notifyfs.vcxproj.filters" />
         </ComponentGroup>
-        <ComponentGroup Id="C.WinFsp.sym">
+        <ComponentGroup Id="C.$(var.MyProductName).sym">
-            <ComponentRef Id="C.winfsp_x64.sys.pdb" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.sys.pdb" />
-            <ComponentRef Id="C.winfsp_x86.sys.pdb" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.sys.pdb" />
-            <ComponentRef Id="C.winfsp_x86.dll.pdb" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.dll.pdb" />
-            <ComponentRef Id="C.winfsp_x64.dll.pdb" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll.pdb" />
             <ComponentRef Id="C.launcher_x86.pdb" />
             <ComponentRef Id="C.launcher_x64.pdb" />
             <ComponentRef Id="C.launchctl_x64.pdb" />
@@ -689,20 +718,23 @@
             <ComponentRef Id="C.memfs_x64.pdb" />
             <ComponentRef Id="C.memfs_x86.pdb" />
         </ComponentGroup>
-        <ComponentGroup Id="C.WinFsp.net">
+        <ComponentGroup Id="C.$(var.MyProductName).net">
-            <ComponentRef Id="C.winfsp_msil.dll" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_msil.dll" />
-            <ComponentRef Id="C.winfsp_msil.xml" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_msil.xml" />
             <!--
-            <ComponentRef Id="C.winfsp_msil.dll.GAC" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_msil.dll.GAC" />
-            <ComponentRef Id="C.policy.winfsp_msil.dll.GAC" />
+            <ComponentRef Id="C.policy.$(var.MyProductFileName)_msil.dll.GAC" />
             -->
         </ComponentGroup>
-        <ComponentGroup Id="C.WinFsp.smp.net">
+        <ComponentGroup Id="C.$(var.MyProductName).smp.net">
             <ComponentRef Id="C.memfs_dotnet_msil.exe" />
             <ComponentRef Id="C.memfs_dotnet.Program.cs" />
             <ComponentRef Id="C.passthrough_dotnet.Program.cs" />
             <ComponentRef Id="C.passthrough_dotnet.sln" />
             <ComponentRef Id="C.passthrough_dotnet.csproj" />
+            <ComponentRef Id="C.notifyfs_dotnet.Program.cs" />
+            <ComponentRef Id="C.notifyfs_dotnet.sln" />
+            <ComponentRef Id="C.notifyfs_dotnet.csproj" />
         </ComponentGroup>
 
         <Feature
@@ -725,8 +757,8 @@
                 AllowAdvertise="no"
                 InstallDefault="local"
                 Absent="disallow">
-                <ComponentGroupRef Id="C.WinFsp.bin" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).bin" />
-                <ComponentGroupRef Id="C.WinFsp.net" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).net" />
             </Feature>
             <!--
             <Feature
@@ -737,7 +769,7 @@
                 AllowAdvertise="no"
                 InstallDefault="local"
                 Absent="allow">
-                <ComponentGroupRef Id="C.WinFsp.net" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).net" />
             </Feature>
             -->
             <Feature
@@ -748,11 +780,11 @@
                 AllowAdvertise="no"
                 InstallDefault="local"
                 Absent="allow">
-                <ComponentGroupRef Id="C.WinFsp.inc" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).inc" />
-                <ComponentGroupRef Id="C.WinFsp.lib" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).lib" />
-                <ComponentGroupRef Id="C.WinFsp.smp" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).smp" />
-                <ComponentGroupRef Id="C.WinFsp.smp.net" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).smp.net" />
-                <ComponentGroupRef Id="C.WinFsp.sym" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).sym" />
             </Feature>
             <Feature
                 Id="F.KernelDeveloper"
@@ -762,7 +794,7 @@
                 AllowAdvertise="no"
                 InstallDefault="local"
                 Absent="allow">
-                <ComponentGroupRef Id="C.WinFsp.opt.fsext" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).opt.fsext" />
             </Feature>
             <Feature
                 Id="F.Cygfuse"
@@ -772,7 +804,7 @@
                 AllowAdvertise="no"
                 InstallDefault="local"
                 Absent="allow">
-                <ComponentGroupRef Id="C.WinFsp.opt.fuse" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).opt.fuse" />
             </Feature>
         </Feature>
 

build/VStudio/installer/winfsp_msi.wixproj

@@ -7,7 +7,7 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>d53aac39-4c57-4ca5-a4f3-c2b24888c594</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>winfsp-$(MyVersion)</OutputName>
+    <OutputName>$(MyProductFileName)-$(MyVersion)</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -16,7 +16,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>$(SolutionDir)build\$(Name).build\$(Configuration)\$(Platform)\</IntermediateOutputPath>
-    <DefineConstants>Debug;MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyFullVersion=$(MyFullVersion)</DefineConstants>
+    <DefineConstants>Debug;MyProductName=$(MyProductName);MyProductFileName=$(MyProductFileName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyFullVersion=$(MyFullVersion)</DefineConstants>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
     <SuppressPdbOutput>True</SuppressPdbOutput>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>$(SolutionDir)build\$(Name).build\$(Configuration)\$(Platform)\</IntermediateOutputPath>
-    <DefineConstants>MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyFullVersion=$(MyFullVersion)</DefineConstants>
+    <DefineConstants>MyProductName=$(MyProductName);MyProductFileName=$(MyProductFileName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyFullVersion=$(MyFullVersion)</DefineConstants>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
     <SuppressPdbOutput>True</SuppressPdbOutput>

build/VStudio/testing/winfsp-tests.vcxproj

@@ -107,7 +107,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>ntdll.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;netapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -123,7 +123,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>ntdll.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;netapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,7 +143,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ntdll.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;netapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -163,7 +163,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ntdll.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;netapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -195,6 +195,7 @@
     <ClCompile Include="..\..\..\tst\winfsp-tests\lock-test.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\memfs-test.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\mount-test.c" />
+    <ClCompile Include="..\..\..\tst\winfsp-tests\notify-test.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\oplock-test.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\path-test.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\posix-test.c" />

build/VStudio/testing/winfsp-tests.vcxproj.filters

@@ -109,6 +109,9 @@
     <ClCompile Include="..\..\..\tst\winfsp-tests\uuid5-test.c">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\tst\winfsp-tests\notify-test.c">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\ext\tlib\testsuite.h">

build/VStudio/version.properties

@@ -12,14 +12,15 @@
         <MyGitRevision Condition="!$(MyGitHead.StartsWith(ref: ))">$(MyGitHead.Substring(0, 7))</MyGitRevision>
 
         <MyProductName>WinFsp</MyProductName>
+        <MyProductFileName>winfsp</MyProductFileName>
         <MyDescription>Windows File System Proxy</MyDescription>
         <MyCompanyName>Navimatics LLC</MyCompanyName>
         <MyCopyright>2015-$([System.DateTime]::Now.ToString(`yyyy`)) Bill Zissimopoulos</MyCopyright>
 
-        <MyCanonicalVersion>1.8</MyCanonicalVersion>
+        <MyCanonicalVersion>1.10</MyCanonicalVersion>
 
-        <MyProductVersion>2020.2</MyProductVersion>
+        <MyProductVersion>2021.1 Beta2</MyProductVersion>
-        <MyProductStage>Gold</MyProductStage>
+        <MyProductStage>Beta</MyProductStage>
 
         <MyVersion>$(MyCanonicalVersion).$(MyBuildNumber)</MyVersion>
         <MyVersionWithCommas>$(MyVersion.Replace('.',',')),0</MyVersionWithCommas>
@@ -27,14 +28,18 @@
 
         <MyAssemblyPolicyVersion>$(MyCanonicalVersion.Substring(0,$(MyVersion.IndexOf('.')))).0</MyAssemblyPolicyVersion>
         <MyAssemblyVersion>$(MyAssemblyPolicyVersion).0.0</MyAssemblyVersion>
+
+        <!-- When rebranding WinFsp you MUST change the following GUIDs - use VS "Create GUID" tool -->
+        <MyFspFsctlDeviceClassGuid>{ 0x6f9d25fa, 0x6dee, 0x4a9d, { 0x80, 0xf5, 0xe9, 0x8e, 0x14, 0xf3, 0x5e, 0x54 } }</MyFspFsctlDeviceClassGuid>
+        <MyFspFsvrtDeviceClassGuid>{ 0xb48171c3, 0xdd50, 0x4852, { 0x83, 0xa3, 0x34, 0x4c, 0x50, 0xd9, 0x3b, 0x17 } }</MyFspFsvrtDeviceClassGuid>
     </PropertyGroup>
 
     <ItemDefinitionGroup>
         <ClCompile>
-            <PreprocessorDefinitions>NTDDI_VERSION=0x06010000;_WIN32_WINNT=0x0601</PreprocessorDefinitions>
+            <PreprocessorDefinitions>NTDDI_VERSION=0x06010000;_WIN32_WINNT=0x0601;MyProductName=$(MyProductName);MyProductFileName=$(MyProductFileName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas);MyFullVersion=$(MyFullVersion);MyFspFsctlDeviceClassGuid=$(MyFspFsctlDeviceClassGuid);MyFspFsvrtDeviceClassGuid=$(MyFspFsvrtDeviceClassGuid)</PreprocessorDefinitions>
         </ClCompile>
         <ResourceCompile>
-            <PreprocessorDefinitions>MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas);MyFullVersion=$(MyFullVersion)</PreprocessorDefinitions>
+            <PreprocessorDefinitions>MyProductName=$(MyProductName);MyProductFileName=$(MyProductFileName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas);MyFullVersion=$(MyFullVersion)MyFspFsctlDeviceClassGuid=$(MyFspFsctlDeviceClassGuid);MyFspFsvrtDeviceClassGuid=$(MyFspFsvrtDeviceClassGuid)</PreprocessorDefinitions>
         </ResourceCompile>
     </ItemDefinitionGroup>
     <ItemDefinitionGroup Condition="'$(IsKernelModeToolset)'=='true'">

build/VStudio/winfsp_dll.vcxproj

@@ -52,6 +52,7 @@
     <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\ldap.c" />
     <ClCompile Include="..\..\src\dll\mount.c" />
     <ClCompile Include="..\..\src\dll\np.c" />
     <ClCompile Include="..\..\src\dll\security.c" />
@@ -181,25 +182,25 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(SolutionName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(SolutionName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(SolutionName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(SolutionName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -224,7 +225,7 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
       <MapFileName>$(OutDir)$(TargetFileName).map</MapFileName>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <ModuleDefinitionFile>..\..\src\dll\library.def</ModuleDefinitionFile>
-      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib;netapi32.lib;wldap32.lib</AdditionalDependencies>
       <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
@@ -251,7 +252,7 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
       <MapFileName>$(OutDir)$(TargetFileName).map</MapFileName>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
       <ModuleDefinitionFile>..\..\src\dll\library.def</ModuleDefinitionFile>
-      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib;netapi32.lib;wldap32.lib</AdditionalDependencies>
       <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
@@ -281,7 +282,7 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
       <MapFileName>$(OutDir)$(TargetFileName).map</MapFileName>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <ModuleDefinitionFile>..\..\src\dll\library.def</ModuleDefinitionFile>
-      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib;netapi32.lib;wldap32.lib</AdditionalDependencies>
       <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
       <AdditionalOptions>/PDBALTPATH:$(TargetFileName).pdb %(AdditionalOptions)</AdditionalOptions>
     </Link>
@@ -312,7 +313,7 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
       <MapFileName>$(OutDir)$(TargetFileName).map</MapFileName>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
       <ModuleDefinitionFile>..\..\src\dll\library.def</ModuleDefinitionFile>
-      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib;netapi32.lib;wldap32.lib</AdditionalDependencies>
       <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
       <AdditionalOptions>/PDBALTPATH:$(TargetFileName).pdb %(AdditionalOptions)</AdditionalOptions>
     </Link>

build/VStudio/winfsp_dll.vcxproj.filters

@@ -169,6 +169,9 @@
     <ClCompile Include="..\..\src\shared\ku\posix.c">
       <Filter>Source\shared\ku</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\dll\ldap.c">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\dll\library.def">

build/VStudio/winfsp_sys.vcxproj

@@ -75,28 +75,28 @@
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(SolutionName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(SolutionName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(SolutionName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(SolutionName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -187,6 +187,7 @@
     <ClCompile Include="..\..\src\sys\shutdown.c" />
     <ClCompile Include="..\..\src\sys\silo.c" />
     <ClCompile Include="..\..\src\sys\statistics.c" />
+    <ClCompile Include="..\..\src\sys\trace.c" />
     <ClCompile Include="..\..\src\sys\util.c" />
     <ClCompile Include="..\..\src\sys\volinfo.c" />
     <ClCompile Include="..\..\src\sys\volume.c" />

build/VStudio/winfsp_sys.vcxproj.filters

@@ -125,6 +125,9 @@
     <ClCompile Include="..\..\src\sys\silo.c">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\sys\trace.c">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\sys\driver.h">

doc/Known-File-Systems.asciidoc

@@ -1,6 +1,6 @@
 = Known File Systems and File System Libraries
 
-This document contains a list of known file systems and file system libraries that run on WinFsp. Please contact the WinFsp project to have your file system solution added to this list.
+This document contains a list of known open-source file systems and file system libraries that run on WinFsp. Please contact the WinFsp project to have your file system solution added to this list.
 
 == File Systems
 
@@ -9,13 +9,16 @@ This document contains a list of known file systems and file system libraries th
 - https://github.com/lowleveldesign/fsmemfs[fsmemfs] - Memory File System written in F#
 - https://github.com/ihaveamac/fuse-3ds[fuse-3ds] - FUSE Filesystem Python scripts for Nintendo 3DS files
 - https://github.com/sganis/golddrive[golddrive] - Windows ssh network drive
+- https://github.com/billziss-gh/hubfs[hubfs] - File system for GitHub
 - 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/billziss-gh/objfs[objfs] - Object Storage File System
 - https://github.com/ncw/rclone[rclone] - rsync for cloud storage
 - https://github.com/hasse69/rar2fs[rar2fs] - FUSE file system for reading RAR archives
 - https://github.com/billziss-gh/redditfs[redditfs] - ls -l /r/programming
 - https://github.com/netheril96/securefs[securefs] - Filesystem in userspace (FUSE) with transparent authenticated encryption
 - https://github.com/billziss-gh/sshfs-win[sshfs-win] - SSHFS for Windows
+- https://github.com/printpagestopdf/WordpressDrive[WordpressDrive] - Windows Userspace Filesystem based on WinFsp that presents a Wordpress Site as a Windows Drive
 - https://github.com/emoose/xbox-winfsp[xbox-winfsp] - Adds native support to Windows for the FATX, STFS & GDFX (aka XGD/XDVDFS) Xbox filesystems.
 - https://github.com/UtrechtUniversity/YodaDrive[YodaDrive] - Mount a Yoda drive as a local drive
 

doc/WinFsp-Rebranding.asciidoc

@@ -0,0 +1,59 @@
+= WinFsp Rebranding
+
+If you have a commercial WinFsp license and wish to produce a rebranded version of WinFsp, you can follow the instructions in this document.
+
+== Overview
+
+The WinFsp build is controlled by the file `build\VStudio\version.properties`. The file contains properties that control the final build output in a number of ways. Some of the properties in this file control how the final build product is branded, others how it is versioned, etc.
+
+=== Branding
+
+The properties that control branding are the following:
+
+* `MyProductName`: This is the overall product name. It should be a short name without spaces. For example: `MyCompanyFSP`. The default value is `WinFsp`.
+
+* `MyProductFileName`: This is the file name that will be used for the primary WinFsp components. For example: if you use `mycompanyfsp` the FSD will be named `mycompanyfsp-x64.sys` and `mycompanyfsp-x86.sys`, the DLL will be named `mycompanyfsp-x64.dll` and `mycompanyfsp-x86.dll`, etc. The default value is `winfsp`. (Note that due to a limitation the WinFsp .NET implementation assumes that `MyProductFileName` is the lowercase version of `MyProductName`.)
+
+* `MyDescription`: This is a longer product description. For example: `MyCompany File System Proxy`. The default value is `Windows File System Proxy`.
+
+* `MyCompanyName`: This is the company name.
+
+* `MyCopyright`: This is the product's copyright.
+
+* `MyFspFsctlDeviceClassGuid`, `MyFspFsvrtDeviceClassGuid`: When creating devices the FSD needs to assign GUID classes to them; it uses the GUIDs specified by these properties. You MUST change these GUIDs when rebranding; otherwise your product and "official" WinFsp releases may interfere with each other. From the Visual Studio main menu use Tools > Create GUID and select option "3. static const struct GUID" to produce GUIDs in the correct format.
+
+=== Versioning
+
+The properties that control versioning are the following:
+
+* `MyCanonicalVersion`: This is the "canonical" (i.e. non-marketing) version of the product. WinFsp uses a `major.minor.build` versioning scheme. The `major.minor` portion of the version comes from this property; build numbers are computed automatically from the current date.
+
+** Some WinFsp components check that canonical versions of different components match. For example, the WinFsp .NET implementation checks that its major version matches the one from the WinFsp DLL.
+
+* `MyProductVersion`: This is the product (i.e. marketing) version of the product. WinFsp uses the release year as the product version; it also adds a point release for subsequent releases (thus 2021 is the first release in 2021, and 2021.1 is the second release, etc). This property may be an arbitrary string.
+
+* `MyProductStage`: This specifies the kind of the build. Allowed values are `Beta`, `RC` (Release Candidate) and `Gold` (Final).
+
+== Limitations
+
+Currently WinFsp supports rebranding of the core WinFsp components:
+
+* The WinFsp FSD (File System Driver).
+
+* The WinFsp DLL (user mode DLL). This includes the DLL import libraries.
+
+* The WinFsp Launcher (Windows service that allows for easy launching of file systems).
+
+Currently WinFsp does not support rebranding of the following components:
+
+* Development files such as header files, samples, etc. These are not end-user visible and therefore are not necessary to be rebranded.
+
+* WinFsp test suites.
+
+* FUSE for Cygwin.
+
+* Chocolatey builds.
+
+Additional limitations:
+
+* The default installer (in file `build\VStudio\installer\Product.wxs`) contains a number of GUIDs. These MUST be changed if the default installer is used by a rebranded product; otherwise installation of your product and "official" WinFsp releases may interfere with each other. There is a Python script at `tools\gensrc\wixguid.py` that can help with this.

ext/tlib/callstack.c

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

ext/tlib/callstack.h

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

ext/tlib/injected/allfunc.h

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

ext/tlib/injected/curlfunc.c

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

ext/tlib/injected/curlfunc.h

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

ext/tlib/injected/stdfunc.c

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

ext/tlib/injected/stdfunc.h

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

ext/tlib/injection.c

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

ext/tlib/injection.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injection.h
  *
- * @copyright 2014-2020 Bill Zissimopoulos
+ * @copyright 2014-2021 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-2020 Bill Zissimopoulos
+ * @copyright 2014-2021 Bill Zissimopoulos
  */
 
 #include <tlib/testsuite.h>

ext/tlib/testsuite.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/testsuite.h
  *
- * @copyright 2014-2020 Bill Zissimopoulos
+ * @copyright 2014-2021 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-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -152,6 +152,8 @@ FSP_FUSE_API void FSP_FUSE_API_NAME(fsp_fuse_exit)(struct fsp_fuse_env *env,
     struct fuse *f);
 FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_exited)(struct fsp_fuse_env *env,
     struct fuse *f);
+FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_notify)(struct fsp_fuse_env *env,
+    struct fuse *f, const char *path, uint32_t action);
 FSP_FUSE_API struct fuse_context *FSP_FUSE_API_NAME(fsp_fuse_get_context)(struct fsp_fuse_env *env);
 
 FSP_FUSE_SYM(
@@ -212,6 +214,13 @@ int fuse_exited(struct fuse *f),
         (fsp_fuse_env(), f);
 })
 
+FSP_FUSE_SYM(
+int fuse_notify(struct fuse *f, const char *path, uint32_t action),
+{
+    return FSP_FUSE_API_CALL(fsp_fuse_notify)
+        (fsp_fuse_env(), f, path, action);
+})
+
 FSP_FUSE_SYM(
 struct fuse_context *fuse_get_context(void),
 {
@@ -236,9 +245,8 @@ int fuse_interrupted(void),
 FSP_FUSE_SYM(
 int fuse_invalidate(struct fuse *f, const char *path),
 {
-    (void)f;
+    return FSP_FUSE_API_CALL(fsp_fuse_notify)
-    (void)path;
+        (fsp_fuse_env(), f, path, 0);
-    return -EINVAL;
 })
 
 FSP_FUSE_SYM(

inc/fuse/fuse_common.h

@@ -6,7 +6,7 @@
  *     FUSE: Filesystem in Userspace
  *     Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -79,6 +79,17 @@ extern "C" {
 #define UF_ARCHIVE                      FSP_FUSE_UF_ARCHIVE
 #endif
 
+/* notify extension */
+#define FSP_FUSE_NOTIFY_MKDIR           0x0001
+#define FSP_FUSE_NOTIFY_RMDIR           0x0002
+#define FSP_FUSE_NOTIFY_CREATE          0x0004
+#define FSP_FUSE_NOTIFY_UNLINK          0x0008
+#define FSP_FUSE_NOTIFY_CHMOD           0x0010
+#define FSP_FUSE_NOTIFY_CHOWN           0x0020
+#define FSP_FUSE_NOTIFY_UTIME           0x0040
+#define FSP_FUSE_NOTIFY_CHFLAGS         0x0080
+#define FSP_FUSE_NOTIFY_TRUNCATE        0x0100
+
 struct fuse_file_info
 {
     int flags;

inc/fuse/fuse_opt.h

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

inc/fuse3/fuse.h

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

inc/fuse3/fuse_common.h

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

inc/fuse3/fuse_opt.h

@@ -2,7 +2,7 @@
  * @file fuse3/fuse_opt.h
  * WinFsp FUSE3 compatible API.
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

inc/fuse3/winfsp_fuse.h

@@ -2,7 +2,7 @@
  * @file fuse3/winfsp_fuse.h
  * WinFsp FUSE3 compatible API.
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

inc/winfsp/fsctl.h

@@ -1,7 +1,7 @@
 /**
  * @file winfsp/fsctl.h
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -35,17 +35,36 @@ extern "C" {
 #define FSP_FSCTL_STATIC_ASSERT(e,m)    static_assert(1,"")
 #endif
 
-#define FSP_FSCTL_DRIVER_NAME           "WinFsp"
+#define FSP_FSCTL_STR(x)                FSP_FSCTL_STR_(x)
-#define FSP_FSCTL_DISK_DEVICE_NAME      "WinFsp.Disk"
+#define FSP_FSCTL_STR_(x)               #x
-#define FSP_FSCTL_NET_DEVICE_NAME       "WinFsp.Net"
+#if defined(MyProductName)
-#define FSP_FSCTL_MUP_DEVICE_NAME       "WinFsp.Mup"
+#define FSP_FSCTL_PRODUCT_NAME          FSP_FSCTL_STR(MyProductName)
+#else
+#define FSP_FSCTL_PRODUCT_NAME          "WinFsp"
+#endif
+#if defined(MyProductFileName)
+#define FSP_FSCTL_PRODUCT_FILE_NAME     FSP_FSCTL_STR(MyProductFileName)
+#else
+#define FSP_FSCTL_PRODUCT_FILE_NAME     "winfsp"
+#endif
 
-// {6F9D25FA-6DEE-4A9D-80F5-E98E14F35E54}
+#define FSP_FSCTL_DRIVER_NAME           FSP_FSCTL_PRODUCT_NAME
+#define FSP_FSCTL_DISK_DEVICE_NAME      FSP_FSCTL_DRIVER_NAME ".Disk"
+#define FSP_FSCTL_NET_DEVICE_NAME       FSP_FSCTL_DRIVER_NAME ".Net"
+#define FSP_FSCTL_MUP_DEVICE_NAME       FSP_FSCTL_DRIVER_NAME ".Mup"
+
+#if defined(MyFspFsctlDeviceClassGuid)
+extern const __declspec(selectany) GUID FspFsctlDeviceClassGuid = MyFspFsctlDeviceClassGuid;
+#else
 extern const __declspec(selectany) GUID FspFsctlDeviceClassGuid =
     { 0x6f9d25fa, 0x6dee, 0x4a9d, { 0x80, 0xf5, 0xe9, 0x8e, 0x14, 0xf3, 0x5e, 0x54 } };
-// {B48171C3-DD50-4852-83A3-344C50D93B17}
+#endif
+#if defined(MyFspFsvrtDeviceClassGuid)
+extern const __declspec(selectany) GUID FspFsvrtDeviceClassGuid = MyFspFsvrtDeviceClassGuid;
+#else
 extern const __declspec(selectany) GUID FspFsvrtDeviceClassGuid =
     { 0xb48171c3, 0xdd50, 0x4852, { 0x83, 0xa3, 0x34, 0x4c, 0x50, 0xd9, 0x3b, 0x17 } };
+#endif
 
 /* alignment macros */
 #define FSP_FSCTL_ALIGN_UP(x, s)        (((x) + ((s) - 1L)) & ~((s) - 1L))
@@ -66,6 +85,10 @@ extern const __declspec(selectany) GUID FspFsvrtDeviceClassGuid =
     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 't', METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
 #define FSP_FSCTL_STOP                  \
     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 'S', METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSP_FSCTL_STOP0                 \
+    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 's', METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSP_FSCTL_NOTIFY                \
+    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 'n', METHOD_NEITHER, FILE_ANY_ACCESS)
 
 /* fsctl internal device codes (usable only in-kernel) */
 #define FSP_FSCTL_TRANSACT_INTERNAL     \
@@ -268,6 +291,15 @@ typedef struct
 FSP_FSCTL_STATIC_ASSERT(24 == sizeof(FSP_FSCTL_STREAM_INFO),
     "sizeof(FSP_FSCTL_STREAM_INFO) must be exactly 24.");
 typedef struct
+{
+    UINT16 Size;
+    UINT32 Filter;
+    UINT32 Action;
+    WCHAR FileNameBuf[];
+} FSP_FSCTL_NOTIFY_INFO;
+FSP_FSCTL_STATIC_ASSERT(12 == sizeof(FSP_FSCTL_NOTIFY_INFO),
+    "sizeof(FSP_FSCTL_NOTIFY_INFO) must be exactly 12.");
+typedef struct
 {
     UINT64 UserContext;
     UINT64 UserContext2;
@@ -617,6 +649,9 @@ FSP_API NTSTATUS FspFsctlTransact(HANDLE VolumeHandle,
     PVOID RequestBuf, SIZE_T *PRequestBufSize,
     BOOLEAN Batch);
 FSP_API NTSTATUS FspFsctlStop(HANDLE VolumeHandle);
+FSP_API NTSTATUS FspFsctlStop0(HANDLE VolumeHandle);
+FSP_API NTSTATUS FspFsctlNotify(HANDLE VolumeHandle,
+    FSP_FSCTL_NOTIFY_INFO *NotifyInfo, SIZE_T Size);
 FSP_API NTSTATUS FspFsctlGetVolumeList(PWSTR DevicePath,
     PWCHAR VolumeListBuf, PSIZE_T PVolumeListSize);
 FSP_API NTSTATUS FspFsctlPreflight(PWSTR DevicePath);

inc/winfsp/launch.h

@@ -5,7 +5,7 @@
  * In order to use the WinFsp Launch API a program must include <winfsp/launch.h>
  * and link with the winfsp_x64.dll (or winfsp_x86.dll) library.
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -32,10 +32,10 @@
 extern "C" {
 #endif
 
-#define FSP_LAUNCH_REGKEY               "Software\\WinFsp\\Services"
+#define FSP_LAUNCH_REGKEY               "Software\\" FSP_FSCTL_PRODUCT_NAME "\\Services"
 #define FSP_LAUNCH_REGKEY_WOW64         KEY_WOW64_32KEY
 
-#define FSP_LAUNCH_PIPE_NAME            "\\\\.\\pipe\\WinFsp.{14E7137D-22B4-437A-B0C1-D21D1BDF3767}"
+#define FSP_LAUNCH_PIPE_NAME            "\\\\.\\pipe\\" FSP_FSCTL_PRODUCT_NAME ".{14E7137D-22B4-437A-B0C1-D21D1BDF3767}"
 #define FSP_LAUNCH_PIPE_BUFFER_SIZE     4096
 #define FSP_LAUNCH_PIPE_OWNER           ((PSID)WinLocalSystemSid)
 

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-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -91,6 +91,7 @@ typedef struct _REPARSE_DATA_BUFFER
 #if !defined(FILE_NEED_EA)
 #define FILE_NEED_EA                    0x00000080
 #endif
+#if !defined(__MINGW32__)
 typedef struct _FILE_FULL_EA_INFORMATION
 {
     ULONG NextEntryOffset;
@@ -99,6 +100,7 @@ typedef struct _FILE_FULL_EA_INFORMATION
     USHORT EaValueLength;
     CHAR EaName[1];
 } FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION;
+#endif
 
 /**
  * @group File System
@@ -1186,6 +1188,72 @@ FSP_API VOID FspFileSystemStopDispatcher(FSP_FILE_SYSTEM *FileSystem);
  */
 FSP_API VOID FspFileSystemSendResponse(FSP_FILE_SYSTEM *FileSystem,
     FSP_FSCTL_TRANSACT_RSP *Response);
+/**
+ * Begin notifying Windows that the file system has file changes.
+ *
+ * A file system that wishes to notify Windows about file changes must
+ * first issue an FspFileSystemBegin call, followed by 0 or more
+ * FspFileSystemNotify calls, followed by an FspFileSystemNotifyEnd call.
+ *
+ * This operation blocks concurrent file rename operations. File rename
+ * operations may interfere with file notification, because a file being
+ * notified may also be concurrently renamed. After all file change
+ * notifications have been issued, you must make sure to call
+ * FspFileSystemNotifyEnd to allow file rename operations to proceed.
+ *
+ * @param FileSystem
+ *     The file system object.
+ * @return
+ *     STATUS_SUCCESS or error code. The error code STATUS_CANT_WAIT means that
+ *     a file rename operation is currently in progress and the operation must be
+ *     retried at a later time.
+ */
+FSP_API NTSTATUS FspFileSystemNotifyBegin(FSP_FILE_SYSTEM *FileSystem, ULONG Timeout);
+/**
+ * End notifying Windows that the file system has file changes.
+ *
+ * A file system that wishes to notify Windows about file changes must
+ * first issue an FspFileSystemBegin call, followed by 0 or more
+ * FspFileSystemNotify calls, followed by an FspFileSystemNotifyEnd call.
+ *
+ * This operation allows any blocked file rename operations to proceed.
+ *
+ * @param FileSystem
+ *     The file system object.
+ * @return
+ *     STATUS_SUCCESS or error code.
+ */
+FSP_API NTSTATUS FspFileSystemNotifyEnd(FSP_FILE_SYSTEM *FileSystem);
+/**
+ * Notify Windows that the file system has file changes.
+ *
+ * A file system that wishes to notify Windows about file changes must
+ * first issue an FspFileSystemBegin call, followed by 0 or more
+ * FspFileSystemNotify calls, followed by an FspFileSystemNotifyEnd call.
+ *
+ * Note that FspFileSystemNotify requires file names to be normalized. A
+ * normalized file name is one that contains the correct case of all characters
+ * in the file name.
+ *
+ * For case-sensitive file systems all file names are normalized by definition.
+ * For case-insensitive file systems that implement file name normalization,
+ * a normalized file name is the one that the file system specifies in the
+ * response to Create or Open (see also FspFileSystemGetOpenFileInfo). For
+ * case-insensitive file systems that do not implement file name normalization
+ * a normalized file name is the upper case version of the file name used
+ * to open the file.
+ *
+ * @param FileSystem
+ *     The file system object.
+ * @param NotifyInfo
+ *     Buffer containing information about file changes.
+ * @param Size
+ *     Size of buffer.
+ * @return
+ *     STATUS_SUCCESS or error code.
+ */
+FSP_API NTSTATUS FspFileSystemNotify(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FSCTL_NOTIFY_INFO *NotifyInfo, SIZE_T Size);
 /**
  * Get the current operation context.
  *
@@ -1645,6 +1713,28 @@ UINT32 FspFileSystemGetEaPackedSize(PFILE_FULL_EA_INFORMATION SingleEa)
     /* magic computations are courtesy of NTFS */
     return 5 + SingleEa->EaNameLength + SingleEa->EaValueLength;
 }
+/**
+ * Add notify information to a buffer.
+ *
+ * This is a helper for filling a buffer to use with FspFileSystemNotify.
+ *
+ * @param NotifyInfo
+ *     The notify information to add.
+ * @param Buffer
+ *     Pointer to a buffer that will receive the notify information.
+ * @param Length
+ *     Length of buffer.
+ * @param PBytesTransferred [out]
+ *     Pointer to a memory location that will receive the actual number of bytes stored. This should
+ *     be initialized to 0 prior to the first call to FspFileSystemAddNotifyInfo for a particular
+ *     buffer.
+ * @return
+ *     TRUE if the notify information was added, FALSE if there was not enough space to add it.
+ * @see
+ *     FspFileSystemNotify
+ */
+FSP_API BOOLEAN FspFileSystemAddNotifyInfo(FSP_FSCTL_NOTIFY_INFO *NotifyInfo,
+    PVOID Buffer, ULONG Length, PULONG PBytesTransferred);
 
 /*
  * Directory buffering
@@ -1738,6 +1828,10 @@ FSP_API VOID FspDeleteSid(PSID Sid, NTSTATUS (*CreateFunc)());
 FSP_API NTSTATUS FspPosixMapPermissionsToSecurityDescriptor(
     UINT32 Uid, UINT32 Gid, UINT32 Mode,
     PSECURITY_DESCRIPTOR *PSecurityDescriptor);
+FSP_API NTSTATUS FspPosixMergePermissionsToSecurityDescriptor(
+    UINT32 Uid, UINT32 Gid, UINT32 Mode,
+    PSECURITY_DESCRIPTOR ExistingSecurityDescriptor,
+    PSECURITY_DESCRIPTOR *PSecurityDescriptor);
 FSP_API NTSTATUS FspPosixMapSecurityDescriptorToPermissions(
     PSECURITY_DESCRIPTOR SecurityDescriptor,
     PUINT32 PUid, PUINT32 PGid, PUINT32 PMode);
@@ -2020,9 +2114,9 @@ static inline
 NTSTATUS FspLoad(PVOID *PModule)
 {
 #if defined(_WIN64)
-#define FSP_DLLNAME                     "winfsp-x64.dll"
+#define FSP_DLLNAME                     FSP_FSCTL_PRODUCT_FILE_NAME "-x64.dll"
 #else
-#define FSP_DLLNAME                     "winfsp-x86.dll"
+#define FSP_DLLNAME                     FSP_FSCTL_PRODUCT_FILE_NAME "-x86.dll"
 #endif
 #define FSP_DLLPATH                     "bin\\" FSP_DLLNAME
 
@@ -2050,7 +2144,7 @@ NTSTATUS FspLoad(PVOID *PModule)
     Module = LoadLibraryW(L"" FSP_DLLNAME);
     if (0 == Module)
     {
-        Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\WinFsp",
+        Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\" FSP_FSCTL_PRODUCT_NAME,
             0, KEY_READ | KEY_WOW64_32KEY, &RegKey);
         if (ERROR_SUCCESS == Result)
         {

inc/winfsp/winfsp.hpp

@@ -2,7 +2,7 @@
  * @file winfsp/winfsp.hpp
  * WinFsp C++ Layer.
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -649,7 +649,7 @@ public:
     NTSTATUS Preflight(PWSTR MountPoint)
     {
         return FspFileSystemPreflight(
-            _VolumeParams.Prefix[0] ? L"WinFsp.Net" : L"WinFsp.Disk",
+            _VolumeParams.Prefix[0] ? L"" FSP_FSCTL_NET_DEVICE_NAME : L"" FSP_FSCTL_DISK_DEVICE_NAME,
             MountPoint);
     }
     NTSTATUS Mount(PWSTR MountPoint,
@@ -669,7 +669,7 @@ public:
         if (!NT_SUCCESS(Result))
             return Result;
         Result = FspFileSystemCreate(
-            _VolumeParams.Prefix[0] ? L"WinFsp.Net" : L"WinFsp.Disk",
+            _VolumeParams.Prefix[0] ? L"" FSP_FSCTL_NET_DEVICE_NAME : L"" FSP_FSCTL_DISK_DEVICE_NAME,
             &_VolumeParams, Interface(), &_FileSystemPtr);
         if (!NT_SUCCESS(Result))
             return Result;

opt/cygfuse/fuse/cygfuse.c

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

opt/cygfuse/fuse3/cygfuse.c

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

opt/fsext/inc/winfsp/fsext.h

@@ -1,7 +1,7 @@
 /**
  * @file winfsp/fsext.h
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/debug.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/debug.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/dirbuf.c

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

src/dll/eventlog.c

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

src/dll/fs.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fs.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -349,7 +349,7 @@ exit:
 
     FspFileSystemSetDispatcherResult(FileSystem, Result);
 
-    FspFsctlStop(FileSystem->VolumeHandle);
+    FspFsctlStop0(FileSystem->VolumeHandle);
 
     if (0 != DispatcherThread)
     {
@@ -398,11 +398,13 @@ FSP_API VOID FspFileSystemStopDispatcher(FSP_FILE_SYSTEM *FileSystem)
     if (0 == FileSystem->DispatcherThread)
         return;
 
-    FspFsctlStop(FileSystem->VolumeHandle);
+    FspFsctlStop0(FileSystem->VolumeHandle);
 
     WaitForSingleObject(FileSystem->DispatcherThread, INFINITE);
     CloseHandle(FileSystem->DispatcherThread);
     FileSystem->DispatcherThread = 0;
+
+    FspFsctlStop(FileSystem->VolumeHandle);
 }
 
 FSP_API VOID FspFileSystemSendResponse(FSP_FILE_SYSTEM *FileSystem,
@@ -423,7 +425,7 @@ FSP_API VOID FspFileSystemSendResponse(FSP_FILE_SYSTEM *FileSystem,
     {
         FspFileSystemSetDispatcherResult(FileSystem, Result);
 
-        FspFsctlStop(FileSystem->VolumeHandle);
+        FspFsctlStop0(FileSystem->VolumeHandle);
     }
 }
 
@@ -432,6 +434,58 @@ FSP_API FSP_FILE_SYSTEM_OPERATION_CONTEXT *FspFileSystemGetOperationContext(VOID
     return (FSP_FILE_SYSTEM_OPERATION_CONTEXT *)TlsGetValue(FspFileSystemTlsKey);
 }
 
+FSP_API NTSTATUS FspFileSystemNotifyBegin(FSP_FILE_SYSTEM *FileSystem, ULONG Timeout)
+{
+    static const ULONG Delays[] =
+    {
+         10/*ms*/,
+         10/*ms*/,
+         50/*ms*/,
+         50/*ms*/,
+        100/*ms*/,
+        100/*ms*/,
+        300/*ms*/,
+    };
+    ULONG Total = 0, Delay;
+    NTSTATUS Result;
+
+    for (ULONG i = 0, n = sizeof(Delays) / sizeof(Delays[0]);; i++)
+    {
+        Result = FspFsctlNotify(FileSystem->VolumeHandle, 0, 0);
+        if (STATUS_CANT_WAIT != Result)
+            return Result;
+
+        Delay = n > i ? Delays[i] : Delays[n - 1];
+        if (INFINITE == Timeout)
+            Sleep(Delay);
+        else
+        {
+            if (Total >= Timeout)
+                break;
+            if (Total + Delay > Timeout)
+                Delay = Timeout - Total;
+            Total += Delay;
+            Sleep(Delay);
+        }
+    }
+
+    return Result;
+}
+
+FSP_API NTSTATUS FspFileSystemNotifyEnd(FSP_FILE_SYSTEM *FileSystem)
+{
+    FSP_FSCTL_NOTIFY_INFO NotifyInfo;
+
+    memset(&NotifyInfo, 0, sizeof NotifyInfo);
+    return FspFsctlNotify(FileSystem->VolumeHandle, &NotifyInfo, sizeof NotifyInfo.Size);
+}
+
+FSP_API NTSTATUS FspFileSystemNotify(FSP_FILE_SYSTEM *FileSystem,
+    FSP_FSCTL_NOTIFY_INFO *NotifyInfo, SIZE_T Size)
+{
+    return FspFsctlNotify(FileSystem->VolumeHandle, NotifyInfo, Size);
+}
+
 /*
  * Out-of-Line
  */

src/dll/fsctl.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fsctl.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -161,6 +161,35 @@ FSP_API NTSTATUS FspFsctlStop(HANDLE VolumeHandle)
     return STATUS_SUCCESS;
 }
 
+FSP_API NTSTATUS FspFsctlStop0(HANDLE VolumeHandle)
+{
+    DWORD Bytes;
+
+    if (!DeviceIoControl(VolumeHandle, FSP_FSCTL_STOP0, 0, 0, 0, 0, &Bytes, 0))
+        return FspNtStatusFromWin32(GetLastError());
+
+    return STATUS_SUCCESS;
+}
+
+FSP_API NTSTATUS FspFsctlNotify(HANDLE VolumeHandle,
+    FSP_FSCTL_NOTIFY_INFO *NotifyInfo, SIZE_T Size)
+{
+    NTSTATUS Result = STATUS_SUCCESS;
+    DWORD Bytes = 0;
+
+    if (!DeviceIoControl(VolumeHandle,
+        FSP_FSCTL_NOTIFY,
+        NotifyInfo, (DWORD)Size, 0, 0,
+        &Bytes, 0))
+    {
+        Result = FspNtStatusFromWin32(GetLastError());
+        goto exit;
+    }
+
+exit:
+    return Result;
+}
+
 FSP_API NTSTATUS FspFsctlGetVolumeList(PWSTR DevicePath,
     PWCHAR VolumeListBuf, PSIZE_T PVolumeListSize)
 {
@@ -235,6 +264,7 @@ FSP_API NTSTATUS FspFsctlPreflight(PWSTR DevicePath)
 
 static NTSTATUS FspFsctlStartService(VOID)
 {
+    static SRWLOCK Lock = SRWLOCK_INIT;
     PWSTR DriverName = L"" FSP_FSCTL_DRIVER_NAME;
     SC_HANDLE ScmHandle = 0;
     SC_HANDLE SvcHandle = 0;
@@ -242,6 +272,8 @@ static NTSTATUS FspFsctlStartService(VOID)
     DWORD LastError;
     NTSTATUS Result;
 
+    AcquireSRWLockExclusive(&Lock);
+
     /* Determine if we are running inside container.
      *
      * See https://github.com/microsoft/perfview/blob/V1.9.65/src/TraceEvent/TraceEventSession.cs#L525
@@ -312,6 +344,8 @@ exit:
     if (0 != ScmHandle)
         CloseServiceHandle(ScmHandle);
 
+    ReleaseSRWLockExclusive(&Lock);
+
     return Result;
 }
 

src/dll/fsop.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fsop.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -1866,3 +1866,9 @@ FSP_API BOOLEAN FspFileSystemAddEa(PFILE_FULL_EA_INFORMATION SingleEa,
 
     return TRUE;
 }
+
+FSP_API BOOLEAN FspFileSystemAddNotifyInfo(FSP_FSCTL_NOTIFY_INFO *NotifyInfo,
+    PVOID Buffer, ULONG Length, PULONG PBytesTransferred)
+{
+    return FspFileSystemAddXxxInfo(NotifyInfo, Buffer, Length, PBytesTransferred);
+}

src/dll/fuse/fuse.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -20,6 +20,7 @@
  */
 
 #include <dll/fuse/library.h>
+#include <sddl.h>
 
 struct fuse_chan
 {
@@ -105,6 +106,8 @@ static struct fuse_opt fsp_fuse_core_opts[] =
     FUSE_OPT_KEY("ExactFileSystemName=", 'E'),
     FUSE_OPT_KEY("--ExactFileSystemName=", 'E'),
 
+    FUSE_OPT_KEY("FileSecurity=", 's'),
+    FUSE_OPT_KEY("--FileSecurity=", 's'),
     FSP_FUSE_CORE_OPT("UserName=", set_uid, 1),
     FUSE_OPT_KEY("UserName=", 'u'),
     FSP_FUSE_CORE_OPT("--UserName=", set_uid, 1),
@@ -184,6 +187,28 @@ FSP_FUSE_API struct fuse_chan *fsp_fuse_mount(struct fsp_fuse_env *env,
         MountPointBuf[1] = L'\0';
         Size = 2 * sizeof(WCHAR);
     }
+    else if (
+        (
+            '\\' == mountpoint[0] &&
+            '\\' == mountpoint[1] &&
+            ('?' == mountpoint[2] || '.' == mountpoint[2]) &&
+            '\\' == mountpoint[3]
+        ) &&
+        (
+            ('A' <= mountpoint[4] && mountpoint[4] <= 'Z') ||
+            ('a' <= mountpoint[4] && mountpoint[4] <= 'z')
+        ) &&
+        ':' == mountpoint[5] && '\0' == mountpoint[6])
+    {
+        MountPointBuf[0] = '\\';
+        MountPointBuf[1] = '\\';
+        MountPointBuf[2] = mountpoint[2];
+        MountPointBuf[3] = '\\';
+        MountPointBuf[4] = mountpoint[4];
+        MountPointBuf[5] = ':';
+        MountPointBuf[6] = '\0';
+        Size = 7 * sizeof(WCHAR);
+    }
     else if (
         (
             ('A' <= mountpoint[0] && mountpoint[0] <= 'Z') ||
@@ -244,6 +269,29 @@ FSP_FUSE_API int fsp_fuse_is_lib_option(struct fsp_fuse_env *env,
     return fsp_fuse_opt_match(env, fsp_fuse_core_opts, opt);
 }
 
+static int fsp_fuse_sddl_to_security(const char *Sddl, PUINT8 Security, PULONG PSecuritySize)
+{
+    PSECURITY_DESCRIPTOR SecurityDescriptor;
+    ULONG SecurityDescriptorSize;
+    int res = -1;
+
+    if (ConvertStringSecurityDescriptorToSecurityDescriptorA(
+        Sddl, SDDL_REVISION_1, &SecurityDescriptor, &SecurityDescriptorSize))
+    {
+        if (*PSecuritySize >= SecurityDescriptorSize)
+        {
+            memcpy(Security, SecurityDescriptor, SecurityDescriptorSize);
+            *PSecuritySize = SecurityDescriptorSize;
+
+            res = 0;
+        }
+
+        LocalFree(SecurityDescriptor);
+    }
+
+    return res;
+}
+
 static int fsp_fuse_username_to_uid(const char *username, int *puid)
 {
     union
@@ -281,6 +329,63 @@ static int fsp_fuse_username_to_uid(const char *username, int *puid)
     return 0;
 }
 
+static int fsp_fuse_utf8towcs_trunc(
+    const char *Str, int StrLen,
+    PWSTR Wcs, int WcsLen)
+{
+    if (0 == StrLen)
+        return 0;
+
+    int Size = MultiByteToWideChar(CP_UTF8, 0, Str, StrLen, Wcs, WcsLen);
+    if (0 != Size)
+        return Size;
+
+    if (0 == WcsLen)
+        return 0;
+
+    PWSTR Buf = 0;
+
+    Size = MultiByteToWideChar(CP_UTF8, 0, Str, StrLen, 0, 0);
+    if (0 == Size)
+        goto exit;
+
+    Buf = MemAlloc(Size * sizeof(WCHAR));
+    if (0 == Buf)
+    {
+        SetLastError(ERROR_NO_SYSTEM_RESOURCES);
+        Size = 0;
+        goto exit;
+    }
+
+    Size = MultiByteToWideChar(CP_UTF8, 0, Str, StrLen, Buf, Size);
+    if (0 == Size)
+        goto exit;
+
+    if (-1 == StrLen)
+    {
+        if (Size >= WcsLen)
+        {
+            Size = WcsLen - 1;
+            memcpy(Wcs, Buf, Size * sizeof(WCHAR));
+            Wcs[Size] = L'\0';
+            Size++;
+        }
+        else
+            memcpy(Wcs, Buf, Size * sizeof(WCHAR));
+    }
+    else
+    {
+        if (Size >= WcsLen)
+            Size = WcsLen;
+        memcpy(Wcs, Buf, Size * sizeof(WCHAR));
+    }
+
+exit:
+    MemFree(Buf);
+
+    return Size;
+}
+
 static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
     struct fuse_args *outargs)
 {
@@ -295,6 +400,7 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
         FspServiceLog(EVENTLOG_ERROR_TYPE, L""
             FSP_FUSE_LIBRARY_NAME " options:\n"
             "    -o umask=MASK              set file permissions (octal)\n"
+            "    -o FileSecurity=SDDL       set file DACL (SDDL format)\n"
             "    -o create_umask=MASK       set newly created file permissions (octal)\n"
             "        -o create_file_umask=MASK      for files only\n"
             "        -o create_dir_umask=MASK       for directories only\n"
@@ -345,7 +451,7 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
             arg += sizeof "VolumePrefix=" - 1;
         else if ('V' == arg[2])
             arg += sizeof "--VolumePrefix=" - 1;
-        if (0 == MultiByteToWideChar(CP_UTF8, 0, arg, -1,
+        if (0 == fsp_fuse_utf8towcs_trunc(arg, -1,
             opt_data->VolumeParams.Prefix, sizeof opt_data->VolumeParams.Prefix / sizeof(WCHAR)))
             return -1;
         opt_data->VolumeParams.Prefix
@@ -361,7 +467,7 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
             arg += sizeof "FileSystemName=" - 1;
         else if ('F' == arg[2])
             arg += sizeof "--FileSystemName=" - 1;
-        if (0 == MultiByteToWideChar(CP_UTF8, 0, arg, -1,
+        if (0 == fsp_fuse_utf8towcs_trunc(arg, -1,
             opt_data->VolumeParams.FileSystemName + 5,
             sizeof opt_data->VolumeParams.FileSystemName / sizeof(WCHAR) - 5))
             return -1;
@@ -374,13 +480,25 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
             arg += sizeof "ExactFileSystemName=" - 1;
         else if ('E' == arg[2])
             arg += sizeof "--ExactFileSystemName=" - 1;
-        if (0 == MultiByteToWideChar(CP_UTF8, 0, arg, -1,
+        if (0 == fsp_fuse_utf8towcs_trunc(arg, -1,
             opt_data->VolumeParams.FileSystemName,
             sizeof opt_data->VolumeParams.FileSystemName / sizeof(WCHAR)))
             return -1;
         opt_data->VolumeParams.FileSystemName
             [sizeof opt_data->VolumeParams.FileSystemName / sizeof(WCHAR) - 1] = L'\0';
         return 0;
+    case 's':
+        if ('F' == arg[0])
+            arg += sizeof "FileSecurity=" - 1;
+        else if ('F' == arg[2])
+            arg += sizeof "--FileSecurity=" - 1;
+        opt_data->FileSecuritySize = sizeof opt_data->FileSecurityBuf;
+        if (-1 == fsp_fuse_sddl_to_security(arg, opt_data->FileSecurityBuf, &opt_data->FileSecuritySize))
+        {
+            opt_data->FileSecuritySize = (ULONG)-1;
+            return -1;
+        }
+        return 0;
     case 'u':
         if ('U' == arg[0])
             arg += sizeof "UserName=" - 1;
@@ -406,7 +524,7 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
     case 'v':
         arg += sizeof "volname=" - 1;
         opt_data->VolumeLabelLength = (UINT16)(sizeof(WCHAR) *
-            MultiByteToWideChar(CP_UTF8, 0, arg, lstrlenA(arg),
+            fsp_fuse_utf8towcs_trunc(arg, lstrlenA(arg),
             opt_data->VolumeLabel, sizeof opt_data->VolumeLabel / sizeof(WCHAR)));
         if (0 == opt_data->VolumeLabelLength)
             return -1;
@@ -448,7 +566,12 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
 
     if (-1 == fsp_fuse_core_opt_parse(env, args, &opt_data, /*help=*/1))
     {
-        if (-1 == opt_data.username_to_uid_result)
+        if ((ULONG)-1 == opt_data.FileSecuritySize)
+        {
+            ErrorMessage = L": invalid file security.";
+            goto fail;
+        }
+        else if (-1 == opt_data.username_to_uid_result)
         {
             ErrorMessage = L": invalid user or group name.";
             goto fail;
@@ -517,7 +640,7 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
     if (L'\0' == opt_data.VolumeParams.FileSystemName[0])
         memcpy(opt_data.VolumeParams.FileSystemName, L"FUSE", 5 * sizeof(WCHAR));
 
-    f = fsp_fuse_obj_alloc(env, sizeof *f);
+    f = fsp_fuse_obj_alloc(env, sizeof *f + opt_data.FileSecuritySize);
     if (0 == f)
         goto fail;
 
@@ -537,6 +660,11 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
     memcpy(&f->VolumeParams, &opt_data.VolumeParams, sizeof opt_data.VolumeParams);
     f->VolumeLabelLength = opt_data.VolumeLabelLength;
     memcpy(&f->VolumeLabel, &opt_data.VolumeLabel, opt_data.VolumeLabelLength);
+    if (0 != opt_data.FileSecuritySize)
+    {
+        memcpy(f->FileSecurityBuf, opt_data.FileSecurityBuf, opt_data.FileSecuritySize);
+        f->FileSecurity = f->FileSecurityBuf;
+    }
 
     Size = (lstrlenW(ch->MountPoint) + 1) * sizeof(WCHAR);
     f->MountPoint = fsp_fuse_obj_alloc(env, Size);
@@ -610,6 +738,115 @@ FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_exited)(struct fsp_fuse_env *env,
     return f->exited;
 }
 
+FSP_FUSE_API int fsp_fuse_notify(struct fsp_fuse_env *env,
+    struct fuse *f, const char *path, uint32_t action)
+{
+    PWSTR Path = 0;
+    int PathLength;
+    union
+    {
+        FSP_FSCTL_NOTIFY_INFO V;
+        UINT8 B[sizeof(FSP_FSCTL_NOTIFY_INFO) + FSP_FSCTL_TRANSACT_PATH_SIZEMAX];
+    } NotifyInfo;
+    NTSTATUS Result;
+    int result;
+
+    Result = FspPosixMapPosixToWindowsPath(path, &Path);
+    if (!NT_SUCCESS(Result))
+    {
+        result = -ENOMEM;
+        goto exit;
+    }
+
+    PathLength = lstrlenW(Path);
+    if (FSP_FSCTL_TRANSACT_PATH_SIZEMAX / sizeof(WCHAR) <= PathLength)
+    {
+        result = -ENAMETOOLONG;
+        goto exit;
+    }
+
+    NotifyInfo.V.Size = (UINT16)(sizeof(FSP_FSCTL_NOTIFY_INFO) + PathLength * sizeof(WCHAR));
+    NotifyInfo.V.Filter = 0;
+    NotifyInfo.V.Action = 0;
+    memcpy(NotifyInfo.V.FileNameBuf, Path, NotifyInfo.V.Size - sizeof(FSP_FSCTL_NOTIFY_INFO));
+
+    if (!f->VolumeParams.CaseSensitiveSearch)
+    {
+        /*
+         * Case-insensitive FUSE file systems do not normalize open file names, which means
+         * that the FSD automatically normalizes file names internally by uppercasing them.
+         *
+         * The FspFileSystemNotify API requires normalized names, so upper case the file name
+         * here in the case of case-insensitive file systems.
+         */
+        CharUpperBuffW(NotifyInfo.V.FileNameBuf, PathLength);
+    }
+
+    if (action & FSP_FUSE_NOTIFY_MKDIR)
+    {
+        NotifyInfo.V.Filter = FILE_NOTIFY_CHANGE_DIR_NAME;
+        NotifyInfo.V.Action = FILE_ACTION_ADDED;
+    }
+    else if (action & FSP_FUSE_NOTIFY_RMDIR)
+    {
+        NotifyInfo.V.Filter = FILE_NOTIFY_CHANGE_DIR_NAME;
+        NotifyInfo.V.Action = FILE_ACTION_REMOVED;
+    }
+    else if (action & FSP_FUSE_NOTIFY_CREATE)
+    {
+        NotifyInfo.V.Filter = FILE_NOTIFY_CHANGE_FILE_NAME;
+        NotifyInfo.V.Action = FILE_ACTION_ADDED;
+    }
+    else if (action & FSP_FUSE_NOTIFY_UNLINK)
+    {
+        NotifyInfo.V.Filter = FILE_NOTIFY_CHANGE_FILE_NAME;
+        NotifyInfo.V.Action = FILE_ACTION_REMOVED;
+    }
+
+    if (action & (FSP_FUSE_NOTIFY_CHMOD | FSP_FUSE_NOTIFY_CHOWN))
+    {
+        NotifyInfo.V.Filter |= FILE_NOTIFY_CHANGE_SECURITY;
+        if (0 == NotifyInfo.V.Action)
+            NotifyInfo.V.Action = FILE_ACTION_MODIFIED;
+    }
+
+    if (action & FSP_FUSE_NOTIFY_UTIME)
+    {
+        NotifyInfo.V.Filter |= FILE_NOTIFY_CHANGE_LAST_ACCESS | FILE_NOTIFY_CHANGE_LAST_WRITE;
+        if (0 == NotifyInfo.V.Action)
+            NotifyInfo.V.Action = FILE_ACTION_MODIFIED;
+    }
+
+    if (action & FSP_FUSE_NOTIFY_CHFLAGS)
+    {
+        NotifyInfo.V.Filter |= FILE_NOTIFY_CHANGE_ATTRIBUTES;
+        if (0 == NotifyInfo.V.Action)
+            NotifyInfo.V.Action = FILE_ACTION_MODIFIED;
+    }
+
+    if (action & FSP_FUSE_NOTIFY_TRUNCATE)
+    {
+        NotifyInfo.V.Filter |= FILE_NOTIFY_CHANGE_SIZE;
+        if (0 == NotifyInfo.V.Action)
+            NotifyInfo.V.Action = FILE_ACTION_MODIFIED;
+    }
+
+    Result = FspFileSystemNotify(f->FileSystem, &NotifyInfo.V, NotifyInfo.V.Size);
+    if (!NT_SUCCESS(Result))
+    {
+        result = -ENOMEM;
+        goto exit;
+    }
+
+    result = 0;
+
+exit:
+    if (0 != Path)
+        FspPosixDeletePath(Path);
+
+    return result;
+}
+
 FSP_FUSE_API struct fuse_context *fsp_fuse_get_context(struct fsp_fuse_env *env)
 {
     struct fuse_context *context;

src/dll/fuse/fuse_compat.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_compat.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 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-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -472,7 +472,8 @@ static NTSTATUS fsp_fuse_intf_GetSecurityEx(FSP_FILE_SYSTEM *FileSystem,
 
     if (0 != PSecurityDescriptorSize)
     {
-        Result = FspPosixMapPermissionsToSecurityDescriptor(Uid, Gid, Mode, &SecurityDescriptor);
+        Result = FspPosixMergePermissionsToSecurityDescriptor(Uid, Gid, Mode, f->FileSecurity,
+            &SecurityDescriptor);
         if (!NT_SUCCESS(Result))
             goto exit;
 
@@ -498,7 +499,7 @@ static NTSTATUS fsp_fuse_intf_GetSecurityEx(FSP_FILE_SYSTEM *FileSystem,
 exit:
     if (0 != SecurityDescriptor)
         FspDeleteSecurityDescriptor(SecurityDescriptor,
-            FspPosixMapPermissionsToSecurityDescriptor);
+            FspPosixMergePermissionsToSecurityDescriptor);
 
     return Result;
 }
@@ -950,12 +951,12 @@ exit:
             if (CreateOptions & FILE_DIRECTORY_FILE)
             {
                 if (0 != f->ops.releasedir)
-                    f->ops.releasedir(filedesc->PosixPath, &fi);
+                    f->ops.releasedir(contexthdr->PosixPath, &fi);
             }
             else
             {
                 if (0 != f->ops.release)
-                    f->ops.release(filedesc->PosixPath, &fi);
+                    f->ops.release(contexthdr->PosixPath, &fi);
             }
         }
 
@@ -1682,7 +1683,8 @@ static NTSTATUS fsp_fuse_intf_SetSecurity(FSP_FILE_SYSTEM *FileSystem,
     if (!NT_SUCCESS(Result))
         goto exit;
 
-    Result = FspPosixMapPermissionsToSecurityDescriptor(Uid, Gid, Mode, &SecurityDescriptor);
+    Result = FspPosixMergePermissionsToSecurityDescriptor(Uid, Gid, Mode, f->FileSecurity,
+        &SecurityDescriptor);
     if (!NT_SUCCESS(Result))
         goto exit;
 
@@ -1729,7 +1731,7 @@ exit:
 
     if (0 != SecurityDescriptor)
         FspDeleteSecurityDescriptor(SecurityDescriptor,
-            FspPosixMapPermissionsToSecurityDescriptor);
+            FspPosixMergePermissionsToSecurityDescriptor);
 
     return Result;
 }

src/dll/fuse/fuse_loop.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_loop.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse/fuse_main.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_main.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 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-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -30,60 +30,6 @@
 #define fsp_fuse_opt_match_exact        ((const char *)1)   /* exact option match */
 #define fsp_fuse_opt_match_next         ((const char *)2)   /* option match, value is next arg */
 
-static long long strtoint(const char *p, int base, int is_signed)
-{
-    long long v;
-    int maxdig, maxalp, sign = +1;
-
-    if (is_signed)
-    {
-        if ('+' == *p)
-            p++;
-        else if ('-' == *p)
-            p++, sign = -1;
-    }
-
-    if (0 == base)
-    {
-        if ('0' == *p)
-        {
-            p++;
-            if ('x' == *p || 'X' == *p)
-            {
-                p++;
-                base = 16;
-            }
-            else
-                base = 8;
-        }
-        else
-        {
-            base = 10;
-        }
-    }
-
-    maxdig = 10 < base ? '9' : (base - 1) + '0';
-    maxalp = 10 < base ? (base - 1 - 10) + 'a' : 0;
-
-    for (v = 0; *p; p++)
-    {
-        int c = *p;
-
-        if ('0' <= c && c <= maxdig)
-            v = base * v + (c - '0');
-        else
-        {
-            c |= 0x20;
-            if ('a' <= c && c <= maxalp)
-                v = base * v + (c - 'a') + 10;
-            else
-                break;
-        }
-    }
-
-    return sign * v;
-}
-
 static void fsp_fuse_opt_match_templ(
     const char *templ, const char **pspec,
     const char **parg)
@@ -281,19 +227,19 @@ static int fsp_fuse_opt_process_arg(struct fsp_fuse_env *env,
                 z++;
                 break;
             case 'd':
-                llv = strtoint(argl, 10, 1);
+                llv = strtollint(argl, 0, 10, 1);
                 goto ivar;
             case 'i':
-                llv = strtoint(argl, 0, 1);
+                llv = strtollint(argl, 0, 0, 1);
                 goto ivar;
             case 'o':
-                llv = strtoint(argl, 8, 0);
+                llv = strtollint(argl, 0, 8, 0);
                 goto ivar;
             case 'u':
-                llv = strtoint(argl, 10, 0);
+                llv = strtollint(argl, 0, 10, 0);
                 goto ivar;
             case 'x': case 'X':
-                llv = strtoint(argl, 16, 0);
+                llv = strtollint(argl, 0, 16, 0);
             ivar:
                 if (z)
                     VAR(data, opt, size_t) = (size_t)llv;

src/dll/fuse/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/library.h
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -72,6 +72,8 @@ struct fuse
     FSP_FILE_SYSTEM *FileSystem;
     volatile int exited;
     struct fuse3 *fuse3;
+    PSECURITY_DESCRIPTOR FileSecurity;
+    FSP_FSCTL_DECLSPEC_ALIGN UINT8 FileSecurityBuf[];
 };
 struct fsp_fuse_context_header
 {
@@ -156,6 +158,8 @@ struct fsp_fuse_core_opt_data
     FSP_FSCTL_VOLUME_PARAMS VolumeParams;
     UINT16 VolumeLabelLength;
     WCHAR VolumeLabel[sizeof ((FSP_FSCTL_VOLUME_INFO *)0)->VolumeLabel / sizeof(WCHAR)];
+    ULONG FileSecuritySize;
+    FSP_FSCTL_DECLSPEC_ALIGN UINT8 FileSecurityBuf[1024];
 };
 FSP_FSCTL_STATIC_ASSERT(
     sizeof ((struct fuse *)0)->VolumeLabel == sizeof ((struct fsp_fuse_core_opt_data *)0)->VolumeLabel,

src/dll/fuse3/fuse2to3.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse3/fuse2to3.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse3/fuse3.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse3/fuse3.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse3/fuse3_compat.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse3_compat.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse3/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse3/library.h
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/launch.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/launch.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/ldap.c

@@ -0,0 +1,157 @@
+/**
+ * @file dll/ldap.c
+ *
+ * @copyright 2015-2021 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 software
+ * in accordance with the commercial license agreement provided in
+ * conjunction with the software.  The terms and conditions of any such
+ * commercial license agreement shall govern, supersede, and render
+ * ineffective any application of the GPLv3 license to this software,
+ * notwithstanding of any reference thereto in the software or
+ * associated repository.
+ */
+
+#include <dll/library.h>
+#include <winldap.h>
+
+ULONG FspLdapConnect(PWSTR HostName, PVOID *PLdap)
+{
+    LDAP *Ldap = 0;
+    ULONG LdapResult;
+
+    *PLdap = 0;
+
+    Ldap = ldap_initW(HostName, LDAP_PORT);
+    if (0 == Ldap)
+    {
+        LdapResult = LdapGetLastError();
+        goto exit;
+    }
+
+    /* enable signing and encryption */
+    ldap_set_optionW(Ldap, LDAP_OPT_SIGN, LDAP_OPT_ON);
+    ldap_set_optionW(Ldap, LDAP_OPT_ENCRYPT, LDAP_OPT_ON);
+
+    LdapResult = ldap_bind_sW(Ldap, 0, 0, LDAP_AUTH_NEGOTIATE);
+    if (LDAP_SUCCESS != LdapResult)
+        goto exit;
+
+    *PLdap = Ldap;
+    LdapResult = LDAP_SUCCESS;
+
+exit:
+    if (LDAP_SUCCESS != LdapResult)
+    {
+        if (0 != Ldap)
+            ldap_unbind(Ldap);
+    }
+
+    return LdapResult;
+}
+
+VOID FspLdapClose(PVOID Ldap0)
+{
+    LDAP *Ldap = Ldap0;
+
+    ldap_unbind(Ldap);
+}
+
+ULONG FspLdapGetValue(PVOID Ldap0, PWSTR Base, ULONG Scope, PWSTR Filter, PWSTR Attribute,
+    PWSTR *PValue)
+{
+    LDAP *Ldap = Ldap0;
+    PWSTR Attributes[2];
+    LDAPMessage *Message = 0, *Entry;
+    PWSTR *Values = 0;
+    int Size;
+    PWSTR Value;
+    ULONG LdapResult;
+
+    *PValue = 0;
+
+    Attributes[0] = Attribute;
+    Attributes[1] = 0;
+    LdapResult = ldap_search_sW(Ldap, Base, Scope, Filter, Attributes, 0, &Message);
+    if (LDAP_SUCCESS != LdapResult)
+        goto exit;
+
+    Entry = ldap_first_entry(Ldap, Message);
+    if (0 == Entry)
+    {
+        LdapResult = LDAP_OTHER;
+        goto exit;
+    }
+
+    Values = ldap_get_valuesW(Ldap, Entry, Attributes[0]);
+    if (0 == Values || 0 == ldap_count_valuesW(Values))
+    {
+        LdapResult = LDAP_OTHER;
+        goto exit;
+    }
+
+    Size = (lstrlenW(Values[0]) + 1) * sizeof(WCHAR);
+    Value = MemAlloc(Size);
+    if (0 == Value)
+    {
+        LdapResult = LDAP_NO_MEMORY;
+        goto exit;
+    }
+    memcpy(Value, Values[0], Size);
+
+    *PValue = Value;
+    LdapResult = LDAP_SUCCESS;
+
+exit:
+    if (0 != Values)
+        ldap_value_freeW(Values);
+    if (0 != Message)
+        ldap_msgfree(Message);
+
+    return LdapResult;
+}
+
+ULONG FspLdapGetDefaultNamingContext(PVOID Ldap, PWSTR *PValue)
+{
+    return FspLdapGetValue(Ldap, 0, LDAP_SCOPE_BASE, L"(objectClass=*)", L"defaultNamingContext",
+        PValue);
+}
+
+ULONG FspLdapGetTrustPosixOffset(PVOID Ldap, PWSTR Context, PWSTR Domain, PWSTR *PValue)
+{
+    WCHAR Base[1024];
+    WCHAR Filter[512];
+    BOOLEAN IsFlatName;
+
+    *PValue = 0;
+
+    if (sizeof Base / sizeof Base[0] - 64 < lstrlenW(Context) ||
+        sizeof Filter / sizeof Filter[0] - 64 < lstrlenW(Domain))
+        return LDAP_OTHER;
+
+    IsFlatName = TRUE;
+    for (PWSTR P = Domain; *P; P++)
+        if (L'.' == *P)
+        {
+            IsFlatName = FALSE;
+            break;
+        }
+
+    wsprintfW(Base,
+        L"CN=System,%s",
+        Context);
+    wsprintfW(Filter,
+        IsFlatName ?
+            L"(&(objectClass=trustedDomain)(flatName=%s))" :
+            L"(&(objectClass=trustedDomain)(name=%s))",
+        Domain);
+
+    return FspLdapGetValue(Ldap, Base, LDAP_SCOPE_ONELEVEL, Filter, L"trustPosixOffset", PValue);
+}

src/dll/library.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/library.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/library.h
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -30,7 +30,7 @@
 
 #include <shared/ku/config.h>
 
-#define LIBRARY_NAME                    "WinFsp"
+#define LIBRARY_NAME                    FSP_FSCTL_PRODUCT_NAME
 
 /* DEBUGLOG */
 #if !defined(NDEBUG)
@@ -64,6 +64,13 @@ NTSTATUS FspEventLogUnregister(VOID);
 PSID FspWksidNew(WELL_KNOWN_SID_TYPE WellKnownSidType, PNTSTATUS PResult);
 PSID FspWksidGet(WELL_KNOWN_SID_TYPE WellKnownSidType);
 
+ULONG FspLdapConnect(PWSTR HostName, PVOID *PLdap);
+VOID FspLdapClose(PVOID Ldap);
+ULONG FspLdapGetValue(PVOID Ldap, PWSTR Base, ULONG Scope, PWSTR Filter, PWSTR Attribute,
+    PWSTR *PValue);
+ULONG FspLdapGetDefaultNamingContext(PVOID Ldap, PWSTR *PValue);
+ULONG FspLdapGetTrustPosixOffset(PVOID Ldap, PWSTR Context, PWSTR Domain, PWSTR *PValue);
+
 PWSTR FspDiagIdent(VOID);
 
 #define FspFileSystemDirectoryBufferEntryInvalid ((ULONG)-1)

src/dll/mount.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/mount.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/np.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/np.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -742,7 +742,7 @@ DWORD APIENTRY NPAddConnection3(HWND hwndOwner,
     DWORD AuthPackage, CredentialsKind;
     WCHAR UserName[CREDUI_MAX_USERNAME_LENGTH + 1], Password[CREDUI_MAX_PASSWORD_LENGTH + 1];
 #if defined(FSP_NP_CREDENTIAL_MANAGER)
-    BOOL Save = TRUE;
+    BOOL Save = FALSE;
 #endif
 
     //dwFlags |= CONNECT_INTERACTIVE | CONNECT_PROMPT; /* TESTING ONLY! */

src/dll/ntstatus.c

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

src/dll/ntstatus.i

@@ -46,6 +46,7 @@ case ERROR_CANT_ACCESS_FILE:                  return STATUS_IO_REPARSE_TAG_NOT_H
 case ERROR_CANT_DISABLE_MANDATORY:            return STATUS_CANT_DISABLE_MANDATORY;
 case ERROR_CANT_OPEN_ANONYMOUS:               return STATUS_CANT_OPEN_ANONYMOUS;
 case ERROR_CANT_RESOLVE_FILENAME:             return STATUS_REPARSE_POINT_NOT_RESOLVED;
+case ERROR_CANT_WAIT:                         return STATUS_CANT_WAIT;
 case ERROR_CHILD_MUST_BE_VOLATILE:            return STATUS_CHILD_MUST_BE_VOLATILE;
 case ERROR_CLEANER_CARTRIDGE_INSTALLED:       return STATUS_CLEANER_CARTRIDGE_INSTALLED;
 case ERROR_CLUSTER_INVALID_NETWORK:           return STATUS_CLUSTER_INVALID_NETWORK;

src/dll/path.c

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

src/dll/security.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/security.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -488,7 +488,8 @@ FSP_API VOID FspDeleteSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor
         return;
 
     if ((NTSTATUS (*)())FspAccessCheckEx == CreateFunc ||
-        (NTSTATUS (*)())FspPosixMapPermissionsToSecurityDescriptor == CreateFunc)
+        (NTSTATUS (*)())FspPosixMapPermissionsToSecurityDescriptor == CreateFunc ||
+        (NTSTATUS (*)())FspPosixMergePermissionsToSecurityDescriptor == CreateFunc)
         MemFree(SecurityDescriptor);
     else
     if ((NTSTATUS (*)())FspCreateSecurityDescriptor == CreateFunc ||

src/dll/service.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/service.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/util.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/util.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/version.rc

@@ -23,9 +23,9 @@ BEGIN
             VALUE "CompanyName", STR(MyCompanyName)
             VALUE "FileDescription", STR(MyDescription)
             VALUE "FileVersion", STR(MyFullVersion)
-            VALUE "InternalName", "winfsp.dll"
+            VALUE "InternalName", STR(MyProductFileName) ".dll"
             VALUE "LegalCopyright", STR(MyCopyright)
-            VALUE "OriginalFilename", "winfsp.dll"
+            VALUE "OriginalFilename", STR(MyProductFileName) ".dll"
             VALUE "ProductName", STR(MyProductName)
             VALUE "ProductVersion", STR(MyProductVersion)
         END

src/dll/wksid.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/wksid.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dotnet/FileSystemBase+Const.cs

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

src/dotnet/FileSystemBase.cs

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

src/dotnet/FileSystemHost.cs

@@ -1,7 +1,7 @@
 /*
  * dotnet/FileSystemHost.cs
  *
- * Copyright 2015-2020 Bill Zissimopoulos
+ * Copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -342,7 +342,7 @@ namespace Fsp
         public Int32 Preflight(String MountPoint)
         {
             return Api.FspFileSystemPreflight(
-                _VolumeParams.IsPrefixEmpty() ? "WinFsp.Disk" : "WinFsp.Net",
+                _VolumeParams.IsPrefixEmpty() ? Api.ProductName + ".Disk" : Api.ProductName + ".Net",
                 MountPoint);
         }
         /// <summary>
@@ -416,7 +416,7 @@ namespace Fsp
             if (0 > Result)
                 return Result;
             Result = Api.FspFileSystemCreate(
-                _VolumeParams.IsPrefixEmpty() ? "WinFsp.Disk" : "WinFsp.Net",
+                _VolumeParams.IsPrefixEmpty() ? Api.ProductName + ".Disk" : Api.ProductName + ".Net",
                 ref _VolumeParams, _FileSystemInterfacePtr, out _FileSystemPtr);
             if (0 > Result)
                 return Result;
@@ -582,6 +582,75 @@ namespace Fsp
             Response.IoStatus.Status = (UInt32)Status;
             Api.FspFileSystemSendResponse(_FileSystemPtr, ref Response);
         }
+        /// <summary>
+        /// Begin notifying Windows that the file system has file changes.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// A file system that wishes to notify Windows about file changes must
+        /// first issue an FspFileSystemBegin call, followed by 0 or more
+        /// FspFileSystemNotify calls, followed by an FspFileSystemNotifyEnd call.
+        /// </para><para>
+        /// This operation blocks concurrent file rename operations. File rename
+        /// operations may interfere with file notification, because a file being
+        /// notified may also be concurrently renamed. After all file change
+        /// notifications have been issued, you must make sure to call
+        /// FspFileSystemNotifyEnd to allow file rename operations to proceed.
+        /// </para>
+        /// </remarks>
+        /// <returns>
+        /// STATUS_SUCCESS or error code. The error code STATUS_CANT_WAIT means that
+        /// a file rename operation is currently in progress and the operation must be
+        /// retried at a later time.
+        /// </returns>
+        public Int32 NotifyBegin(UInt32 Timeout)
+        {
+            return Api.FspFileSystemNotifyBegin(_FileSystemPtr, Timeout);
+        }
+        /// <summary>
+        /// End notifying Windows that the file system has file changes.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// A file system that wishes to notify Windows about file changes must
+        /// first issue an FspFileSystemBegin call, followed by 0 or more
+        /// FspFileSystemNotify calls, followed by an FspFileSystemNotifyEnd call.
+        /// </para><para>
+        /// This operation allows any blocked file rename operations to proceed.
+        /// </para>
+        /// </remarks>
+        /// <returns>STATUS_SUCCESS or error code.</returns>
+        public Int32 NotifyEnd()
+        {
+            return Api.FspFileSystemNotifyEnd(_FileSystemPtr);
+        }
+        /// <summary>
+        /// Notify Windows that the file system has file changes.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// A file system that wishes to notify Windows about file changes must
+        /// first issue an FspFileSystemBegin call, followed by 0 or more
+        /// FspFileSystemNotify calls, followed by an FspFileSystemNotifyEnd call.
+        /// </para><para>
+        /// Note that FspFileSystemNotify requires file names to be normalized. A
+        /// normalized file name is one that contains the correct case of all characters
+        /// in the file name.
+        /// </para><para>
+        /// For case-sensitive file systems all file names are normalized by definition.
+        /// For case-insensitive file systems that implement file name normalization,
+        /// a normalized file name is the one that the file system specifies in the
+        /// response to Create or Open (see also FspFileSystemGetOpenFileInfo). For
+        /// case-insensitive file systems that do not implement file name normalization
+        /// a normalized file name is the upper case version of the file name used
+        /// to open the file.
+        /// </para>
+        /// </remarks>
+        /// <returns>STATUS_SUCCESS or error code.</returns>
+        public Int32 Notify(NotifyInfo[] NotifyInfoArray)
+        {
+            return Api.FspFileSystemNotify(_FileSystemPtr, NotifyInfoArray);
+        }
 
         /* FSP_FILE_SYSTEM_INTERFACE */
         private static Byte[] ByteBufferNotNull = new Byte[0];

src/dotnet/Interop.cs

@@ -1,7 +1,7 @@
 /*
  * dotnet/Interop.cs
  *
- * Copyright 2015-2020 Bill Zissimopoulos
+ * Copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -310,6 +310,85 @@ namespace Fsp.Interop
         }
     }
 
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct NotifyInfoInternal
+    {
+        internal const int FileNameBufSize = 1024 * 2/*FSP_FSCTL_TRANSACT_PATH_SIZEMAX*/;
+        internal static int FileNameBufOffset =
+            (int)Marshal.OffsetOf(typeof(NotifyInfoInternal), "FileNameBuf");
+
+        internal UInt16 Size;
+        internal UInt32 Filter;
+        internal UInt32 Action;
+        //internal unsafe fixed UInt16 FileNameBuf[];
+        internal unsafe fixed UInt16 FileNameBuf[FileNameBufSize];
+
+        internal unsafe void SetFileNameBuf(String Value)
+        {
+            fixed (UInt16 *P = FileNameBuf)
+            {
+                int Size = null != Value ? Value.Length : 0;
+                if (Size > FileNameBufSize)
+                    Size = FileNameBufSize;
+                for (int I = 0; Size > I; I++)
+                    P[I] = Value[I];
+                this.Size = (UInt16)(FileNameBufOffset + Size * 2);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Enumeration of all the possible values for NotifyInfo.Action
+    /// </summary>
+    public enum NotifyAction : UInt32
+    {
+        Added = 1,
+        Removed = 2,
+        Modified = 3,
+        RenamedOldName = 4,
+        RenamedNewName = 5,
+        AddedStream = 6,
+        RemovedStream = 7,
+        ModifiedStream = 8,
+        RemovedByDelete = 9,
+        IdNotTunnelled = 10,
+        TunnelledIdCollision = 11,
+    }
+
+
+    /// <summary>
+    /// Enumeration of all the possible values for NotifyInfo.Filter
+    /// </summary>
+    [Flags]
+    public enum NotifyFilter : UInt32
+    {
+        None              = 0x00000,
+        ChangeFileName    = 0x00001,
+        ChangeDirName     = 0x00002,
+        ChangeName        = ChangeFileName | ChangeDirName,
+        ChangeAttributes  = 0x00004,
+        ChangeSize        = 0x00008,
+        ChangeLastWrite   = 0x00010,
+        ChangeLastAccess  = 0x00020,
+        ChangeCreation    = 0x00040,
+        ChangeEa          = 0x00080,
+        ChangeSecurity    = 0x00100,
+        ChangeStreamName  = 0x00200,
+        ChangeStreamSize  = 0x00400,
+        ChangeStreamWrite = 0x00800,
+    }
+
+    /// <summary>
+    /// Contains file change notification information.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct NotifyInfo
+    {
+        public String FileName;
+        public NotifyAction Action;
+        public NotifyFilter Filter;
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     internal struct FullEaInformation
     {
@@ -743,6 +822,18 @@ namespace Fsp.Interop
                 IntPtr FileSystem,
                 ref FspFsctlTransactRsp Response);
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+            internal delegate Int32 FspFileSystemNotifyBegin(
+                IntPtr FileSystem,
+                UInt32 Timeout);
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+            internal delegate Int32 FspFileSystemNotifyEnd(
+                IntPtr FileSystem);
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+            internal delegate Int32 FspFileSystemNotify(
+                IntPtr FileSystem,
+                IntPtr NotifyInfo,
+                UIntPtr Size);
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             internal unsafe delegate FspFileSystemOperationContext *FspFileSystemGetOperationContext();
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             internal delegate IntPtr FspFileSystemMountPointF(
@@ -805,6 +896,13 @@ namespace Fsp.Interop
                 out UInt32 PBytesTransferred);
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             [return: MarshalAs(UnmanagedType.U1)]
+            internal delegate Boolean FspFileSystemAddNotifyInfo(
+                IntPtr NotifyInfo,
+                IntPtr Buffer,
+                UInt32 Length,
+                out UInt32 PBytesTransferred);
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+            [return: MarshalAs(UnmanagedType.U1)]
             internal delegate Boolean FspFileSystemAcquireDirectoryBuffer(
                 ref IntPtr PDirBuffer,
                 [MarshalAs(UnmanagedType.U1)] Boolean Reset,
@@ -930,6 +1028,9 @@ namespace Fsp.Interop
         internal static Proto.FspFileSystemStartDispatcher FspFileSystemStartDispatcher;
         internal static Proto.FspFileSystemStopDispatcher FspFileSystemStopDispatcher;
         internal static Proto.FspFileSystemSendResponse FspFileSystemSendResponse;
+        internal static Proto.FspFileSystemNotifyBegin FspFileSystemNotifyBegin;
+        internal static Proto.FspFileSystemNotifyEnd FspFileSystemNotifyEnd;
+        internal static Proto.FspFileSystemNotify _FspFileSystemNotify;
         internal static Proto.FspFileSystemGetOperationContext FspFileSystemGetOperationContext;
         internal static Proto.FspFileSystemMountPointF FspFileSystemMountPoint;
         internal static Proto.FspFileSystemSetOperationGuardStrategyF FspFileSystemSetOperationGuardStrategy;
@@ -941,6 +1042,7 @@ namespace Fsp.Interop
         internal static Proto.FspFileSystemCanReplaceReparsePoint _FspFileSystemCanReplaceReparsePoint;
         internal static Proto.FspFileSystemAddStreamInfo _FspFileSystemAddStreamInfo;
         internal static Proto.FspFileSystemAddEa _FspFileSystemAddEa;
+        internal static Proto.FspFileSystemAddNotifyInfo _FspFileSystemAddNotifyInfo;
         internal static Proto.FspFileSystemAcquireDirectoryBuffer FspFileSystemAcquireDirectoryBuffer;
         internal static Proto.FspFileSystemFillDirectoryBuffer FspFileSystemFillDirectoryBuffer;
         internal static Proto.FspFileSystemReleaseDirectoryBuffer FspFileSystemReleaseDirectoryBuffer;
@@ -1013,6 +1115,15 @@ namespace Fsp.Interop
         {
             return _FspFileSystemAddStreamInfo(IntPtr.Zero, Buffer, Length, out PBytesTransferred);
         }
+        internal static unsafe Boolean FspFileSystemAddNotifyInfo(
+            ref NotifyInfoInternal NotifyInfo,
+            IntPtr Buffer,
+            UInt32 Length,
+            out UInt32 PBytesTransferred)
+        {
+            fixed (NotifyInfoInternal *P = &NotifyInfo)
+                return _FspFileSystemAddNotifyInfo((IntPtr)P, Buffer, Length, out PBytesTransferred);
+        }
 
         internal delegate Int32 EnumerateEa(
             Object FileNode,
@@ -1070,6 +1181,35 @@ namespace Fsp.Interop
             return _FspFileSystemAddEa(IntPtr.Zero, Buffer, Length, out PBytesTransferred);
         }
 
+        internal static unsafe Int32 FspFileSystemNotify(
+            IntPtr FileSystem,
+            NotifyInfo[] NotifyInfoArray)
+        {
+            int Length = 0;
+            for (int I = 0; NotifyInfoArray.Length > I; I++)
+            {
+                Length += NotifyInfoInternal.FileNameBufOffset +
+                    NotifyInfoArray[I].FileName.Length * 2;
+                Length = (Length + 7) & ~7; // align to next qword boundary
+            }
+
+            Byte[] Buffer = new Byte[Length];
+            UInt32 BytesTransferred = default(UInt32);
+            fixed (Byte *P = Buffer)
+            {
+                for (int I = 0; NotifyInfoArray.Length > I; I++)
+                {
+                    NotifyInfoInternal Internal = default(NotifyInfoInternal);
+                    Internal.Action = (UInt32)NotifyInfoArray[I].Action;
+                    Internal.Filter = (UInt32)NotifyInfoArray[I].Filter;
+                    Internal.SetFileNameBuf(NotifyInfoArray[I].FileName);
+                    FspFileSystemAddNotifyInfo(
+                        ref Internal, (IntPtr)P, (UInt32)Length, out BytesTransferred);
+                }
+                return _FspFileSystemNotify(FileSystem, (IntPtr)P, (UIntPtr)BytesTransferred);
+            }
+        }
+
         internal unsafe static Object GetUserContext(
             IntPtr NativePtr)
         {
@@ -1285,13 +1425,17 @@ namespace Fsp.Interop
         }
 
         /* initialization */
+        internal static String ProductName = "WinFsp";
+        internal static String ProductFileName = "winfsp";
         private static IntPtr LoadDll()
         {
             String DllPath = null;
-            String DllName = 8 == IntPtr.Size ? "winfsp-x64.dll" : "winfsp-x86.dll";
+            String DllName = 8 == IntPtr.Size ?
+                ProductFileName + "-x64.dll" :
+                ProductFileName + "-x86.dll";
             String KeyName = 8 == IntPtr.Size ?
-                "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\WinFsp" :
+                "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\" + ProductName :
-                "HKEY_LOCAL_MACHINE\\Software\\WinFsp";
+                "HKEY_LOCAL_MACHINE\\Software\\" + ProductName;
             IntPtr Module;
             Module = LoadLibraryW(DllName);
             if (IntPtr.Zero == Module)
@@ -1330,6 +1474,9 @@ namespace Fsp.Interop
             FspFileSystemStartDispatcher = GetEntryPoint<Proto.FspFileSystemStartDispatcher>(Module);
             FspFileSystemStopDispatcher = GetEntryPoint<Proto.FspFileSystemStopDispatcher>(Module);
             FspFileSystemSendResponse = GetEntryPoint<Proto.FspFileSystemSendResponse>(Module);
+            FspFileSystemNotifyBegin = GetEntryPoint<Proto.FspFileSystemNotifyBegin>(Module);
+            FspFileSystemNotifyEnd = GetEntryPoint<Proto.FspFileSystemNotifyEnd>(Module);
+            _FspFileSystemNotify = GetEntryPoint<Proto.FspFileSystemNotify>(Module);
             FspFileSystemGetOperationContext = GetEntryPoint<Proto.FspFileSystemGetOperationContext>(Module);
             FspFileSystemMountPoint = GetEntryPoint<Proto.FspFileSystemMountPointF>(Module);
             FspFileSystemSetOperationGuardStrategy = GetEntryPoint<Proto.FspFileSystemSetOperationGuardStrategyF>(Module);
@@ -1341,6 +1488,7 @@ namespace Fsp.Interop
             _FspFileSystemCanReplaceReparsePoint = GetEntryPoint<Proto.FspFileSystemCanReplaceReparsePoint>(Module);
             _FspFileSystemAddStreamInfo = GetEntryPoint<Proto.FspFileSystemAddStreamInfo>(Module);
             _FspFileSystemAddEa = GetEntryPoint<Proto.FspFileSystemAddEa>(Module);
+            _FspFileSystemAddNotifyInfo = GetEntryPoint<Proto.FspFileSystemAddNotifyInfo>(Module);
             FspFileSystemAcquireDirectoryBuffer = GetEntryPoint<Proto.FspFileSystemAcquireDirectoryBuffer>(Module);
             FspFileSystemFillDirectoryBuffer = GetEntryPoint<Proto.FspFileSystemFillDirectoryBuffer>(Module);
             FspFileSystemReleaseDirectoryBuffer = GetEntryPoint<Proto.FspFileSystemReleaseDirectoryBuffer>(Module);
@@ -1381,6 +1529,15 @@ namespace Fsp.Interop
             if (Debugger.IsAttached)
                 Debugger.Break();
 #endif
+            object[] attributes = Assembly.GetExecutingAssembly().GetCustomAttributes(
+                typeof(AssemblyProductAttribute), false);
+            if (null != attributes &&
+                0 < attributes.Length &&
+                null != attributes[0] as AssemblyProductAttribute)
+            {
+                ProductName = (attributes[0] as AssemblyProductAttribute).Product;
+                ProductFileName = ProductName.ToLowerInvariant();
+            }
             LoadProto(LoadDll());
             CheckVersion();
         }

src/dotnet/Service.cs

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

src/fsptool/fsptool.c

@@ -1,7 +1,7 @@
 /**
  * @file fsptool/fsptool.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -55,36 +55,6 @@ static void printlog(HANDLE h, const char *format, ...)
     va_end(ap);
 }
 
-static unsigned wcstoint(const wchar_t *p, const wchar_t **endp, int base)
-{
-    unsigned v;
-    int maxdig, maxalp;
-
-    maxdig = 10 < base ? '9' : (base - 1) + '0';
-    maxalp = 10 < base ? (base - 1 - 10) + 'a' : 0;
-
-    for (v = 0; *p; p++)
-    {
-        int c = *p;
-
-        if ('0' <= c && c <= maxdig)
-            v = base * v + (c - '0');
-        else
-        {
-            c |= 0x20;
-            if ('a' <= c && c <= maxalp)
-                v = base * v + (c - 'a') + 10;
-            else
-                break;
-        }
-    }
-
-    if (0 != endp)
-        *endp = (wchar_t *)p;
-
-    return v;
-}
-
 static void usage(void)
 {
     fatal(ERROR_INVALID_PARAMETER,
@@ -380,7 +350,7 @@ static NTSTATUS id_uid(PWSTR UidStr)
     UINT32 Uid;
     NTSTATUS Result;
 
-    Uid = wcstoint(UidStr, &UidStr, 10);
+    Uid = wcstouint(UidStr, &UidStr, 10, 0);
     if (L'\0' != *UidStr)
         return STATUS_INVALID_PARAMETER;
 
@@ -525,13 +495,13 @@ static NTSTATUS perm_mode(PWSTR PermStr)
     UINT32 Uid, Gid, Mode;
     NTSTATUS Result;
 
-    Uid = wcstoint(PermStr, &PermStr, 10);
+    Uid = wcstouint(PermStr, &PermStr, 10, 0);
     if (L':' != *PermStr)
         return STATUS_INVALID_PARAMETER;
-    Gid = wcstoint(PermStr + 1, &PermStr, 10);
+    Gid = wcstouint(PermStr + 1, &PermStr, 10, 0);
     if (L':' != *PermStr)
         return STATUS_INVALID_PARAMETER;
-    Mode = wcstoint(PermStr + 1, &PermStr, 8);
+    Mode = wcstouint(PermStr + 1, &PermStr, 8, 0);
     if (L'\0' != *PermStr)
         return STATUS_INVALID_PARAMETER;
 

src/launcher/launchctl.c

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

src/launcher/launcher.c

@@ -1,7 +1,7 @@
 /**
  * @file launcher/launcher.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -25,7 +25,7 @@
 #include <sddl.h>
 #include <userenv.h>
 
-#define PROGNAME                        "WinFsp.Launcher"
+#define PROGNAME                        FSP_FSCTL_PRODUCT_NAME ".Launcher"
 
 static NTSTATUS (NTAPI *SvcNtOpenSymbolicLinkObject)(
     PHANDLE LinkHandle,

src/launcher/ptrans.c

@@ -1,7 +1,7 @@
 /**
  * @file launcher/ptrans.c
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/shared/ku/config.h

@@ -4,7 +4,7 @@
  * Shared kernel/user configuration. This file is to be included by the
  * FSD and DLL components ONLY!
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/shared/ku/library.h

@@ -1,7 +1,7 @@
 /**
  * @file shared/ku/library.h
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -26,6 +26,8 @@
 
 #include <dll/library.h>
 #include <aclapi.h>
+#include <dsgetdc.h>
+#include <lm.h>
 #define _NTDEF_
 #include <ntsecapi.h>
 

src/shared/ku/posix.c

@@ -14,7 +14,7 @@
  * [SNAME]
  *     https://www.cygwin.com/cygwin-ug-net/using-specialnames.html
  *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -41,6 +41,10 @@ FSP_API VOID FspDeleteSid(PSID Sid, NTSTATUS (*CreateFunc)());
 FSP_API NTSTATUS FspPosixMapPermissionsToSecurityDescriptor(
     UINT32 Uid, UINT32 Gid, UINT32 Mode,
     PSECURITY_DESCRIPTOR *PSecurityDescriptor);
+FSP_API NTSTATUS FspPosixMergePermissionsToSecurityDescriptor(
+    UINT32 Uid, UINT32 Gid, UINT32 Mode,
+    PSECURITY_DESCRIPTOR ExistingSecurityDescriptor,
+    PSECURITY_DESCRIPTOR *PSecurityDescriptor);
 FSP_API NTSTATUS FspPosixMapSecurityDescriptorToPermissions(
     PSECURITY_DESCRIPTOR SecurityDescriptor,
     PUINT32 PUid, PUINT32 PGid, PUINT32 PMode);
@@ -59,6 +63,7 @@ FSP_API VOID FspPosixDecodeWindowsPath(PWSTR WindowsPath, ULONG Size);
 #pragma alloc_text(PAGE, FspPosixCreateSid)
 #pragma alloc_text(PAGE, FspDeleteSid)
 #pragma alloc_text(PAGE, FspPosixMapPermissionsToSecurityDescriptor)
+#pragma alloc_text(PAGE, FspPosixMergePermissionsToSecurityDescriptor)
 #pragma alloc_text(PAGE, FspPosixMapSecurityDescriptorToPermissions)
 #pragma alloc_text(PAGE, FspPosixMapWindowsToPosixPathEx)
 #pragma alloc_text(PAGE, FspPosixMapPosixToWindowsPathEx)
@@ -111,8 +116,84 @@ static union
 #define FspUnmappedUid                  (65534)
 
 static PISID FspAccountDomainSid, FspPrimaryDomainSid;
+static struct
+{
+    PSID DomainSid;
+    PWSTR NetbiosDomainName;
+    PWSTR DnsDomainName;
+    ULONG TrustPosixOffset;
+} *FspTrustedDomains;
+static ULONG FspTrustedDomainCount;
+static BOOLEAN FspDistinctPermsForSameOwnerGroup;
 static INIT_ONCE FspPosixInitOnce = INIT_ONCE_STATIC_INIT;
+
 #if !defined(_KERNEL_MODE)
+
+static ULONG FspPosixInitializeTrustPosixOffsets(VOID)
+{
+    PVOID Ldap = 0;
+    PWSTR DefaultNamingContext = 0;
+    PWSTR TrustPosixOffsetString = 0;
+    ULONG LdapResult;
+
+    LdapResult = FspLdapConnect(0/* default LDAP server */, &Ldap);
+    if (0 != LdapResult)
+        goto exit;
+
+    LdapResult = FspLdapGetDefaultNamingContext(Ldap, &DefaultNamingContext);
+    if (0 != LdapResult)
+        goto exit;
+
+    /* get the "trustPosixOffset" for each trusted domain */
+    for (ULONG I = 0; FspTrustedDomainCount > I; I++)
+    {
+        MemFree(TrustPosixOffsetString);
+        LdapResult = FspLdapGetTrustPosixOffset(Ldap,
+            DefaultNamingContext, FspTrustedDomains[I].DnsDomainName, &TrustPosixOffsetString);
+        if (0 == LdapResult)
+            FspTrustedDomains[I].TrustPosixOffset = wcstouint(TrustPosixOffsetString, 0, 10, 1);
+    }
+
+    LdapResult = 0;
+
+exit:
+    MemFree(TrustPosixOffsetString);
+    MemFree(DefaultNamingContext);
+    if (0 != Ldap)
+        FspLdapClose(Ldap);
+
+    /* if the "trustPosixOffset" looks wrong, fix it up using Cygwin magic value 0xfe500000 */
+    for (ULONG I = 0; FspTrustedDomainCount > I; I++)
+    {
+        if (0x100000 > FspTrustedDomains[I].TrustPosixOffset)
+            FspTrustedDomains[I].TrustPosixOffset = 0xfe500000;
+    }
+
+    return LdapResult;
+}
+
+static VOID FspPosixInitializeFromRegistry(VOID)
+{
+    HKEY RegKey;
+    LONG Result;
+    DWORD Size;
+    DWORD DistinctPermsForSameOwnerGroup;
+
+    DistinctPermsForSameOwnerGroup = 0;
+
+    Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\" FSP_FSCTL_PRODUCT_NAME,
+        0, KEY_READ | KEY_WOW64_32KEY, &RegKey);
+    if (ERROR_SUCCESS == Result)
+    {
+        Size = sizeof DistinctPermsForSameOwnerGroup;
+        Result = RegGetValueW(RegKey, 0, L"DistinctPermsForSameOwnerGroup",
+            RRF_RT_REG_DWORD, 0, &DistinctPermsForSameOwnerGroup, &Size);
+        RegCloseKey(RegKey);
+    }
+
+    FspDistinctPermsForSameOwnerGroup = !!DistinctPermsForSameOwnerGroup;
+}
+
 static BOOL WINAPI FspPosixInitialize(
     PINIT_ONCE InitOnce, PVOID Parameter, PVOID *Context)
 {
@@ -120,8 +201,10 @@ static BOOL WINAPI FspPosixInitialize(
     LSA_HANDLE PolicyHandle = 0;
     PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = 0;
     PPOLICY_DNS_DOMAIN_INFO PrimaryDomainInfo = 0;
+    PDS_DOMAIN_TRUSTSW TrustedDomains = 0;
+    ULONG TrustedDomainCount, RealTrustedDomainCount;
     BYTE Count;
-    ULONG Size;
+    ULONG Size, Temp;
     NTSTATUS Result;
 
     Result = LsaOpenPolicy(0, &Obja, POLICY_VIEW_LOCAL_INFORMATION, &PolicyHandle);
@@ -148,9 +231,106 @@ static BOOL WINAPI FspPosixInitialize(
         FspPrimaryDomainSid = MemAlloc(Size);
         if (0 != FspPrimaryDomainSid)
             memcpy(FspPrimaryDomainSid, PrimaryDomainInfo->Sid, Size);
+
+        if (ERROR_SUCCESS == DsEnumerateDomainTrustsW(
+            0, DS_DOMAIN_DIRECT_INBOUND | DS_DOMAIN_DIRECT_OUTBOUND | DS_DOMAIN_IN_FOREST,
+            &TrustedDomains, &TrustedDomainCount))
+        {
+            Size = 0;
+            RealTrustedDomainCount = 0;
+            for (ULONG I = 0; TrustedDomainCount > I; I++)
+            {
+                if (0 == TrustedDomains[I].DomainSid ||
+                    (0 == TrustedDomains[I].NetbiosDomainName &&
+                        0 == TrustedDomains[I].DnsDomainName) ||
+                    EqualSid(TrustedDomains[I].DomainSid, FspPrimaryDomainSid))
+                    continue;
+                if (0 != TrustedDomains[I].DomainSid)
+                {
+                    Size = FSP_FSCTL_DEFAULT_ALIGN_UP(Size);
+                    Size += GetLengthSid(TrustedDomains[I].DomainSid);
+                }
+                if (0 != TrustedDomains[I].NetbiosDomainName)
+                {
+                    Size = FSP_FSCTL_ALIGN_UP(Size, sizeof(WCHAR));
+                    Size += (lstrlenW(TrustedDomains[I].NetbiosDomainName) + 1) * sizeof(WCHAR);
+                }
+                if (0 != TrustedDomains[I].DnsDomainName)
+                {
+                    Size = FSP_FSCTL_ALIGN_UP(Size, sizeof(WCHAR));
+                    Size += (lstrlenW(TrustedDomains[I].DnsDomainName) + 1) * sizeof(WCHAR);
+                }
+                RealTrustedDomainCount++;
+            }
+            Size = FSP_FSCTL_DEFAULT_ALIGN_UP(sizeof FspTrustedDomains[0] * RealTrustedDomainCount) + Size;
+            if (0 < RealTrustedDomainCount)
+            {
+                FspTrustedDomains = MemAlloc(Size);
+                if (0 != FspTrustedDomains)
+                {
+                    Size = FSP_FSCTL_DEFAULT_ALIGN_UP(sizeof FspTrustedDomains[0] * RealTrustedDomainCount);
+                    for (ULONG I = 0, J = 0; TrustedDomainCount > I; I++)
+                    {
+                        if (0 == TrustedDomains[I].DomainSid ||
+                            (0 == TrustedDomains[I].NetbiosDomainName &&
+                                0 == TrustedDomains[I].DnsDomainName) ||
+                            EqualSid(TrustedDomains[I].DomainSid, FspPrimaryDomainSid))
+                            continue;
+                        FspTrustedDomains[J].DomainSid = 0;
+                        FspTrustedDomains[J].NetbiosDomainName = 0;
+                        FspTrustedDomains[J].DnsDomainName = 0;
+                        FspTrustedDomains[J].TrustPosixOffset = 0;
+                        if (0 != TrustedDomains[I].DomainSid)
+                        {
+                            Size = FSP_FSCTL_DEFAULT_ALIGN_UP(Size);
+                            FspTrustedDomains[J].DomainSid =
+                                (PVOID)((PUINT8)FspTrustedDomains + Size);
+                            Size += (Temp = GetLengthSid(TrustedDomains[I].DomainSid));
+                            memcpy(FspTrustedDomains[J].DomainSid,
+                                TrustedDomains[I].DomainSid, Temp);
+                        }
+                        if (0 != TrustedDomains[I].NetbiosDomainName)
+                        {
+                            Size = FSP_FSCTL_ALIGN_UP(Size, sizeof(WCHAR));
+                            FspTrustedDomains[J].NetbiosDomainName =
+                                (PVOID)((PUINT8)FspTrustedDomains + Size);
+                            Size += (Temp = (lstrlenW(TrustedDomains[I].NetbiosDomainName) + 1) * sizeof(WCHAR));
+                            memcpy(FspTrustedDomains[J].NetbiosDomainName,
+                                TrustedDomains[I].NetbiosDomainName, Temp);
+                        }
+                        if (0 != TrustedDomains[I].DnsDomainName)
+                        {
+                            Size = FSP_FSCTL_ALIGN_UP(Size, sizeof(WCHAR));
+                            FspTrustedDomains[J].DnsDomainName =
+                                (PVOID)((PUINT8)FspTrustedDomains + Size);
+                            Size += (Temp = (lstrlenW(TrustedDomains[I].DnsDomainName) + 1) * sizeof(WCHAR));
+                            memcpy(FspTrustedDomains[J].DnsDomainName,
+                                TrustedDomains[I].DnsDomainName, Temp);
+                        }
+                        if (0 == FspTrustedDomains[J].NetbiosDomainName)
+                            FspTrustedDomains[J].NetbiosDomainName =
+                                FspTrustedDomains[J].DnsDomainName;
+                        else
+                        if (0 == FspTrustedDomains[J].DnsDomainName)
+                            FspTrustedDomains[J].DnsDomainName =
+                                FspTrustedDomains[J].NetbiosDomainName;
+                        J++;
+                    }
+                    FspTrustedDomainCount = RealTrustedDomainCount;
+                }
+            }
+        }
     }
 
+    if (0 < FspTrustedDomainCount)
+        FspPosixInitializeTrustPosixOffsets();
+
+    FspPosixInitializeFromRegistry();
+
 exit:
+    if (0 != TrustedDomains)
+        NetApiBufferFree(TrustedDomains);
+
     if (0 != PrimaryDomainInfo)
         LsaFreeMemory(PrimaryDomainInfo);
 
@@ -172,11 +352,14 @@ VOID FspPosixFinalize(BOOLEAN Dynamic)
 
     if (Dynamic)
     {
+        MemFree(FspTrustedDomains);
         MemFree(FspAccountDomainSid);
         MemFree(FspPrimaryDomainSid);
     }
 }
+
 #else
+
 ULONG NTAPI FspPosixInitialize(
     PRTL_RUN_ONCE RunOnce, PVOID Parameter, PVOID *Context)
 {
@@ -222,8 +405,12 @@ ULONG NTAPI FspPosixInitialize(
         FspPrimaryDomainSid = &FspPrimaryDomainSidBuf.V;
     }
 
+    /* always enable permissive permissions for same owner group in kernel mode */
+    FspDistinctPermsForSameOwnerGroup = TRUE;
+
     return TRUE;
 }
+
 #endif
 
 static inline BOOLEAN FspPosixIsRelativeSid(PISID Sid1, PISID Sid2)
@@ -318,7 +505,8 @@ FSP_API NTSTATUS FspPosixMapUidToSid(UINT32 Uid, PSID *PSid)
     }
     else if (0x100000 <= Uid && Uid < 0xff000000)
     {
-        if (0 != FspPrimaryDomainSid &&
+        if ((Uid < 0x300000 || 0 == FspTrustedDomainCount) &&
+            0 != FspPrimaryDomainSid &&
             5 == FspPrimaryDomainSid->IdentifierAuthority.Value[5] &&
             4 == FspPrimaryDomainSid->SubAuthorityCount)
         {
@@ -329,11 +517,30 @@ FSP_API NTSTATUS FspPosixMapUidToSid(UINT32 Uid, PSID *PSid)
                 FspPrimaryDomainSid->SubAuthority[3],
                 Uid - 0x100000);
         }
+        else
+        {
+            PISID DomainSid = 0;
+            ULONG TrustPosixOffset = 0;
+            for (ULONG I = 0; FspTrustedDomainCount > I; I++)
+            {
+                if (FspTrustedDomains[I].TrustPosixOffset <= Uid &&
+                    FspTrustedDomains[I].TrustPosixOffset > TrustPosixOffset)
+                {
+                    DomainSid = FspTrustedDomains[I].DomainSid;
+                    TrustPosixOffset = FspTrustedDomains[I].TrustPosixOffset;
+                }
+            }
+            if (0 != DomainSid)
+            {
+                *PSid = FspPosixCreateSid(5, 5,
+                    21,
+                    DomainSid->SubAuthority[1],
+                    DomainSid->SubAuthority[2],
+                    DomainSid->SubAuthority[3],
+                    Uid - TrustPosixOffset);
+            }
+        }
     }
-    /*
-     * I am sorry, I am not going to bother with all that trustPosixOffset stuff.
-     * But if you need it, I accept patches :)
-     */
 
     /* [IDMAP]
      * Mandatory Labels:
@@ -432,11 +639,15 @@ FSP_API NTSTATUS FspPosixMapSidToUid(PSID Sid, PUINT32 PUid)
             else if (0 != FspAccountDomainSid &&
                 FspPosixIsRelativeSid(FspAccountDomainSid, Sid))
                 *PUid = 0x30000 + Rid;
-
+            else
-            /*
+                for (ULONG I = 0; FspTrustedDomainCount > I; I++)
-             * I am sorry, I am not going to bother with all that trustPosixOffset stuff.
+                {
-             * But if you need it, I accept patches :)
+                    if (FspPosixIsRelativeSid(FspTrustedDomains[I].DomainSid, Sid))
-             */
+                    {
+                        *PUid = FspTrustedDomains[I].TrustPosixOffset + Rid;
+                        break;
+                    }
+                }
         }
 
         /* [IDMAP]
@@ -600,7 +811,7 @@ FSP_API NTSTATUS FspPosixMapPermissionsToSecurityDescriptor(
      * bits are different?. In this case, the most restrictive permissions
      * are chosen and assigned to both ACEs.
      */
-    if (EqualSid(OwnerSid, GroupSid))
+    if (!FspDistinctPermsForSameOwnerGroup && EqualSid(OwnerSid, GroupSid))
         OwnerPerm = GroupPerm = OwnerPerm & GroupPerm;
 
     /* [PERMS]
@@ -725,6 +936,101 @@ lasterror:
     goto exit;
 }
 
+FSP_API NTSTATUS FspPosixMergePermissionsToSecurityDescriptor(
+    UINT32 Uid, UINT32 Gid, UINT32 Mode,
+    PSECURITY_DESCRIPTOR ExistingSecurityDescriptor,
+    PSECURITY_DESCRIPTOR *PSecurityDescriptor)
+{
+    FSP_KU_CODE;
+
+    if (0 == ExistingSecurityDescriptor)
+        return FspPosixMapPermissionsToSecurityDescriptor(Uid, Gid, Mode, PSecurityDescriptor);
+
+    PSID ExistingOwnerSid = 0, ExistingGroupSid = 0;
+    BOOL Defaulted, ExistingDaclPresent;
+    PACL ExistingAcl = 0;
+    PSID OwnerSid = 0, GroupSid = 0;
+    SECURITY_DESCRIPTOR SecurityDescriptor;
+    PSECURITY_DESCRIPTOR RelativeSecurityDescriptor = 0;
+    ULONG Size;
+    NTSTATUS Result;
+
+    *PSecurityDescriptor = 0;
+
+    if (!GetSecurityDescriptorOwner(ExistingSecurityDescriptor, &ExistingOwnerSid, &Defaulted))
+        goto lasterror;
+    if (!GetSecurityDescriptorGroup(ExistingSecurityDescriptor, &ExistingGroupSid, &Defaulted))
+        goto lasterror;
+    if (!GetSecurityDescriptorDacl(ExistingSecurityDescriptor, &ExistingDaclPresent, &ExistingAcl, &Defaulted))
+        goto lasterror;
+
+    if (0 == ExistingOwnerSid)
+    {
+        Result = FspPosixMapUidToSid(Uid, &OwnerSid);
+        if (!NT_SUCCESS(Result))
+            goto exit;
+        ExistingOwnerSid = OwnerSid;
+    }
+
+    if (0 == ExistingGroupSid)
+    {
+        Result = FspPosixMapUidToSid(Gid, &GroupSid);
+        if (!NT_SUCCESS(Result))
+            goto exit;
+        ExistingGroupSid = GroupSid;
+    }
+
+    if (!InitializeSecurityDescriptor(&SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION))
+        goto lasterror;
+
+    if (!SetSecurityDescriptorOwner(&SecurityDescriptor, ExistingOwnerSid, FALSE))
+        goto lasterror;
+    if (!SetSecurityDescriptorGroup(&SecurityDescriptor, ExistingGroupSid, FALSE))
+        goto lasterror;
+    if (0 != ExistingAcl)
+    {
+        if (!SetSecurityDescriptorControl(&SecurityDescriptor, SE_DACL_PROTECTED, SE_DACL_PROTECTED))
+            goto lasterror;
+        if (!SetSecurityDescriptorDacl(&SecurityDescriptor, TRUE, ExistingAcl, FALSE))
+            goto lasterror;
+    }
+
+    Size = 0;
+    if (!MakeSelfRelativeSD(&SecurityDescriptor, 0, &Size) &&
+        ERROR_INSUFFICIENT_BUFFER != GetLastError())
+        goto lasterror;
+
+    RelativeSecurityDescriptor = MemAlloc(Size);
+    if (0 == RelativeSecurityDescriptor)
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    if (!MakeSelfRelativeSD(&SecurityDescriptor, RelativeSecurityDescriptor, &Size))
+        goto lasterror;
+
+    *PSecurityDescriptor = RelativeSecurityDescriptor;
+
+    Result = STATUS_SUCCESS;
+
+exit:
+    if (!NT_SUCCESS(Result))
+        MemFree(RelativeSecurityDescriptor);
+
+    if (0 != GroupSid)
+        FspDeleteSid(GroupSid, FspPosixMapUidToSid);
+
+    if (0 != OwnerSid)
+        FspDeleteSid(OwnerSid, FspPosixMapUidToSid);
+
+    return Result;
+
+lasterror:
+    Result = FspNtStatusFromWin32(GetLastError());
+    goto exit;
+}
+
 static inline ACCESS_MASK FspPosixCanonicalizeAccessMask(ACCESS_MASK AccessMask)
 {
     PGENERIC_MAPPING Mapping = FspGetFileGenericMapping();