update changelog

dll: fuse: fix path arg to release on Create error
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)
2025-07-02 00:42:54 -05:00 · 2021-06-13 12:40:41 -07:00 · 2021-06-09 10:17:59 -07:00 · 2021-06-09 10:13:41 -07:00 · 2021-06-08 12:22:26 -07:00 · 2021-06-08 10:38:27 -07:00
205 changed files with 2668 additions and 383 deletions
--- a/.github/workflows/avm.yml
+++ b/.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
--- a/Changelog.asciidoc
+++ b/Changelog.asciidoc
@ -1,6 +1,92 @@
 = 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:
--- a/Contributors.asciidoc
+++ b/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
 |===
--- a/README.md
+++ b/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/>
--- a/art/winfsp-glow.png
+++ b/art/winfsp-glow.png
--- a/art/winfsp-outln.afdesign
+++ b/art/winfsp-outln.afdesign
--- a/art/winfsp-solid.afdesign
+++ b/art/winfsp-solid.afdesign
--- a/art/winfsp-solid.png
+++ b/art/winfsp-solid.png
--- a/art/winfsp.afdesign
+++ b/art/winfsp.afdesign
--- a/art/wixbanner.afdesign
+++ b/art/wixbanner.afdesign
--- a/art/wixbanner.pxm
+++ b/art/wixbanner.pxm
--- a/art/wixdialog.afdesign
+++ b/art/wixdialog.afdesign
--- a/art/wixdialog.pxm
+++ b/art/wixdialog.pxm
--- a/build/VStudio/dotnet/winfsp.net.csproj
+++ b/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>
--- a/build/VStudio/installer/CustomActions/CustomActions.cpp
+++ b/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.
--- a/build/VStudio/installer/Product.wxs
+++ b/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">
-                <File Name="winfsp-x64.sys" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x64.sys">
+                <File Name="$(var.MyProductFileName)-x64.sys" KeyPath="yes" />
            </Component>
-            <Component Id="C.winfsp_x86.sys">
-                <File Name="winfsp-x86.sys" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x86.sys">
+                <File Name="$(var.MyProductFileName)-x86.sys" KeyPath="yes" />
            </Component>

-            <!-- On Win64 register winfsp-x64.dll -->
-            <Component Id="C.winfsp_x64.dll.selfreg" Guid="F0A67746-1A9C-4976-8EC0-882E9407FA6D">
-                <File Id="FILE.winfsp_x64.dll.selfreg" Name="winfsp-x64.dll" KeyPath="yes" SelfRegCost="1" />
+            <!-- On Win64 register $(var.MyProductFileName)-x64.dll -->
+            <Component Id="C.$(var.MyProductFileName)_x64.dll.selfreg" Guid="F0A67746-1A9C-4976-8EC0-882E9407FA6D">
+                <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">
-                <File Name="winfsp-x86.dll" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x86.dll" Guid="950492FB-12F7-4E27-9124-8325A2BC9927">
+                <File Name="$(var.MyProductFileName)-x86.dll" KeyPath="yes" />
                <Condition>VersionNT64</Condition>
            </Component>

-            <!-- On Win32 register winfsp-x86.dll -->
-            <Component Id="C.winfsp_x64.dll" Guid="4D6E7A8E-0CA6-49BE-B312-1EDADE725756">
-                <File Name="winfsp-x64.dll" KeyPath="yes" />
+            <!-- On Win32 register $(var.MyProductFileName)-x86.dll -->
+            <Component Id="C.$(var.MyProductFileName)_x64.dll" Guid="4D6E7A8E-0CA6-49BE-B312-1EDADE725756">
+                <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">
-                <File Id="FILE.winfsp_x86.dll.selfreg" Name="winfsp-x86.dll" KeyPath="yes" SelfRegCost="1" />
+            <Component Id="C.$(var.MyProductFileName)_x86.dll.selfreg" Guid="F0DEF7A6-AF55-419F-A58A-DF4018C6FA73">
+                <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">
-                <File Id="FILE.winfsp_msil.dll" Name="winfsp-msil.dll" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_msil.dll" Guid="0D8BA6AE-9F87-402B-AE1A-95B0AE3BE179">
+                <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">
-                <File Id="FILE.winfsp_msil.xml" Name="winfsp-msil.xml" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_msil.xml" Guid="1657F707-C112-454C-91AE-0FDEBBF454AB">
+                <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">
-                <File Id="FILE.winfsp_msil.dll.GAC" Name="winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
+            <Component Id="C.$(var.MyProductFileName)_msil.dll.GAC" Guid="6469467D-8C90-4889-8138-4028F9DA6E85">
+                <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">
-                <File Name="policy.1.0.winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
-                <File Name="policy.1.0.winfsp-msil.config" KeyPath="no" />
+            <Component Id="C.policy.$(var.MyProductFileName)_msil.dll.GAC">
+                <File Name="policy.1.0.$(var.MyProductFileName)-msil.dll" KeyPath="yes" Assembly=".net" />
+                <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">
-                <File Name="winfsp-x64.lib" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x64.lib">
+                <File Name="$(var.MyProductFileName)-x64.lib" KeyPath="yes" />
            </Component>
-            <Component Id="C.winfsp_x86.lib">
-                <File Name="winfsp-x86.lib" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x86.lib">
+                <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">
-                <File Name="winfsp-x64.sys.pdb" Source="..\build\$(var.Configuration)\winfsp-x64.sys.public.pdb" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x64.sys.pdb">
+                <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">
-                <File Name="winfsp-x86.sys.pdb" Source="..\build\$(var.Configuration)\winfsp-x86.sys.public.pdb" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x86.sys.pdb">
+                <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">
-                <File Name="winfsp-x64.dll.pdb" Source="..\build\$(var.Configuration)\winfsp-x64.dll.public.pdb" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x64.dll.pdb">
+                <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">
-                <File Name="winfsp-x86.dll.pdb" Source="..\build\$(var.Configuration)\winfsp-x86.dll.public.pdb" KeyPath="yes" />
+            <Component Id="C.$(var.MyProductFileName)_x86.dll.pdb">
+                <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">
-            <ComponentRef Id="C.winfsp_x64.sys" />
-            <ComponentRef Id="C.winfsp_x86.sys" />
-            <ComponentRef Id="C.winfsp_x64.dll.selfreg" />
-            <ComponentRef Id="C.winfsp_x86.dll" />
-            <ComponentRef Id="C.winfsp_x64.dll" />
-            <ComponentRef Id="C.winfsp_x86.dll.selfreg" />
+        <ComponentGroup Id="C.$(var.MyProductName).bin">
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.sys" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.sys" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll.selfreg" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.dll" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll" />
+            <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">
-            <ComponentRef Id="C.winfsp_x64.lib" />
-            <ComponentRef Id="C.winfsp_x86.lib" />
+        <ComponentGroup Id="C.$(var.MyProductName).lib">
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.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">
-            <ComponentRef Id="C.winfsp_x64.sys.pdb" />
-            <ComponentRef Id="C.winfsp_x86.sys.pdb" />
-            <ComponentRef Id="C.winfsp_x86.dll.pdb" />
-            <ComponentRef Id="C.winfsp_x64.dll.pdb" />
+        <ComponentGroup Id="C.$(var.MyProductName).sym">
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.sys.pdb" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.sys.pdb" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.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">
-            <ComponentRef Id="C.winfsp_msil.dll" />
-            <ComponentRef Id="C.winfsp_msil.xml" />
+        <ComponentGroup Id="C.$(var.MyProductName).net">
+            <ComponentRef Id="C.$(var.MyProductFileName)_msil.dll" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_msil.xml" />
            <!--
-            <ComponentRef Id="C.winfsp_msil.dll.GAC" />
-            <ComponentRef Id="C.policy.winfsp_msil.dll.GAC" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_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.WinFsp.net" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).bin" />
+                <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.WinFsp.lib" />
-                <ComponentGroupRef Id="C.WinFsp.smp" />
-                <ComponentGroupRef Id="C.WinFsp.smp.net" />
-                <ComponentGroupRef Id="C.WinFsp.sym" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).inc" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).lib" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).smp" />
+                <ComponentGroupRef Id="C.$(var.MyProductName).smp.net" />
+                <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>

--- a/build/VStudio/installer/winfsp_msi.wixproj
+++ b/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>
--- a/build/VStudio/installer/wixbanner.bmp
+++ b/build/VStudio/installer/wixbanner.bmp
--- a/build/VStudio/installer/wixdialog-Beta.bmp
+++ b/build/VStudio/installer/wixdialog-Beta.bmp
--- a/build/VStudio/installer/wixdialog-Gold.bmp
+++ b/build/VStudio/installer/wixdialog-Gold.bmp
--- a/build/VStudio/installer/wixdialog-RC.bmp
+++ b/build/VStudio/installer/wixdialog-RC.bmp
--- a/build/VStudio/version.properties
+++ b/build/VStudio/version.properties
@ -12,13 +12,14 @@
        <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.9</MyCanonicalVersion>
+        <MyCanonicalVersion>1.10</MyCanonicalVersion>

-        <MyProductVersion>2021 Beta1</MyProductVersion>
+        <MyProductVersion>2021.1 Beta2</MyProductVersion>
        <MyProductStage>Beta</MyProductStage>

        <MyVersion>$(MyCanonicalVersion).$(MyBuildNumber)</MyVersion>
@ -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'">
--- a/build/VStudio/winfsp_dll.vcxproj
+++ b/build/VStudio/winfsp_dll.vcxproj
@ -182,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>
--- a/build/VStudio/winfsp_sys.vcxproj
+++ b/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" />
--- a/build/VStudio/winfsp_sys.vcxproj.filters
+++ b/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">
--- a/doc/Known-File-Systems.asciidoc
+++ b/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

--- a/doc/WinFsp-Rebranding.asciidoc
+++ b/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.
--- a/ext/tlib/callstack.c
+++ b/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>
--- a/ext/tlib/callstack.h
+++ b/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
--- a/ext/tlib/injected/allfunc.h
+++ b/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
--- a/ext/tlib/injected/curlfunc.c
+++ b/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>
--- a/ext/tlib/injected/curlfunc.h
+++ b/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
--- a/ext/tlib/injected/stdfunc.c
+++ b/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>
--- a/ext/tlib/injected/stdfunc.h
+++ b/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
--- a/ext/tlib/injection.c
+++ b/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>
--- a/ext/tlib/injection.h
+++ b/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.
--- a/ext/tlib/testsuite.c
+++ b/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>
--- a/ext/tlib/testsuite.h
+++ b/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
--- a/inc/fuse/fuse.h
+++ b/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.
--- a/inc/fuse/fuse_common.h
+++ b/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.
--- a/inc/fuse/fuse_opt.h
+++ b/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.
--- a/inc/fuse/winfsp_fuse.h
+++ b/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.
--- a/inc/fuse3/fuse.h
+++ b/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.
--- a/inc/fuse3/fuse_common.h
+++ b/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.
--- a/inc/fuse3/fuse_opt.h
+++ b/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.
--- a/inc/fuse3/winfsp_fuse.h
+++ b/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.
--- a/inc/winfsp/fsctl.h
+++ b/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_DISK_DEVICE_NAME      "WinFsp.Disk"
-#define FSP_FSCTL_NET_DEVICE_NAME       "WinFsp.Net"
-#define FSP_FSCTL_MUP_DEVICE_NAME       "WinFsp.Mup"
+#define FSP_FSCTL_STR(x)                FSP_FSCTL_STR_(x)
+#define FSP_FSCTL_STR_(x)               #x
+#if defined(MyProductName)
+#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,8 @@ 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)

@ -628,6 +649,7 @@ 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,
--- a/inc/winfsp/launch.h
+++ b/inc/winfsp/launch.h
@ -5,7 +5,7 @@
 * In order to use the WinFsp Launch API a program must include &lt;winfsp/launch.h&gt;
 * 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)

--- a/inc/winfsp/winfsp.h
+++ b/inc/winfsp/winfsp.h
@ -5,7 +5,7 @@
 * In order to use the WinFsp API the user mode file system must include &lt;winfsp/winfsp.h&gt;
 * 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
@ -1826,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);
@ -2108,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

@ -2138,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)
        {
--- a/inc/winfsp/winfsp.hpp
+++ b/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;
--- a/opt/cygfuse/fuse/cygfuse.c
+++ b/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.
--- a/opt/cygfuse/fuse3/cygfuse.c
+++ b/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.
--- a/opt/fsext/inc/winfsp/fsext.h
+++ b/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.
--- a/src/dll/debug.c
+++ b/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.
--- a/src/dll/dirbuf.c
+++ b/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.
--- a/src/dll/eventlog.c
+++ b/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.
--- a/src/dll/fs.c
+++ b/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);
    }
 }

--- a/src/dll/fsctl.c
+++ b/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,16 @@ 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)
 {
@ -254,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;
@ -261,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
@ -331,6 +344,8 @@ exit:
    if (0 != ScmHandle)
        CloseServiceHandle(ScmHandle);

+    ReleaseSRWLockExclusive(&Lock);
+
    return Result;
 }

--- a/src/dll/fsop.c
+++ b/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.
--- a/src/dll/fuse/fuse.c
+++ b/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),
@ -266,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
@ -303,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)
 {
@ -317,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"
@ -367,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
@ -383,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;
@ -396,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;
@ -428,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;
@ -470,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;
@ -539,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;

@ -559,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);
--- a/src/dll/fuse/fuse_compat.c
+++ b/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.
--- a/src/dll/fuse/fuse_intf.c
+++ b/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;
 }
--- a/src/dll/fuse/fuse_loop.c
+++ b/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.
--- a/src/dll/fuse/fuse_main.c
+++ b/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.
--- a/src/dll/fuse/fuse_opt.c
+++ b/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.
--- a/src/dll/fuse/library.h
+++ b/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,
--- a/src/dll/fuse3/fuse2to3.c
+++ b/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.
--- a/src/dll/fuse3/fuse3.c
+++ b/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.
--- a/src/dll/fuse3/fuse3_compat.c
+++ b/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.
--- a/src/dll/fuse3/library.h
+++ b/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.
--- a/src/dll/launch.c
+++ b/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.
--- a/src/dll/ldap.c
+++ b/src/dll/ldap.c
@ -1,7 +1,7 @@
 /**
 * @file dll/ldap.c
 *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
 */
 /*
 * This file is part of WinFsp.
--- a/src/dll/library.c
+++ b/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.
--- a/src/dll/library.h
+++ b/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)
--- a/src/dll/mount.c
+++ b/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.
--- a/src/dll/np.c
+++ b/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! */
--- a/src/dll/ntstatus.c
+++ b/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.
--- a/src/dll/path.c
+++ b/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.
--- a/src/dll/security.c
+++ b/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 ||
--- a/src/dll/service.c
+++ b/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.
--- a/src/dll/util.c
+++ b/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.
--- a/src/dll/version.rc
+++ b/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
--- a/src/dll/wksid.c
+++ b/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.
--- a/src/dotnet/FileSystemBase+Const.cs
+++ b/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.
--- a/src/dotnet/FileSystemBase.cs
+++ b/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.
--- a/src/dotnet/FileSystemHost.cs
+++ b/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;
--- a/src/dotnet/Interop.cs
+++ b/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.
@ -315,7 +315,7 @@ namespace Fsp.Interop
    {
        internal const int FileNameBufSize = 1024 * 2/*FSP_FSCTL_TRANSACT_PATH_SIZEMAX*/;
        internal static int FileNameBufOffset =
-            (int)Marshal.OffsetOf(typeof(DirInfo), "FileNameBuf");
+            (int)Marshal.OffsetOf(typeof(NotifyInfoInternal), "FileNameBuf");

        internal UInt16 Size;
        internal UInt32 Filter;
@ -337,6 +337,47 @@ namespace Fsp.Interop
        }
    }

+    /// <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>
@ -344,8 +385,8 @@ namespace Fsp.Interop
    public struct NotifyInfo
    {
        public String FileName;
-        public UInt32 Action;
-        public UInt32 Filter;
+        public NotifyAction Action;
+        public NotifyFilter Filter;
    }

    [StructLayout(LayoutKind.Sequential)]
@ -1147,10 +1188,11 @@ namespace Fsp.Interop
            int Length = 0;
            for (int I = 0; NotifyInfoArray.Length > I; I++)
            {
-                Length = (Length + 7) & ~7; // align to next qword boundary
                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)
@ -1158,8 +1200,8 @@ namespace Fsp.Interop
                for (int I = 0; NotifyInfoArray.Length > I; I++)
                {
                    NotifyInfoInternal Internal = default(NotifyInfoInternal);
-                    Internal.Action = NotifyInfoArray[I].Action;
-                    Internal.Filter = NotifyInfoArray[I].Filter;
+                    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);
@ -1383,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\\WinFsp";
+                "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\" + ProductName :
+                "HKEY_LOCAL_MACHINE\\Software\\" + ProductName;
            IntPtr Module;
            Module = LoadLibraryW(DllName);
            if (IntPtr.Zero == Module)
@ -1483,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();
        }
--- a/src/dotnet/Service.cs
+++ b/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.
--- a/src/fsptool/fsptool.c
+++ b/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.
--- a/src/launcher/launchctl.c
+++ b/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.
--- a/src/launcher/launcher.c
+++ b/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,
--- a/src/launcher/ptrans.c
+++ b/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.
--- a/src/shared/ku/config.h
+++ b/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.
--- a/src/shared/ku/library.h
+++ b/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.
--- a/src/shared/ku/posix.c
+++ b/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)
@ -118,9 +123,12 @@ static struct
    PWSTR DnsDomainName;
    ULONG TrustPosixOffset;
 } *FspTrustedDomains;
-ULONG FspTrustedDomainCount;
+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;
@ -164,6 +172,28 @@ exit:
    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)
 {
@ -295,6 +325,8 @@ static BOOL WINAPI FspPosixInitialize(
    if (0 < FspTrustedDomainCount)
        FspPosixInitializeTrustPosixOffsets();

+    FspPosixInitializeFromRegistry();
+
 exit:
    if (0 != TrustedDomains)
        NetApiBufferFree(TrustedDomains);
@ -325,7 +357,9 @@ VOID FspPosixFinalize(BOOLEAN Dynamic)
        MemFree(FspPrimaryDomainSid);
    }
 }
+
 #else
+
 ULONG NTAPI FspPosixInitialize(
    PRTL_RUN_ONCE RunOnce, PVOID Parameter, PVOID *Context)
 {
@ -371,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)
@ -773,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]
@ -898,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();
--- a/src/shared/ku/uuid5.c
+++ b/src/shared/ku/uuid5.c
@ -1,7 +1,7 @@
 /**
 * @file shared/ku/uuid5.c
 *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
 */
 /*
 * This file is part of WinFsp.
--- a/src/shared/um/minimal.h
+++ b/src/shared/um/minimal.h
@ -1,7 +1,7 @@
 /**
 * @file shared/um/minimal.h
 *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
 */
 /*
 * This file is part of WinFsp.
--- a/src/sys/callbacks.c
+++ b/src/sys/callbacks.c
@ -2,7 +2,7 @@
 * @file sys/callbacks.c
 * Fast I/O and resource acquisition callbacks.
 *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
 */
 /*
 * This file is part of WinFsp.
--- a/src/sys/cleanup.c
+++ b/src/sys/cleanup.c
@ -1,7 +1,7 @@
 /**
 * @file sys/cleanup.c
 *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
 */
 /*
 * This file is part of WinFsp.
--- a/src/sys/close.c
+++ b/src/sys/close.c
@ -1,7 +1,7 @@
 /**
 * @file sys/close.c
 *
- * @copyright 2015-2020 Bill Zissimopoulos
+ * @copyright 2015-2021 Bill Zissimopoulos
 */
 /*
 * This file is part of WinFsp.
@ -84,8 +84,9 @@ static NTSTATUS FspFsvolClose(
    FspFileDescDelete(FileDesc); /* this will also close the MainFileObject if any */
    FspFileNodeDereference(FileNode);

-    /* if we are closing files in the context of a rename make it synchronous */
-    if (FspFsvolDeviceFileRenameIsAcquiredExclusive(FsvolDeviceObject))
+    /* if closing in the context of a rename or IOQ is above the watermark make it synchronous */
+    if (FspFsvolDeviceFileRenameIsAcquiredExclusive(FsvolDeviceObject) ||
+        FspIoqPendingAboveWatermark(FspFsvolDeviceExtension(FsvolDeviceObject)->Ioq, 50))
    {
        /* acquire ownership of the Request */
        Request->Hint = (UINT_PTR)Irp;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bill Zissimopoulos	068270fa7f	update changelog	2021-06-13 12:40:41 -07:00
Bill Zissimopoulos	f51bdef534	dll: fuse: fix path arg to release on Create error 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)	2021-06-09 10:17:59 -07:00
Bill Zissimopoulos	63f91cc667	build: bump version	2021-06-09 10:13:41 -07:00
Bill Zissimopoulos	6e3e469fcb	doc: update known file systems	2021-06-08 12:22:26 -07:00
Bill Zissimopoulos	efcc82b5dd	build: update version	2021-06-08 10:38:27 -07:00
Bill Zissimopoulos	cad5e68ac8	art: update logo	2021-06-01 13:49:00 -07:00
Bill Zissimopoulos	6e3a8f70b2	update source copyright to 2021	2021-05-21 15:57:05 -07:00
Bill Zissimopoulos	6bc0fe4ac5	art: update logo	2021-05-21 14:53:52 -07:00
Bill Zissimopoulos	07f097220f	changelog: update for v1.10B1	2021-05-21 11:41:35 -07:00
Bill Zissimopoulos	ca832988ed	dll,sys: fix issue #369 The original WinFsp protocol for shutting down a file system was to issue an FSP_FSCTL_STOP control code to the fsctl device. This would set the IOQ to the "stopped" state and would also cancel all active IRP's. Cancelation of IRP's would sometimes free buffers that may have still been in use by the user mode file system threads; hence access violation. To fix this problem a new control code FSP_FSCTL_STOP0 is introduced. The new file system shutdown protocol is backwards compatible with the original one and works as follows: - First the file system process issues an FSP_FSCTL_STOP0 control code which sets the IOQ to the "stopped" state but does NOT cancel IRP's. - Then the file system process waits for its dispatcher threads to complete (see FspFileSystemStopDispatcher). - Finally the file system process issues an FSP_FSCTL_STOP control code which stops the (already stopped) IOQ and cancels all IRP's.	2021-05-18 12:30:17 -07:00
Bill Zissimopoulos	23e401e312	Merge pull request #371 from lemourin/mingw-fix inc: don't redeclare _FILE_FULL_EA_INFORMATION for mingw	2021-05-17 10:00:17 -07:00
Paweł Wegner	bde57697f9	Add Paweł Wegner to contributors.	2021-05-15 14:59:10 +02:00
Paweł Wegner	f62aa00a1e	inc: don't redeclare _FILE_FULL_EA_INFORMATION for mingw mingw-w64 declares _FILE_FULL_EA_INFORMATION since Jan 18, 2010 [1]. The change allows the winfsp client library to be consumed by projects built with mingw. [1]: `afd1465722`	2021-05-14 14:08:02 +02:00
Bill Zissimopoulos	a27994289d	art: update	2021-05-07 16:50:58 -07:00
Bill Zissimopoulos	3b10145e93	tst: winfsp-tests: disable new tests that fail on passthrough	2021-04-19 13:34:35 -07:00
Bill Zissimopoulos	33c6e7ee61	sys: fix issue #364	2021-04-16 16:43:34 -07:00
Bill Zissimopoulos	d0d67998c1	inc: fsctl.h: fix class guid's when used outside our build system	2021-04-13 15:33:57 -07:00
Bill Zissimopoulos	aa7888effc	tools: wixguid.py	2021-04-13 15:22:42 -07:00
Bill Zissimopoulos	3c7e712e57	tools: build.bat: skip choco build for non-WinFsp brands	2021-04-13 14:38:51 -07:00
Bill Zissimopoulos	f8ee12f592	build: fix inadvertently broken DLL build on VS2015	2021-04-12 22:07:04 -07:00
Bill Zissimopoulos	c84d47aa3e	doc: WinFsp rebranding document	2021-04-12 21:38:09 -07:00
Bill Zissimopoulos	023c925fb6	WinFsp rebranding support	2021-04-12 17:47:34 -07:00
Bill Zissimopoulos	a7cfabeff8	tools: add batch file that fixes issue #162	2021-04-08 15:00:55 -07:00
Bill Zissimopoulos	d4a70da611	Merge branch 'pvt-tsfix'	2021-04-08 14:06:52 -07:00
Bill Zissimopoulos	50892bfa19	shared: posix: DistinctPermsForSameOwnerGroup	2021-04-06 15:00:31 -07:00
Bill Zissimopoulos	b2e677a3d3	sys: FspFsvolSetBasicInformation: issue #362 According to the FILE_BASIC_INFORMATION doc a file system should not update a file timestamp when it receives a value of -1 in the corresponding time field. This commit converts a -1 timestamp to a 0 timestamp; this directs a WinFsp file system not to update the corresponding file timestamp. This commit fixes issue #362	2021-04-06 13:41:35 -07:00
Bill Zissimopoulos	9d76495340	update Changlog for v1.9	2021-04-06 13:01:33 -07:00
Bill Zissimopoulos	41c604b0fd	update Changelog for v1.9B2	2021-04-06 13:00:30 -07:00
Bill Zissimopoulos	28a9534a65	build: version.properties: bump version	2021-04-06 12:53:33 -07:00
Bill Zissimopoulos	b87c907af8	build: version.properties: bump version	2021-02-02 16:50:52 -08:00
Bill Zissimopoulos	9d5efe5f98	dll: fuse: FileSecurity option	2021-01-25 16:54:59 -08:00
Bill Zissimopoulos	c5b850be35	sys: improve trace functionality	2021-01-25 13:11:10 -08:00
Bill Zissimopoulos	0af0bfbe7c	sys: FspFsvolClose: convert CLOSE requests to synchronous when above the IOQ watermark	2021-01-25 12:45:33 -08:00
Bill Zissimopoulos	1dbcae3985	sys: FspTraceNtStatus: fix spelling mistake	2021-01-25 12:44:59 -08:00
Bill Zissimopoulos	a5726c820b	sys: add trace functionality	2021-01-13 16:15:06 -08:00
Bill Zissimopoulos	870c54253a	Merge pull request #342 from gaotxg/master Credential: Default do not save password	2021-01-05 19:47:51 -08:00
gaotxg	f9cbbea386	Update Contributors.asciidoc	2021-01-06 10:47:42 +08:00
gaotxg	a939d9997b	Credential: Default do not save password If user want to save password, click save and credential window won't appear again. Do not remember password should be default option.	2020-12-30 11:19:57 +08:00
Bill Zissimopoulos	c803ef24f8	dll: fuse: truncate fixed size options Some options (VolumePrefix, FileSystemName, volname) have a fixed maximum size. This commit adds functionality to truncate user-specified long options to their fixed maximum size.	2020-12-22 15:44:37 -08:00
Bill Zissimopoulos	2d5d058d2f	dll: FspFsctlStartService:make thread safe	2020-12-19 11:05:24 -08:00
Bill Zissimopoulos	a372c6ee40	changelog: add note about notifyfs file systems	2020-12-18 16:57:08 -08:00
Bill Zissimopoulos	c8a5f52fb1	installer: add notifyfs-dotnet file system	2020-12-18 16:47:20 -08:00
Bill Zissimopoulos	40052b143e	tst: notifyfs-dotnet: add .NET file system to demo file notification mechanism	2020-12-18 16:39:30 -08:00
Bill Zissimopoulos	8006763367	dotnet: Interop: NotifyInfoInternal: fix FileNameBufOffset	2020-12-18 16:37:08 -08:00
Bill Zissimopoulos	7ed9c56005	Merge pull request #336 from alonsohki/fix-notify-interop-alignment Fix an alignment problem in the FspFileSystemNotify interop	2020-12-18 15:45:48 -08:00
Bill Zissimopoulos	12fd8942f7	tst: notifyfs: root dir does not have dot entries	2020-12-18 15:19:47 -08:00
Bill Zissimopoulos	3eb1f48174	installer: add notifyfs file system	2020-12-17 15:26:57 -08:00
Bill Zissimopoulos	ac26bde9ee	tst: notifyfs: add file system to demo file notification mechanism	2020-12-17 15:20:02 -08:00
Alberto Alonso	6421dd92a9	Fix an alignment problem in the FspFileSystemNotify interop that would leave a buffer size not aligned to a multiple of 8, and make notify calls fail.	2020-12-02 13:18:42 +02:00
Bill Zissimopoulos	b05d5e286e	dotnet: rename NotifyInfoFilter and NotifyInfoAction	2020-11-27 10:37:22 -08:00
Bill Zissimopoulos	2d0df701e3	Merge pull request #335 from alonsohki/document-notifyinfo-fields Document the NotifyInfo fields for the .NET interop layer.	2020-11-27 10:28:37 -08:00
Alberto Alonso	2f1a5b98e2	Update NotifyInfoAction and NotifyInfoFilter enum constants for more readability.	2020-11-26 15:00:03 +02:00
Alberto Alonso	21a636aaae	Update Contributors.asciidoc	2020-11-24 20:07:31 +02:00
Alberto Alonso	3b90908e01	Document the NotifyInfo fields for the .NET interop layer.	2020-11-24 20:02:02 +02:00
Bill Zissimopoulos	90e86d4592	workflows: update AntiVirus monitor	2020-11-17 09:19:21 -08:00