tools: make-release: add new signatures

- Check that the operation succeeded prior to copying to the output buffer.
- Avoid information leaks by only copying what is necessary to the output
buffer (suggestion by Tay Kiat Loong).

Changelog.md

@@ -1,6 +1,46 @@
 # Changelog
 
 
+## v2.2B1 (2026 Beta1)
+
+- [FIX] Fixes vulnerability CVE-2026-3006 discovered by Tay Kiat Loong.
+
+- [FIX] The WinFsp Network Provider provides improved shell support for network file systems not managed by the Launcher. See commit f021496.
+
+- [FUSE] Add FUSE option `FlushOnCleanup`. See PR #614 by @chenjie4255.
+
+- [FUSE] FUSE now respects the `direct_io` flag. See PR #646 by @chenjie4255.
+
+- [FUSE] Add FUSE option `AddWriteEaAccess`. See PR #648 by @chenjie4255.
+
+
+## v2.1 (2025)
+
+- [FIX] Fixes a compatibility problem with certain AntiVirus products (e.g. Trend Micro).
+
+- [FIX] Fixes a couple of rare BSODs on recent versions of Windows 11. See commits a482183, a2cd697 for details.
+
+- [FIX] Fixes a rare problem when using `NtCreateFile` to perform "relative" opens on a network drive (see GitHub issue #561).
+
+- [FIX] Fixes a racing issue with two processes competing to start the FSD discovered during testing.
+
+
+## v2.1B2 (2024 Beta2)
+
+- [FIX] Fixes a rare BSOD on recent versions of Windows. See commit a482183 for details.
+
+- [FIX] Fixes a rare problem when using `NtCreateFile` to perform "relative" opens on a network drive (see GitHub issue #561).
+
+- [FIX] Fixes a racing issue with two processes competing to start the FSD discovered during testing.
+
+
+## v2.1B1 (2024 Beta1)
+
+- [FIX] Fixes a rare BSOD on recent versions of Windows. See commit a482183 for details.
+
+- [FIX] Fixes a racing issue with two processes competing to start the FSD discovered during testing.
+
+
 ## v2.0 (2023)
 
 This release is a major version change for WinFsp (from 1.x to 2.x). There are no backwards incompatible API changes in this release, but nevertheless enough things change that warrant a version change.

Contributors.asciidoc

@@ -60,6 +60,7 @@ CONTRIBUTOR LIST
 |Brett Dutro                                                    |brett.dutro at gmail.com
 |Changjian Gao (Juicedata, https://juicefs.com)                 |gcj at juicedata.io
 |Colin Atkinson (Atakama, https://atakama.com)                  |colin at atakama.com
+|Ethan Chan (Juicedata, https://juicefs.com)                    |ethan at juicedata.io
 |Felix Croes                                                    |felix at dworkin.nl
 |Francois Karam (KS2, http://www.ks2.fr)                        |francois.karam at ks2.fr
 |Fritz Elfert                                                   |fritz-github at fritz-elfert.de
@@ -67,12 +68,15 @@ CONTRIBUTOR LIST
 |John Oberschelp                                                |john at oberschelp.net
 |John Tyner                                                     |jtyner at gmail.com
 |Konstantinos Karakostas                                        |noiredev at protonmail.com
+|Naoki Ikeguchi                                                 |me at s6n.jp
 |Paweł Wegner (Google LLC, https://google.com)                  |lemourin at google.com
 |Pedro Frejo (Arpa System, https://arpasystem.com)              |pedro.frejo at arpasystem.com
 |Ronny Chan                                                     |ronny at ronnychan.ca
 |Sam Kelly (DuroSoft Technologies LLC, https://durosoft.com)    |sam at durosoft.com
 |Santiago Ganis                                                 |sganis at gmail.com
+|Thomas Gibson-Robinson                                         |tom at cocotec.io
 |Tobias Urlaub                                                  |saibotu at outlook.de
 |Victor Gao                                                     |victgm at outlook.com
 |Zeho Huang                                                     |zeho11 at protonmail.com
+|Zhangfen Duan                                                  |lzcgwushuang at 163.com
 |===

build/VStudio/build.common.props

@@ -3,10 +3,10 @@
     <Import Project="$(MsbuildThisFileDirectory)\build.version.props" />
     <ItemDefinitionGroup>
         <ClCompile>
-            <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);MyFsdLoadLogging=$(MyFsdLoadLogging);MyFsctlRegisterPath=$(MyFsctlRegisterPath);MyNpRegisterPath=$(MyNpRegisterPath);MyEventLogRegisterPath=$(MyEventLogRegisterPath)</PreprocessorDefinitions>
+            <PreprocessorDefinitions>NTDDI_VERSION=$(MyNtddiVersion);_WIN32_WINNT=$(MyWin32Version);MyProductName=$(MyProductName);MyProductFileName=$(MyProductFileName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas);MyFullVersion=$(MyFullVersion);MyFspFsctlDeviceClassGuid=$(MyFspFsctlDeviceClassGuid);MyFspFsvrtDeviceClassGuid=$(MyFspFsvrtDeviceClassGuid);MyFsctlRegisterPath=$(MyFsctlRegisterPath);MyNpRegisterPath=$(MyNpRegisterPath);MyEventLogRegisterPath=$(MyEventLogRegisterPath)</PreprocessorDefinitions>
         </ClCompile>
         <ResourceCompile>
-            <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);MyFsdLoadLogging=$(MyFsdLoadLogging);MyFsctlRegisterPath=$(MyFsctlRegisterPath);MyNpRegisterPath=$(MyNpRegisterPath);MyEventLogRegisterPath=$(MyEventLogRegisterPath)</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);MyFsctlRegisterPath=$(MyFsctlRegisterPath);MyNpRegisterPath=$(MyNpRegisterPath);MyEventLogRegisterPath=$(MyEventLogRegisterPath)</PreprocessorDefinitions>
         </ResourceCompile>
     </ItemDefinitionGroup>
     <ItemDefinitionGroup Condition="'$(IsKernelModeToolset)'=='true'">

build/VStudio/build.version.props

@@ -18,12 +18,12 @@
         <MyCompanyName>Navimatics LLC</MyCompanyName>
         <MyCopyright>2015-$([System.DateTime]::Now.ToString(`yyyy`)) Bill Zissimopoulos</MyCopyright>
 
-        <MyCanonicalVersion>2.0</MyCanonicalVersion>
+        <MyCanonicalVersion>2.2</MyCanonicalVersion>
 
-        <MyProductVersion>2023</MyProductVersion>
+        <MyProductVersion>2026 Beta1</MyProductVersion>
-        <MyProductStage>Gold</MyProductStage>
+        <MyProductStage>Beta</MyProductStage>
 
-        <MyCrossCert>DigiCertGlobalG3CodeSigningECCSHA3842021CA1.cer</MyCrossCert>
+        <MyCrossCert>CrossCert.cer</MyCrossCert>
         <MyCertIssuer>DigiCert</MyCertIssuer>
 
         <MyVersion>$(MyCanonicalVersion).$(MyBuildNumber)</MyVersion>
@@ -41,9 +41,6 @@
         <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>
 
-        <!-- FSD load/unload logging; set to 1 to enable -->
-        <MyFsdLoadLogging>0</MyFsdLoadLogging>
-
         <!--
             Configure paths used for registration via DllRegisterServer:
 
@@ -75,5 +72,22 @@
         <MyFsctlRegisterPath>"."</MyFsctlRegisterPath>
         <MyNpRegisterPath>"."</MyNpRegisterPath>
         <MyEventLogRegisterPath>"."</MyEventLogRegisterPath>
+
+        <!--
+            Target SDK/WDK version
+
+            For VS2019 builds (supports Win7/Win8/Win10+ x86/x64/a64):
+                MyTargetPlatformVersion = 10.0.19041.0
+                MyNtddiVersion = 0x06010000
+                MyWin32Version = 0x0601
+
+            For latest SDK/WDK builds (supports Win10+ x64/a64):
+                MyTargetPlatformVersion = $(LatestTargetPlatformVersion)
+                MyNtddiVersion = 0x0A000006
+                MyWin32Version = 0x0A00
+        -->
+        <MyTargetPlatformVersion>10.0.19041.0</MyTargetPlatformVersion>
+        <MyNtddiVersion>0x06010000</MyNtddiVersion>
+        <MyWin32Version>0x0601</MyWin32Version>
     </PropertyGroup>
 </Project>

build/VStudio/installer/CustomActions/CustomActions.cpp

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

build/VStudio/installer/CustomActions/CustomActions.vcxproj

@@ -15,7 +15,7 @@
     <ProjectGuid>{95C223E6-B5F1-4FD0-9376-41CDBC824445}</ProjectGuid>
     <RootNamespace>CustomActions</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

build/VStudio/testing/fsbench.vcxproj

@@ -31,7 +31,7 @@
     <ProjectGuid>{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>fsbench</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

build/VStudio/testing/fscrash.vcxproj

@@ -31,7 +31,7 @@
     <ProjectGuid>{10757011-749D-4954-873B-AE38D8145472}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>fscrash</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

build/VStudio/testing/memfs.vcxproj

@@ -31,7 +31,7 @@
     <ProjectGuid>{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>memfs</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
     <ProjectName>memfs</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

build/VStudio/testing/winfsp-tests.vcxproj

@@ -31,7 +31,7 @@
     <ProjectGuid>{262DF8CC-E7A8-4460-A22C-683CBA322C32}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>winfsptests</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

build/VStudio/tools/fsptool.vcxproj

@@ -31,7 +31,7 @@
     <ProjectGuid>{1E997BEC-1642-4A5C-B252-852DA094E11E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>fsptool</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

build/VStudio/tools/launchctl.vcxproj

@@ -31,7 +31,7 @@
     <ProjectGuid>{264A5D09-126F-4760-A3F1-4B3B95C925AA}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>launchctl</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

build/VStudio/tools/launcher.vcxproj

@@ -31,7 +31,7 @@
     <ProjectGuid>{6CDF9411-B852-4EAC-822D-8F930675F17B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>launcher</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

build/VStudio/winfsp_dll.vcxproj

@@ -163,7 +163,7 @@ copy /b $(OutDir)fuse3-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse3-$(My
     <ProjectGuid>{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>winfspdll</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
     <ProjectName>winfsp.dll</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

build/VStudio/winfsp_sys.vcxproj

@@ -35,7 +35,7 @@
     <Configuration>Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
     <RootNamespace>winfsp</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(MyTargetPlatformVersion)</WindowsTargetPlatformVersion>
     <ProjectName>winfsp.sys</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

doc/Known-File-Systems.asciidoc

@@ -5,6 +5,7 @@ This document contains a list of known open-source file systems and file system
 == File Systems
 
 - https://github.com/wesley1975/blobfs-win[blobfs-win] - The native porting of the blobfs on the windows platform, blobfs can help you mount the Azure Blob storage as the local disk driver, no matter it is a Linux system or a Windows system.
+- https://github.com/buildbarn/bb-remote-execution[buildbarn] - A bazel-compatible remote execution service that uses WinFSP to provide a virtual directory for performing builds
 - https://github.com/cryptomator/cryptomator[Cryptomator] - Multi-platform transparent client-side encryption of your files in the cloud
 - https://github.com/vgough/encfs[EncFS] - an Encrypted Filesystem for FUSE
 - https://github.com/lowleveldesign/fsmemfs[fsmemfs] - Memory File System written in F#
@@ -28,9 +29,9 @@ This document contains a list of known open-source file systems and file system
 == File System Libraries
 
 - https://github.com/winfsp/cgofuse[Go: cgofuse] - Cross-platform FUSE library for Go
+- https://github.com/aegistudio/go-winfsp[Go: go-winfsp] - WinFSP bindings for Go
 - https://github.com/SerCeMan/jnr-fuse[Java: jnr-fuse] - FUSE implementation in Java using Java Native Runtime (JNR)
 - https://github.com/jnr-winfsp-team/jnr-winfsp[Java: jnr-winfsp] - A Java binding for WinFsp using Java Native Runtime (JNR)
-- https://github.com/DuroSoft/fuse-bindings[Nodejs: fuse-bindings] - Fully maintained FUSE bindings for Node that aims to cover the entire FUSE api
 - https://github.com/billziss-gh/fusepy[Python: fusepy] - Simple ctypes bindings for FUSE
 - https://github.com/pleiszenburg/refuse[Python: refuse] - Simple cross-plattform ctypes bindings for libfuse / FUSE for macOS / WinFsp
 - https://github.com/Scille/winfspy[Python: winfspy] - WinFSP binding for Python

doc/WinFsp-API-launch.h.md

@@ -416,7 +416,7 @@ typedef struct _FSP_LAUNCH_REG_RECORD {
 <br/>
 <p align="center">
 <sub>
-Copyright © 2015-2021 Bill Zissimopoulos
+Copyright © 2015-2026 Bill Zissimopoulos
 <br/>
 Generated with <a href="https://github.com/billziss-gh/prettydoc">prettydoc</a>
 </sub>

doc/WinFsp-API-winfsp.h.md

@@ -404,6 +404,59 @@ NTSTATUS ( *DeleteReparsePoint)(
 STATUS\_SUCCESS or error code.
 
 
+</blockquote>
+</details>
+
+<details>
+<summary>
+<b>DispatcherStopped</b> - Inform the file system that its dispatcher has been stopped.
+</summary>
+<blockquote>
+<br/>
+
+```c
+VOID ( *DispatcherStopped)(
+    FSP_FILE_SYSTEM *FileSystem, 
+    BOOLEAN Normally);  
+```
+
+**Parameters**
+
+- _FileSystem_ \- The file system on which this request is posted.
+- _Normally_ \- TRUE if the file system is being stopped via FspFileSystemStopDispatcher.
+FALSE if the file system is being stopped because of another reason such
+as driver unload/uninstall.
+
+**Discussion**
+
+Prior to WinFsp v2.0 the FSD would never unmount a file system volume unless
+the user mode file system requested the unmount. Since WinFsp v2.0 it is possible
+for the FSD to unmount a file system volume without an explicit user mode file system
+request. For example, this happens when the FSD is being uninstalled.
+
+A user mode file system can use this operation to determine when its dispatcher
+has been stopped. The Normally parameter can be used to determine why the dispatcher
+was stopped: it is TRUE when the file system is being stopped via
+FspFileSystemStopDispatcher and FALSE otherwise.
+
+When the file system receives a request with Normally == TRUE it need not take any
+extra steps. This case is the same as for pre-v2.0 versions: since the file system
+stopped the dispatcher via FspFileSystemStopDispatcher, it will likely exit its
+process soon.
+
+When the file system receives a request with Normally == FALSE it may need to take
+extra steps to exit its process as this is not done by default.
+
+A file system that uses the FspService infrastructure may use the
+FspFileSystemStopServiceIfNecessary API to correctly handle all cases.
+
+This operation is the last one that a file system will receive.
+
+**See Also**
+
+- FspFileSystemStopServiceIfNecessary
+
+
 </blockquote>
 </details>
 
@@ -1655,7 +1708,7 @@ FSP_API NTSTATUS FspFileSystemCreate(
 - _DevicePath_ \- The name of the control device for this file system. This must be either
 FSP\_FSCTL\_DISK\_DEVICE\_NAME or FSP\_FSCTL\_NET\_DEVICE\_NAME.
 - _VolumeParams_ \- Volume parameters for the newly created file system.
-- _Interface_ \- A pointer to the actual operations that actually implement this user mode file system.
+- _Interface_ \- A pointer to the operations that implement this user mode file system.
 - _PFileSystem_ \- [out]
 Pointer that will receive the file system object created on successful return from this
 call.
@@ -2309,6 +2362,39 @@ FSP_API VOID FspFileSystemStopDispatcher(
 - _FileSystem_ \- The file system object.
 
 
+</blockquote>
+</details>
+
+<details>
+<summary>
+<b>FspFileSystemStopServiceIfNecessary</b> - Stop a file system service, if any.
+</summary>
+<blockquote>
+<br/>
+
+```c
+FSP_API VOID FspFileSystemStopServiceIfNecessary(
+    FSP_FILE_SYSTEM *FileSystem, 
+    BOOLEAN Normally);  
+```
+
+**Parameters**
+
+- _FileSystem_ \- The file system object.
+- _Normally_ \- TRUE if the file system is being stopped via FspFileSystemStopDispatcher.
+FALSE if the file system is being stopped because of another reason such
+as driver unload/uninstall.
+
+**Discussion**
+
+This is a helper for implementing the DispatcherStopped operation, but only for file systems
+that use the FspService infrastructure.
+
+**See Also**
+
+- DispatcherStopped
+
+
 </blockquote>
 </details>
 
@@ -2651,6 +2737,8 @@ This function starts and runs a service. It executes the Windows StartServiceCtr
 to connect the service process to the Service Control Manager. If the Service Control Manager is
 not available (and console mode is allowed) it will enter console mode.
 
+This function should be called once per process.
+
 
 </blockquote>
 </details>
@@ -2775,7 +2863,7 @@ in a clean manner by calling this function.
 <br/>
 <p align="center">
 <sub>
-Copyright © 2015-2021 Bill Zissimopoulos
+Copyright © 2015-2026 Bill Zissimopoulos
 <br/>
 Generated with <a href="https://github.com/billziss-gh/prettydoc">prettydoc</a>
 </sub>

doc/WinFsp-Registry-Settings.md

@@ -65,6 +65,8 @@ Primary registry key used to store WinFsp settings. On a 64-bit system (x64 or A
 
 * `InstallDir (REG_SZ)`: Contains the WinFsp installation directory.
 
+* `SxsDir (REG_SZ)`: Contains the WinFsp Side-by-Side (SxS) directory. The SxS directory allows for multiple versions of WinFsp to be active at the same time and among other benefits it enables reinstalling WinFsp without reboot. The SxS directory contains primarily executable files.
+
 * `DistinctPermsForSameOwnerGroup (REG_DWORD)`: Directs how WinFsp-FUSE should consider UNIX owner and group permissions in the case when the Windows owner and group SID are the same (for example, this can happen when someone uses a Microsoft account as their primary login). When this setting is 0 and the Windows owner and group SID are the same, WinFsp-FUSE combines the UNIX owner and group permissions (for example, user permission `rw-` and group permission `---` combine to `---`), which can result in inadvertent "access denied" errors. When this setting is 1 and even if the Windows owner and group SID are the same, WinFsp-FUSE looks at the UNIX owner permissions and the UNIX group permissions separately. The default value is 1 since v1.11B1 and was 0 in earlier versions.
 
 * `MountBroadcastDriveChange (REG_DWORD)`: A value of 1 instructs WinFsp to broadcast an additional "drive change" message to all top-level windows during mounting and unmounting. The default value is 0. Normally the Windows infrastructure broadcasts a `WM_DEVICECHANGE` message whenever a drive gets added/removed. In some rare systems it is possible for this message to get lost or stalled. The workaround for these rare systems is to enable this registry setting, in which case WinFsp will broadcast the `WM_DEVICECHANGE` using a slightly different but more reliable method than the one Windows uses.

ext/tlib/callstack.c

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

ext/tlib/callstack.h

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

ext/tlib/injected/allfunc.h

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

ext/tlib/injected/curlfunc.c

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

ext/tlib/injected/curlfunc.h

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

ext/tlib/injected/stdfunc.c

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

ext/tlib/injected/stdfunc.h

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

ext/tlib/injection.c

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

ext/tlib/injection.h

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

ext/tlib/testsuite.c

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

ext/tlib/testsuite.h

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

inc/fuse/fuse.h

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

inc/fuse/fuse_common.h

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

inc/fuse/fuse_opt.h

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

inc/fuse/winfsp_fuse.h

@@ -2,7 +2,7 @@
  * @file fuse/winfsp_fuse.h
  * WinFsp FUSE compatible API.
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -27,6 +27,7 @@
 #include <stdint.h>
 #if !defined(WINFSP_DLL_INTERNAL)
 #include <stdlib.h>
+#include <string.h>
 #endif
 
 #ifdef __cplusplus

inc/fuse3/fuse.h

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

inc/fuse3/fuse_common.h

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

inc/fuse3/fuse_opt.h

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

inc/fuse3/winfsp_fuse.h

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

inc/winfsp/fsctl.h

@@ -1,7 +1,7 @@
 /**
  * @file winfsp/fsctl.h
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -696,6 +696,7 @@ FSP_API NTSTATUS FspFsctlNotify(HANDLE VolumeHandle,
 FSP_API NTSTATUS FspFsctlGetVolumeList(PWSTR DevicePath,
     PWCHAR VolumeListBuf, PSIZE_T PVolumeListSize);
 FSP_API NTSTATUS FspFsctlPreflight(PWSTR DevicePath);
+FSP_API NTSTATUS FspFsctlServiceVersion(PUINT32 PVersion);
 FSP_API NTSTATUS FspFsctlStartService(VOID);
 FSP_API NTSTATUS FspFsctlStopService(VOID);
 FSP_API NTSTATUS FspFsctlEnumServices(

inc/winfsp/launch.h

@@ -5,7 +5,7 @@
  * In order to use the WinFsp Launch API a program must include <winfsp/launch.h>
  * and link with the winfsp_x64.dll (or winfsp_x86.dll) library.
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

inc/winfsp/winfsp.h

@@ -5,7 +5,7 @@
  * In order to use the WinFsp API the user mode file system must include <winfsp/winfsp.h>
  * and link with the winfsp_x64.dll (or winfsp_x86.dll) library.
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

inc/winfsp/winfsp.hpp

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

opt/cygfuse/fuse/cygfuse.c

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

opt/cygfuse/fuse3/cygfuse.c

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

opt/fsext/inc/winfsp/fsext.h

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

src/dll/debug.c

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

src/dll/debuglog.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/debuglog.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/dirbuf.c

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

src/dll/eventlog.c

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

src/dll/fs.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fs.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fsctl.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fsctl.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -31,8 +31,6 @@ static ULONG FspFsctlServiceVersionValue;
 static DWORD FspFsctlTransactCode = FSP_FSCTL_TRANSACT;
 static DWORD FspFsctlTransactBatchCode = FSP_FSCTL_TRANSACT_BATCH;
 
-static VOID FspFsctlServiceVersion(PUINT32 PVersion);
-
 FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath,
     const FSP_FSCTL_VOLUME_PARAMS *VolumeParams,
     PWCHAR VolumeNameBuf, SIZE_T VolumeNameSize,
@@ -423,15 +421,33 @@ exit:
     return TRUE;
 }
 
-static VOID FspFsctlServiceVersion(PUINT32 PVersion)
+FSP_API NTSTATUS FspFsctlServiceVersion(PUINT32 PVersion)
 {
     InitOnceExecuteOnce(&FspFsctlServiceVersionInitOnce, FspFsctlServiceVersionInitialize, 0, 0);
 
     if (0 != PVersion)
         *PVersion = FspFsctlServiceVersionValue;
+
+    return 0 != FspFsctlServiceVersionValue ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL;
 }
 
-static SRWLOCK FspFsctlStartStopServiceLock = SRWLOCK_INIT;
+static FSP_ADAPTIVE_LOCK FspFsctlStartStopServiceLock = FSP_ADAPTIVE_LOCK_INIT;
+static VOID FspFsctlStartStopServiceLockAcquire(VOID)
+{
+    extern HINSTANCE DllInstance;
+    WCHAR DllPath[MAX_PATH];
+    PWSTR FileName = 0;
+
+    if (0 != GetModuleFileNameW(DllInstance, DllPath, MAX_PATH))
+        FileName = DllPath;
+
+    FspAdaptiveLockAcquire(&FspFsctlStartStopServiceLock,
+        FileName, 0xfffffffffffffff0ull, (10 + 1) * 1000);
+}
+static VOID FspFsctlStartStopServiceLockRelease(VOID)
+{
+    FspAdaptiveLockRelease(&FspFsctlStartStopServiceLock);
+}
 
 static BOOLEAN FspFsctlRunningInContainer(VOID)
 {
@@ -455,7 +471,7 @@ static NTSTATUS FspFsctlStartServiceByName(PWSTR DriverName)
     DWORD LastError;
     NTSTATUS Result;
 
-    AcquireSRWLockExclusive(&FspFsctlStartStopServiceLock);
+    FspFsctlStartStopServiceLockAcquire();
 
     if (FspFsctlRunningInContainer())
     {
@@ -517,7 +533,7 @@ exit:
     if (0 != ScmHandle)
         CloseServiceHandle(ScmHandle);
 
-    ReleaseSRWLockExclusive(&FspFsctlStartStopServiceLock);
+    FspFsctlStartStopServiceLockRelease();
 
     return Result;
 }
@@ -587,7 +603,7 @@ FSP_API NTSTATUS FspFsctlStopService(VOID)
 
     FspSxsAppendSuffix(DriverName, sizeof DriverName, L"" FSP_FSCTL_DRIVER_NAME);
 
-    AcquireSRWLockExclusive(&FspFsctlStartStopServiceLock);
+    FspFsctlStartStopServiceLockAcquire();
 
     if (FspFsctlRunningInContainer())
     {
@@ -659,7 +675,7 @@ exit:
     if (0 != ProcessToken)
         CloseHandle(ProcessToken);
 
-    ReleaseSRWLockExclusive(&FspFsctlStartStopServiceLock);
+    FspFsctlStartStopServiceLockRelease();
 
     return Result;
 }

src/dll/fsop.c

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

src/dll/fuse/fuse.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -98,6 +98,7 @@ static struct fuse_opt fsp_fuse_core_opts[] =
     FSP_FUSE_CORE_OPT("VolumeInfoTimeout=", set_VolumeInfoTimeout, 1),
     FSP_FUSE_CORE_OPT("VolumeInfoTimeout=%d", VolumeParams.VolumeInfoTimeout, 0),
     FSP_FUSE_CORE_OPT("KeepFileCache=", set_KeepFileCache, 1),
+    FSP_FUSE_CORE_OPT("FlushOnCleanup=", set_FlushOnCleanup, 1),
     FSP_FUSE_CORE_OPT("LegacyUnlinkRename=", set_LegacyUnlinkRename, 1),
     FSP_FUSE_CORE_OPT("ThreadCount=%u", ThreadCount, 0),
     FUSE_OPT_KEY("UNC=", 'U'),
@@ -120,6 +121,8 @@ static struct fuse_opt fsp_fuse_core_opts[] =
     FSP_FUSE_CORE_OPT("--GroupName=", set_gid, 1),
     FUSE_OPT_KEY("--GroupName=", 'g'),
     
+    FSP_FUSE_CORE_OPT("AddWriteEaAccess", add_write_ea_access, 1),
+
     FUSE_OPT_END,
 };
 
@@ -880,7 +883,7 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
     opt_data.VolumeParams.ReparsePointsAccessCheck = FALSE;
     opt_data.VolumeParams.NamedStreams = FALSE;
     opt_data.VolumeParams.ReadOnlyVolume = FALSE;
-    opt_data.VolumeParams.PostCleanupWhenModifiedOnly = TRUE;
+    opt_data.VolumeParams.PostCleanupWhenModifiedOnly = !opt_data.set_FlushOnCleanup;
     opt_data.VolumeParams.PassQueryDirectoryFileName = TRUE;
     opt_data.VolumeParams.DeviceControl = TRUE;
 #if defined(FSP_CFG_REJECT_EARLY_IRP)
@@ -902,9 +905,11 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
     f->set_create_dir_umask = opt_data.set_create_dir_umask; f->create_dir_umask = opt_data.create_dir_umask;
     f->set_uid = opt_data.set_uid; f->uid = opt_data.uid;
     f->set_gid = opt_data.set_gid; f->gid = opt_data.gid;
+    f->add_write_ea_access = opt_data.add_write_ea_access;
     f->rellinks = opt_data.rellinks;
     f->dothidden = opt_data.dothidden;
     f->ThreadCount = opt_data.ThreadCount;
+    f->FlushOnCleanup = !!opt_data.set_FlushOnCleanup;
     memcpy(&f->ops, ops, opsize);
     f->data = data;
     f->DebugLog = opt_data.debug ? -1 : 0;

src/dll/fuse/fuse_compat.c

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

src/dll/fuse/fuse_intf.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_intf.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -545,6 +545,39 @@ static NTSTATUS fsp_fuse_intf_GetFileInfoFunnel(FSP_FILE_SYSTEM *FileSystem,
     return STATUS_SUCCESS;
 }
 
+static VOID fsp_fuse_intf_AddWriteEaAccess(
+    PSECURITY_DESCRIPTOR SecurityDescriptor)
+{
+    BOOL DaclPresent, DaclDefaulted;
+    PACL Acl;
+    ACL_SIZE_INFORMATION AclSizeInfo;
+    PACE_HEADER Ace;
+    PACCESS_MASK AccessMask;
+
+    if (!GetSecurityDescriptorDacl(SecurityDescriptor, &DaclPresent, &Acl, &DaclDefaulted))
+        return;
+    if (0 == Acl)
+        return;
+    if (!GetAclInformation(Acl, &AclSizeInfo, sizeof AclSizeInfo, AclSizeInformation))
+        return;
+
+    for (DWORD I = 0; I < AclSizeInfo.AceCount; I++)
+    {
+        if (!GetAce(Acl, I, &Ace))
+            return;
+
+        if (Ace->AceType == ACCESS_ALLOWED_ACE_TYPE)
+            AccessMask = &((PACCESS_ALLOWED_ACE)Ace)->Mask;
+        else if (Ace->AceType == ACCESS_DENIED_ACE_TYPE)
+            AccessMask = &((PACCESS_DENIED_ACE)Ace)->Mask;
+        else
+            continue;
+
+        if (*AccessMask & FILE_WRITE_DATA)
+            *AccessMask |= FILE_WRITE_EA;
+    }
+}
+
 static NTSTATUS fsp_fuse_intf_GetSecurityEx(FSP_FILE_SYSTEM *FileSystem,
     const char *PosixPath, struct fuse_file_info *fi,
     PUINT32 PFileAttributes,
@@ -579,7 +612,11 @@ static NTSTATUS fsp_fuse_intf_GetSecurityEx(FSP_FILE_SYSTEM *FileSystem,
 
         *PSecurityDescriptorSize = SecurityDescriptorSize;
         if (0 != SecurityDescriptorBuf) 
+        {
             memcpy(SecurityDescriptorBuf, SecurityDescriptor, SecurityDescriptorSize);
+            if (f->add_write_ea_access)
+                fsp_fuse_intf_AddWriteEaAccess(SecurityDescriptorBuf);
+        }
     }
 
     if (0 != PFileAttributes)
@@ -1046,13 +1083,12 @@ static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
         goto exit;
 
     /*
-     * Ignore fuse_file_info::direct_io, fuse_file_info::keep_cache.
+     * Ignore fuse_file_info::keep_cache.
-     * NOTE: Originally WinFsp did not support disabling the cache manager
-     * for an individual file. This is now possible and we should revisit.
-     *
      * Ignore fuse_file_info::nonseekable.
      */
 
+    FspFileSystemGetOperationContext()->Response->Rsp.Create.Opened.DisableCache = fi.direct_io;
+
     *PFileDesc = filedesc;
     memcpy(FileInfo, &FileInfoBuf, sizeof FileInfoBuf);
 
@@ -1191,13 +1227,12 @@ static NTSTATUS fsp_fuse_intf_Open(FSP_FILE_SYSTEM *FileSystem,
         goto exit;
 
     /*
-     * Ignore fuse_file_info::direct_io, fuse_file_info::keep_cache.
+     * Ignore fuse_file_info::keep_cache.
-     * NOTE: Originally WinFsp did not support disabling the cache manager
-     * for an individual file. This is now possible and we should revisit.
-     *
      * Ignore fuse_file_info::nonseekable.
      */
 
+    FspFileSystemGetOperationContext()->Response->Rsp.Create.Opened.DisableCache = fi.direct_io;
+
     *PFileDesc = filedesc;
     memcpy(FileInfo, &FileInfoBuf, sizeof FileInfoBuf);
 
@@ -1305,6 +1340,7 @@ static VOID fsp_fuse_intf_Cleanup(FSP_FILE_SYSTEM *FileSystem,
 {
     struct fuse *f = FileSystem->UserContext;
     struct fsp_fuse_file_desc *filedesc = FileDesc;
+    struct fuse_file_info fi;
 
     /*
      * In Windows a DeleteFile/RemoveDirectory is the sequence of the following:
@@ -1331,6 +1367,14 @@ static VOID fsp_fuse_intf_Cleanup(FSP_FILE_SYSTEM *FileSystem,
      * LegacyUnlinkRename option to opt out of the POSIX unlink semantics.
      */
 
+    if (f->FlushOnCleanup && !filedesc->IsDirectory && !filedesc->IsReparsePoint) {
+        memset(&fi, 0, sizeof fi);
+        fi.flags = filedesc->OpenFlags;
+        fi.fh = filedesc->FileHandle;
+        if (0 != f->ops.flush)
+            f->ops.flush(filedesc->PosixPath, &fi);
+    }
+
     if (Flags & FspCleanupDelete)
         if (filedesc->IsDirectory && !filedesc->IsReparsePoint)
         {
@@ -1366,7 +1410,7 @@ static VOID fsp_fuse_intf_Close(FSP_FILE_SYSTEM *FileSystem,
     }
     else
     {
-        if (0 != f->ops.flush)
+        if (!f->FlushOnCleanup && 0 != f->ops.flush)
             f->ops.flush(filedesc->PosixPath, &fi);
         if (0 != f->ops.release)
             f->ops.release(filedesc->PosixPath, &fi);

src/dll/fuse/fuse_loop.c

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

src/dll/fuse/fuse_main.c

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

src/dll/fuse/fuse_opt.c

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

src/dll/fuse/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/library.h
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -55,6 +55,7 @@ struct fuse
     int set_create_dir_umask, create_dir_umask;
     int set_uid, uid;
     int set_gid, gid;
+    int add_write_ea_access;
     int rellinks;
     int dothidden;
     unsigned ThreadCount;
@@ -63,6 +64,7 @@ struct fuse
     unsigned conn_want;
     BOOLEAN fsinit;
     BOOLEAN has_symlinks, has_slashdot;
+    BOOLEAN FlushOnCleanup;
     UINT32 DebugLog;
     FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY OpGuardStrategy;
     FSP_FSCTL_VOLUME_PARAMS VolumeParams;
@@ -147,6 +149,7 @@ struct fsp_fuse_core_opt_data
         set_create_dir_umask, create_dir_umask,
         set_uid, uid, username_to_uid_result,
         set_gid, gid,
+        add_write_ea_access,
         set_uidmap,
         set_attr_timeout, attr_timeout,
         rellinks,
@@ -156,6 +159,7 @@ struct fsp_fuse_core_opt_data
         set_EaTimeout,
         set_VolumeInfoTimeout,
         set_KeepFileCache,
+        set_FlushOnCleanup,
         set_LegacyUnlinkRename;
     unsigned ThreadCount;
     FSP_FSCTL_VOLUME_PARAMS VolumeParams;

src/dll/fuse3/fuse2to3.c

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

src/dll/fuse3/fuse3.c

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

src/dll/fuse3/fuse3_compat.c

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

src/dll/fuse3/library.h

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

src/dll/launch.c

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

src/dll/ldap.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/ldap.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/library.c

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

src/dll/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/library.h
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -106,6 +106,21 @@ NTSTATUS FspGetModuleFileName(
     ULONG Size,
     PWSTR RelativePath);
 
+typedef struct
+{
+    SRWLOCK Lock;
+    HANDLE Handle;
+    UINT64 Offset;
+} FSP_ADAPTIVE_LOCK;
+#define FSP_ADAPTIVE_LOCK_INIT          { SRWLOCK_INIT, INVALID_HANDLE_VALUE, 0 }
+VOID FspAdaptiveLockAcquire(
+    FSP_ADAPTIVE_LOCK *Lock,
+    PWSTR FileName,
+    UINT64 Offset,
+    DWORD Timeout);
+VOID FspAdaptiveLockRelease(
+    FSP_ADAPTIVE_LOCK *Lock);
+
 #define FspFileSystemDirectoryBufferEntryInvalid ((ULONG)-1)
 VOID FspFileSystemPeekInDirectoryBuffer(PVOID *PDirBuffer,
     PUINT8 *PBuffer, PULONG *PIndex, PULONG PCount);

src/dll/mount.c

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

src/dll/np.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/np.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -454,6 +454,41 @@ exit:
     return NpResult;
 }
 
+static BOOLEAN FspNpCheckRemoteVolume(PWSTR RemoteName)
+{
+    PWSTR ClassName, InstanceName, P;
+    ULONG ClassNameLen, InstanceNameLen;
+    WCHAR RemoteNameBuf[9 + sizeof(((FSP_FSCTL_VOLUME_PARAMS *)0)->Prefix) / sizeof(WCHAR)];
+    HANDLE Handle;
+    DWORD Bytes;
+    BOOLEAN Result;
+
+    if (!FspNpParseRemoteName(RemoteName,
+        &ClassName, &ClassNameLen, &InstanceName, &InstanceNameLen))
+        return FALSE;
+
+    Result = FALSE;
+
+    P = RemoteNameBuf;
+    *P++ = L'\\'; *P++ = L'\\'; *P++ = L'?'; *P++ = L'\\';
+    *P++ = L'U'; *P++ = L'N'; *P++ = L'C'; *P++ = L'\\';
+    memcpy(P, ClassName, ClassNameLen * sizeof(WCHAR)); P += ClassNameLen; *P++ = L'\\';
+    memcpy(P, InstanceName, InstanceNameLen * sizeof(WCHAR)); P += InstanceNameLen; *P++ = L'\\';
+    *P++ = L'\0';
+
+    Handle = CreateFileW(RemoteNameBuf,
+        FILE_READ_ATTRIBUTES, 0, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
+    if (INVALID_HANDLE_VALUE != Handle)
+    {
+        /* the file system is up and running; is it WinFsp? */
+        if (DeviceIoControl(Handle, FSP_FSCTL_QUERY_WINFSP, 0, 0, 0, 0, &Bytes, 0))
+            Result = TRUE;
+        CloseHandle(Handle);
+    }
+
+    return Result;
+}
+
 DWORD APIENTRY NPGetConnection(
     LPWSTR lpLocalName, LPWSTR lpRemoteName, LPDWORD lpnBufferLen)
 {
@@ -573,7 +608,16 @@ DWORD APIENTRY NPAddConnection(LPNETRESOURCEW lpNetResource, LPWSTR lpPassword,
 
     NpResult = FspNpGetRemoteInfo(lpRemoteName, 0, &CredentialsKind, &AllowImpersonation);
     if (WN_SUCCESS != NpResult)
+    {
+        /*
+         * This may still be a WinFsp network file system, but not managed by the Launcher.
+         * So if it is already live, one of ours and we do not need to map a drive, then go
+         * ahead and report success.
+         */
+        if (L'\0' == LocalNameBuf[0] && FspNpCheckRemoteVolume(lpRemoteName))
+            NpResult = WN_SUCCESS;
         return NpResult;
+    }
 
 #if defined(FSP_NP_CREDENTIAL_MANAGER)
     /* if we need credentials and none were passed check with the credential manager */
@@ -720,6 +764,15 @@ DWORD APIENTRY NPAddConnection(LPNETRESOURCEW lpNetResource, LPWSTR lpPassword,
             /* we are not being asked for a drive mapping, so whatever we have is good! */
             NpResult = WN_SUCCESS;
         break;
+    case WN_NO_NETWORK:
+        /*
+         * This may still be a WinFsp network file system, but not managed by the Launcher.
+         * So if it is already live, one of ours and we do not need to map a drive, then go
+         * ahead and report success.
+         */
+        if (L'\0' == LocalNameBuf[0] && FspNpCheckRemoteVolume(lpRemoteName))
+            NpResult = WN_SUCCESS;
+        break;
     default:
         NpResult = WN_NO_NETWORK;
         break;

src/dll/ntstatus.c

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

src/dll/path.c

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

src/dll/security.c

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

src/dll/service.c

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

src/dll/sxs.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/sxs.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/util.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/util.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -418,3 +418,74 @@ NTSTATUS FspGetModuleFileName(
 
     return STATUS_SUCCESS;
 }
+
+VOID FspAdaptiveLockAcquire(
+    FSP_ADAPTIVE_LOCK *Lock,
+    PWSTR FileName,
+    UINT64 Offset,
+    DWORD Timeout)
+{
+    AcquireSRWLockExclusive(&Lock->Lock);
+
+    if (0 != FileName)
+    {
+        HANDLE Handle;
+        DWORD BytesTransferred;
+        OVERLAPPED Overlapped;
+        BOOL Success;
+
+        Handle = CreateFileW(
+            FileName,
+            FILE_READ_DATA,
+            FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+            0,
+            OPEN_EXISTING,
+            FILE_FLAG_OVERLAPPED,
+            0);
+        if (INVALID_HANDLE_VALUE != Handle)
+        {
+            memset(&Overlapped, 0, sizeof Overlapped);
+            Overlapped.Offset = ((PLARGE_INTEGER)&Offset)->LowPart;
+            Overlapped.OffsetHigh = ((PLARGE_INTEGER)&Offset)->HighPart;
+
+            Success = LockFileEx(
+                Handle,
+                LOCKFILE_EXCLUSIVE_LOCK, 0,
+                1, 0,
+                &Overlapped);
+            if (Success || ERROR_IO_PENDING == GetLastError())
+            {
+                Success = FALSE;
+                if (WAIT_OBJECT_0 == WaitForSingleObject(Handle, Timeout))
+                    Success = GetOverlappedResult(Handle, &Overlapped, &BytesTransferred, TRUE);
+            }
+
+            if (Success)
+            {
+                Lock->Handle = Handle;
+                Lock->Offset = Offset;
+            }
+            else
+                CloseHandle(Handle);
+        }
+    }
+}
+
+VOID FspAdaptiveLockRelease(
+    FSP_ADAPTIVE_LOCK *Lock)
+{
+    if (INVALID_HANDLE_VALUE != Lock->Handle)
+    {
+        HANDLE Handle = Lock->Handle;
+        LARGE_INTEGER LargeOffset = *(PLARGE_INTEGER)&Lock->Offset;
+
+        UnlockFile(Handle, LargeOffset.LowPart, LargeOffset.HighPart, 1, 0);
+
+        CloseHandle(Handle);
+
+        Lock->Handle = INVALID_HANDLE_VALUE;
+        Lock->Offset = 0;
+    }
+
+    ReleaseSRWLockExclusive(&Lock->Lock);
+}

src/dll/wksid.c

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

src/dotnet/FileSystemBase+Const.cs

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

src/dotnet/FileSystemBase.cs

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

src/dotnet/FileSystemHost.cs

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

src/dotnet/Interop.cs

@@ -1,7 +1,7 @@
 /*
  * dotnet/Interop.cs
  *
- * Copyright 2015-2022 Bill Zissimopoulos
+ * Copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dotnet/Service.cs

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

src/fsptool/fsptool.c

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

src/launcher/launchctl.c

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

src/launcher/launcher.c

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

src/launcher/ptrans.c

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

src/shared/ku/config.h

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

src/shared/ku/library.h

@@ -1,7 +1,7 @@
 /**
  * @file shared/ku/library.h
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/shared/ku/mountmgr.c

@@ -1,7 +1,7 @@
 /**
  * @file shared/ku/mountmgr.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/shared/ku/posix.c

@@ -14,7 +14,7 @@
  * [SNAME]
  *     https://www.cygwin.com/cygwin-ug-net/using-specialnames.html
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -1416,7 +1416,7 @@ FSP_API NTSTATUS FspPosixMapPosixToWindowsPathEx(const char *PosixPath, PWSTR *P
         goto lasterror;
 
     WindowsPath = MemAlloc(Size * sizeof(WCHAR));
-    if (0 == PosixPath)
+    if (0 == WindowsPath)
     {
         Result = STATUS_INSUFFICIENT_RESOURCES;
         goto exit;

src/shared/ku/uuid5.c

@@ -1,7 +1,7 @@
 /**
  * @file shared/ku/uuid5.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/shared/um/minimal.h

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

src/sys/callbacks.c

@@ -2,7 +2,7 @@
  * @file sys/callbacks.c
  * Fast I/O and resource acquisition callbacks.
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -324,7 +324,9 @@ VOID FspPropagateTopFlags(PIRP Irp, PIRP TopLevelIrp)
             FspFileNodeAcquireMain :
             FspFileNodeAcquireFull);
     }
-    else if ((PIRP)MM_SYSTEM_RANGE_START <= TopLevelIrp && IO_TYPE_IRP == TopLevelIrp->Type)
+    else if ((PIRP)MM_SYSTEM_RANGE_START <= TopLevelIrp &&
+        IO_TYPE_IRP == TopLevelIrp->Type &&
+        TopLevelIrp->CurrentLocation <= TopLevelIrp->StackCount)
     {
         PFILE_OBJECT FileObject = IoGetCurrentIrpStackLocation(Irp)->FileObject;
         PFILE_OBJECT TopLevelFileObject = IoGetCurrentIrpStackLocation(TopLevelIrp)->FileObject;

src/sys/cleanup.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/cleanup.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -242,8 +242,7 @@ static VOID FspFsvolCleanupRequestFini(FSP_FSCTL_TRANSACT_REQ *Request, PVOID Co
     FspFileNodeReleaseOwner(FileNode, Pgio, Request);
 
     FspFileNodeCleanupComplete(FileNode, FileObject, !!Request->Req.Cleanup.Delete);
-    if (!FileNode->IsDirectory)
+    FspFileNodeOplockCheck(FileNode, Irp);
-        FspFileNodeOplockCheck(FileNode, Irp);
     SetFlag(FileObject->Flags, FO_CLEANUP_COMPLETE);
 
     MainFileHandle = FileDesc->MainFileHandle;

src/sys/close.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/close.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -75,6 +75,9 @@ static NTSTATUS FspFsvolClose(
 
     ASSERT(FileNode == FileDesc->FileNode);
 
+    if (!FlagOn(FileObject->Flags, FO_CLEANUP_COMPLETE))
+        FspFileNodeOplockCheck(FileNode, Irp);
+
     /* create the user-mode file system request; MustSucceed because IRP_MJ_CLOSE cannot fail */
     FspIopCreateRequestMustSucceed(0, 0, 0, &Request);
     Request->Kind = FspFsctlTransactCloseKind;

src/sys/create.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/create.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -298,6 +298,8 @@ static NTSTATUS FspFsvolCreateNoLock(
     ULONG CreateOptions = IrpSp->Parameters.Create.Options;
     USHORT FileAttributes = IrpSp->Parameters.Create.FileAttributes;
     PSECURITY_DESCRIPTOR SecurityDescriptor = AccessState->SecurityDescriptor;
+    BOOLEAN SecurityDescriptorRelative = 0 != SecurityDescriptor &&
+        BooleanFlagOn(((SECURITY_DESCRIPTOR *)SecurityDescriptor)->Control, SE_SELF_RELATIVE);
     ULONG SecurityDescriptorSize = 0;
     UINT64 AllocationSize = Irp->Overlay.AllocationSize.QuadPart;
     UINT64 AllocationUnit;
@@ -406,7 +408,10 @@ static NTSTATUS FspFsvolCreateNoLock(
         if (!RtlValidSecurityDescriptor(SecurityDescriptor))
             return STATUS_INVALID_PARAMETER;
 #endif
-        SecurityDescriptorSize = RtlLengthSecurityDescriptor(SecurityDescriptor);
+        if (SecurityDescriptorRelative)
+            SecurityDescriptorSize = RtlLengthSecurityDescriptor(SecurityDescriptor);
+        else
+            RtlAbsoluteToSelfRelativeSD(SecurityDescriptor, 0, &SecurityDescriptorSize);
     }
 
     /* align allocation size */
@@ -702,8 +707,18 @@ static NTSTATUS FspFsvolCreateNoLock(
 
     /* copy the security descriptor (if any) into the request */
     if (0 != SecurityDescriptorSize)
-        RtlCopyMemory(Request->Buffer + Request->Req.Create.SecurityDescriptor.Offset,
+    {
-            SecurityDescriptor, SecurityDescriptorSize);
+        if (SecurityDescriptorRelative)
+            RtlCopyMemory(
+                Request->Buffer + Request->Req.Create.SecurityDescriptor.Offset,
+                SecurityDescriptor,
+                SecurityDescriptorSize);
+        else
+            RtlAbsoluteToSelfRelativeSD(
+                SecurityDescriptor,
+                (PSECURITY_DESCRIPTOR)(Request->Buffer + Request->Req.Create.SecurityDescriptor.Offset),
+                &SecurityDescriptorSize);
+    }
 
     /* copy the extra buffer (if any) into the request */
     if (0 != ExtraBuffer)

src/sys/debug.c

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

src/sys/devctl.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/devctl.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -72,15 +72,32 @@ BOOLEAN FspFastIoDeviceControl(
     if (!Result)
         FSP_RETURN();
 
-#if 0
+    if (0 != InputBufferLength &&
-    PDEVICE_OBJECT FsctlDeviceObject = DeviceObject;
+        FSP_FSCTL_DEFAULT_ALIGN_UP(sizeof(FSP_FSCTL_TRANSACT_RSP)) > InputBufferLength)
-    if (!FspDeviceReference(FsctlDeviceObject))
+        FSP_RETURN(IoStatus->Status = STATUS_INVALID_PARAMETER);
+    if (0 != OutputBufferLength &&
+        FSP_FSCTL_TRANSACT_BUFFER_SIZEMIN > OutputBufferLength)
+        FSP_RETURN(IoStatus->Status = STATUS_BUFFER_TOO_SMALL);
+
+    PVOID SystemBuffer = 0;
+
+    if (0 != InputBufferLength || 0 != OutputBufferLength)
     {
-        IoStatus->Status = STATUS_CANCELLED;
+        SystemBuffer = FspAllocNonPaged(
-        IoStatus->Information = 0;
+            InputBufferLength > OutputBufferLength ? InputBufferLength : OutputBufferLength);
-        FSP_RETURN();
+        if (0 == SystemBuffer)
+            FSP_RETURN(Result = FALSE);
+        if (0 != InputBuffer)
+            try
+            {
+                RtlCopyMemory(SystemBuffer, InputBuffer, InputBufferLength);
+            }
+            except (EXCEPTION_EXECUTE_HANDLER)
+            {
+                FspFree(SystemBuffer);
+                FSP_RETURN(Result = FALSE);
+            }
     }
-#endif
 
     ASSERT(0 == IoGetTopLevelIrp());
     IoSetTopLevelIrp((PIRP)FSRTL_FAST_IO_TOP_LEVEL_IRP);
@@ -88,18 +105,29 @@ BOOLEAN FspFastIoDeviceControl(
     IoStatus->Status = FspVolumeFastTransact(
         FileObject->FsContext2,
         IoControlCode,
-        InputBuffer,
+        SystemBuffer,
         InputBufferLength,
-        OutputBuffer,
+        0 != OutputBufferLength ? SystemBuffer : 0,
         OutputBufferLength,
         IoStatus,
         (PIRP)FSRTL_FAST_IO_TOP_LEVEL_IRP);
 
     IoSetTopLevelIrp(0);
 
-#if 0
+    if (0 != SystemBuffer)
-    FspDeviceDereference(FsctlDeviceObject);
+    {
-#endif
+        if (NT_SUCCESS(IoStatus->Status) && 0 != OutputBuffer)
+            try
+            {
+                RtlCopyMemory(OutputBuffer, SystemBuffer, IoStatus->Information);
+            }
+            except (EXCEPTION_EXECUTE_HANDLER)
+            {
+                IoStatus->Status = GetExceptionCode();
+                IoStatus->Information = 0;
+            }
+        FspFree(SystemBuffer);
+    }
 
     FSP_LEAVE_BOOL(
         "%s, FileObject=%p",

src/sys/device.c

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

src/sys/devtimer.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/devtimer.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/sys/dirctl.c

@@ -1,7 +1,7 @@
 /**
  * @file sys/dirctl.c
  *
- * @copyright 2015-2022 Bill Zissimopoulos
+ * @copyright 2015-2026 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.