tst: memfs: MemfsUpperChar

Bit-twiddling upper case char

.github/ISSUE_TEMPLATE/question.md

@@ -5,4 +5,4 @@ about: Questions are better asked in the WinFsp Google Group. However you may as
 
 ## Question
 
-_Please consider asking questions in the [WinFsp Google Group](https://groups.google.com/forum/#!forum/winfsp) instead. Before asking a question please also consult the [WinFsp Frequently Asked Questions](https://github.com/billziss-gh/winfsp/wiki/Frequently-Asked-Questions)._
+_Please consider asking questions in the [WinFsp Google Group](https://groups.google.com/forum/#!forum/winfsp) instead. Before asking a question please also consult the [WinFsp Frequently Asked Questions](https://github.com/winfsp/winfsp/wiki/Frequently-Asked-Questions)._

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/avm.yml

@@ -11,6 +11,8 @@ jobs:
     - uses: billziss-gh/avm@v1
       with:
         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
+            https://github.com/winfsp/winfsp/releases/download/v1.6/winfsp-1.6.20027.msi
+            https://github.com/winfsp/winfsp/releases/download/v1.7/winfsp-1.7.20172.msi
+            https://github.com/winfsp/winfsp/releases/download/v1.8/winfsp-1.8.20304.msi
+            https://github.com/winfsp/winfsp/releases/download/v1.9/winfsp-1.9.21096.msi
+            https://github.com/winfsp/winfsp/releases/download/v1.10/winfsp-1.10.22006.msi

Changelog.md

@@ -0,0 +1,87 @@
+# Changelog
+
+
+## v1.11B3 (2022+ARM64 Beta3)
+
+- [NEW] ARM64 support! For details see [WinFsp on ARM64](https://github.com/winfsp/winfsp/wiki/WinFsp-on-ARM64).
+
+- [NEW] A new file system operation has been added to the FUSE API:
+
+    ```C
+    int (*getpath)(const char *path, char *buf, size_t size,
+        struct fuse_file_info *fi);
+    ```
+
+    The `getpath` operation allows a case-insensitive file system to report the correct case of a file path. For example, `getpath` can be used to report that the actual path of a file opened as `/PATH/TO/FILE` is really `/Path/To/File`. This capability is important for some Windows file system scenarios and can sometimes result in a performance improvement.
+
+- [NEW] New `ntptfs` sample file system. This is a production quality pass through file system and should be used instead of the original `passthrough` file system that was developed for education purposes only.
+
+- [NEW] Many performance improvements:
+
+    - A new `PostDispositionForDirOnly` setting has been added to `FSP_FSCTL_VOLUME_PARAMS`. This allows a file system to declare that it does not want to see `SetInformation/Disposition` requests for files (such requests will still be sent for directories, because a file system is supposed to check if a directory is empty before deletion). This makes file (not directory) deletion faster. This optimization should be safe to enable for most file systems. FUSE file systems get this optimization for free.
+
+    - The FSD now implements "fast I/O" reads and writes. Fast I/O is a technique for doing I/O without using IRP's (I/O Request Packets) and can only work for file systems using the cache manager (`FileInfoTimeout==-1`). This results in significant improvement in read/write scenarios.
+
+    - The FSD now implements "fast I/O" for "transact" messages. Transact messages are used in the communication protocol between the kernel-mode FSD and the user-mode file system. Fast I/O speeds this communication protocol by as much as 10% in some scenarios. (Fast I/O for transact messages is enabled only when using the new `FSP_IOCTL_TRANSACT` control code, but does not require any other special configuration to be enabled.)
+
+    - The FSD per directory cache limit has been increased from 16K to 64K. This should allow for more directory data to be maintained in kernel and reduce round-trips to the user mode file system.
+
+    - The user mode directory buffering mechanism (`FspFileSystemAcquireDirectoryBuffer`) has been improved. The mechanism uses the quick-sort algorithm internally which can exhibit bad performance when sorting already sorted data. The quick-sort algorithm has been improved with the use use of median of three partitioning, which alleviates this problem.
+
+- [FIX] The WinFsp Network Provider now implements `NPGetUniversalName`. This fixes problems with some apps (e.g. Photos app).
+
+- [FIX] WinFsp-FUSE now supports Azure AD accounts when specifying the `-o uid=-1` option. In addition a new option `-o uidmap=UID:SID` allows the specification of arbitrary UID<->SID or UID<->UserName mappings.
+
+- [FIX] All executables (`*.exe,*.dll,*.sys`) in the WinFsp installation `bin` folder are now signed.
+
+- [FIX] The default value for the registry setting `DistinctPermsForSameOwnerGroup` has been changed from 0 to 1.
+
+- [BUILD] Product configuration (`MyProductName`, etc.) is done by the file `build.version.props` located in `build\VStudio`. This file was previously named `version.properties`.
+
+
+## v1.11B2 (2022+ARM64 Beta2)
+
+- [NEW] ARM64 support! For details see [WinFsp on ARM64](https://github.com/winfsp/winfsp/wiki/WinFsp-on-ARM64).
+
+- [NEW] A new file system operation has been added to the FUSE API:
+
+    ```C
+    int (*getpath)(const char *path, char *buf, size_t size,
+        struct fuse_file_info *fi);
+    ```
+
+    The `getpath` operation allows a case-insensitive file system to report the correct case of a file path. For example, `getpath` can be used to report that the actual path of a file opened as `/PATH/TO/FILE` is really `/Path/To/File`. This capability is important for some Windows file system scenarios and can sometimes result in a performance improvement.
+
+- [NEW] Many performance improvements:
+
+    - A new `PostDispositionForDirOnly` setting has been added to `FSP_FSCTL_VOLUME_PARAMS`. This allows a file system to declare that it does not want to see `SetInformation/Disposition` requests for files (such requests will still be sent for directories, because a file system is supposed to check if a directory is empty before deletion). This makes file (not directory) deletion faster. This optimization should be safe to enable for most file systems. FUSE file systems get this optimization for free.
+
+    - The FSD now implements "fast I/O" reads and writes. Fast I/O is a technique for doing I/O without using IRP's (I/O Request Packets) and can only work for file systems using the cache manager (`FileInfoTimeout==-1`). This results in significant improvement in read/write scenarios.
+
+    - The FSD per directory cache limit has been increased from 16K to 64K. This should allow for more directory data to be maintained in kernel and reduce round-trips to a user mode file system.
+
+    - The user mode directory buffering mechanism (`FspFileSystemAcquireDirectoryBuffer`) has been improved. The mechanism uses the quick-sort algorithm internally which can exhibit bad performance when sorting already sorted data. The quick-sort algorithm has been improved with the use use of median of three partitioning, which alleviates this problem.
+
+- [NEW] The default value for the registry setting `DistinctPermsForSameOwnerGroup` has been changed from 0 to 1.
+
+- [NEW] New `ntptfs` sample file system. This is a production quality pass through file system and should be used instead of the original `passthrough` file system that was developed for education purposes only.
+
+- [FIX] The WinFsp Network Provider now implements `NPGetUniversalName`. This fixes problems with some apps (e.g. Photos app).
+
+- [BUILD] Product configuration (`MyProductName`, etc.) is done by the file `build.version.props` located in `build\VStudio`. This file was previously named `version.properties`.
+
+
+## v1.11B1 (2022+ARM64 Beta1)
+
+- [NEW] ARM64 support! For details see [WinFsp on ARM64](https://github.com/winfsp/winfsp/wiki/WinFsp-on-ARM64).
+
+- [NEW] New `ntptfs` sample file system. This is a production quality pass through file system and should be used instead of the original `passthrough` file system that was developed for education purposes only.
+
+- [NEW] The default value for the registry setting `DistinctPermsForSameOwnerGroup` has been changed from 0 to 1.
+
+- [BUILD] Product configuration (`MyProductName`, etc.) is done by the file `build.version.props` located in `build\VStudio`. This file was previously named `version.properties`.
+
+
+## v1.10 (2022)
+
+Prior changes are recorded in `doc/archive/Changelog-upto-v1.10.asciidoc`.

License.txt

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

README.md

@@ -7,11 +7,11 @@
 
 <p align="center">
     <b>Download</b><br>
-    <a href="https://github.com/billziss-gh/winfsp/releases/latest">
-        <img src="https://img.shields.io/github/release/billziss-gh/winfsp.svg?label=stable&style=for-the-badge"/>
+    <a href="https://github.com/winfsp/winfsp/releases/latest">
+        <img src="https://img.shields.io/github/release/winfsp/winfsp.svg?label=stable&style=for-the-badge"/>
     </a>
-    <a href="https://github.com/billziss-gh/winfsp/releases">
-        <img src="https://img.shields.io/github/release/billziss-gh/winfsp/all.svg?label=latest&colorB=e52e4b&style=for-the-badge"/>
+    <a href="https://github.com/winfsp/winfsp/releases">
+        <img src="https://img.shields.io/github/release/winfsp/winfsp/all.svg?label=latest&colorB=e52e4b&style=for-the-badge"/>
     </a>
     <a href="https://chocolatey.org/packages/winfsp">
         <img src="https://img.shields.io/badge/choco-install%20winfsp-black.svg?style=for-the-badge"/>
@@ -53,7 +53,7 @@ WinFsp strives for compatibility with NTFS and file system correctness. For the
 WinFsp has an easy to use but comprehensive API.
 
 * This simple [Tutorial](doc/WinFsp-Tutorial.asciidoc) explains how to build a file system.
-* Consult the [API Reference](http://www.secfs.net/winfsp/apiref/) for native development.
+* Consult the [API Reference](https://winfsp.dev/apiref) for native development.
 * Includes .NET layer for managed development. See [src/dotnet](src/dotnet).
 * Includes FUSE 2.8 compatibility layer: [fuse/fuse.h](inc/fuse/fuse.h)
 * Includes FUSE 3.2 compatibility layer: [fuse3/fuse.h](inc/fuse3/fuse.h)
@@ -63,7 +63,7 @@ WinFsp has an easy to use but comprehensive API.
 * Signed drivers provided on every release.
 * Available under the [GPLv3](License.txt) license with a special exception for Free/Libre and Open Source Software.
 
-To learn more about WinFsp, please visit its website: http://www.secfs.net/winfsp/
+To learn more about WinFsp, please visit its website: https://winfsp.dev
 
 ## Project Organization
 
@@ -125,7 +125,7 @@ I am looking for help in the following areas:
 
 * If you have a file system that runs on FUSE please consider porting it to WinFsp. WinFsp has a native API, but it also has a FUSE (high-level) API.
 * If you are working with a language other than C/C++ (e.g. Delphi, Java, etc.) and you are interested in porting/wrapping WinFsp I would love to hear from you.
-* There are a number of outstanding issues listed in the [GitHub repository](https://github.com/billziss-gh/winfsp/issues). Many of these require knowledge of Windows kernel-mode and an understanding of the internals of WinFsp so they are not for the faint of heart.
+* There are a number of outstanding issues listed in the [GitHub repository](https://github.com/winfsp/winfsp/issues). Many of these require knowledge of Windows kernel-mode and an understanding of the internals of WinFsp so they are not for the faint of heart.
 
 In all cases I can provide ideas and/or support.
 

appveyor.yml

@@ -1,12 +1,23 @@
 version: '{build}'
 
+skip_tags: true
+
 environment:
   # Disable the winfsp-tests built-in exception filter to allow WER to collect dumps.
   WINFSP_TESTS_EXCEPTION_FILTER_DISABLE: 1
+
   matrix:
-  - CONFIGURATION: Debug
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    CONFIGURATION: Debug
     TESTING: Func
-  - CONFIGURATION: Release
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    CONFIGURATION: Release
+    TESTING: Func
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CONFIGURATION: Release
+    TESTING: Func
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    CONFIGURATION: Release
     TESTING: Func
   #- CONFIGURATION: Release
   #  TESTING: Avast
@@ -14,16 +25,19 @@ environment:
   #  TESTING: Perf
 
 init:
-#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 install:
 # Hack to make WDK 1903 work on VS2015.
 # See https://github.com/appveyor-tests/WDK-10.0.14393.0/blob/31cf12217fe0c92b218c70d7027dfe145be4f4cb/appveyor.yml#L7
 - ps: |
-    [xml]$targets = get-content "C:\Program Files (x86)\Windows Kits\10\build\WindowsDriver.Common.targets"
-    $usingTask = $targets.ChildNodes[1].UsingTask | ? {$_.TaskName -eq "ValidateNTTargetVersion"}
-    $usingTask.AssemblyFile = '$(WDKContentRoot)build\bin\Microsoft.DriverKit.Build.Tasks.16.0.dll'
-    $targets.Save("C:\Program Files (x86)\Windows Kits\10\build\WindowsDriver.Common.targets")
+    if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") {
+      [xml]$targets = get-content "C:\Program Files (x86)\Windows Kits\10\build\WindowsDriver.Common.targets"
+      $usingTask = $targets.ChildNodes[1].UsingTask | ? {$_.TaskName -eq "ValidateNTTargetVersion"}
+      $usingTask.AssemblyFile = '$(WDKContentRoot)build\bin\Microsoft.DriverKit.Build.Tasks.16.0.dll'
+      $targets.Save("C:\Program Files (x86)\Windows Kits\10\build\WindowsDriver.Common.targets")
+      Add-AppveyorMessage "Hack to make WDK 1903 work on VS2015"
+    }
 # Submodules
 - git submodule update --init --recursive
 # Kernel and user mode dumps
@@ -35,7 +49,7 @@ install:
 # Boot configuration
 - appveyor AddMessage "Change boot configuration and reboot" -Category Information
 - bcdedit /set testsigning on
-- if %TESTING%==Func verifier /standard /driver winfsp-x64.sys
+- if %TESTING%==Func verifier /standard /driver winfsp-x64.sys & exit 0
 - ps: Restart-Computer -Force
 - ps: Start-Sleep -s 60
 
@@ -46,12 +60,17 @@ build_script:
 #- C:\cygwin64\bin\bash --login -c "make -C '%CD%\opt\cygfuse' dist"
 #- C:\cygwin\setup-x86.exe -qnNd -P cygport
 #- C:\cygwin\bin\bash --login -c "make -C '%CD%\opt\cygfuse' dist"
+# remove ARM64 project configurations to build in VS2015/VS2017
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" tools\gensrc\remove-build-arm64.bat
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" tools\gensrc\remove-build-arm64.bat
 # build winfsp
 - tools\build.bat %CONFIGURATION%
 
 test_script:
 - choco install winfsp -s build\VStudio\build\%CONFIGURATION% -y --pre
-- if %TESTING%==Func appveyor DownloadFile http://www.secfs.net/Test.Filter.Driver.zip && 7z x Test.Filter.Driver.zip
+- if %TESTING%==Func appveyor DownloadFile https://winfsp.dev/assets/pvt/Test.Filter.Driver.zip.001
+- if %TESTING%==Func appveyor DownloadFile https://winfsp.dev/assets/pvt/Test.Filter.Driver.zip.002
+- if %TESTING%==Func 7z x Test.Filter.Driver.zip.001
 - if %TESTING%==Func start /wait msiexec /i "Test.Filter.Driver\HCK Filter.Driver Content-x86_en-us.msi" /qn
 - if %TESTING%==Func tools\nmake-ext-test.bat %CONFIGURATION%
 - if %TESTING%==Func tools\run-tests.bat %CONFIGURATION%

build/VStudio/build.common.props

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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)</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)</PreprocessorDefinitions>
+        </ResourceCompile>
+    </ItemDefinitionGroup>
+    <ItemDefinitionGroup Condition="'$(IsKernelModeToolset)'=='true'">
+        <ClCompile>
+            <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+        </ClCompile>
+        <DriverSign>
+            <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
+        </DriverSign>
+    </ItemDefinitionGroup>
+    <ItemDefinitionGroup Condition="'$(DefaultPlatformToolset)'=='v140'">
+        <Link>
+            <GenerateDebugInformation>true</GenerateDebugInformation>
+        </Link>
+    </ItemDefinitionGroup>
+    <ItemDefinitionGroup Condition="'$(DefaultPlatformToolset)'!='v140'">
+        <Link>
+            <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+        </Link>
+    </ItemDefinitionGroup>
+    <PropertyGroup>
+        <SpectreMitigation>false</SpectreMitigation>
+    </PropertyGroup>
+</Project>

build/VStudio/build.version.props

@@ -6,7 +6,8 @@
 
         <!-- git revision -->
         <MyGitRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .git/HEAD))</MyGitRoot>
-        <MyGitHead>$([System.IO.File]::ReadAllText($(MyGitRoot)/.git/HEAD).Trim())</MyGitHead>
+        <MyGitHead Condition=" Exists('$(MyGitRoot)/.git/HEAD')">$([System.IO.File]::ReadAllText($(MyGitRoot)/.git/HEAD).Trim())</MyGitHead>
+        <MyGitHead Condition="!Exists('$(MyGitRoot)/.git/HEAD')">0000000</MyGitHead>
         <MyGitRevision Condition="$(MyGitHead.StartsWith(ref: )) And  Exists('$(MyGitRoot)/.git/$(MyGitHead.Substring(5))')">$([System.IO.File]::ReadAllText($(MyGitRoot)/.git/$(MyGitHead.Substring(5))).Trim().Substring(0, 7))</MyGitRevision>
         <MyGitRevision Condition="$(MyGitHead.StartsWith(ref: )) And !Exists('$(MyGitRoot)/.git/$(MyGitHead.Substring(5))')">$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText($(MyGitRoot)/.git/packed-refs)), '[0-9a-fA-F]{40,}.*$(MyGitHead.Substring(5))').Value.Substring(0, 7))</MyGitRevision>
         <MyGitRevision Condition="!$(MyGitHead.StartsWith(ref: ))">$(MyGitHead.Substring(0, 7))</MyGitRevision>
@@ -17,10 +18,13 @@
         <MyCompanyName>Navimatics LLC</MyCompanyName>
         <MyCopyright>2015-$([System.DateTime]::Now.ToString(`yyyy`)) Bill Zissimopoulos</MyCopyright>
 
-        <MyCanonicalVersion>1.10</MyCanonicalVersion>
+        <MyCanonicalVersion>1.11</MyCanonicalVersion>
 
-        <MyProductVersion>2022</MyProductVersion>
-        <MyProductStage>Gold</MyProductStage>
+        <MyProductVersion>2022+ARM64 Beta3</MyProductVersion>
+        <MyProductStage>Beta</MyProductStage>
+
+        <MyCrossCert>DigiCert High Assurance EV Root CA.crt</MyCrossCert>
+        <MyCertIssuer>DigiCert</MyCertIssuer>
 
         <MyVersion>$(MyCanonicalVersion).$(MyBuildNumber)</MyVersion>
         <MyVersionWithCommas>$(MyVersion.Replace('.',',')),0</MyVersionWithCommas>
@@ -29,35 +33,12 @@
         <MyAssemblyPolicyVersion>$(MyCanonicalVersion.Substring(0,$(MyVersion.IndexOf('.')))).0</MyAssemblyPolicyVersion>
         <MyAssemblyVersion>$(MyAssemblyPolicyVersion).0.0</MyAssemblyVersion>
 
+        <MyProductFileArch Condition="'$(Platform)'=='ARM64'">a64</MyProductFileArch>
+        <MyProductFileArch Condition="'$(Platform)'=='x64'">x64</MyProductFileArch>
+        <MyProductFileArch Condition="'$(Platform)'=='Win32'">x86</MyProductFileArch>
+
         <!-- 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;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);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'">
-        <ClCompile>
-            <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-        </ClCompile>
-    </ItemDefinitionGroup>
-    <ItemDefinitionGroup Condition="'$(DefaultPlatformToolset)'=='v140'">
-        <Link>
-            <GenerateDebugInformation>true</GenerateDebugInformation>
-        </Link>
-    </ItemDefinitionGroup>
-    <ItemDefinitionGroup Condition="'$(DefaultPlatformToolset)'!='v140'">
-        <Link>
-            <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
-        </Link>
-    </ItemDefinitionGroup>
-    <PropertyGroup>
-        <SpectreMitigation>false</SpectreMitigation>
-    </PropertyGroup>
 </Project>

build/VStudio/dotnet/winfsp.net.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

build/VStudio/installer/CustomActions/CustomActions.cpp

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

build/VStudio/installer/CustomActions/CustomActions.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -43,21 +43,20 @@
     <_ProjectFileVersion>14.0.25123.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(WIX)sdk\VS2015\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>

build/VStudio/installer/Product.wxs

@@ -22,6 +22,15 @@
             DowngradeErrorMessage="A newer version of $(var.MyProductName) is already installed." />
         <Media Id="1" Cabinet="$(var.MyProductName).cab" EmbedCab="yes" />
 
+        <Property Id="OSARCH" Secure="yes" Value="AMD64">
+            <RegistrySearch
+                Id="R.OSARCH"
+                Root="HKLM"
+                Key="SYSTEM\CurrentControlSet\Control\Session Manager\Environment"
+                Name="PROCESSOR_ARCHITECTURE"
+                Type="raw" />
+        </Property>
+
         <Property Id="P.LauncherName">$(var.MyProductName).Launcher</Property>
         <Property Id="P.LauncherRegistryKey">Software\$(var.MyProductName)\Services</Property>
         <Property Id="P.RegistryKey">Software\$(var.MyProductName)</Property>
@@ -62,6 +71,9 @@
             </Component>
         </DirectoryRef>
         <DirectoryRef Id="BINDIR" FileSource="..\build\$(var.Configuration)">
+            <Component Id="C.$(var.MyProductFileName)_a64.sys">
+                <File Name="$(var.MyProductFileName)-a64.sys" KeyPath="yes" />
+            </Component>
             <Component Id="C.$(var.MyProductFileName)_x64.sys">
                 <File Name="$(var.MyProductFileName)-x64.sys" KeyPath="yes" />
             </Component>
@@ -69,24 +81,46 @@
                 <File Name="$(var.MyProductFileName)-x86.sys" KeyPath="yes" />
             </Component>
 
-            <!-- 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>
+            <!-- On WinArm64 register $(var.MyProductFileName)-a64.dll -->
+            <Component Id="C.$(var.MyProductFileName)_a64.dll.a64" Guid="86FB483B-0910-458E-93B4-3CCB66D27AF0">
+                <File Id="FILE.$(var.MyProductFileName)_a64.dll.a64" Name="$(var.MyProductFileName)-a64.dll" KeyPath="yes" SelfRegCost="1" />
+                <Condition><![CDATA[OSARCH = "ARM64"]]></Condition>
             </Component>
-            <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 Id="C.$(var.MyProductFileName)_x64.dll.a64" Guid="941FAE3E-A650-4BAC-97F5-F8C6E98DB5D2">
+                <File Id="FILE.$(var.MyProductFileName)_x64.dll.a64" Name="$(var.MyProductFileName)-x64.dll" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "ARM64"]]></Condition>
+            </Component>
+            <Component Id="C.$(var.MyProductFileName)_x86.dll.a64" Guid="C312214D-F9A3-40EB-B2C3-4FAF5BF3F938">
+                <File Id="FILE.$(var.MyProductFileName)_x86.dll.a64" Name="$(var.MyProductFileName)-x86.dll" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "ARM64"]]></Condition>
+            </Component>
+
+            <!-- On Win64 register $(var.MyProductFileName)-x64.dll -->
+            <Component Id="C.$(var.MyProductFileName)_a64.dll.x64" Guid="4ABB46C2-A8E3-49E8-B051-05DBF2B351AE">
+                <File Id="FILE.$(var.MyProductFileName)_a64.dll.x64" Name="$(var.MyProductFileName)-a64.dll" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "AMD64"]]></Condition>
+            </Component>
+            <Component Id="C.$(var.MyProductFileName)_x64.dll.x64" Guid="F0A67746-1A9C-4976-8EC0-882E9407FA6D">
+                <File Id="FILE.$(var.MyProductFileName)_x64.dll.x64" Name="$(var.MyProductFileName)-x64.dll" KeyPath="yes" SelfRegCost="1" />
+                <Condition><![CDATA[OSARCH = "AMD64"]]></Condition>
+            </Component>
+            <Component Id="C.$(var.MyProductFileName)_x86.dll.x64" Guid="950492FB-12F7-4E27-9124-8325A2BC9927">
+                <File Id="FILE.$(var.MyProductFileName)_x86.dll.x64" Name="$(var.MyProductFileName)-x86.dll" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "AMD64"]]></Condition>
             </Component>
 
             <!-- 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 Id="C.$(var.MyProductFileName)_a64.dll.x86" Guid="071C0EB2-A0EB-46A1-B5B0-124F60ECD6B3">
+                <File Id="FILE.$(var.MyProductFileName)_a64.dll.x86" Name="$(var.MyProductFileName)-a64.dll" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "x86"]]></Condition>
             </Component>
-            <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 Id="C.$(var.MyProductFileName)_x64.dll.x86" Guid="4D6E7A8E-0CA6-49BE-B312-1EDADE725756">
+                <File Id="FILE.$(var.MyProductFileName)_x64.dll.x86" Name="$(var.MyProductFileName)-x64.dll" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "x86"]]></Condition>
+            </Component>
+            <Component Id="C.$(var.MyProductFileName)_x86.dll.x86" Guid="F0DEF7A6-AF55-419F-A58A-DF4018C6FA73">
+                <File Id="FILE.$(var.MyProductFileName)_x86.dll.x86" Name="$(var.MyProductFileName)-x86.dll" KeyPath="yes" SelfRegCost="1" />
+                <Condition><![CDATA[OSARCH = "x86"]]></Condition>
             </Component>
 
             <!-- install assembly -->
@@ -106,52 +140,90 @@
             </Component>
             -->
 
-            <!-- On Win64 ServiceInstall launcher-x64.exe -->
-            <Component Id="C.launcher_x64.exe.svcinst">
-                <File Id="launcher_x64.exe.svcinst" Name="launcher-x64.exe" KeyPath="yes" />
+            <!-- On WinArm64 ServiceInstall launcher-a64.exe -->
+            <Component Id="C.launcher_a64.exe.a64" Guid="E37E6D75-C44B-4189-8E86-CE5A3E0B0626">
+                <File Id="FILE.launcher_a64.exe.a64" Name="launcher-a64.exe" KeyPath="yes" />
                 <ServiceInstall
-                    Id="launcher_x64.exe.svcinst"
+                    Id="launcher_a64.exe.a64"
                     Name="[P.LauncherName]"
                     Description="$(var.MyDescription)"
                     Type="ownProcess"
                     Start="auto"
                     ErrorControl="ignore" />
                 <ServiceControl
-                    Id="launcher_x64.exe.svcinst"
+                    Id="launcher_a64.exe.a64"
                     Name="[P.LauncherName]"
                     Start="install"
                     Stop="both"
                     Remove="uninstall" />
-                <Condition>VersionNT64</Condition>
+                <Condition><![CDATA[OSARCH = "ARM64"]]></Condition>
             </Component>
-            <Component Id="C.launcher_x86.exe">
-                <File Name="launcher-x86.exe" KeyPath="yes" />
-                <Condition>VersionNT64</Condition>
+            <Component Id="C.launcher_x64.exe.a64" Guid="CF5F3EEE-F739-4F50-9938-13C0D2CD9C7A">
+                <File Id="FILE.launcher_x64.exe.a64" Name="launcher-x64.exe" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "ARM64"]]></Condition>
+            </Component>
+            <Component Id="C.launcher_x86.exe.a64" Guid="D5E9FF96-9E00-46BA-8719-BC49CF35BBE6">
+                <File Id="FILE.launcher_x86.exe.a64" Name="launcher-x86.exe" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "ARM64"]]></Condition>
+            </Component>
+
+            <!-- On Win64 ServiceInstall launcher-x64.exe -->
+            <Component Id="C.launcher_a64.exe.x64" Guid="10A3F0F9-6555-4071-9C93-EA50E4B3F115">
+                <File Id="FILE.launcher_a64.exe.x64" Name="launcher-a64.exe" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "AMD64"]]></Condition>
+            </Component>
+            <Component Id="C.launcher_x64.exe.x64" Guid="2AB4E729-F7CB-4B4A-BE81-6C0C3B3194FC">
+                <File Id="FILE.launcher_x64.exe.x64" Name="launcher-x64.exe" KeyPath="yes" />
+                <ServiceInstall
+                    Id="launcher_x64.exe.x64"
+                    Name="[P.LauncherName]"
+                    Description="$(var.MyDescription)"
+                    Type="ownProcess"
+                    Start="auto"
+                    ErrorControl="ignore" />
+                <ServiceControl
+                    Id="launcher_x64.exe.x64"
+                    Name="[P.LauncherName]"
+                    Start="install"
+                    Stop="both"
+                    Remove="uninstall" />
+                <Condition><![CDATA[OSARCH = "AMD64"]]></Condition>
+            </Component>
+            <Component Id="C.launcher_x86.exe.x64" Guid="C5B6D411-8A6A-4944-8C4F-7D9FB9A72826">
+                <File Id="FILE.launcher_x86.exe.x64" Name="launcher-x86.exe" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "AMD64"]]></Condition>
             </Component>
 
             <!-- On Win32 ServiceInstall launcher-x86.exe -->
-            <Component Id="C.launcher_x64.exe" Guid="88CDBE92-8B67-485A-838F-FA4AD37F306F">
-                <File Name="launcher-x64.exe" KeyPath="yes" />
-                <Condition>NOT VersionNT64</Condition>
+            <Component Id="C.launcher_a64.exe.x86" Guid="5048AEF5-9DE2-406E-A2EA-F237BAD13286">
+                <File Id="FILE.launcher_a64.exe.x86" Name="launcher-a64.exe" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "x86"]]></Condition>
             </Component>
-            <Component Id="C.launcher_x86.exe.svcinst" Guid="E995D906-0273-4758-9B26-99A3A8CD143A">
-                <File Id="launcher_x86.exe.svcinst" Name="launcher-x86.exe" KeyPath="yes" />
+            <Component Id="C.launcher_x64.exe.x86" Guid="88CDBE92-8B67-485A-838F-FA4AD37F306F">
+                <File Id="FILE.launcher_x64.exe.x86" Name="launcher-x64.exe" KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "x86"]]></Condition>
+            </Component>
+            <Component Id="C.launcher_x86.exe.x86" Guid="E995D906-0273-4758-9B26-99A3A8CD143A">
+                <File Id="FILE.launcher_x86.exe.x86" Name="launcher-x86.exe" KeyPath="yes" />
                 <ServiceInstall
-                    Id="launcher_x86.exe.svcinst"
+                    Id="launcher_x86.exe.x86"
                     Name="[P.LauncherName]"
                     Description="$(var.MyDescription)"
                     Type="ownProcess"
                     Start="auto"
                     ErrorControl="ignore" />
                 <ServiceControl
-                    Id="launcher_x86.exe.svcinst"
+                    Id="launcher_x86.exe.x86"
                     Name="[P.LauncherName]"
                     Start="install"
                     Stop="both"
                     Remove="uninstall" />
-                <Condition>NOT VersionNT64</Condition>
+                <Condition><![CDATA[OSARCH = "x86"]]></Condition>
             </Component>
 
+            <Component Id="C.launchctl_a64.exe" Guid="B9B5CF8E-317D-40EE-A208-BC46A2A99BAB">
+                <File Name="launchctl-a64.exe" KeyPath="yes" />
+            </Component>
             <Component Id="C.launchctl_x64.exe" Guid="2753623B-66F1-4514-B9C7-F879178DFF49">
                 <File Name="launchctl-x64.exe" KeyPath="yes" />
             </Component>
@@ -159,6 +231,9 @@
                 <File Name="launchctl-x86.exe" KeyPath="yes" />
             </Component>
 
+            <Component Id="C.fsptool_a64.exe" Guid="F75A8B14-000C-4933-AD83-EC0D1D3AD3CA">
+                <File Name="fsptool-a64.exe" KeyPath="yes" />
+            </Component>
             <Component Id="C.fsptool_x64.exe" Guid="013FE508-097D-4433-9C60-717F5446E7F4">
                 <File Name="fsptool-x64.exe" KeyPath="yes" />
             </Component>
@@ -173,6 +248,32 @@
                 <File Name="fsreg.bat" Source="..\..\..\tools\fsreg.bat" KeyPath="yes" />
             </Component>
 
+            <Component Id="C.memfs_a64.exe">
+                <File Name="memfs-a64.exe" KeyPath="yes" />
+                <RegistryKey
+                    Root="HKLM"
+                    Key="[P.LauncherRegistryKey]">
+                    <RegistryKey
+                        Key="memfs-a64">
+                        <RegistryValue
+                            Type="string"
+                            Name="Executable"
+                            Value="[BINDIR]memfs-a64.exe" />
+                        <RegistryValue
+                            Type="string"
+                            Name="CommandLine"
+                            Value="-i -F NTFS -n 65536 -s 67108864 -u %1 -m %2" />
+                        <RegistryValue
+                            Type="string"
+                            Name="Security"
+                            Value="D:P(A;;RPWPLC;;;WD)" />
+                        <RegistryValue
+                            Type="integer"
+                            Name="JobControl"
+                            Value="1" />
+                    </RegistryKey>
+                </RegistryKey>
+            </Component>
             <Component Id="C.memfs_x64.exe">
                 <File Name="memfs-x64.exe" KeyPath="yes" />
                 <RegistryKey
@@ -297,6 +398,9 @@
             </Directory>
         </DirectoryRef>
         <DirectoryRef Id="LIBDIR" FileSource="..\build\$(var.Configuration)">
+            <Component Id="C.$(var.MyProductFileName)_a64.lib">
+                <File Name="$(var.MyProductFileName)-a64.lib" KeyPath="yes" />
+            </Component>
             <Component Id="C.$(var.MyProductFileName)_x64.lib">
                 <File Name="$(var.MyProductFileName)-x64.lib" KeyPath="yes" />
             </Component>
@@ -304,6 +408,16 @@
                 <File Name="$(var.MyProductFileName)-x86.lib" KeyPath="yes" />
             </Component>
 
+            <!-- On WinArm64 copy fuse-a64.pc -->
+            <Component Id="C.fuse_a64.pc" Guid="74E6E9BD-AF16-4635-AE52-84B33E4E196E">
+                <File
+                    Id="FILE.fuse_a64.pc"
+                    Name="fuse.pc"
+                    Source="..\build\$(var.Configuration)\fuse-a64.pc"
+                    KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "ARM64"]]></Condition>
+            </Component>
+
             <!-- On Win64 copy fuse-x64.pc -->
             <Component Id="C.fuse_x64.pc" Guid="407395D2-D076-411E-B1D0-D97E21E11A3C">
                 <File
@@ -311,7 +425,7 @@
                     Name="fuse.pc"
                     Source="..\build\$(var.Configuration)\fuse-x64.pc"
                     KeyPath="yes" />
-                <Condition>VersionNT64</Condition>
+                <Condition><![CDATA[OSARCH = "AMD64"]]></Condition>
             </Component>
 
             <!-- On Win32 copy fuse-x86.pc -->
@@ -321,7 +435,17 @@
                     Name="fuse.pc"
                     Source="..\build\$(var.Configuration)\fuse-x86.pc"
                     KeyPath="yes" />
-                <Condition>NOT VersionNT64</Condition>
+                <Condition><![CDATA[OSARCH = "x86"]]></Condition>
+            </Component>
+
+            <!-- On WinArm64 copy fuse3-x64.pc -->
+            <Component Id="C.fuse3_a64.pc" Guid="2B6444DB-25E5-45B4-BC61-157D3B992F2B">
+                <File
+                    Id="FILE.fuse3_a64.pc"
+                    Name="fuse3.pc"
+                    Source="..\build\$(var.Configuration)\fuse3-a64.pc"
+                    KeyPath="yes" />
+                <Condition><![CDATA[OSARCH = "ARM64"]]></Condition>
             </Component>
 
             <!-- On Win64 copy fuse3-x64.pc -->
@@ -331,7 +455,7 @@
                     Name="fuse3.pc"
                     Source="..\build\$(var.Configuration)\fuse3-x64.pc"
                     KeyPath="yes" />
-                <Condition>VersionNT64</Condition>
+                <Condition><![CDATA[OSARCH = "AMD64"]]></Condition>
             </Component>
 
             <!-- On Win32 copy fuse3-x86.pc -->
@@ -341,7 +465,7 @@
                     Name="fuse3.pc"
                     Source="..\build\$(var.Configuration)\fuse3-x86.pc"
                     KeyPath="yes" />
-                <Condition>NOT VersionNT64</Condition>
+                <Condition><![CDATA[OSARCH = "x86"]]></Condition>
             </Component>
         </DirectoryRef>
         <DirectoryRef Id="OPTDIR">
@@ -378,6 +502,9 @@
                     </Directory>
                 </Directory>
                 <Directory Id="OPTDIR.fsext.lib" Name="lib">
+                    <Component Id="C.fsext.winfsp_a64.lib">
+                        <File Id="FILE.fsext.winfsp_a64.lib" Name="winfsp-a64.lib" KeyPath="yes" />
+                    </Component>
                     <Component Id="C.fsext.winfsp_x64.lib">
                         <File Id="FILE.fsext.winfsp_x64.lib" Name="winfsp-x64.lib" KeyPath="yes" />
                     </Component>
@@ -450,6 +577,29 @@
                     <File Id="FILE.memfs_dotnet.Program.cs" Name="Program.cs" KeyPath="yes" />
                 </Component>
             </Directory>
+            <Directory Id="SMPDIR.ntptfs" Name="ntptfs">
+                <Component Id="C.ptfs.c">
+                    <File Name="ptfs.c" KeyPath="yes" />
+                </Component>
+                <Component Id="C.lfs.c">
+                    <File Name="lfs.c" KeyPath="yes" />
+                </Component>
+                <Component Id="C.ptfs_main.c">
+                    <File Name="ptfs-main.c" KeyPath="yes" />
+                </Component>
+                <Component Id="C.ptfs.h">
+                    <File Name="ptfs.h" KeyPath="yes" />
+                </Component>
+                <Component Id="C.ntptfs.sln">
+                    <File Name="ntptfs.sln" KeyPath="yes" />
+                </Component>
+                <Component Id="C.ntptfs.vcxproj">
+                    <File Name="ntptfs.vcxproj" KeyPath="yes" />
+                </Component>
+                <Component Id="C.ntptfs.vcxproj.filters">
+                    <File Name="ntptfs.vcxproj.filters" KeyPath="yes" />
+                </Component>
+            </Directory>
             <Directory Id="SMPDIR.airfs" Name="airfs">
                 <Component Id="C.airfs.cpp">
                     <File Name="airfs.cpp" KeyPath="yes" />
@@ -588,36 +738,54 @@
             </Directory>
         </DirectoryRef>
         <DirectoryRef Id="SYMDIR">
+            <Component Id="C.$(var.MyProductFileName)_a64.sys.pdb">
+                <File Name="$(var.MyProductFileName)-a64.sys.pdb" Source="..\build\$(var.Configuration)\$(var.MyProductFileName)-a64.sys.public.pdb" KeyPath="yes" />
+            </Component>
             <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.$(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.$(var.MyProductFileName)_a64.dll.pdb">
+                <File Name="$(var.MyProductFileName)-a64.dll.pdb" Source="..\build\$(var.Configuration)\$(var.MyProductFileName)-a64.dll.public.pdb" KeyPath="yes" />
+            </Component>
             <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.$(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_a64.pdb">
+                <File Name="launcher-a64.pdb" Source="..\build\$(var.Configuration)\launcher-a64.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" />
             </Component>
             <Component Id="C.launcher_x86.pdb">
                 <File Name="launcher-x86.pdb" Source="..\build\$(var.Configuration)\launcher-x86.public.pdb" KeyPath="yes" />
             </Component>
+            <Component Id="C.launchctl_a64.pdb">
+                <File Name="launchctl-a64.pdb" Source="..\build\$(var.Configuration)\launchctl-a64.public.pdb" KeyPath="yes" />
+            </Component>
             <Component Id="C.launchctl_x64.pdb">
                 <File Name="launchctl-x64.pdb" Source="..\build\$(var.Configuration)\launchctl-x64.public.pdb" KeyPath="yes" />
             </Component>
             <Component Id="C.launchctl_x86.pdb">
                 <File Name="launchctl-x86.pdb" Source="..\build\$(var.Configuration)\launchctl-x86.public.pdb" KeyPath="yes" />
             </Component>
+            <Component Id="C.fsptool_a64.pdb">
+                <File Name="fsptool-a64.pdb" Source="..\build\$(var.Configuration)\fsptool-a64.public.pdb" KeyPath="yes" />
+            </Component>
             <Component Id="C.fsptool_x64.pdb">
                 <File Name="fsptool-x64.pdb" Source="..\build\$(var.Configuration)\fsptool-x64.public.pdb" KeyPath="yes" />
             </Component>
             <Component Id="C.fsptool_x86.pdb">
                 <File Name="fsptool-x86.pdb" Source="..\build\$(var.Configuration)\fsptool-x86.public.pdb" KeyPath="yes" />
             </Component>
+            <Component Id="C.memfs_a64.pdb">
+                <File Name="memfs-a64.pdb" Source="..\build\$(var.Configuration)\memfs-a64.public.pdb" KeyPath="yes" />
+            </Component>
             <Component Id="C.memfs_x64.pdb">
                 <File Name="memfs-x64.pdb" Source="..\build\$(var.Configuration)\memfs-x64.public.pdb" KeyPath="yes" />
             </Component>
@@ -627,18 +795,31 @@
         </DirectoryRef>
 
         <ComponentGroup Id="C.$(var.MyProductName).bin">
+            <ComponentRef Id="C.$(var.MyProductFileName)_a64.sys" />
             <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" />
-            <ComponentRef Id="C.launcher_x86.exe.svcinst" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_a64.dll.a64" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll.a64" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.dll.a64" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_a64.dll.x64" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll.x64" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.dll.x64" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_a64.dll.x86" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll.x86" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.dll.x86" />
+            <ComponentRef Id="C.launcher_a64.exe.a64" />
+            <ComponentRef Id="C.launcher_x64.exe.a64" />
+            <ComponentRef Id="C.launcher_x86.exe.a64" />
+            <ComponentRef Id="C.launcher_a64.exe.x64" />
+            <ComponentRef Id="C.launcher_x64.exe.x64" />
+            <ComponentRef Id="C.launcher_x86.exe.x64" />
+            <ComponentRef Id="C.launcher_a64.exe.x86" />
+            <ComponentRef Id="C.launcher_x64.exe.x86" />
+            <ComponentRef Id="C.launcher_x86.exe.x86" />
+            <ComponentRef Id="C.launchctl_a64.exe" />
             <ComponentRef Id="C.launchctl_x64.exe" />
             <ComponentRef Id="C.launchctl_x86.exe" />
+            <ComponentRef Id="C.fsptool_a64.exe" />
             <ComponentRef Id="C.fsptool_x64.exe" />
             <ComponentRef Id="C.fsptool_x86.exe" />
             <ComponentRef Id="C.diag.bat" />
@@ -659,10 +840,13 @@
             <ComponentRef Id="C.winfsp_fuse3.h" />
         </ComponentGroup>
         <ComponentGroup Id="C.$(var.MyProductName).lib">
+            <ComponentRef Id="C.$(var.MyProductFileName)_a64.lib" />
             <ComponentRef Id="C.$(var.MyProductFileName)_x64.lib" />
             <ComponentRef Id="C.$(var.MyProductFileName)_x86.lib" />
+            <ComponentRef Id="C.fuse_a64.pc" />
             <ComponentRef Id="C.fuse_x64.pc" />
             <ComponentRef Id="C.fuse_x86.pc" />
+            <ComponentRef Id="C.fuse3_a64.pc" />
             <ComponentRef Id="C.fuse3_x64.pc" />
             <ComponentRef Id="C.fuse3_x86.pc" />
         </ComponentGroup>
@@ -676,10 +860,12 @@
         </ComponentGroup>
         <ComponentGroup Id="C.$(var.MyProductName).opt.fsext">
             <ComponentRef Id="C.fsext.h" />
+            <ComponentRef Id="C.fsext.winfsp_a64.lib" />
             <ComponentRef Id="C.fsext.winfsp_x64.lib" />
             <ComponentRef Id="C.fsext.winfsp_x86.lib" />
         </ComponentGroup>
         <ComponentGroup Id="C.$(var.MyProductName).smp">
+            <ComponentRef Id="C.memfs_a64.exe" />
             <ComponentRef Id="C.memfs_x64.exe" />
             <ComponentRef Id="C.memfs_x86.exe" />
             <ComponentRef Id="C.memfs.h" />
@@ -699,6 +885,13 @@
             <ComponentRef Id="C.memfs_fuse3.vcxproj.filters" />
             <ComponentRef Id="C.memfs_fuse3.Makefile" />
             <ComponentRef Id="C.memfs_fuse3.README.md" />
+            <ComponentRef Id="C.ptfs.c" />
+            <ComponentRef Id="C.lfs.c" />
+            <ComponentRef Id="C.ptfs_main.c" />
+            <ComponentRef Id="C.ptfs.h" />
+            <ComponentRef Id="C.ntptfs.sln" />
+            <ComponentRef Id="C.ntptfs.vcxproj" />
+            <ComponentRef Id="C.ntptfs.vcxproj.filters" />
             <ComponentRef Id="C.airfs.cpp" />
             <ComponentRef Id="C.persistence.cpp" />
             <ComponentRef Id="C.common.h" />
@@ -735,16 +928,22 @@
             <ComponentRef Id="C.notifyfs.vcxproj.filters" />
         </ComponentGroup>
         <ComponentGroup Id="C.$(var.MyProductName).sym">
+            <ComponentRef Id="C.$(var.MyProductFileName)_a64.sys.pdb" />
             <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)_a64.dll.pdb" />
             <ComponentRef Id="C.$(var.MyProductFileName)_x64.dll.pdb" />
-            <ComponentRef Id="C.launcher_x86.pdb" />
+            <ComponentRef Id="C.$(var.MyProductFileName)_x86.dll.pdb" />
+            <ComponentRef Id="C.launcher_a64.pdb" />
             <ComponentRef Id="C.launcher_x64.pdb" />
+            <ComponentRef Id="C.launcher_x86.pdb" />
+            <ComponentRef Id="C.launchctl_a64.pdb" />
             <ComponentRef Id="C.launchctl_x64.pdb" />
             <ComponentRef Id="C.launchctl_x86.pdb" />
+            <ComponentRef Id="C.fsptool_a64.pdb" />
             <ComponentRef Id="C.fsptool_x64.pdb" />
             <ComponentRef Id="C.fsptool_x86.pdb" />
+            <ComponentRef Id="C.memfs_a64.pdb" />
             <ComponentRef Id="C.memfs_x64.pdb" />
             <ComponentRef Id="C.memfs_x86.pdb" />
         </ComponentGroup>

build/VStudio/installer/winfsp_msi.wixproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

build/VStudio/testing/fsbench.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -45,6 +53,12 @@
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -52,6 +66,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -66,33 +87,51 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -107,6 +146,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -122,6 +162,23 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\ext</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -141,6 +198,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -160,6 +218,27 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\ext</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -169,9 +248,13 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</SDLCheck>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">TurnOffAllWarnings</WarningLevel>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</SDLCheck>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">TurnOffAllWarnings</WarningLevel>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</SDLCheck>
     </ClCompile>
     <ClCompile Include="..\..\..\tst\fsbench\fsbench.c" />
   </ItemGroup>

build/VStudio/testing/fscrash.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -45,6 +53,12 @@
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -52,6 +66,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -66,33 +87,51 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -124,6 +163,21 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\tst\memfs;..\..\..\inc</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -162,6 +216,25 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\tst\memfs;..\..\..\inc</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\tst\fscrash\fscrash-main.c" />
     <ClCompile Include="..\..\..\tst\fscrash\fscrash.c" />

build/VStudio/testing/memfs-dotnet.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

build/VStudio/testing/memfs.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -46,6 +54,12 @@
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -53,6 +67,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -67,33 +88,51 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -127,6 +166,22 @@
       <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>MEMFS_STANDALONE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -169,6 +224,27 @@
       <AdditionalOptions>/PDBALTPATH:$(TargetName).pdb %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>MEMFS_STANDALONE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+      <AdditionalOptions>/PDBALTPATH:$(TargetName).pdb %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\winfsp_dll.vcxproj">
       <Project>{4a7c0b21-9e10-4c81-92de-1493efcf24eb}</Project>

build/VStudio/testing/winfsp-tests.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -45,6 +53,12 @@
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -52,6 +66,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -66,33 +87,51 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -126,6 +165,22 @@
       <AdditionalDependencies>ntdll.lib;netapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>__func__=__FUNCTION__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\..\..\tst\memfs;..\..\..\src;..\..\..\inc;..\..\..\ext</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>ntdll.lib;netapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -166,16 +221,40 @@
       <AdditionalDependencies>ntdll.lib;netapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>__func__=__FUNCTION__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\..\..\tst\memfs;..\..\..\src;..\..\..\inc;..\..\..\ext</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ntdll.lib;netapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\ext\tlib\testsuite.c">
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</SDLCheck>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</SDLCheck>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</SDLCheck>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</SDLCheck>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TurnOffAllWarnings</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">TurnOffAllWarnings</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">TurnOffAllWarnings</WarningLevel>
     </ClCompile>
     <ClCompile Include="..\..\..\tst\memfs\memfs.cpp" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\create-test.c" />

build/VStudio/tools/fsptool.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -45,6 +53,12 @@
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -52,6 +66,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -66,33 +87,51 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -130,6 +169,24 @@
       <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -174,6 +231,28 @@
       <AdditionalOptions>/PDBALTPATH:$(TargetName).pdb %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+      <AdditionalOptions>/PDBALTPATH:$(TargetName).pdb %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\winfsp_dll.vcxproj">
       <Project>{4a7c0b21-9e10-4c81-92de-1493efcf24eb}</Project>

build/VStudio/tools/launchctl.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -45,6 +53,12 @@
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -52,6 +66,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -66,33 +87,51 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -134,6 +173,26 @@
       <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -182,6 +241,30 @@
       <AdditionalOptions>/PDBALTPATH:$(TargetName).pdb %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+      <AdditionalOptions>/PDBALTPATH:$(TargetName).pdb %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\launcher\launchctl.c" />
   </ItemGroup>
@@ -190,7 +273,9 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>

build/VStudio/tools/launcher.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -45,6 +53,12 @@
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -52,6 +66,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -66,33 +87,51 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(ProjectName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -136,6 +175,27 @@
       <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;userenv.lib</AdditionalDependencies>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -186,6 +246,31 @@
       <AdditionalOptions>/PDBALTPATH:$(TargetName).pdb %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\inc</AdditionalIncludeDirectories>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;userenv.lib</AdditionalDependencies>
+      <StripPrivateSymbols>$(OutDir)$(TargetName).public.pdb</StripPrivateSymbols>
+      <AdditionalOptions>/PDBALTPATH:$(TargetName).pdb %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\launcher\launcher.c" />
     <ClCompile Include="..\..\..\src\launcher\ptrans.c" />
@@ -200,7 +285,9 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>

build/VStudio/winfsp.sln

@@ -60,168 +60,250 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fsptool", "tools\fsptool.vc
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Installer.Debug|ARM64 = Installer.Debug|ARM64
 		Installer.Debug|x64 = Installer.Debug|x64
 		Installer.Debug|x86 = Installer.Debug|x86
+		Installer.Release|ARM64 = Installer.Release|ARM64
 		Installer.Release|x64 = Installer.Release|x64
 		Installer.Release|x86 = Installer.Release|x86
+		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|x64.ActiveCfg = Debug|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|x64.Build.0 = Debug|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|x86.ActiveCfg = Debug|Win32
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Debug|x86.Build.0 = Debug|Win32
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Release|x64.ActiveCfg = Release|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|ARM64.Build.0 = Release|ARM64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|x64.ActiveCfg = Release|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|x64.Build.0 = Release|x64
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|x86.ActiveCfg = Release|Win32
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}.Release|x86.Build.0 = Release|Win32
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|ARM64.Build.0 = Debug|ARM64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|x64.ActiveCfg = Debug|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|x64.Build.0 = Debug|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|x86.ActiveCfg = Debug|Win32
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Debug|x86.Build.0 = Debug|Win32
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Release|x64.ActiveCfg = Release|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|ARM64.Build.0 = Release|ARM64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x64.ActiveCfg = Release|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x64.Build.0 = Release|x64
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x86.ActiveCfg = Release|Win32
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x86.Build.0 = Release|Win32
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|ARM64.Build.0 = Debug|ARM64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x64.ActiveCfg = Debug|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x64.Build.0 = Debug|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x86.ActiveCfg = Debug|Win32
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x86.Build.0 = Debug|Win32
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Release|x64.ActiveCfg = Release|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|ARM64.ActiveCfg = Release|ARM64
+		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|ARM64.Build.0 = Release|ARM64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x64.ActiveCfg = Release|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x64.Build.0 = Release|x64
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x86.ActiveCfg = Release|Win32
 		{262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x86.Build.0 = Release|Win32
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x64.ActiveCfg = Debug|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x64.Build.0 = Debug|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x86.ActiveCfg = Debug|Win32
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x86.Build.0 = Debug|Win32
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Release|x64.ActiveCfg = Release|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|ARM64.Build.0 = Release|ARM64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x64.ActiveCfg = Release|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x64.Build.0 = Release|x64
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.ActiveCfg = Release|Win32
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.Build.0 = Release|Win32
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|ARM64.ActiveCfg = Debug|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|x64.ActiveCfg = Debug|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|x86.ActiveCfg = Debug|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|ARM64.ActiveCfg = Release|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|ARM64.Build.0 = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|x64.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|x64.Build.0 = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|x86.ActiveCfg = Debug|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Debug|x86.Build.0 = Debug|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|ARM64.ActiveCfg = Release|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|ARM64.Build.0 = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|x64.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|x64.Build.0 = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|x86.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Installer.Release|x86.Build.0 = Release|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|ARM64.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|x64.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|x86.ActiveCfg = Release|x86
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Debug|x64.ActiveCfg = Debug|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Debug|x86.ActiveCfg = Debug|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|ARM64.ActiveCfg = Debug|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|ARM64.Build.0 = Debug|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|x64.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|x64.Build.0 = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|x86.ActiveCfg = Debug|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Debug|x86.Build.0 = Debug|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|ARM64.ActiveCfg = Release|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|ARM64.Build.0 = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|x64.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|x64.Build.0 = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|x86.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Installer.Release|x86.Build.0 = Release|Win32
+		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Release|ARM64.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Release|x64.ActiveCfg = Release|Win32
 		{95C223E6-B5F1-4FD0-9376-41CDBC824445}.Release|x86.ActiveCfg = Release|Win32
+		{10757011-749D-4954-873B-AE38D8145472}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{10757011-749D-4954-873B-AE38D8145472}.Debug|ARM64.Build.0 = Debug|ARM64
 		{10757011-749D-4954-873B-AE38D8145472}.Debug|x64.ActiveCfg = Debug|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Debug|x64.Build.0 = Debug|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Debug|x86.ActiveCfg = Debug|Win32
 		{10757011-749D-4954-873B-AE38D8145472}.Debug|x86.Build.0 = Debug|Win32
+		{10757011-749D-4954-873B-AE38D8145472}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{10757011-749D-4954-873B-AE38D8145472}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{10757011-749D-4954-873B-AE38D8145472}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{10757011-749D-4954-873B-AE38D8145472}.Installer.Release|x64.ActiveCfg = Release|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{10757011-749D-4954-873B-AE38D8145472}.Release|ARM64.ActiveCfg = Release|ARM64
+		{10757011-749D-4954-873B-AE38D8145472}.Release|ARM64.Build.0 = Release|ARM64
 		{10757011-749D-4954-873B-AE38D8145472}.Release|x64.ActiveCfg = Release|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Release|x64.Build.0 = Release|x64
 		{10757011-749D-4954-873B-AE38D8145472}.Release|x86.ActiveCfg = Release|Win32
 		{10757011-749D-4954-873B-AE38D8145472}.Release|x86.Build.0 = Release|Win32
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|ARM64.Build.0 = Debug|ARM64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|x64.ActiveCfg = Debug|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|x64.Build.0 = Debug|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|x86.ActiveCfg = Debug|Win32
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Debug|x86.Build.0 = Debug|Win32
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Release|x64.ActiveCfg = Release|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|ARM64.Build.0 = Release|ARM64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|x64.ActiveCfg = Release|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|x64.Build.0 = Release|x64
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|x86.ActiveCfg = Release|Win32
 		{C4E1E9E5-0959-488E-8C6A-C327CC81BEFB}.Release|x86.Build.0 = Release|Win32
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Debug|x64.ActiveCfg = Debug|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Release|ARM64.ActiveCfg = Release|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Release|x64.ActiveCfg = Release|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Installer.Release|x86.ActiveCfg = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|ARM64.Build.0 = Release|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|x64.ActiveCfg = Release|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|x64.Build.0 = Release|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|x86.ActiveCfg = Release|Any CPU
 		{94580219-CC8D-4FE5-A3BE-437B0B3481E1}.Release|x86.Build.0 = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|x64.Build.0 = Debug|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Release|ARM64.ActiveCfg = Release|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Release|x64.ActiveCfg = Release|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Installer.Release|x86.ActiveCfg = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|ARM64.Build.0 = Release|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|x64.ActiveCfg = Release|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|x64.Build.0 = Release|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|x86.ActiveCfg = Release|Any CPU
 		{4920E350-D496-4652-AE98-6C4208AEC1D8}.Release|x86.Build.0 = Release|Any CPU
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|ARM64.Build.0 = Debug|ARM64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|x64.ActiveCfg = Debug|x64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|x64.Build.0 = Debug|x64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|x86.ActiveCfg = Debug|Win32
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Debug|x86.Build.0 = Debug|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Release|x64.ActiveCfg = Release|x64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|ARM64.Build.0 = Release|ARM64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|x64.ActiveCfg = Release|x64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|x64.Build.0 = Release|x64
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|x86.ActiveCfg = Release|Win32
 		{6CDF9411-B852-4EAC-822D-8F930675F17B}.Release|x86.Build.0 = Release|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|ARM64.Build.0 = Debug|ARM64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|x64.ActiveCfg = Debug|x64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|x64.Build.0 = Debug|x64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|x86.ActiveCfg = Debug|Win32
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Debug|x86.Build.0 = Debug|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Release|x64.ActiveCfg = Release|x64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|ARM64.Build.0 = Release|ARM64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|x64.ActiveCfg = Release|x64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|x64.Build.0 = Release|x64
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|x86.ActiveCfg = Release|Win32
 		{264A5D09-126F-4760-A3F1-4B3B95C925AA}.Release|x86.Build.0 = Release|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|ARM64.Build.0 = Debug|ARM64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|x64.ActiveCfg = Debug|x64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|x64.Build.0 = Debug|x64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|x86.ActiveCfg = Debug|Win32
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Debug|x86.Build.0 = Debug|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Debug|x64.ActiveCfg = Debug|x64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Debug|x86.ActiveCfg = Debug|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Release|ARM64.ActiveCfg = Release|ARM64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Release|x64.ActiveCfg = Release|x64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Installer.Release|x86.ActiveCfg = Release|Win32
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|ARM64.Build.0 = Release|ARM64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|x64.ActiveCfg = Release|x64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|x64.Build.0 = Release|x64
 		{1E997BEC-1642-4A5C-B252-852DA094E11E}.Release|x86.ActiveCfg = Release|Win32

build/VStudio/winfsp_dll.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -40,6 +48,7 @@
     <ClInclude Include="..\..\src\shared\um\minimal.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\dll\debug.c" />
     <ClCompile Include="..\..\src\dll\dirbuf.c" />
     <ClCompile Include="..\..\src\dll\eventlog.c" />
     <ClCompile Include="..\..\src\dll\fuse3\fuse2to3.c" />
@@ -56,7 +65,7 @@
     <ClCompile Include="..\..\src\dll\mount.c" />
     <ClCompile Include="..\..\src\dll\np.c" />
     <ClCompile Include="..\..\src\dll\security.c" />
-    <ClCompile Include="..\..\src\dll\debug.c" />
+    <ClCompile Include="..\..\src\dll\debuglog.c" />
     <ClCompile Include="..\..\src\dll\fsctl.c" />
     <ClCompile Include="..\..\src\dll\fsop.c" />
     <ClCompile Include="..\..\src\dll\library.c" />
@@ -71,49 +80,69 @@
   <ItemGroup>
     <CustomBuild Include="..\..\src\dll\fuse\fuse.pc.in">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo arch=$(PlatformTarget) &gt;$(OutDir)fuse-$(PlatformTarget).pc
-copy /b $(OutDir)fuse-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse-$(PlatformTarget).pc &gt;nul</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Writing fuse-$(PlatformTarget).pc</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)fuse-$(PlatformTarget).pc</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse-$(MyProductFileArch).pc &gt;nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Writing fuse-$(MyProductFileArch).pc</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)fuse-$(MyProductFileArch).pc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo arch=$(PlatformTarget) &gt;$(OutDir)fuse-$(PlatformTarget).pc
-copy /b $(OutDir)fuse-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse-$(PlatformTarget).pc &gt;nul</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Writing fuse-$(PlatformTarget).pc</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)fuse-$(PlatformTarget).pc</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse-$(MyProductFileArch).pc &gt;nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Writing fuse-$(MyProductFileArch).pc</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)fuse-$(MyProductFileArch).pc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo arch=$(PlatformTarget) &gt;$(OutDir)fuse-$(PlatformTarget).pc
-copy /b $(OutDir)fuse-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse-$(PlatformTarget).pc &gt;nul</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Writing fuse-$(PlatformTarget).pc</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)fuse-$(PlatformTarget).pc</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse-$(MyProductFileArch).pc &gt;nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse-$(MyProductFileArch).pc &gt;nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Writing fuse-$(MyProductFileArch).pc</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Writing fuse-$(MyProductFileArch).pc</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)fuse-$(MyProductFileArch).pc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(OutDir)fuse-$(MyProductFileArch).pc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo arch=$(PlatformTarget) &gt;$(OutDir)fuse-$(PlatformTarget).pc
-copy /b $(OutDir)fuse-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse-$(PlatformTarget).pc &gt;nul</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Writing fuse-$(PlatformTarget).pc</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)fuse-$(PlatformTarget).pc</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</LinkObjects>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse-$(MyProductFileArch).pc &gt;nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse-$(MyProductFileArch).pc &gt;nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Writing fuse-$(MyProductFileArch).pc</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Writing fuse-$(MyProductFileArch).pc</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)fuse-$(MyProductFileArch).pc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)fuse-$(MyProductFileArch).pc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkObjects>
     </CustomBuild>
     <CustomBuild Include="..\..\src\dll\fuse3\fuse3.pc.in">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo arch=$(PlatformTarget) &gt;$(OutDir)fuse3-$(PlatformTarget).pc
-copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(PlatformTarget).pc &gt;nul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo arch=$(PlatformTarget) &gt;$(OutDir)fuse3-$(PlatformTarget).pc
-copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(PlatformTarget).pc &gt;nul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo arch=$(PlatformTarget) &gt;$(OutDir)fuse3-$(PlatformTarget).pc
-copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(PlatformTarget).pc &gt;nul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo arch=$(PlatformTarget) &gt;$(OutDir)fuse3-$(PlatformTarget).pc
-copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(PlatformTarget).pc &gt;nul</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Writing fuse3-$(PlatformTarget).pc</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Writing fuse3-$(PlatformTarget).pc</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Writing fuse3-$(PlatformTarget).pc</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Writing fuse3-$(PlatformTarget).pc</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)fuse3-$(PlatformTarget).pc</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)fuse3-$(PlatformTarget).pc</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)fuse3-$(PlatformTarget).pc</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)fuse3-$(PlatformTarget).pc</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse3-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse3-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse3-$(MyProductFileArch).pc &gt;nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse3-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse3-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse3-$(MyProductFileArch).pc &gt;nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse3-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse3-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse3-$(MyProductFileArch).pc &gt;nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse3-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse3-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse3-$(MyProductFileArch).pc &gt;nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse3-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse3-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse3-$(MyProductFileArch).pc &gt;nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo arch=$(MyProductFileArch) &gt;$(OutDir)fuse3-$(MyProductFileArch).pc
+copy /b $(OutDir)fuse3-$(MyProductFileArch).pc + %(FullPath) $(OutDir)fuse3-$(MyProductFileArch).pc &gt;nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Writing fuse3-$(MyProductFileArch).pc</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Writing fuse3-$(MyProductFileArch).pc</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Writing fuse3-$(MyProductFileArch).pc</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Writing fuse3-$(MyProductFileArch).pc</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Writing fuse3-$(MyProductFileArch).pc</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Writing fuse3-$(MyProductFileArch).pc</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)fuse3-$(MyProductFileArch).pc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)fuse3-$(MyProductFileArch).pc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)fuse3-$(MyProductFileArch).pc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(OutDir)fuse3-$(MyProductFileArch).pc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)fuse3-$(MyProductFileArch).pc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)fuse3-$(MyProductFileArch).pc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</LinkObjects>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkObjects>
     </CustomBuild>
     <None Include="..\..\src\dll\library.def" />
   </ItemGroup>
@@ -123,7 +152,9 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -153,6 +184,12 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -160,6 +197,13 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -174,33 +218,51 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -256,6 +318,33 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
       <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WINFSPDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>
+      </SDLCheck>
+      <AdditionalIncludeDirectories>..\..\src;..\..\inc</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <ProgramDatabaseFile>$(OutDir)$(TargetFileName).pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)$(TargetFileName).map</MapFileName>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>..\..\src\dll\library.def</ModuleDefinitionFile>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib;netapi32.lib;wldap32.lib</AdditionalDependencies>
+      <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -318,6 +407,37 @@ copy /b $(OutDir)fuse3-$(PlatformTarget).pc + %(FullPath) $(OutDir)fuse3-$(Platf
       <AdditionalOptions>/PDBALTPATH:$(TargetFileName).pdb %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WINFSPDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>
+      </SDLCheck>
+      <AdditionalIncludeDirectories>..\..\src;..\..\inc</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ProgramDatabaseFile>$(OutDir)$(TargetFileName).pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)$(TargetFileName).map</MapFileName>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>..\..\src\dll\library.def</ModuleDefinitionFile>
+      <AdditionalDependencies>%(AdditionalDependencies);rpcrt4.lib;credui.lib;secur32.lib;version.lib;netapi32.lib;wldap32.lib</AdditionalDependencies>
+      <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
+      <AdditionalOptions>/PDBALTPATH:$(TargetFileName).pdb %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

build/VStudio/winfsp_dll.vcxproj.filters

@@ -94,7 +94,7 @@
     <ClCompile Include="..\..\src\dll\library.c">
       <Filter>Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\dll\debug.c">
+    <ClCompile Include="..\..\src\dll\debuglog.c">
       <Filter>Source</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\dll\ntstatus.c">
@@ -172,6 +172,9 @@
     <ClCompile Include="..\..\src\dll\ldap.c">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\dll\debug.c">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\dll\library.def">

build/VStudio/winfsp_sys.vcxproj

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="version.properties" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -55,6 +63,14 @@
     <ConfigurationType>Driver</ConfigurationType>
     <DriverType>WDM</DriverType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <KernelBufferOverflowLib>$(DDK_LIB_PATH)\BufferOverflowFastFailK.lib</KernelBufferOverflowLib>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>WDM</DriverType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -63,6 +79,14 @@
     <ConfigurationType>Driver</ConfigurationType>
     <DriverType>WDM</DriverType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <KernelBufferOverflowLib>$(DDK_LIB_PATH)\BufferOverflowFastFailK.lib</KernelBufferOverflowLib>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>WDM</DriverType>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -73,31 +97,45 @@
   <PropertyGroup />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
+    <EnableInf2cat>false</EnableInf2cat>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(PlatformTarget)\</IntDir>
-    <TargetName>$(MyProductFileName)-$(PlatformTarget)</TargetName>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+    <TargetName>$(MyProductFileName)-$(MyProductFileArch)</TargetName>
+    <EnableInf2cat>false</EnableInf2cat>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName).build\$(Configuration)\$(MyProductFileArch)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -142,6 +180,20 @@
       <ImportLibrary>$(OutDir)$(TargetName)$(TargetExt).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\src;..\..\opt\fsext\inc;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions> _WIN64;_ARM64_;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cng.lib;wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateMapFile>true</GenerateMapFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetFileName).pdb</ProgramDatabaseFile>
+      <MapFileName>$(OutDir)$(TargetFileName).map</MapFileName>
+      <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
+      <ImportLibrary>$(OutDir)$(TargetName)$(TargetExt).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\src;..\..\opt\fsext\inc;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -157,6 +209,21 @@
       <ImportLibrary>$(OutDir)$(TargetName)$(TargetExt).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\src;..\..\opt\fsext\inc;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions> _WIN64;_ARM64_;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cng.lib;wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateMapFile>true</GenerateMapFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetFileName).pdb</ProgramDatabaseFile>
+      <MapFileName>$(OutDir)$(TargetFileName).map</MapFileName>
+      <StripPrivateSymbols>$(OutDir)$(TargetFileName).public.pdb</StripPrivateSymbols>
+      <AdditionalOptions>/PDBALTPATH:$(TargetFileName).pdb %(AdditionalOptions)</AdditionalOptions>
+      <ImportLibrary>$(OutDir)$(TargetName)$(TargetExt).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
   </ItemGroup>
@@ -180,6 +247,7 @@
     <ClCompile Include="..\..\src\sys\fsext.c" />
     <ClCompile Include="..\..\src\sys\iop.c" />
     <ClCompile Include="..\..\src\sys\ioq.c" />
+    <ClCompile Include="..\..\src\sys\devtimer.c" />
     <ClCompile Include="..\..\src\sys\lockctl.c" />
     <ClCompile Include="..\..\src\sys\meta.c" />
     <ClCompile Include="..\..\src\sys\mountdev.c" />
@@ -210,7 +278,9 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_AMD64_=1;AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_WIN64;_ARM64_=1;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64;_AMD64_=1;AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">_WIN64;_ARM64_=1;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
@@ -218,64 +288,94 @@
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set DriverFile=$(TargetFileName)
 set Provider="$(MyCompanyName)"
-set CatalogFile=driver-$(PlatformTarget).cat
+set CatalogFile=driver-$(MyProductFileArch).cat
 
 setlocal EnableDelayedExpansion
-if exist $(OutDir)driver-$(PlatformTarget).inf del $(OutDir)driver-$(PlatformTarget).inf
+if exist $(OutDir)driver-$(MyProductFileArch).inf del $(OutDir)driver-$(MyProductFileArch).inf
 for /f "delims=" %%l in (%(FullPath)) do (
     set line=%%l
-    echo !line! &gt;&gt;$(OutDir)driver-$(PlatformTarget).inf
+    echo !line! &gt;&gt;$(OutDir)driver-$(MyProductFileArch).inf
 )
 
-stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(PlatformTarget).inf</Command>
+stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(MyProductFileArch).inf</Command>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkObjects>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set DriverFile=$(TargetFileName)
 set Provider="$(MyCompanyName)"
-set CatalogFile=driver-$(PlatformTarget).cat
+set CatalogFile=driver-$(MyProductFileArch).cat
 
 setlocal EnableDelayedExpansion
-if exist $(OutDir)driver-$(PlatformTarget).inf del $(OutDir)driver-$(PlatformTarget).inf
+if exist $(OutDir)driver-$(MyProductFileArch).inf del $(OutDir)driver-$(MyProductFileArch).inf
 for /f "delims=" %%l in (%(FullPath)) do (
     set line=%%l
-    echo !line! &gt;&gt;$(OutDir)driver-$(PlatformTarget).inf
+    echo !line! &gt;&gt;$(OutDir)driver-$(MyProductFileArch).inf
 )
 
-stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(PlatformTarget).inf</Command>
+stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(MyProductFileArch).inf</Command>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkObjects>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set DriverFile=$(TargetFileName)
 set Provider="$(MyCompanyName)"
-set CatalogFile=driver-$(PlatformTarget).cat
+set CatalogFile=driver-$(MyProductFileArch).cat
 
 setlocal EnableDelayedExpansion
-if exist $(OutDir)driver-$(PlatformTarget).inf del $(OutDir)driver-$(PlatformTarget).inf
+if exist $(OutDir)driver-$(MyProductFileArch).inf del $(OutDir)driver-$(MyProductFileArch).inf
 for /f "delims=" %%l in (%(FullPath)) do (
     set line=%%l
-    echo !line! &gt;&gt;$(OutDir)driver-$(PlatformTarget).inf
+    echo !line! &gt;&gt;$(OutDir)driver-$(MyProductFileArch).inf
 )
 
-stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(PlatformTarget).inf</Command>
+stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(MyProductFileArch).inf</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">set DriverFile=$(TargetFileName)
+set Provider="$(MyCompanyName)"
+set CatalogFile=driver-$(MyProductFileArch).cat
+
+setlocal EnableDelayedExpansion
+if exist $(OutDir)driver-$(MyProductFileArch).inf del $(OutDir)driver-$(MyProductFileArch).inf
+for /f "delims=" %%l in (%(FullPath)) do (
+    set line=%%l
+    echo !line! &gt;&gt;$(OutDir)driver-$(MyProductFileArch).inf
+)
+
+stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(MyProductFileArch).inf</Command>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</LinkObjects>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set DriverFile=$(TargetFileName)
 set Provider="$(MyCompanyName)"
-set CatalogFile=driver-$(PlatformTarget).cat
+set CatalogFile=driver-$(MyProductFileArch).cat
 
 setlocal EnableDelayedExpansion
-if exist $(OutDir)driver-$(PlatformTarget).inf del $(OutDir)driver-$(PlatformTarget).inf
+if exist $(OutDir)driver-$(MyProductFileArch).inf del $(OutDir)driver-$(MyProductFileArch).inf
 for /f "delims=" %%l in (%(FullPath)) do (
     set line=%%l
-    echo !line! &gt;&gt;$(OutDir)driver-$(PlatformTarget).inf
+    echo !line! &gt;&gt;$(OutDir)driver-$(MyProductFileArch).inf
 )
 
-stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(PlatformTarget).inf</Command>
+stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(MyProductFileArch).inf</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">set DriverFile=$(TargetFileName)
+set Provider="$(MyCompanyName)"
+set CatalogFile=driver-$(MyProductFileArch).cat
+
+setlocal EnableDelayedExpansion
+if exist $(OutDir)driver-$(MyProductFileArch).inf del $(OutDir)driver-$(MyProductFileArch).inf
+for /f "delims=" %%l in (%(FullPath)) do (
+    set line=%%l
+    echo !line! &gt;&gt;$(OutDir)driver-$(MyProductFileArch).inf
+)
+
+stampinf -d * -v $(MyVersion) -f $(OutDir)driver-$(MyProductFileArch).inf</Command>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Writing driver-$(PlatformTarget).inf</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)driver-$(PlatformTarget).inf</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Writing driver-$(PlatformTarget).inf</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)driver-$(PlatformTarget).inf</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Writing driver-$(PlatformTarget).inf</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)driver-$(PlatformTarget).inf</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Writing driver-$(PlatformTarget).inf</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)driver-$(PlatformTarget).inf</Outputs>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkObjects>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Writing driver-$(MyProductFileArch).inf</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)driver-$(MyProductFileArch).inf</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Writing driver-$(MyProductFileArch).inf</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)driver-$(MyProductFileArch).inf</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Writing driver-$(MyProductFileArch).inf</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Writing driver-$(MyProductFileArch).inf</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)driver-$(MyProductFileArch).inf</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(OutDir)driver-$(MyProductFileArch).inf</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Writing driver-$(MyProductFileArch).inf</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Writing driver-$(MyProductFileArch).inf</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)driver-$(MyProductFileArch).inf</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)driver-$(MyProductFileArch).inf</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

build/VStudio/winfsp_sys.vcxproj.filters

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

build/choco/LICENSE.txt

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

build/choco/VERIFICATION.txt

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

build/choco/winfsp.nuspec

@@ -3,20 +3,20 @@
     <metadata>
         <id>winfsp</id>
         <version>$version$</version>
-        <packageSourceUrl>https://github.com/billziss-gh/winfsp/tree/master/build/choco</packageSourceUrl>
+        <packageSourceUrl>https://github.com/winfsp/winfsp/tree/master/build/choco</packageSourceUrl>
         <owners>Bill Zissimopoulos</owners>
 
         <title>WinFsp</title>
         <authors>Bill Zissimopoulos</authors>
-        <projectUrl>https://github.com/billziss-gh/winfsp</projectUrl>
-        <iconUrl>https://github.com/billziss-gh/winfsp/raw/master/art/winfsp-solid.png</iconUrl>
+        <projectUrl>https://github.com/winfsp/winfsp</projectUrl>
+        <iconUrl>https://github.com/winfsp/winfsp/raw/master/art/winfsp-solid.png</iconUrl>
         <copyright>Bill Zissimopoulos</copyright>
-        <licenseUrl>https://github.com/billziss-gh/winfsp/blob/master/License.txt</licenseUrl>
+        <licenseUrl>https://github.com/winfsp/winfsp/blob/master/License.txt</licenseUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <projectSourceUrl>https://github.com/billziss-gh/winfsp</projectSourceUrl>
-        <docsUrl>https://github.com/billziss-gh/winfsp/tree/master/doc</docsUrl>
+        <projectSourceUrl>https://github.com/winfsp/winfsp</projectSourceUrl>
+        <docsUrl>https://github.com/winfsp/winfsp/tree/master/doc</docsUrl>
         <mailingListUrl>https://groups.google.com/forum/#!forum/winfsp</mailingListUrl>
-        <bugTrackerUrl>https://github.com/billziss-gh/winfsp/issues</bugTrackerUrl>
+        <bugTrackerUrl>https://github.com/winfsp/winfsp/issues</bugTrackerUrl>
         <tags>driver filesystem fuse gplv3 windows-kernel admin</tags>
         <summary>Windows File System Proxy - FUSE for Windows</summary>
         <description>
@@ -39,7 +39,7 @@ To verify installation:
 * For Cygwin: `net use m: '\\memfs64\share'`
 * To delete the drive: `net use m: /delete`
         </description>
-        <releaseNotes>https://github.com/billziss-gh/winfsp/blob/master/Changelog.asciidoc</releaseNotes>
+        <releaseNotes>https://github.com/winfsp/winfsp/blob/master/Changelog.md</releaseNotes>
 
         <!--<dependencies>
             <dependency id="chocolatey-uninstall.extension" />

doc/Known-File-Systems.asciidoc

@@ -5,28 +5,31 @@ 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/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#
 - 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/winfsp/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/winfsp/nfs-win[nfs-win] - NFS for Windows
+- https://github.com/winfsp/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/s3fs-fuse/s3fs-fuse[s3fs-fuse] - FUSE-based file system backed by Amazon S3
 - 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/winfsp/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
 
 == File System Libraries
 
-- https://github.com/billziss-gh/cgofuse[Go: cgofuse] - Cross-platform FUSE library for Go
-- https://github.com/DuroSoft/fuse-bindings[Nodejs: fuse-bindings] - Fully maintained FUSE bindings for Node that aims to cover the entire FUSE api
+- https://github.com/winfsp/cgofuse[Go: cgofuse] - Cross-platform FUSE library 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/Native-API-vs-FUSE.asciidoc

@@ -6,7 +6,7 @@ This document compares the "native" WinFsp API to the FUSE API and provides a ra
 
 WinFsp provides two different but conceptually similar API's for the same purpose of implementing a user mode file system:
 
-- The WinFsp API, which is documented in the include file `inc/winfsp/winfsp.h` (and online at http://www.secfs.net/winfsp/apiref/). This API consists of the `FSP_FILE_SYSTEM_INTERFACE` "class" and the `FspFileSystem*` functions.
+- The WinFsp API, which is documented in the include file `inc/winfsp/winfsp.h` (and online at https://winfsp.dev/apiref). This API consists of the `FSP_FILE_SYSTEM_INTERFACE` "class" and the `FspFileSystem*` functions.
 - The FUSE (high-level) API, which is the well understood API from the FUSE project originally by Miklos Szeredi.
 
 Given the similarities between the two API's some questions naturally arise:

doc/Queued-Events.asciidoc

@@ -1,6 +1,6 @@
 = Queued Events - Windows kernel events with IOCP scheduling characteristics
 
-In this article I am discussing _Queued Events_. _Queued Events_ are a Windows kernel synchronization mechanism that I invented for https://github.com/billziss-gh/winfsp[WinFsp - FUSE for Windows]. _Queued Events_ behave like kernel Synchronization Events (i.e. Win32 auto-reset events), but provide scheduling characteristics similar to those of I/O Completion Ports.
+In this article I am discussing _Queued Events_. _Queued Events_ are a Windows kernel synchronization mechanism that I invented for https://github.com/winfsp/winfsp[WinFsp - FUSE for Windows]. _Queued Events_ behave like kernel Synchronization Events (i.e. Win32 auto-reset events), but provide scheduling characteristics similar to those of I/O Completion Ports.
 
 == The Problem
 
@@ -92,7 +92,7 @@ We now have to consider what happens when we have one EventSet concurrently with
 
 NOTE: _Queued Events_ cannot cleanly support an EventClear operation. The obvious choice of using KeRemoveQueue with a 0 timeout is insufficient because it would associate the current thread with the KQUEUE and that is not desirable. KeRundownQueue cannot be used either because it disassociates all threads from the KQUEUE.
 
-The complete implementation of _Queued Events_ within WinFsp can be found here: https://github.com/billziss-gh/winfsp/blob/v1.1/src/sys/driver.h#L655-L795
+The complete implementation of _Queued Events_ within WinFsp can be found here: https://github.com/winfsp/winfsp/blob/v1.1/src/sys/driver.h#L655-L795
 
 == Queued Events Scheduling Characteristics
 
@@ -102,4 +102,3 @@ Queued Events encapsulate KQUEUE's and therefore inherit their scheduling charac
 - They limit the number of threads that can be satisfied concurrently.
 
 These characteristics are desirable because they reduce the number of context switches thus speeding up the WinFsp IPC implementation. Performance testing immediately after the incorporation of _Queued Events_ into WinFsp showed significant performance improvements; profiling with xperf showed that context switches among file system threads were now a relatively rare event!
-

doc/SSHFS-Port-Case-Study.asciidoc

@@ -91,7 +91,7 @@ implib=${prefix}/bin/winfsp-${arch}.dll
 Name: fuse
 Description: WinFsp FUSE compatible API
 Version: 2.8
-URL: http://www.secfs.net/winfsp/
+URL: https://winfsp.dev
 Libs: "${implib}"
 Cflags: -I"${incdir}"
 ----

doc/WinFsp-Performance-Testing.asciidoc

@@ -15,9 +15,9 @@ ifndef::env-browser[image::WinFsp-Performance-Testing/rdwr_tests.png[]]
 
 == Fsbench
 
-All testing was performed using a new performance test suite developed as part of WinFsp, called https://github.com/billziss-gh/winfsp/blob/master/tst/fsbench/fsbench.c[fsbench]. Fsbench was developed because it allows the creation of tests that are important to file system developers; for example, it can answer questions of the type: "how long does it take to delete 1000 files" or "how long does it take to list a directory with 10000 files in it".
+All testing was performed using a new performance test suite developed as part of WinFsp, called https://github.com/winfsp/winfsp/blob/master/tst/fsbench/fsbench.c[fsbench]. Fsbench was developed because it allows the creation of tests that are important to file system developers; for example, it can answer questions of the type: "how long does it take to delete 1000 files" or "how long does it take to list a directory with 10000 files in it".
 
-Fsbench is based on the https://github.com/billziss-gh/winfsp/tree/master/ext/tlib[tlib] library, originally from the *secfs* project. Tlib is usually used to develop regression test suites in C/C++, but can be also used to create performance tests. 
+Fsbench is based on the https://github.com/winfsp/winfsp/tree/master/ext/tlib[tlib] library, originally from the *secfs* project. Tlib is usually used to develop regression test suites in C/C++, but can be also used to create performance tests.
 
 Fsbench currently includes the following tests:
 

doc/WinFsp-Rebranding.asciidoc

@@ -4,7 +4,7 @@ If you have a commercial WinFsp license and wish to produce a rebranded version
 
 == 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.
+The WinFsp build is controlled by the file `build\VStudio\build.version.props`. 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
 

doc/WinFsp-Tutorial.asciidoc

@@ -11,9 +11,11 @@ endif::[]
 
 In this tutorial we describe the process of creating a simple user mode file system using WinFsp. The file system we will create is called "passthrough", because it simply passes through the file system operations requested by the kernel to an underlying file system (usually NTFS).
 
+NOTE: The file system that we build in this tutorial is suitable for education purposes. If you are looking for a production quality pass through file system please see the `ntptfs` sample.
+
 == Prerequisites
 
-This tutorial assumes that you have WinFsp and Visual Studio 2015 installed. The WinFsp installer can be downloaded from the WinFsp GitHub repository: https://github.com/billziss-gh/winfsp. The Microsoft Visual Studio Community 2015 can be downloaded for free from Microsoft's web site.
+This tutorial assumes that you have WinFsp and Visual Studio 2015 installed. The WinFsp installer can be downloaded from the WinFsp GitHub repository: https://github.com/winfsp/winfsp. The Microsoft Visual Studio Community 2015 can be downloaded for free from Microsoft's web site.
 
 When installing WinFsp make sure to choose "Developer" to ensure that all necessary header and library files are included in the installation.
 

doc/WinFsp-on-ARM64.asciidoc

@@ -0,0 +1,40 @@
+= WinFsp on ARM64
+
+This document summarizes the changes made to WinFsp to support Windows on ARM64. With these changes WinFsp runs natively in the ARM64 environment, while maintaining backwards compatibility.
+
+== Build System
+
+* Visual Studio 2019 or later is required to build WinFsp. Visual Studio 2015 builds are no longer possible because of lack of ARM64 support.
+** The script `tools\gensrc\remove-build-arm64.bat` can be used to remove the ARM64 configuration from the project files. This allows WinFsp to be built with Visual Studio 2015, but without ARM64 support. This is a hack to support AppVeyor builds on Server 2012 images that have only Visual Studio 2015 installed.
+* Build configuration is now done by the file `build.common.props` located in `build\VStudio`.
+* Product configuration (`MyProductName`, etc.) is done by the file `build.version.props` located in `build\VStudio`. This file was previously named `version.properties`.
+* Project files under `build\VStudio` have been updated to support ARM64 builds.
+
+== Include Files
+
+* The macros `FSP_FSCTL_PRODUCT_FULL_REGKEY` and `FSP_FSCTL_PRODUCT_FILE_ARCH` have been added to header file `inc\winfsp\fsctl.h`:
+** `FSP_FSCTL_PRODUCT_FULL_REGKEY`: The full registry path for WinFsp.
+** `FSP_FSCTL_PRODUCT_FILE_ARCH`: The expected computer architecture suffix to use for file names (`a64` for ARM64, `x64` for x64, `x86` for x86).
+
+== File System Driver
+
+* The `IoInitializeTimer`, `IoStartTimer` and `IoStopTimer` DDI's are missing from Windows on ARM64 (https://social.msdn.microsoft.com/Forums/en-US/e1f4dbbd-a3f1-40a4-8f8b-e12a04b1b074/is-iostarttimer-universal[link]). The same functionality is now implemented within WinFsp in file `src\sys\devtimer.c`
+* The FSD (and other WinFsp components) used a number of memory barriers primarily for the purpose of lock-free access of certain variables. Most of these memory barriers have been removed and replaced with "interlocked" loads/stores so that any such accesses would continue to be correct under ARM64, which has weaker consistency guarantees than x86/x64. The new `FspInterlocked*` calls are implemented in `inc/winfsp/fsctl.h` and are used by both kernel and user mode code.
+
+== Samples
+
+* The sample project files have been updated to support ARM64 builds.
+
+== Installer
+
+* The installer has been retrofitted to support native installation on ARM64, x64 and x86 environments.
+* The installer remains a single MSI file that supports all architectures.
+** NOTE: The current technique for detecting OS architecture relies on reading the registry value `PROCESSOR_ARCHITECTURE` from key `HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment`. This may be fragile and a better technique may be required.
+* Files are installed in `\Program Files (x86)\WinFsp` on ARM64 and x64 Windows and `\Program Files` on x86 Windows.
+* Registry settings are placed in `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\WinFsp` on ARM64 and x64 Windows and `HKEY_LOCAL_MACHINE\SOFTWARE\WinFsp` on x86 Windows.
+* Files for all architectures are always installed regardless of OS architecture. For example, all of `winfsp-a64.dll`, `winfsp-x64.dll` and `winfsp-x86.dll` are found in the `bin` subdirectory on ARM64, x64 and x86 Windows.
+* WinFsp supports x86 file systems on x86 Windows, x86 and x64 file systems on x64 Windows and x86, x64 and ARM64 file systems on ARM64 Windows.
+
+== License
+
+* The special exception for FLOSS to GPLv3 has been updated to mention that linking to `winfsp-a64.dll` is also allowed.

ext/tlib/callstack.c

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

ext/tlib/callstack.h

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

ext/tlib/injected/allfunc.h

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

ext/tlib/injected/curlfunc.c

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

ext/tlib/injected/curlfunc.h

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

ext/tlib/injected/stdfunc.c

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

ext/tlib/injected/stdfunc.h

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

ext/tlib/injection.c

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

ext/tlib/injection.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/injection.h
  *
- * @copyright 2014-2021 Bill Zissimopoulos
+ * @copyright 2014-2022 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-2021 Bill Zissimopoulos
+ * @copyright 2014-2022 Bill Zissimopoulos
  */
 
 #include <tlib/testsuite.h>
@@ -48,25 +48,51 @@ void tlib_add_test_opt(const char *name, void (*fn)(void))
     add_test_to_list(name, fn, 1, &test_tail);
 }
 
+struct hook
+{
+    void (*fn)(const char *name, void (*fn)(void), int v);
+    struct hook *next;
+};
+static struct hook hook_sentinel = { .next = &hook_sentinel };
+static struct hook *hook_tail = &hook_sentinel;
+static void add_hook_to_list(void (*fn)(void), struct hook **tail)
+{
+    struct hook *hook = calloc(1, sizeof *hook);
+    hook->fn = fn;
+    hook->next = (*tail)->next;
+    (*tail)->next = hook;
+    (*tail) = hook;
+}
+void tlib_add_hook(void (*fn)(const char *name, void (*fn)(void), int v))
+{
+    add_hook_to_list(fn, &hook_tail);
+}
+
 static FILE *tlib_out, *tlib_err;
 static jmp_buf test_jmp_buf, *test_jmp;
 static char assert_buf[256];
 static void test_printf(const char *fmt, ...);
 static double run_test(struct test *test)
 {
+    double res;
+    for (struct hook *hook = hook_tail->next->next; 0 != hook->fn; hook = hook->next)
+        hook->fn(test->name, test->fn, +1);
 #if defined(_WIN64) || defined(_WIN32)
     #pragma comment(lib, "winmm.lib")
     unsigned long __stdcall timeGetTime(void);
     unsigned long t0 = timeGetTime();
     test->fn();
     unsigned long t1 = timeGetTime();
-    return (t1 - t0) / 1000.0;
+    res = (t1 - t0) / 1000.0;
 #else
     time_t t0 = time(0);
     test->fn();
     time_t t1 = time(0);
-    return difftime(t1, t0);
+    res = difftime(t1, t0);
 #endif
+    for (struct hook *hook = hook_tail->next->next; 0 != hook->fn; hook = hook->next)
+        hook->fn(test->name, test->fn, -1);
+    return res;
 }
 static void do_test_default(struct test *test, int testno)
 {
@@ -201,16 +227,23 @@ void tlib_run_tests(int argc, char *argv[])
 }
 void tlib__assert(const char *func, const char *file, int line, const char *expr)
 {
+    char extra_buf[256] = "";
 #if defined(_WIN64) || defined(_WIN32)
+    long __stdcall RtlGetLastNtStatus(void);
+    unsigned long __stdcall RtlGetLastWin32Error(void);
+    snprintf(extra_buf, sizeof extra_buf,
+        " (err=%lx:%lu)",
+        RtlGetLastNtStatus(),
+        RtlGetLastWin32Error());
     const char *p = strrchr(file, '\\');
 #else
     const char *p = strrchr(file, '/');
 #endif
     file = 0 != p ? p + 1 : file;
     if (0 == func)
-        test_printf("%sASSERT(%s) failed at: %s:%d\n", assert_buf, expr, file, line);
+        test_printf("%sASSERT(%s) failed at: %s:%d%s\n", assert_buf, expr, file, line, extra_buf);
     else
-        test_printf("%sASSERT(%s) failed at %s:%d:%s\n", assert_buf, expr, file, line, func);
+        test_printf("%sASSERT(%s) failed at %s:%d:%s%s\n", assert_buf, expr, file, line, func, extra_buf);
     if (0 != test_jmp)
         longjmp(*test_jmp, 1);
 }

ext/tlib/testsuite.h

@@ -1,7 +1,7 @@
 /**
  * @file tlib/testsuite.h
  *
- * @copyright 2014-2021 Bill Zissimopoulos
+ * @copyright 2014-2022 Bill Zissimopoulos
  */
 
 #ifndef TLIB_TESTSUITE_H_INCLUDED
@@ -65,6 +65,23 @@ void tlib_add_test_suite(const char *name, void (*fn)(void));
 void tlib_add_test(const char *name, void (*fn)(void));
 void tlib_add_test_opt(const char *name, void (*fn)(void));
 
+/**
+ * Register a test hook to be run before and after every test.
+ *
+ * Test hooks are functions with prototype
+ * <code>void testhook(const char *name, void (*fn)(void), int v)</code>.
+ * The parameter v specifies that a test is about to be executed (v is +1)
+ * or it was just executed (v is -1).
+ */
+#define TESTHOOK(fn)\
+    do\
+    {\
+        void fn(const char *name, void (*fn)(void), int v);\
+        tlib_add_hook(fn);\
+    } while (0)
+
+void tlib_add_hook(void (*fn)(const char *name, void (*fn)(void), int v));
+
 /**
  * Printf function.
  *

inc/fuse/fuse.h

@@ -6,7 +6,7 @@
  *     FUSE: Filesystem in Userspace
  *     Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -103,8 +103,10 @@ struct fuse_operations
     /* _ */ int (*flock)(const char *path, struct fuse_file_info *, int op);
     /* _ */ int (*fallocate)(const char *path, int mode, fuse_off_t off, fuse_off_t len,
         struct fuse_file_info *fi);
+    /* WinFsp */
+    /* S */ int (*getpath)(const char *path, char *buf, size_t size,
+        struct fuse_file_info *fi);
     /* OSXFUSE */
-    /* _ */ int (*reserved00)();
     /* _ */ int (*reserved01)();
     /* _ */ int (*reserved02)();
     /* _ */ int (*statfs_x)(const char *path, struct fuse_statfs *stbuf);

inc/fuse/fuse_common.h

@@ -6,7 +6,7 @@
  *     FUSE: Filesystem in Userspace
  *     Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -94,6 +94,9 @@ extern "C" {
 #define FSP_FUSE_NOTIFY_CHFLAGS         0x0080
 #define FSP_FUSE_NOTIFY_TRUNCATE        0x0100
 
+/* getpath extension */
+#define FSP_FUSE_HAS_GETPATH            1
+
 struct fuse_file_info
 {
     int flags;

inc/fuse/fuse_opt.h

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

inc/fuse3/fuse.h

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

inc/winfsp/fsctl.h

@@ -1,7 +1,7 @@
 /**
  * @file winfsp/fsctl.h
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -66,6 +66,22 @@ extern const __declspec(selectany) GUID FspFsvrtDeviceClassGuid =
     { 0xb48171c3, 0xdd50, 0x4852, { 0x83, 0xa3, 0x34, 0x4c, 0x50, 0xd9, 0x3b, 0x17 } };
 #endif
 
+/* locations */
+#define FSP_FSCTL_PRODUCT_REGKEY        "Software\\" FSP_FSCTL_PRODUCT_NAME
+#define FSP_FSCTL_PRODUCT_REGKEY_WOW64  KEY_WOW64_32KEY
+#if defined(_ARM64_)
+#define FSP_FSCTL_PRODUCT_FULL_REGKEY   "Software\\WOW6432Node\\" FSP_FSCTL_PRODUCT_NAME
+#define FSP_FSCTL_PRODUCT_FILE_ARCH     "a64"
+#elif defined(_AMD64_)
+#define FSP_FSCTL_PRODUCT_FULL_REGKEY   "Software\\WOW6432Node\\" FSP_FSCTL_PRODUCT_NAME
+#define FSP_FSCTL_PRODUCT_FILE_ARCH     "x64"
+#elif defined(_X86_)
+#define FSP_FSCTL_PRODUCT_FULL_REGKEY   "Software\\" FSP_FSCTL_PRODUCT_NAME
+#define FSP_FSCTL_PRODUCT_FILE_ARCH     "x86"
+#else
+#error unknown architecture
+#endif
+
 /* alignment macros */
 #define FSP_FSCTL_ALIGN_UP(x, s)        (((x) + ((s) - 1L)) & ~((s) - 1L))
 #define FSP_FSCTL_DEFAULT_ALIGNMENT     8
@@ -81,8 +97,12 @@ extern const __declspec(selectany) GUID FspFsvrtDeviceClassGuid =
     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 'L', METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define FSP_FSCTL_TRANSACT              \
     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 'T', METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSP_IOCTL_TRANSACT              \
+    CTL_CODE(0x8000 | ('F'<<8) | 'W', 0x800 + 'T', METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define FSP_FSCTL_TRANSACT_BATCH        \
     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 't', METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
+#define FSP_IOCTL_TRANSACT_BATCH        \
+    CTL_CODE(0x8000 | ('F'<<8) | 'W', 0x800 + 't', METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define FSP_FSCTL_STOP                  \
     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 'S', METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define FSP_FSCTL_STOP0                 \
@@ -93,6 +113,8 @@ extern const __declspec(selectany) GUID FspFsvrtDeviceClassGuid =
 /* fsctl internal device codes (usable only in-kernel) */
 #define FSP_FSCTL_TRANSACT_INTERNAL     \
     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x800 + 'I', METHOD_NEITHER, FILE_ANY_ACCESS)
+#define FSP_IOCTL_TRANSACT_INTERNAL     \
+    CTL_CODE(0x8000 | ('F'<<8) | 'W', 0x800 + 'I', METHOD_BUFFERED, FILE_ANY_ACCESS)
 
 /* fsvol device codes */
 #define FSP_FSCTL_QUERY_WINFSP          \
@@ -206,7 +228,8 @@ enum
     UINT32 DirectoryMarkerAsNextOffset:1;   /* directory marker is next offset instead of last name */\
     UINT32 RejectIrpPriorToTransact0:1;     /* reject IRP's prior to FspFsctlTransact with 0 buffers */\
     UINT32 SupportsPosixUnlinkRename:1;     /* file system supports POSIX-style unlink and rename */\
-    UINT32 KmReservedFlags:2;\
+    UINT32 PostDispositionWhenNecessaryOnly:1;  /* post Disposition for dirs or READONLY attr check */\
+    UINT32 KmReservedFlags:1;\
     WCHAR Prefix[FSP_FSCTL_VOLUME_PREFIX_SIZE / sizeof(WCHAR)]; /* UNC prefix (\Server\Share) */\
     WCHAR FileSystemName[FSP_FSCTL_VOLUME_FSNAME_SIZE / sizeof(WCHAR)];
 #define FSP_FSCTL_VOLUME_PARAMS_V1_FIELD_DEFN\
@@ -683,6 +706,93 @@ FSP_API NTSTATUS FspMountSet(FSP_MOUNT_DESC *Desc);
 FSP_API NTSTATUS FspMountRemove(FSP_MOUNT_DESC *Desc);
 #endif
 
+/*
+ * Atomics
+ *
+ * See https://www.cl.cam.ac.uk/~pes20/cpp/cpp0xmappings.html (https://archive.is/mJfFX)
+ */
+#if _MSC_VER >= 1920 /* VS2019 or later */
+__int32 __iso_volatile_load32(const volatile __int32 *);
+void __iso_volatile_store32(volatile __int32 *, __int32);
+__int64 __iso_volatile_load64(const volatile __int64 *);
+void __iso_volatile_store64(volatile __int64 *, __int64);
+#define FSP_INTERLOCKED__LOAD32(p)      __iso_volatile_load32(p)
+#define FSP_INTERLOCKED__STORE32(p,v)   __iso_volatile_store32(p,v)
+#define FSP_INTERLOCKED__LOAD64(p)      __iso_volatile_load64(p)
+#define FSP_INTERLOCKED__STORE64(p,v)   __iso_volatile_store64(p,v)
+#else
+#define FSP_INTERLOCKED__LOAD32(p)      (*(p))
+#define FSP_INTERLOCKED__STORE32(p,v)   (*(p) = (v))
+#define FSP_INTERLOCKED__LOAD64(p)      (*(p))
+#define FSP_INTERLOCKED__STORE64(p,v)   (*(p) = (v))
+#endif
+static inline INT32 FspInterlockedLoad32(INT32 volatile *p)
+{
+#if defined(_M_ARM64)
+    void __dmb(unsigned int);
+    INT32 v = FSP_INTERLOCKED__LOAD32(p);
+    __dmb(0xb);
+    return v;
+
+#elif defined(_M_X64) || defined(_M_IX86)
+    void _ReadWriteBarrier(void);
+    INT32 v = FSP_INTERLOCKED__LOAD32(p);
+    _ReadWriteBarrier();
+    return v;
+
+#endif
+}
+static inline VOID FspInterlockedStore32(INT32 volatile *p, INT32 v)
+{
+#if defined(_M_ARM64)
+    void __dmb(unsigned int);
+    __dmb(0xb);
+    FSP_INTERLOCKED__STORE32(p, v);
+    __dmb(0xb);
+
+#elif defined(_M_X64) || defined(_M_IX86)
+    long _InterlockedExchange(long volatile *, long);
+    _InterlockedExchange((long volatile *)p, v);
+
+#endif
+}
+static inline VOID *FspInterlockedLoadPointer(VOID *volatile *p)
+{
+#if defined(_M_ARM64)
+    void __dmb(unsigned int);
+    VOID *v = (VOID *)FSP_INTERLOCKED__LOAD64((__int64 volatile *)(p));
+    __dmb(0xb);
+    return v;
+
+#elif defined(_M_X64)
+    void _ReadWriteBarrier(void);
+    VOID *v = (VOID *)FSP_INTERLOCKED__LOAD64((__int64 volatile *)(p));
+    _ReadWriteBarrier();
+    return v;
+
+#elif defined(_M_IX86)
+    void _ReadWriteBarrier(void);
+    VOID *v = (VOID *)FSP_INTERLOCKED__LOAD32((__int32 volatile *)(p));
+    _ReadWriteBarrier();
+    return v;
+
+#endif
+}
+static inline VOID FspInterlockedStorePointer(VOID *volatile *p, VOID *v)
+{
+#if defined(_M_ARM64)
+    void __dmb(unsigned int);
+    __dmb(0xb);
+    FSP_INTERLOCKED__STORE64((__int64 volatile *)(p), (__int64)(v));
+    __dmb(0xb);
+
+#elif defined(_M_X64) || defined(_M_IX86)
+    void *_InterlockedExchangePointer(void *volatile *, void *);
+    _InterlockedExchangePointer(p, v);
+
+#endif
+}
+
 #ifdef __cplusplus
 }
 #endif

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-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -32,8 +32,9 @@
 extern "C" {
 #endif
 
-#define FSP_LAUNCH_REGKEY               "Software\\" FSP_FSCTL_PRODUCT_NAME "\\Services"
-#define FSP_LAUNCH_REGKEY_WOW64         KEY_WOW64_32KEY
+#define FSP_LAUNCH_REGKEY               FSP_FSCTL_PRODUCT_REGKEY "\\Services"
+#define FSP_LAUNCH_REGKEY_WOW64         FSP_FSCTL_PRODUCT_REGKEY_WOW64
+#define FSP_LAUNCH_FULL_REGKEY          FSP_FSCTL_PRODUCT_FULL_REGKEY "\\Services"
 
 #define FSP_LAUNCH_PIPE_NAME            "\\\\.\\pipe\\" FSP_FSCTL_PRODUCT_NAME ".{14E7137D-22B4-437A-B0C1-D21D1BDF3767}"
 #define FSP_LAUNCH_PIPE_BUFFER_SIZE     4096

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-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -1348,9 +1348,7 @@ static inline
 VOID FspFileSystemGetDispatcherResult(FSP_FILE_SYSTEM *FileSystem,
     NTSTATUS *PDispatcherResult)
 {
-    /* 32-bit reads are atomic */
-    *PDispatcherResult = FileSystem->DispatcherResult;
-    MemoryBarrier();
+    *PDispatcherResult = FspInterlockedLoad32((INT32 *)&FileSystem->DispatcherResult);
 }
 FSP_API VOID FspFileSystemGetDispatcherResultF(FSP_FILE_SYSTEM *FileSystem,
     NTSTATUS *PDispatcherResult);
@@ -1752,6 +1750,8 @@ FSP_API BOOLEAN FspFileSystemAddNotifyInfo(FSP_FSCTL_NOTIFY_INFO *NotifyInfo,
 /*
  * Directory buffering
  */
+FSP_API BOOLEAN FspFileSystemAcquireDirectoryBufferEx(PVOID* PDirBuffer,
+    BOOLEAN Reset, ULONG CapacityHint, PNTSTATUS PResult);
 FSP_API BOOLEAN FspFileSystemAcquireDirectoryBuffer(PVOID *PDirBuffer,
     BOOLEAN Reset, PNTSTATUS PResult);
 FSP_API BOOLEAN FspFileSystemFillDirectoryBuffer(PVOID *PDirBuffer,
@@ -1835,6 +1835,7 @@ NTSTATUS FspAccessCheck(FSP_FILE_SYSTEM *FileSystem,
 /*
  * POSIX Interop
  */
+FSP_API NTSTATUS FspPosixSetUidMap(UINT32 Uid[], PSID Sid[], ULONG Count);
 FSP_API NTSTATUS FspPosixMapUidToSid(UINT32 Uid, PSID *PSid);
 FSP_API NTSTATUS FspPosixMapSidToUid(PSID Sid, PUINT32 PUid);
 FSP_API VOID FspDeleteSid(PSID Sid, NTSTATUS (*CreateFunc)());
@@ -2126,11 +2127,7 @@ FSP_API NTSTATUS FspVersion(PUINT32 PVersion);
 static inline
 NTSTATUS FspLoad(PVOID *PModule)
 {
-#if defined(_WIN64)
-#define FSP_DLLNAME                     FSP_FSCTL_PRODUCT_FILE_NAME "-x64.dll"
-#else
-#define FSP_DLLNAME                     FSP_FSCTL_PRODUCT_FILE_NAME "-x86.dll"
-#endif
+#define FSP_DLLNAME                     FSP_FSCTL_PRODUCT_FILE_NAME "-" FSP_FSCTL_PRODUCT_FILE_ARCH ".dll"
 #define FSP_DLLPATH                     "bin\\" FSP_DLLNAME
 
     WINADVAPI
@@ -2147,7 +2144,6 @@ NTSTATUS FspLoad(PVOID *PModule)
 
     WCHAR PathBuf[MAX_PATH];
     DWORD Size;
-    HKEY RegKey;
     LONG Result;
     HMODULE Module;
 
@@ -2157,15 +2153,9 @@ NTSTATUS FspLoad(PVOID *PModule)
     Module = LoadLibraryW(L"" FSP_DLLNAME);
     if (0 == Module)
     {
-        Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\" FSP_FSCTL_PRODUCT_NAME,
-            0, KEY_READ | KEY_WOW64_32KEY, &RegKey);
-        if (ERROR_SUCCESS == Result)
-        {
-            Size = sizeof PathBuf - sizeof L"" FSP_DLLPATH + sizeof(WCHAR);
-            Result = RegGetValueW(RegKey, 0, L"InstallDir",
-                RRF_RT_REG_SZ, 0, PathBuf, &Size);
-            RegCloseKey(RegKey);
-        }
+        Size = sizeof PathBuf - sizeof L"" FSP_DLLPATH + sizeof(WCHAR);
+        Result = RegGetValueW(HKEY_LOCAL_MACHINE, L"" FSP_FSCTL_PRODUCT_FULL_REGKEY, L"InstallDir",
+            RRF_RT_REG_SZ, 0, PathBuf, &Size);
         if (ERROR_SUCCESS != Result)
             return STATUS_OBJECT_NAME_NOT_FOUND;
 
@@ -2180,8 +2170,8 @@ NTSTATUS FspLoad(PVOID *PModule)
 
     return STATUS_SUCCESS;
 
-#undef FSP_DLLNAME
 #undef FSP_DLLPATH
+#undef FSP_DLLNAME
 }
 
 #ifdef __cplusplus

inc/winfsp/winfsp.hpp

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

opt/cygfuse/fuse/cygfuse.c

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

opt/cygfuse/fuse/fuse.cygport

@@ -4,9 +4,9 @@ RELEASE=10
 CATEGORY="Utils"
 SUMMARY="WinFsp FUSE compatibility layer"
 DESCRIPTION="Enables FUSE file systems to be run on Cygwin."
-HOMEPAGE="http://www.secfs.net/winfsp/"
+HOMEPAGE="https://winfsp.dev"
 
-SRC_URI=${CYGPORT_SRC_URI:-"https://github.com/billziss-gh/winfsp/archive/master.tar.gz"}
+SRC_URI=${CYGPORT_SRC_URI:-"https://github.com/winfsp/winfsp/archive/master.tar.gz"}
 SRC_DIR=${CYGPORT_SRC_DIR:-winfsp-master}
 
 src_compile()

opt/cygfuse/fuse/fuse.pc.in

@@ -4,6 +4,6 @@ incdir=${prefix}/include/fuse
 Name: fuse
 Description: WinFsp FUSE compatible API
 Version: @Version@
-URL: http://www.secfs.net/winfsp/
+URL: https://winfsp.dev
 Libs: -lfuse-@Version@
 Cflags: -I"${incdir}" -DCYGFUSE

opt/cygfuse/fuse3/cygfuse.c

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

opt/cygfuse/fuse3/fuse3.cygport

@@ -4,9 +4,9 @@ RELEASE=2
 CATEGORY="Utils"
 SUMMARY="WinFsp FUSE3 compatibility layer"
 DESCRIPTION="Enables FUSE3 file systems to be run on Cygwin."
-HOMEPAGE="http://www.secfs.net/winfsp/"
+HOMEPAGE="https://winfsp.dev"
 
-SRC_URI=${CYGPORT_SRC_URI:-"https://github.com/billziss-gh/winfsp/archive/master.tar.gz"}
+SRC_URI=${CYGPORT_SRC_URI:-"https://github.com/winfsp/winfsp/archive/master.tar.gz"}
 SRC_DIR=${CYGPORT_SRC_DIR:-winfsp-master}
 
 REQUIRES="fuse"

opt/cygfuse/fuse3/fuse3.pc.in

@@ -4,6 +4,6 @@ incdir=${prefix}/include/fuse3
 Name: fuse
 Description: WinFsp FUSE3 compatible API
 Version: @Version@
-URL: http://www.secfs.net/winfsp/
+URL: https://winfsp.dev
 Libs: -lfuse-@Version@
 Cflags: -I"${incdir}" -DCYGFUSE

opt/fsext/inc/winfsp/fsext.h

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

src/dll/debug.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/debug.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -20,871 +20,22 @@
  */
 
 #include <dll/library.h>
-#include <sddl.h>
-#include <stdarg.h>
 
-static HANDLE FspDebugLogHandle = INVALID_HANDLE_VALUE;
-
-FSP_API VOID FspDebugLogSetHandle(HANDLE Handle)
+#if !defined(NDEBUG)
+ULONG DebugRandom(VOID)
 {
-    FspDebugLogHandle = Handle;
-}
-
-FSP_API VOID FspDebugLog(const char *format, ...)
-{
-    char buf[1024];
-        /* DbgPrint has a 512 byte limit, but wvsprintf is only safe with a 1024 byte buffer */
-    va_list ap;
-    va_start(ap, format);
-    wvsprintfA(buf, format, ap);
-    va_end(ap);
-    buf[sizeof buf - 1] = '\0';
-    if (INVALID_HANDLE_VALUE != FspDebugLogHandle)
-    {
-        DWORD bytes;
-        WriteFile(FspDebugLogHandle, buf, lstrlenA(buf), &bytes, 0);
-    }
-    else
-        OutputDebugStringA(buf);
-}
-
-FSP_API VOID FspDebugLogSD(const char *format, PSECURITY_DESCRIPTOR SecurityDescriptor)
-{
-    char *Sddl;
-
-    if (0 == SecurityDescriptor)
-        FspDebugLog(format, "null security descriptor");
-    else if (ConvertSecurityDescriptorToStringSecurityDescriptorA(SecurityDescriptor,
-        SDDL_REVISION_1,
-        OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
-        DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
-        &Sddl, 0))
-    {
-        FspDebugLog(format, Sddl);
-        LocalFree(Sddl);
-    }
-    else
-        FspDebugLog(format, "invalid security descriptor");
-}
-
-FSP_API VOID FspDebugLogSid(const char *format, PSID Sid)
-{
-    char *S;
-
-    if (0 == Sid)
-        FspDebugLog(format, "null SID");
-    else if (ConvertSidToStringSidA(Sid, &S))
-    {
-        FspDebugLog(format, S);
-        LocalFree(S);
-    }
-    else
-        FspDebugLog(format, "invalid SID");
-}
-
-FSP_API VOID FspDebugLogFT(const char *format, PFILETIME FileTime)
-{
-    SYSTEMTIME SystemTime;
-    char buf[32];
-
-    if (FileTimeToSystemTime(FileTime, &SystemTime))
-    {
-        wsprintfA(buf, "%04hu-%02hu-%02huT%02hu:%02hu:%02hu.%03huZ",
-            SystemTime.wYear, SystemTime.wMonth, SystemTime.wDay,
-            SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond,
-            SystemTime.wMilliseconds);
-        FspDebugLog(format, buf);
-    }
-    else
-        FspDebugLog(format, "invalid file time");
-}
-
-#define MAKE_UINT32_PAIR(v)             \
-    ((PLARGE_INTEGER)&(v))->HighPart, ((PLARGE_INTEGER)&(v))->LowPart
-
-static const char *FspDebugLogDispositionString(UINT32 CreateOptions)
-{
-    switch ((CreateOptions >> 24) & 0xff)
-    {
-    case FILE_CREATE:
-        return "FILE_CREATE";
-    case FILE_OPEN:
-        return "FILE_OPEN";
-    case FILE_OPEN_IF:
-        return "FILE_OPEN_IF";
-    case FILE_OVERWRITE:
-        return "FILE_OVERWRITE";
-    case FILE_SUPERSEDE:
-        return "FILE_SUPERSEDE";
-    case FILE_OVERWRITE_IF:
-        return "FILE_OVERWRITE_IF";
-    default:
-        return "INVALID";
-    }
-}
-
-static const char *FspDebugLogUserContextString(UINT64 UserContext, UINT64 UserContext2, char *Buf)
-{
-    wsprintfA(Buf, 0 == UserContext2 ? "%p" : "%p:%p", (PVOID)UserContext, (PVOID)UserContext2);
-
-    return Buf;
-}
-
-static const char *FspDebugLogFileTimeString(UINT64 FileTime, char *Buf)
-{
-    SYSTEMTIME SystemTime;
-
-    if (0 == FileTime)
-        lstrcpyA(Buf, "0");
-    else if (FileTimeToSystemTime((PFILETIME)&FileTime, &SystemTime))
-    {
-        wsprintfA(Buf, "%04hu-%02hu-%02huT%02hu:%02hu:%02hu.%03huZ",
-            SystemTime.wYear, SystemTime.wMonth, SystemTime.wDay,
-            SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond,
-            SystemTime.wMilliseconds);
-    }
-    else
-        lstrcpyA(Buf, "INVALID");
-
-    return Buf;
-}
-
-static const char *FspDebugLogFileInfoString(FSP_FSCTL_FILE_INFO *FileInfo, char *Buf)
-{
-    char CreationTimeBuf[32], LastAccessTimeBuf[32], LastWriteTimeBuf[32], ChangeTimeBuf[32];
-
-    wsprintfA(Buf,
-        "{"
-        "FileAttributes=%lx, "
-        "ReparseTag=%lx, "
-        "AllocationSize=%lx:%lx, "
-        "FileSize=%lx:%lx, "
-        "CreationTime=%s, "
-        "LastAccessTime=%s, "
-        "LastWriteTime=%s, "
-        "ChangeTime=%s, "
-        "IndexNumber=%lx:%lx"
-        "}",
-        FileInfo->FileAttributes,
-        FileInfo->ReparseTag,
-        MAKE_UINT32_PAIR(FileInfo->AllocationSize),
-        MAKE_UINT32_PAIR(FileInfo->FileSize),
-        FspDebugLogFileTimeString(FileInfo->CreationTime, CreationTimeBuf),
-        FspDebugLogFileTimeString(FileInfo->LastAccessTime, LastAccessTimeBuf),
-        FspDebugLogFileTimeString(FileInfo->LastWriteTime, LastWriteTimeBuf),
-        FspDebugLogFileTimeString(FileInfo->ChangeTime, ChangeTimeBuf),
-        MAKE_UINT32_PAIR(FileInfo->IndexNumber));
-
-    return Buf;
-}
-
-static const char *FspDebugLogVolumeInfoString(FSP_FSCTL_VOLUME_INFO *VolumeInfo, char *Buf)
-{
-    wsprintfA(Buf,
-        "{"
-        "TotalSize=%lx:%lx, "
-        "FreeSize=%lx:%lx, "
-        "VolumeLabel=\"%.32S\""
-        "}",
-        MAKE_UINT32_PAIR(VolumeInfo->TotalSize),
-        MAKE_UINT32_PAIR(VolumeInfo->FreeSize),
-        &VolumeInfo->VolumeLabel);
-
-    return Buf;
-}
-
-static const char *FspDebugLogWideCharBufferString(PVOID WideCharBuf, ULONG Length, char *Buf)
-{
-    WCHAR TempWideCharBuf[64 + 1];
-
-    if (Length > sizeof TempWideCharBuf - sizeof(WCHAR))
-        Length = sizeof TempWideCharBuf - sizeof(WCHAR);
-
-    memcpy(TempWideCharBuf, WideCharBuf, Length);
-    TempWideCharBuf[Length / sizeof(WCHAR)] = L'\0';
-
-    wsprintfA(Buf, "%.64S", TempWideCharBuf);
-
-    return Buf;
-}
-
-static const char *FspDebugLogReparseDataString(PVOID ReparseData0, char *Buf)
-{
-    union
-    {
-        PREPARSE_DATA_BUFFER D;
-        PREPARSE_GUID_DATA_BUFFER G;
-    } ReparseData;
-    char SubstituteName[64 + 1], PrintName[64 + 1];
-
-    ReparseData.D = ReparseData0;
-    if (0 == ReparseData.D->ReparseDataLength)
-        wsprintfA(Buf,
-            "{"
-            "ReparseTag=%#lx, "
-            "ReparseDataLength=%hu"
-            "}",
-            ReparseData.D->ReparseTag, ReparseData.D->ReparseDataLength);
-    else if (IO_REPARSE_TAG_MOUNT_POINT == ReparseData.D->ReparseTag)
-        wsprintfA(Buf,
-            "{"
-            "ReparseTag=IO_REPARSE_TAG_MOUNT_POINT, "
-            "SubstituteName=\"%s\", "
-            "PrintName=\"%s\""
-            "}",
-            FspDebugLogWideCharBufferString(
-                ReparseData.D->MountPointReparseBuffer.PathBuffer +
-                    ReparseData.D->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
-                ReparseData.D->MountPointReparseBuffer.SubstituteNameLength,
-                SubstituteName),
-            FspDebugLogWideCharBufferString(
-                ReparseData.D->MountPointReparseBuffer.PathBuffer +
-                    ReparseData.D->MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR),
-                ReparseData.D->MountPointReparseBuffer.PrintNameLength,
-                PrintName));
-    else if (IO_REPARSE_TAG_SYMLINK == ReparseData.D->ReparseTag)
-        wsprintfA(Buf,
-            "{"
-            "ReparseTag=IO_REPARSE_TAG_SYMLINK, "
-            "SubstituteName=\"%s\", "
-            "PrintName=\"%s\", "
-            "Flags=%u"
-            "}",
-            FspDebugLogWideCharBufferString(
-                ReparseData.D->SymbolicLinkReparseBuffer.PathBuffer +
-                    ReparseData.D->SymbolicLinkReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
-                ReparseData.D->SymbolicLinkReparseBuffer.SubstituteNameLength,
-                SubstituteName),
-            FspDebugLogWideCharBufferString(
-                ReparseData.D->SymbolicLinkReparseBuffer.PathBuffer +
-                    ReparseData.D->SymbolicLinkReparseBuffer.PrintNameOffset / sizeof(WCHAR),
-                ReparseData.D->SymbolicLinkReparseBuffer.PrintNameLength,
-                PrintName),
-            ReparseData.D->SymbolicLinkReparseBuffer.Flags);
-    else if (IsReparseTagMicrosoft(ReparseData.D->ReparseTag))
-        wsprintfA(Buf,
-            "{"
-            "ReparseTag=%#lx, "
-            "ReparseDataLength=%hu"
-            "}",
-            ReparseData.D->ReparseTag, ReparseData.D->ReparseDataLength);
-    else
-#define Guid ReparseData.G->ReparseGuid
-        wsprintfA(Buf,
-            "{"
-            "ReparseTag=%#lx, "
-            "ReparseDataLength=%hu, "
-            "ReparseGuid={%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}"
-            "}",
-            ReparseData.G->ReparseTag, ReparseData.G->ReparseDataLength,
-            Guid.Data1, Guid.Data2, Guid.Data3,
-            Guid.Data4[0], Guid.Data4[1], Guid.Data4[2], Guid.Data4[3],
-            Guid.Data4[4], Guid.Data4[5], Guid.Data4[6], Guid.Data4[7]);
-#undef Guid
-
-    return Buf;
-}
-
-static VOID FspDebugLogRequestVoid(FSP_FSCTL_TRANSACT_REQ *Request, const char *Name)
-{
-    FspDebugLog("%S[TID=%04lx]: %p: >>%s\n",
-        FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint, Name);
-}
-
-static VOID FspDebugLogResponseStatus(FSP_FSCTL_TRANSACT_RSP *Response, const char *Name)
-{
-    FspDebugLog("%S[TID=%04lx]: %p: <<%s IoStatus=%lx[%ld]\n",
-        FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint, Name,
-        Response->IoStatus.Status, Response->IoStatus.Information);
-}
-
-FSP_API VOID FspDebugLogRequest(FSP_FSCTL_TRANSACT_REQ *Request)
-{
-    char UserContextBuf[40];
-    char CreationTimeBuf[32], LastAccessTimeBuf[32], LastWriteTimeBuf[32];
-    char InfoBuf[256];
-    char *Sddl = 0;
-
-    switch (Request->Kind)
-    {
-    case FspFsctlTransactReservedKind:
-        FspDebugLogRequestVoid(Request, "RESERVED");
-        break;
-    case FspFsctlTransactCreateKind:
-        if (0 != Request->Req.Create.SecurityDescriptor.Offset)
-            ConvertSecurityDescriptorToStringSecurityDescriptorA(
-                Request->Buffer + Request->Req.Create.SecurityDescriptor.Offset,
-                SDDL_REVISION_1,
-                OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
-                DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
-                &Sddl, 0);
-        FspDebugLog("%S[TID=%04lx]: %p: >>Create [%c%c%c%c%c%c] \"%S\", "
-            "%s, CreateOptions=%lx, FileAttributes=%lx, Security=%s%s%s, "
-            "AllocationSize=%lx:%lx, "
-            "AccessToken=%p[PID=%lx], DesiredAccess=%lx, GrantedAccess=%lx, "
-            "ShareAccess=%lx\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->Req.Create.UserMode ? 'U' : 'K',
-            Request->Req.Create.HasTraversePrivilege ? 'T' : '-',
-            Request->Req.Create.HasBackupPrivilege ? 'B' : '-',
-            Request->Req.Create.HasRestorePrivilege ? 'R' : '-',
-            Request->Req.Create.OpenTargetDirectory ? 'D' : '-',
-            Request->Req.Create.CaseSensitive ? 'C' : '-',
-            (PWSTR)Request->Buffer,
-            FspDebugLogDispositionString(Request->Req.Create.CreateOptions),
-            Request->Req.Create.CreateOptions & 0xffffff,
-            Request->Req.Create.FileAttributes,
-            Sddl ? "\"" : "",
-            Sddl ? Sddl : "NULL",
-            Sddl ? "\"" : "",
-            MAKE_UINT32_PAIR(Request->Req.Create.AllocationSize),
-            FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.Create.AccessToken),
-            FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.Create.AccessToken),
-            Request->Req.Create.DesiredAccess,
-            Request->Req.Create.GrantedAccess,
-            Request->Req.Create.ShareAccess);
-        LocalFree(Sddl);
-        break;
-    case FspFsctlTransactOverwriteKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>Overwrite%s %s%S%s%s, "
-            "FileAttributes=%lx\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->Req.Overwrite.Supersede ? " [Supersede]" : "",
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.Overwrite.UserContext, Request->Req.Overwrite.UserContext2,
-                UserContextBuf),
-            Request->Req.Overwrite.FileAttributes);
-        break;
-    case FspFsctlTransactCleanupKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>Cleanup%s %s%S%s%s\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->Req.Cleanup.Delete ? " [Delete]" : "",
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.Cleanup.UserContext, Request->Req.Cleanup.UserContext2,
-                UserContextBuf));
-        break;
-    case FspFsctlTransactCloseKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>Close %s%S%s%s\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.Close.UserContext, Request->Req.Close.UserContext2,
-                UserContextBuf));
-        break;
-    case FspFsctlTransactReadKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>Read %s%S%s%s, "
-            "Address=%p, Offset=%lx:%lx, Length=%ld, Key=%lx\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.Read.UserContext, Request->Req.Read.UserContext2,
-                UserContextBuf),
-            (PVOID)Request->Req.Read.Address,
-            MAKE_UINT32_PAIR(Request->Req.Read.Offset),
-            Request->Req.Read.Length,
-            Request->Req.Read.Key);
-        break;
-    case FspFsctlTransactWriteKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>Write%s %s%S%s%s, "
-            "Address=%p, Offset=%lx:%lx, Length=%ld, Key=%lx\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->Req.Write.ConstrainedIo ? " [C]" : "",
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.Write.UserContext, Request->Req.Write.UserContext2,
-                UserContextBuf),
-            (PVOID)Request->Req.Write.Address,
-            MAKE_UINT32_PAIR(Request->Req.Write.Offset),
-            Request->Req.Write.Length,
-            Request->Req.Write.Key);
-        break;
-    case FspFsctlTransactQueryInformationKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>QueryInformation %s%S%s%s\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.QueryInformation.UserContext, Request->Req.QueryInformation.UserContext2,
-                UserContextBuf));
-        break;
-    case FspFsctlTransactSetInformationKind:
-        switch (Request->Req.SetInformation.FileInformationClass)
-        {
-        case 4/*FileBasicInformation*/:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Basic] %s%S%s%s, "
-                "FileAttributes=%lx, CreationTime=%s, LastAccessTime=%s, LastWriteTime=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
-                    UserContextBuf),
-                Request->Req.SetInformation.Info.Basic.FileAttributes,
-                FspDebugLogFileTimeString(Request->Req.SetInformation.Info.Basic.CreationTime,
-                    CreationTimeBuf),
-                FspDebugLogFileTimeString(Request->Req.SetInformation.Info.Basic.LastAccessTime,
-                    LastAccessTimeBuf),
-                FspDebugLogFileTimeString(Request->Req.SetInformation.Info.Basic.LastWriteTime,
-                    LastWriteTimeBuf));
-            break;
-        case 19/*FileAllocationInformation*/:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Allocation] %s%S%s%s, "
-                "AllocationSize=%lx:%lx\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
-                    UserContextBuf),
-                MAKE_UINT32_PAIR(Request->Req.SetInformation.Info.Allocation.AllocationSize));
-            break;
-        case 20/*FileEndOfFileInformation*/:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [EndOfFile] %s%S%s%s, "
-                "FileSize = %lx:%lx\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
-                    UserContextBuf),
-                MAKE_UINT32_PAIR(Request->Req.SetInformation.Info.EndOfFile.FileSize));
-            break;
-        case 13/*FileDispositionInformation*/:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Disposition] %s%S%s%s, "
-                "%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
-                    UserContextBuf),
-                Request->Req.SetInformation.Info.Disposition.Delete ? "Delete" : "Undelete");
-            break;
-        case 64/*FileDispositionInformationEx*/:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [DispositionEx] %s%S%s%s, "
-                "Flags=%lx\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
-                    UserContextBuf),
-                Request->Req.SetInformation.Info.DispositionEx.Flags);
-            break;
-        case 10/*FileRenameInformation*/:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Rename] %s%S%s%s, "
-                "NewFileName=\"%S\", AccessToken=%p[PID=%lx]\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
-                    UserContextBuf),
-                (PWSTR)(Request->Buffer + Request->Req.SetInformation.Info.Rename.NewFileName.Offset),
-                FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.SetInformation.Info.Rename.AccessToken),
-                FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.SetInformation.Info.Rename.AccessToken));
-            break;
-        case 65/*FileRenameInformationEx*/:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [RenameEx] %s%S%s%s, "
-                "NewFileName=\"%S\", AccessToken=%p[PID=%lx], Flags=%lx\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
-                    UserContextBuf),
-                (PWSTR)(Request->Buffer + Request->Req.SetInformation.Info.Rename.NewFileName.Offset),
-                FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.SetInformation.Info.Rename.AccessToken),
-                FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.SetInformation.Info.Rename.AccessToken),
-                Request->Req.SetInformation.Info.RenameEx.Flags);
-            break;
-        default:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [INVALID] %s%S%s%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
-                    UserContextBuf));
-            break;
-        }
-        break;
-    case FspFsctlTransactQueryEaKind:
-        FspDebugLogRequestVoid(Request, "QUERYEA");
-        break;
-    case FspFsctlTransactSetEaKind:
-        FspDebugLogRequestVoid(Request, "SETEA");
-        break;
-    case FspFsctlTransactFlushBuffersKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>FlushBuffers %s%S%s%s\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.FlushBuffers.UserContext, Request->Req.FlushBuffers.UserContext2,
-                UserContextBuf));
-        break;
-    case FspFsctlTransactQueryVolumeInformationKind:
-        FspDebugLogRequestVoid(Request, "QueryVolumeInformation");
-        break;
-    case FspFsctlTransactSetVolumeInformationKind:
-        switch (Request->Req.SetVolumeInformation.FsInformationClass)
-        {
-        case 2/*FileFsLabelInformation*/:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetVolumeInformation [FsLabel] "
-                "Label=\"%S\"\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                (PWSTR)Request->Buffer);
-            break;
-        default:
-            FspDebugLog("%S[TID=%04lx]: %p: >>SetVolumeInformation [INVALID]\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint);
-            break;
-        }
-        break;
-    case FspFsctlTransactQueryDirectoryKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>QueryDirectory %s%S%s%s, "
-            "Address=%p, Length=%ld, Pattern=%s%S%s, Marker=%s%S%s\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.QueryDirectory.UserContext, Request->Req.QueryDirectory.UserContext2,
-                UserContextBuf),
-            (PVOID)Request->Req.QueryDirectory.Address,
-            Request->Req.QueryDirectory.Length,
-            Request->Req.QueryDirectory.Pattern.Size ? "\"" : "",
-            Request->Req.QueryDirectory.Pattern.Size ?
-                (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Pattern.Offset) : L"NULL",
-            Request->Req.QueryDirectory.Pattern.Size ? "\"" : "",
-            Request->Req.QueryDirectory.Marker.Size ? "\"" : "",
-            Request->Req.QueryDirectory.Marker.Size ?
-                (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Marker.Offset) : L"NULL",
-            Request->Req.QueryDirectory.Marker.Size ? "\"" : "");
-        break;
-    case FspFsctlTransactFileSystemControlKind:
-        switch (Request->Req.FileSystemControl.FsControlCode)
-        {
-        case FSCTL_GET_REPARSE_POINT:
-            FspDebugLog("%S[TID=%04lx]: %p: >>FileSystemControl [FSCTL_GET_REPARSE_POINT] %s%S%s%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.FileSystemControl.UserContext, Request->Req.FileSystemControl.UserContext2,
-                    UserContextBuf));
-            break;
-        case FSCTL_SET_REPARSE_POINT:
-        case FSCTL_DELETE_REPARSE_POINT:
-            FspDebugLog("%S[TID=%04lx]: %p: >>FileSystemControl [%s] %s%S%s%s "
-                "ReparseData=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                FSCTL_SET_REPARSE_POINT == Request->Req.FileSystemControl.FsControlCode ?
-                    "FSCTL_SET_REPARSE_POINT" : "FSCTL_DELETE_REPARSE_POINT",
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.FileSystemControl.UserContext, Request->Req.FileSystemControl.UserContext2,
-                    UserContextBuf),
-                FspDebugLogReparseDataString(Request->Buffer + Request->Req.FileSystemControl.Buffer.Offset,
-                    InfoBuf));
-            break;
-        default:
-            FspDebugLog("%S[TID=%04lx]: %p: >>FileSystemControl [INVALID] %s%S%s%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-                Request->FileName.Size ? "\"" : "",
-                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-                Request->FileName.Size ? "\", " : "",
-                FspDebugLogUserContextString(
-                    Request->Req.FileSystemControl.UserContext, Request->Req.FileSystemControl.UserContext2,
-                    UserContextBuf));
-            break;
-        }
-        break;
-    case FspFsctlTransactDeviceControlKind:
-        FspDebugLogRequestVoid(Request, "DEVICECONTROL");
-        break;
-    case FspFsctlTransactShutdownKind:
-        FspDebugLogRequestVoid(Request, "SHUTDOWN");
-        break;
-    case FspFsctlTransactLockControlKind:
-        FspDebugLogRequestVoid(Request, "LOCKCONTROL");
-        break;
-    case FspFsctlTransactQuerySecurityKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>QuerySecurity %s%S%s%s\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.QuerySecurity.UserContext, Request->Req.QuerySecurity.UserContext2,
-                UserContextBuf));
-        break;
-    case FspFsctlTransactSetSecurityKind:
-        if (0 != Request->Req.SetSecurity.SecurityDescriptor.Size)
-            ConvertSecurityDescriptorToStringSecurityDescriptorA(
-                Request->Buffer + Request->Req.SetSecurity.SecurityDescriptor.Offset,
-                SDDL_REVISION_1,
-                OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
-                DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
-                &Sddl, 0);
-        FspDebugLog("%S[TID=%04lx]: %p: >>SetSecurity %s%S%s%s, "
-            "SecurityInformation=%lx, Security=%s%s%s\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.SetSecurity.UserContext, Request->Req.SetSecurity.UserContext2,
-                UserContextBuf),
-            Request->Req.SetSecurity.SecurityInformation,
-            Sddl ? "\"" : "",
-            Sddl ? Sddl : "NULL",
-            Sddl ? "\"" : "");
-        LocalFree(Sddl);
-        break;
-    case FspFsctlTransactQueryStreamInformationKind:
-        FspDebugLog("%S[TID=%04lx]: %p: >>QueryStreamInformation %s%S%s%s\n",
-            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
-            Request->FileName.Size ? "\"" : "",
-            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
-            Request->FileName.Size ? "\", " : "",
-            FspDebugLogUserContextString(
-                Request->Req.QueryStreamInformation.UserContext, Request->Req.QueryStreamInformation.UserContext2,
-                UserContextBuf));
-        break;
-    default:
-        FspDebugLogRequestVoid(Request, "INVALID");
-        break;
-    }
-}
-
-FSP_API VOID FspDebugLogResponse(FSP_FSCTL_TRANSACT_RSP *Response)
-{
-    if (STATUS_PENDING == Response->IoStatus.Status)
-        return;
-
-    char UserContextBuf[40];
-    char InfoBuf[256];
-    char *Sddl = 0;
-
-    switch (Response->Kind)
-    {
-    case FspFsctlTransactReservedKind:
-        FspDebugLogResponseStatus(Response, "RESERVED");
-        break;
-    case FspFsctlTransactCreateKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "Create");
-        else if (STATUS_REPARSE == Response->IoStatus.Status)
-        {
-            if (0/*IO_REPARSE*/ == Response->IoStatus.Information)
-                FspDebugLog("%S[TID=%04lx]: %p: <<Create IoStatus=%lx[%ld] "
-                    "Reparse.FileName=\"%s\"\n",
-                    FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                    Response->IoStatus.Status, Response->IoStatus.Information,
-                    FspDebugLogWideCharBufferString(
-                        Response->Buffer + Response->Rsp.Create.Reparse.Buffer.Offset,
-                        Response->Rsp.Create.Reparse.Buffer.Size,
-                        InfoBuf));
-            else if (1/*IO_REMOUNT*/ == Response->IoStatus.Information)
-                FspDebugLogResponseStatus(Response, "Create");
-            else
-                FspDebugLog("%S[TID=%04lx]: %p: <<Create IoStatus=%lx[%ld] "
-                    "Reparse.Data=\"%s\"\n",
-                    FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                    Response->IoStatus.Status, Response->IoStatus.Information,
-                    FspDebugLogReparseDataString(
-                        Response->Buffer + Response->Rsp.Create.Reparse.Buffer.Offset,
-                        InfoBuf));
-        }
-        else
-            FspDebugLog("%S[TID=%04lx]: %p: <<Create IoStatus=%lx[%ld] "
-                "UserContext=%s, GrantedAccess=%lx, FileInfo=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                FspDebugLogUserContextString(
-                    Response->Rsp.Create.Opened.UserContext, Response->Rsp.Create.Opened.UserContext2,
-                    UserContextBuf),
-                Response->Rsp.Create.Opened.GrantedAccess,
-                FspDebugLogFileInfoString(&Response->Rsp.Create.Opened.FileInfo, InfoBuf));
-        break;
-    case FspFsctlTransactOverwriteKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "Overwrite");
-        else
-            FspDebugLog("%S[TID=%04lx]: %p: <<Overwrite IoStatus=%lx[%ld] "
-                "FileInfo=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                FspDebugLogFileInfoString(&Response->Rsp.Overwrite.FileInfo, InfoBuf));
-        break;
-    case FspFsctlTransactCleanupKind:
-        FspDebugLogResponseStatus(Response, "Cleanup");
-        break;
-    case FspFsctlTransactCloseKind:
-        FspDebugLogResponseStatus(Response, "Close");
-        break;
-    case FspFsctlTransactReadKind:
-        FspDebugLogResponseStatus(Response, "Read");
-        break;
-    case FspFsctlTransactWriteKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "Write");
-        else
-            FspDebugLog("%S[TID=%04lx]: %p: <<Write IoStatus=%lx[%ld] "
-                "FileInfo=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                FspDebugLogFileInfoString(&Response->Rsp.Write.FileInfo, InfoBuf));
-        break;
-    case FspFsctlTransactQueryInformationKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "QueryInformation");
-        else
-            FspDebugLog("%S[TID=%04lx]: %p: <<QueryInformation IoStatus=%lx[%ld] "
-                "FileInfo=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                FspDebugLogFileInfoString(&Response->Rsp.QueryInformation.FileInfo, InfoBuf));
-        break;
-    case FspFsctlTransactSetInformationKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "SetInformation");
-        else
-            FspDebugLog("%S[TID=%04lx]: %p: <<SetInformation IoStatus=%lx[%ld] "
-                "FileInfo=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                FspDebugLogFileInfoString(&Response->Rsp.SetInformation.FileInfo, InfoBuf));
-        break;
-    case FspFsctlTransactQueryEaKind:
-        FspDebugLogResponseStatus(Response, "QUERYEA");
-        break;
-    case FspFsctlTransactSetEaKind:
-        FspDebugLogResponseStatus(Response, "SETEA");
-        break;
-    case FspFsctlTransactFlushBuffersKind:
-        FspDebugLogResponseStatus(Response, "FlushBuffers");
-        break;
-    case FspFsctlTransactQueryVolumeInformationKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "QueryVolumeInformation");
-        else
-            FspDebugLog("%S[TID=%04lx]: %p: <<QueryVolumeInformation IoStatus=%lx[%ld] "
-                "VolumeInfo=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                FspDebugLogVolumeInfoString(&Response->Rsp.QueryVolumeInformation.VolumeInfo, InfoBuf));
-        break;
-    case FspFsctlTransactSetVolumeInformationKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "SetVolumeInformation");
-        else
-            FspDebugLog("%S[TID=%04lx]: %p: <<SetVolumeInformation IoStatus=%lx[%ld] "
-                "VolumeInfo=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                FspDebugLogVolumeInfoString(&Response->Rsp.SetVolumeInformation.VolumeInfo, InfoBuf));
-        break;
-    case FspFsctlTransactQueryDirectoryKind:
-        FspDebugLogResponseStatus(Response, "QueryDirectory");
-        break;
-    case FspFsctlTransactFileSystemControlKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status) ||
-            0 == Response->Rsp.FileSystemControl.Buffer.Size)
-            FspDebugLogResponseStatus(Response, "FileSystemControl");
-        else
-            FspDebugLog("%S[TID=%04lx]: %p: <<FileSystemControl IoStatus=%lx[%ld] "
-                "ReparseData=%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                FspDebugLogReparseDataString(Response->Buffer + Response->Rsp.FileSystemControl.Buffer.Offset,
-                    InfoBuf));
-        break;
-    case FspFsctlTransactDeviceControlKind:
-        FspDebugLogResponseStatus(Response, "DEVICECONTROL");
-        break;
-    case FspFsctlTransactShutdownKind:
-        FspDebugLogResponseStatus(Response, "SHUTDOWN");
-        break;
-    case FspFsctlTransactLockControlKind:
-        FspDebugLogResponseStatus(Response, "LOCKCONTROL");
-        break;
-    case FspFsctlTransactQuerySecurityKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "QuerySecurity");
-        else
-        {
-            if (0 != Response->Rsp.QuerySecurity.SecurityDescriptor.Size)
-                ConvertSecurityDescriptorToStringSecurityDescriptorA(
-                    Response->Buffer + Response->Rsp.QuerySecurity.SecurityDescriptor.Offset,
-                    SDDL_REVISION_1,
-                    OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
-                    DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
-                    &Sddl, 0);
-            FspDebugLog("%S[TID=%04lx]: %p: <<QuerySecurity IoStatus=%lx[%ld] "
-                "Security=%s%s%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                Sddl ? "\"" : "",
-                Sddl ? Sddl : "NULL",
-                Sddl ? "\"" : "");
-            LocalFree(Sddl);
-        }
-        break;
-    case FspFsctlTransactSetSecurityKind:
-        if (!NT_SUCCESS(Response->IoStatus.Status))
-            FspDebugLogResponseStatus(Response, "SetSecurity");
-        else
-        {
-            if (0 != Response->Rsp.SetSecurity.SecurityDescriptor.Size)
-                ConvertSecurityDescriptorToStringSecurityDescriptorA(
-                    Response->Buffer + Response->Rsp.SetSecurity.SecurityDescriptor.Offset,
-                    SDDL_REVISION_1,
-                    OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
-                    DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
-                    &Sddl, 0);
-            FspDebugLog("%S[TID=%04lx]: %p: <<SetSecurity IoStatus=%lx[%ld] "
-                "Security=%s%s%s\n",
-                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
-                Response->IoStatus.Status, Response->IoStatus.Information,
-                Sddl ? "\"" : "",
-                Sddl ? Sddl : "NULL",
-                Sddl ? "\"" : "");
-            LocalFree(Sddl);
-        }
-        break;
-    case FspFsctlTransactQueryStreamInformationKind:
-        FspDebugLogResponseStatus(Response, "QueryStreamInformation");
-        break;
-    default:
-        FspDebugLogResponseStatus(Response, "INVALID");
-        break;
-    }
+    static SRWLOCK SlimLock = SRWLOCK_INIT;
+    static ULONG Seed = 1;
+    ULONG Result;
+
+    AcquireSRWLockExclusive(&SlimLock);
+
+    /* see ucrt sources */
+    Seed = Seed * 214013 + 2531011;
+    Result = (Seed >> 16) & 0x7fff;
+
+    ReleaseSRWLockExclusive(&SlimLock);
+
+    return Result;
 }
+#endif

src/dll/debuglog.c

@@ -0,0 +1,890 @@
+/**
+ * @file dll/debuglog.c
+ *
+ * @copyright 2015-2022 Bill Zissimopoulos
+ */
+/*
+ * This file is part of WinFsp.
+ *
+ * You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License version 3 as published by the Free Software
+ * Foundation.
+ *
+ * Licensees holding a valid commercial license may use this software
+ * in accordance with the commercial license agreement provided in
+ * conjunction with the software.  The terms and conditions of any such
+ * commercial license agreement shall govern, supersede, and render
+ * ineffective any application of the GPLv3 license to this software,
+ * notwithstanding of any reference thereto in the software or
+ * associated repository.
+ */
+
+#include <dll/library.h>
+#include <sddl.h>
+#include <stdarg.h>
+
+static HANDLE FspDebugLogHandle = INVALID_HANDLE_VALUE;
+
+FSP_API VOID FspDebugLogSetHandle(HANDLE Handle)
+{
+    FspDebugLogHandle = Handle;
+}
+
+FSP_API VOID FspDebugLog(const char *format, ...)
+{
+    char buf[1024];
+        /* DbgPrint has a 512 byte limit, but wvsprintf is only safe with a 1024 byte buffer */
+    va_list ap;
+    va_start(ap, format);
+    wvsprintfA(buf, format, ap);
+    va_end(ap);
+    buf[sizeof buf - 1] = '\0';
+    if (INVALID_HANDLE_VALUE != FspDebugLogHandle)
+    {
+        DWORD bytes;
+        WriteFile(FspDebugLogHandle, buf, lstrlenA(buf), &bytes, 0);
+    }
+    else
+        OutputDebugStringA(buf);
+}
+
+FSP_API VOID FspDebugLogSD(const char *format, PSECURITY_DESCRIPTOR SecurityDescriptor)
+{
+    char *Sddl;
+
+    if (0 == SecurityDescriptor)
+        FspDebugLog(format, "null security descriptor");
+    else if (ConvertSecurityDescriptorToStringSecurityDescriptorA(SecurityDescriptor,
+        SDDL_REVISION_1,
+        OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
+        DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
+        &Sddl, 0))
+    {
+        FspDebugLog(format, Sddl);
+        LocalFree(Sddl);
+    }
+    else
+        FspDebugLog(format, "invalid security descriptor");
+}
+
+FSP_API VOID FspDebugLogSid(const char *format, PSID Sid)
+{
+    char *S;
+
+    if (0 == Sid)
+        FspDebugLog(format, "null SID");
+    else if (ConvertSidToStringSidA(Sid, &S))
+    {
+        FspDebugLog(format, S);
+        LocalFree(S);
+    }
+    else
+        FspDebugLog(format, "invalid SID");
+}
+
+FSP_API VOID FspDebugLogFT(const char *format, PFILETIME FileTime)
+{
+    SYSTEMTIME SystemTime;
+    char buf[32];
+
+    if (FileTimeToSystemTime(FileTime, &SystemTime))
+    {
+        wsprintfA(buf, "%04hu-%02hu-%02huT%02hu:%02hu:%02hu.%03huZ",
+            SystemTime.wYear, SystemTime.wMonth, SystemTime.wDay,
+            SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond,
+            SystemTime.wMilliseconds);
+        FspDebugLog(format, buf);
+    }
+    else
+        FspDebugLog(format, "invalid file time");
+}
+
+#define MAKE_UINT32_PAIR(v)             \
+    ((PLARGE_INTEGER)&(v))->HighPart, ((PLARGE_INTEGER)&(v))->LowPart
+
+static const char *FspDebugLogDispositionString(UINT32 CreateOptions)
+{
+    switch ((CreateOptions >> 24) & 0xff)
+    {
+    case FILE_CREATE:
+        return "FILE_CREATE";
+    case FILE_OPEN:
+        return "FILE_OPEN";
+    case FILE_OPEN_IF:
+        return "FILE_OPEN_IF";
+    case FILE_OVERWRITE:
+        return "FILE_OVERWRITE";
+    case FILE_SUPERSEDE:
+        return "FILE_SUPERSEDE";
+    case FILE_OVERWRITE_IF:
+        return "FILE_OVERWRITE_IF";
+    default:
+        return "INVALID";
+    }
+}
+
+static const char *FspDebugLogUserContextString(UINT64 UserContext, UINT64 UserContext2, char *Buf)
+{
+    wsprintfA(Buf, 0 == UserContext2 ? "%p" : "%p:%p", (PVOID)UserContext, (PVOID)UserContext2);
+
+    return Buf;
+}
+
+static const char *FspDebugLogFileTimeString(UINT64 FileTime, char *Buf)
+{
+    SYSTEMTIME SystemTime;
+
+    if (0 == FileTime)
+        lstrcpyA(Buf, "0");
+    else if (FileTimeToSystemTime((PFILETIME)&FileTime, &SystemTime))
+    {
+        wsprintfA(Buf, "%04hu-%02hu-%02huT%02hu:%02hu:%02hu.%03huZ",
+            SystemTime.wYear, SystemTime.wMonth, SystemTime.wDay,
+            SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond,
+            SystemTime.wMilliseconds);
+    }
+    else
+        lstrcpyA(Buf, "INVALID");
+
+    return Buf;
+}
+
+static const char *FspDebugLogFileInfoString(FSP_FSCTL_FILE_INFO *FileInfo, char *Buf)
+{
+    char CreationTimeBuf[32], LastAccessTimeBuf[32], LastWriteTimeBuf[32], ChangeTimeBuf[32];
+
+    wsprintfA(Buf,
+        "{"
+        "FileAttributes=%lx, "
+        "ReparseTag=%lx, "
+        "AllocationSize=%lx:%lx, "
+        "FileSize=%lx:%lx, "
+        "CreationTime=%s, "
+        "LastAccessTime=%s, "
+        "LastWriteTime=%s, "
+        "ChangeTime=%s, "
+        "IndexNumber=%lx:%lx"
+        "}",
+        FileInfo->FileAttributes,
+        FileInfo->ReparseTag,
+        MAKE_UINT32_PAIR(FileInfo->AllocationSize),
+        MAKE_UINT32_PAIR(FileInfo->FileSize),
+        FspDebugLogFileTimeString(FileInfo->CreationTime, CreationTimeBuf),
+        FspDebugLogFileTimeString(FileInfo->LastAccessTime, LastAccessTimeBuf),
+        FspDebugLogFileTimeString(FileInfo->LastWriteTime, LastWriteTimeBuf),
+        FspDebugLogFileTimeString(FileInfo->ChangeTime, ChangeTimeBuf),
+        MAKE_UINT32_PAIR(FileInfo->IndexNumber));
+
+    return Buf;
+}
+
+static const char *FspDebugLogVolumeInfoString(FSP_FSCTL_VOLUME_INFO *VolumeInfo, char *Buf)
+{
+    wsprintfA(Buf,
+        "{"
+        "TotalSize=%lx:%lx, "
+        "FreeSize=%lx:%lx, "
+        "VolumeLabel=\"%.32S\""
+        "}",
+        MAKE_UINT32_PAIR(VolumeInfo->TotalSize),
+        MAKE_UINT32_PAIR(VolumeInfo->FreeSize),
+        &VolumeInfo->VolumeLabel);
+
+    return Buf;
+}
+
+static const char *FspDebugLogWideCharBufferString(PVOID WideCharBuf, ULONG Length, char *Buf)
+{
+    WCHAR TempWideCharBuf[64 + 1];
+
+    if (Length > sizeof TempWideCharBuf - sizeof(WCHAR))
+        Length = sizeof TempWideCharBuf - sizeof(WCHAR);
+
+    memcpy(TempWideCharBuf, WideCharBuf, Length);
+    TempWideCharBuf[Length / sizeof(WCHAR)] = L'\0';
+
+    wsprintfA(Buf, "%.64S", TempWideCharBuf);
+
+    return Buf;
+}
+
+static const char *FspDebugLogReparseDataString(PVOID ReparseData0, char *Buf)
+{
+    union
+    {
+        PREPARSE_DATA_BUFFER D;
+        PREPARSE_GUID_DATA_BUFFER G;
+    } ReparseData;
+    char SubstituteName[64 + 1], PrintName[64 + 1];
+
+    ReparseData.D = ReparseData0;
+    if (0 == ReparseData.D->ReparseDataLength)
+        wsprintfA(Buf,
+            "{"
+            "ReparseTag=%#lx, "
+            "ReparseDataLength=%hu"
+            "}",
+            ReparseData.D->ReparseTag, ReparseData.D->ReparseDataLength);
+    else if (IO_REPARSE_TAG_MOUNT_POINT == ReparseData.D->ReparseTag)
+        wsprintfA(Buf,
+            "{"
+            "ReparseTag=IO_REPARSE_TAG_MOUNT_POINT, "
+            "SubstituteName=\"%s\", "
+            "PrintName=\"%s\""
+            "}",
+            FspDebugLogWideCharBufferString(
+                ReparseData.D->MountPointReparseBuffer.PathBuffer +
+                    ReparseData.D->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
+                ReparseData.D->MountPointReparseBuffer.SubstituteNameLength,
+                SubstituteName),
+            FspDebugLogWideCharBufferString(
+                ReparseData.D->MountPointReparseBuffer.PathBuffer +
+                    ReparseData.D->MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR),
+                ReparseData.D->MountPointReparseBuffer.PrintNameLength,
+                PrintName));
+    else if (IO_REPARSE_TAG_SYMLINK == ReparseData.D->ReparseTag)
+        wsprintfA(Buf,
+            "{"
+            "ReparseTag=IO_REPARSE_TAG_SYMLINK, "
+            "SubstituteName=\"%s\", "
+            "PrintName=\"%s\", "
+            "Flags=%u"
+            "}",
+            FspDebugLogWideCharBufferString(
+                ReparseData.D->SymbolicLinkReparseBuffer.PathBuffer +
+                    ReparseData.D->SymbolicLinkReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
+                ReparseData.D->SymbolicLinkReparseBuffer.SubstituteNameLength,
+                SubstituteName),
+            FspDebugLogWideCharBufferString(
+                ReparseData.D->SymbolicLinkReparseBuffer.PathBuffer +
+                    ReparseData.D->SymbolicLinkReparseBuffer.PrintNameOffset / sizeof(WCHAR),
+                ReparseData.D->SymbolicLinkReparseBuffer.PrintNameLength,
+                PrintName),
+            ReparseData.D->SymbolicLinkReparseBuffer.Flags);
+    else if (IsReparseTagMicrosoft(ReparseData.D->ReparseTag))
+        wsprintfA(Buf,
+            "{"
+            "ReparseTag=%#lx, "
+            "ReparseDataLength=%hu"
+            "}",
+            ReparseData.D->ReparseTag, ReparseData.D->ReparseDataLength);
+    else
+#define Guid ReparseData.G->ReparseGuid
+        wsprintfA(Buf,
+            "{"
+            "ReparseTag=%#lx, "
+            "ReparseDataLength=%hu, "
+            "ReparseGuid={%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}"
+            "}",
+            ReparseData.G->ReparseTag, ReparseData.G->ReparseDataLength,
+            Guid.Data1, Guid.Data2, Guid.Data3,
+            Guid.Data4[0], Guid.Data4[1], Guid.Data4[2], Guid.Data4[3],
+            Guid.Data4[4], Guid.Data4[5], Guid.Data4[6], Guid.Data4[7]);
+#undef Guid
+
+    return Buf;
+}
+
+static VOID FspDebugLogRequestVoid(FSP_FSCTL_TRANSACT_REQ *Request, const char *Name)
+{
+    FspDebugLog("%S[TID=%04lx]: %p: >>%s\n",
+        FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint, Name);
+}
+
+static VOID FspDebugLogResponseStatus(FSP_FSCTL_TRANSACT_RSP *Response, const char *Name)
+{
+    FspDebugLog("%S[TID=%04lx]: %p: <<%s IoStatus=%lx[%ld]\n",
+        FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint, Name,
+        Response->IoStatus.Status, Response->IoStatus.Information);
+}
+
+FSP_API VOID FspDebugLogRequest(FSP_FSCTL_TRANSACT_REQ *Request)
+{
+    char UserContextBuf[40];
+    char CreationTimeBuf[32], LastAccessTimeBuf[32], LastWriteTimeBuf[32];
+    char InfoBuf[256];
+    char *Sddl = 0;
+
+    switch (Request->Kind)
+    {
+    case FspFsctlTransactReservedKind:
+        FspDebugLogRequestVoid(Request, "RESERVED");
+        break;
+    case FspFsctlTransactCreateKind:
+        if (0 != Request->Req.Create.SecurityDescriptor.Offset)
+            ConvertSecurityDescriptorToStringSecurityDescriptorA(
+                Request->Buffer + Request->Req.Create.SecurityDescriptor.Offset,
+                SDDL_REVISION_1,
+                OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
+                DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
+                &Sddl, 0);
+        FspDebugLog("%S[TID=%04lx]: %p: >>Create [%c%c%c%c%c%c] \"%S\", "
+            "%s, CreateOptions=%lx, FileAttributes=%lx, Security=%s%s%s, "
+            "AllocationSize=%lx:%lx, "
+            "AccessToken=%p[PID=%lx], DesiredAccess=%lx, GrantedAccess=%lx, "
+            "ShareAccess=%lx\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->Req.Create.UserMode ? 'U' : 'K',
+            Request->Req.Create.HasTraversePrivilege ? 'T' : '-',
+            Request->Req.Create.HasBackupPrivilege ? 'B' : '-',
+            Request->Req.Create.HasRestorePrivilege ? 'R' : '-',
+            Request->Req.Create.OpenTargetDirectory ? 'D' : '-',
+            Request->Req.Create.CaseSensitive ? 'C' : '-',
+            (PWSTR)Request->Buffer,
+            FspDebugLogDispositionString(Request->Req.Create.CreateOptions),
+            Request->Req.Create.CreateOptions & 0xffffff,
+            Request->Req.Create.FileAttributes,
+            Sddl ? "\"" : "",
+            Sddl ? Sddl : "NULL",
+            Sddl ? "\"" : "",
+            MAKE_UINT32_PAIR(Request->Req.Create.AllocationSize),
+            FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.Create.AccessToken),
+            FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.Create.AccessToken),
+            Request->Req.Create.DesiredAccess,
+            Request->Req.Create.GrantedAccess,
+            Request->Req.Create.ShareAccess);
+        LocalFree(Sddl);
+        break;
+    case FspFsctlTransactOverwriteKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>Overwrite%s %s%S%s%s, "
+            "FileAttributes=%lx\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->Req.Overwrite.Supersede ? " [Supersede]" : "",
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.Overwrite.UserContext, Request->Req.Overwrite.UserContext2,
+                UserContextBuf),
+            Request->Req.Overwrite.FileAttributes);
+        break;
+    case FspFsctlTransactCleanupKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>Cleanup%s %s%S%s%s\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->Req.Cleanup.Delete ? " [Delete]" : "",
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.Cleanup.UserContext, Request->Req.Cleanup.UserContext2,
+                UserContextBuf));
+        break;
+    case FspFsctlTransactCloseKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>Close %s%S%s%s\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.Close.UserContext, Request->Req.Close.UserContext2,
+                UserContextBuf));
+        break;
+    case FspFsctlTransactReadKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>Read %s%S%s%s, "
+            "Address=%p, Offset=%lx:%lx, Length=%ld, Key=%lx\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.Read.UserContext, Request->Req.Read.UserContext2,
+                UserContextBuf),
+            (PVOID)Request->Req.Read.Address,
+            MAKE_UINT32_PAIR(Request->Req.Read.Offset),
+            Request->Req.Read.Length,
+            Request->Req.Read.Key);
+        break;
+    case FspFsctlTransactWriteKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>Write%s %s%S%s%s, "
+            "Address=%p, Offset=%lx:%lx, Length=%ld, Key=%lx\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->Req.Write.ConstrainedIo ? " [C]" : "",
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.Write.UserContext, Request->Req.Write.UserContext2,
+                UserContextBuf),
+            (PVOID)Request->Req.Write.Address,
+            MAKE_UINT32_PAIR(Request->Req.Write.Offset),
+            Request->Req.Write.Length,
+            Request->Req.Write.Key);
+        break;
+    case FspFsctlTransactQueryInformationKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>QueryInformation %s%S%s%s\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.QueryInformation.UserContext, Request->Req.QueryInformation.UserContext2,
+                UserContextBuf));
+        break;
+    case FspFsctlTransactSetInformationKind:
+        switch (Request->Req.SetInformation.FileInformationClass)
+        {
+        case 4/*FileBasicInformation*/:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Basic] %s%S%s%s, "
+                "FileAttributes=%lx, CreationTime=%s, LastAccessTime=%s, LastWriteTime=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
+                    UserContextBuf),
+                Request->Req.SetInformation.Info.Basic.FileAttributes,
+                FspDebugLogFileTimeString(Request->Req.SetInformation.Info.Basic.CreationTime,
+                    CreationTimeBuf),
+                FspDebugLogFileTimeString(Request->Req.SetInformation.Info.Basic.LastAccessTime,
+                    LastAccessTimeBuf),
+                FspDebugLogFileTimeString(Request->Req.SetInformation.Info.Basic.LastWriteTime,
+                    LastWriteTimeBuf));
+            break;
+        case 19/*FileAllocationInformation*/:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Allocation] %s%S%s%s, "
+                "AllocationSize=%lx:%lx\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
+                    UserContextBuf),
+                MAKE_UINT32_PAIR(Request->Req.SetInformation.Info.Allocation.AllocationSize));
+            break;
+        case 20/*FileEndOfFileInformation*/:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [EndOfFile] %s%S%s%s, "
+                "FileSize = %lx:%lx\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
+                    UserContextBuf),
+                MAKE_UINT32_PAIR(Request->Req.SetInformation.Info.EndOfFile.FileSize));
+            break;
+        case 13/*FileDispositionInformation*/:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Disposition] %s%S%s%s, "
+                "%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
+                    UserContextBuf),
+                Request->Req.SetInformation.Info.Disposition.Delete ? "Delete" : "Undelete");
+            break;
+        case 64/*FileDispositionInformationEx*/:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [DispositionEx] %s%S%s%s, "
+                "Flags=%lx\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
+                    UserContextBuf),
+                Request->Req.SetInformation.Info.DispositionEx.Flags);
+            break;
+        case 10/*FileRenameInformation*/:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [Rename] %s%S%s%s, "
+                "NewFileName=\"%S\", AccessToken=%p[PID=%lx]\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
+                    UserContextBuf),
+                (PWSTR)(Request->Buffer + Request->Req.SetInformation.Info.Rename.NewFileName.Offset),
+                FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.SetInformation.Info.Rename.AccessToken),
+                FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.SetInformation.Info.Rename.AccessToken));
+            break;
+        case 65/*FileRenameInformationEx*/:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [RenameEx] %s%S%s%s, "
+                "NewFileName=\"%S\", AccessToken=%p[PID=%lx], Flags=%lx\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
+                    UserContextBuf),
+                (PWSTR)(Request->Buffer + Request->Req.SetInformation.Info.Rename.NewFileName.Offset),
+                FSP_FSCTL_TRANSACT_REQ_TOKEN_HANDLE(Request->Req.SetInformation.Info.Rename.AccessToken),
+                FSP_FSCTL_TRANSACT_REQ_TOKEN_PID(Request->Req.SetInformation.Info.Rename.AccessToken),
+                Request->Req.SetInformation.Info.RenameEx.Flags);
+            break;
+        default:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetInformation [INVALID] %s%S%s%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.SetInformation.UserContext, Request->Req.SetInformation.UserContext2,
+                    UserContextBuf));
+            break;
+        }
+        break;
+    case FspFsctlTransactQueryEaKind:
+        FspDebugLogRequestVoid(Request, "QUERYEA");
+        break;
+    case FspFsctlTransactSetEaKind:
+        FspDebugLogRequestVoid(Request, "SETEA");
+        break;
+    case FspFsctlTransactFlushBuffersKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>FlushBuffers %s%S%s%s\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.FlushBuffers.UserContext, Request->Req.FlushBuffers.UserContext2,
+                UserContextBuf));
+        break;
+    case FspFsctlTransactQueryVolumeInformationKind:
+        FspDebugLogRequestVoid(Request, "QueryVolumeInformation");
+        break;
+    case FspFsctlTransactSetVolumeInformationKind:
+        switch (Request->Req.SetVolumeInformation.FsInformationClass)
+        {
+        case 2/*FileFsLabelInformation*/:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetVolumeInformation [FsLabel] "
+                "Label=\"%S\"\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                (PWSTR)Request->Buffer);
+            break;
+        default:
+            FspDebugLog("%S[TID=%04lx]: %p: >>SetVolumeInformation [INVALID]\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint);
+            break;
+        }
+        break;
+    case FspFsctlTransactQueryDirectoryKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>QueryDirectory %s%S%s%s, "
+            "Address=%p, Length=%ld, Pattern=%s%S%s, Marker=%s%S%s\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.QueryDirectory.UserContext, Request->Req.QueryDirectory.UserContext2,
+                UserContextBuf),
+            (PVOID)Request->Req.QueryDirectory.Address,
+            Request->Req.QueryDirectory.Length,
+            Request->Req.QueryDirectory.Pattern.Size ? "\"" : "",
+            Request->Req.QueryDirectory.Pattern.Size ?
+                (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Pattern.Offset) : L"NULL",
+            Request->Req.QueryDirectory.Pattern.Size ? "\"" : "",
+            Request->Req.QueryDirectory.Marker.Size ? "\"" : "",
+            Request->Req.QueryDirectory.Marker.Size ?
+                (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Marker.Offset) : L"NULL",
+            Request->Req.QueryDirectory.Marker.Size ? "\"" : "");
+        break;
+    case FspFsctlTransactFileSystemControlKind:
+        switch (Request->Req.FileSystemControl.FsControlCode)
+        {
+        case FSCTL_GET_REPARSE_POINT:
+            FspDebugLog("%S[TID=%04lx]: %p: >>FileSystemControl [FSCTL_GET_REPARSE_POINT] %s%S%s%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.FileSystemControl.UserContext, Request->Req.FileSystemControl.UserContext2,
+                    UserContextBuf));
+            break;
+        case FSCTL_SET_REPARSE_POINT:
+        case FSCTL_DELETE_REPARSE_POINT:
+            FspDebugLog("%S[TID=%04lx]: %p: >>FileSystemControl [%s] %s%S%s%s "
+                "ReparseData=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                FSCTL_SET_REPARSE_POINT == Request->Req.FileSystemControl.FsControlCode ?
+                    "FSCTL_SET_REPARSE_POINT" : "FSCTL_DELETE_REPARSE_POINT",
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.FileSystemControl.UserContext, Request->Req.FileSystemControl.UserContext2,
+                    UserContextBuf),
+                FspDebugLogReparseDataString(Request->Buffer + Request->Req.FileSystemControl.Buffer.Offset,
+                    InfoBuf));
+            break;
+        default:
+            FspDebugLog("%S[TID=%04lx]: %p: >>FileSystemControl [INVALID] %s%S%s%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+                Request->FileName.Size ? "\"" : "",
+                Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+                Request->FileName.Size ? "\", " : "",
+                FspDebugLogUserContextString(
+                    Request->Req.FileSystemControl.UserContext, Request->Req.FileSystemControl.UserContext2,
+                    UserContextBuf));
+            break;
+        }
+        break;
+    case FspFsctlTransactDeviceControlKind:
+        FspDebugLogRequestVoid(Request, "DEVICECONTROL");
+        break;
+    case FspFsctlTransactShutdownKind:
+        FspDebugLogRequestVoid(Request, "SHUTDOWN");
+        break;
+    case FspFsctlTransactLockControlKind:
+        FspDebugLogRequestVoid(Request, "LOCKCONTROL");
+        break;
+    case FspFsctlTransactQuerySecurityKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>QuerySecurity %s%S%s%s\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.QuerySecurity.UserContext, Request->Req.QuerySecurity.UserContext2,
+                UserContextBuf));
+        break;
+    case FspFsctlTransactSetSecurityKind:
+        if (0 != Request->Req.SetSecurity.SecurityDescriptor.Size)
+            ConvertSecurityDescriptorToStringSecurityDescriptorA(
+                Request->Buffer + Request->Req.SetSecurity.SecurityDescriptor.Offset,
+                SDDL_REVISION_1,
+                OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
+                DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
+                &Sddl, 0);
+        FspDebugLog("%S[TID=%04lx]: %p: >>SetSecurity %s%S%s%s, "
+            "SecurityInformation=%lx, Security=%s%s%s\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.SetSecurity.UserContext, Request->Req.SetSecurity.UserContext2,
+                UserContextBuf),
+            Request->Req.SetSecurity.SecurityInformation,
+            Sddl ? "\"" : "",
+            Sddl ? Sddl : "NULL",
+            Sddl ? "\"" : "");
+        LocalFree(Sddl);
+        break;
+    case FspFsctlTransactQueryStreamInformationKind:
+        FspDebugLog("%S[TID=%04lx]: %p: >>QueryStreamInformation %s%S%s%s\n",
+            FspDiagIdent(), GetCurrentThreadId(), (PVOID)Request->Hint,
+            Request->FileName.Size ? "\"" : "",
+            Request->FileName.Size ? (PWSTR)Request->Buffer : L"",
+            Request->FileName.Size ? "\", " : "",
+            FspDebugLogUserContextString(
+                Request->Req.QueryStreamInformation.UserContext, Request->Req.QueryStreamInformation.UserContext2,
+                UserContextBuf));
+        break;
+    default:
+        FspDebugLogRequestVoid(Request, "INVALID");
+        break;
+    }
+}
+
+FSP_API VOID FspDebugLogResponse(FSP_FSCTL_TRANSACT_RSP *Response)
+{
+    if (STATUS_PENDING == Response->IoStatus.Status)
+        return;
+
+    char UserContextBuf[40];
+    char InfoBuf[256];
+    char *Sddl = 0;
+
+    switch (Response->Kind)
+    {
+    case FspFsctlTransactReservedKind:
+        FspDebugLogResponseStatus(Response, "RESERVED");
+        break;
+    case FspFsctlTransactCreateKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "Create");
+        else if (STATUS_REPARSE == Response->IoStatus.Status)
+        {
+            if (0/*IO_REPARSE*/ == Response->IoStatus.Information)
+                FspDebugLog("%S[TID=%04lx]: %p: <<Create IoStatus=%lx[%ld] "
+                    "Reparse.FileName=\"%s\"\n",
+                    FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                    Response->IoStatus.Status, Response->IoStatus.Information,
+                    FspDebugLogWideCharBufferString(
+                        Response->Buffer + Response->Rsp.Create.Reparse.Buffer.Offset,
+                        Response->Rsp.Create.Reparse.Buffer.Size,
+                        InfoBuf));
+            else if (1/*IO_REMOUNT*/ == Response->IoStatus.Information)
+                FspDebugLogResponseStatus(Response, "Create");
+            else
+                FspDebugLog("%S[TID=%04lx]: %p: <<Create IoStatus=%lx[%ld] "
+                    "Reparse.Data=\"%s\"\n",
+                    FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                    Response->IoStatus.Status, Response->IoStatus.Information,
+                    FspDebugLogReparseDataString(
+                        Response->Buffer + Response->Rsp.Create.Reparse.Buffer.Offset,
+                        InfoBuf));
+        }
+        else
+            FspDebugLog("%S[TID=%04lx]: %p: <<Create IoStatus=%lx[%ld] "
+                "UserContext=%s, GrantedAccess=%lx, FileInfo=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                FspDebugLogUserContextString(
+                    Response->Rsp.Create.Opened.UserContext, Response->Rsp.Create.Opened.UserContext2,
+                    UserContextBuf),
+                Response->Rsp.Create.Opened.GrantedAccess,
+                FspDebugLogFileInfoString(&Response->Rsp.Create.Opened.FileInfo, InfoBuf));
+        break;
+    case FspFsctlTransactOverwriteKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "Overwrite");
+        else
+            FspDebugLog("%S[TID=%04lx]: %p: <<Overwrite IoStatus=%lx[%ld] "
+                "FileInfo=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                FspDebugLogFileInfoString(&Response->Rsp.Overwrite.FileInfo, InfoBuf));
+        break;
+    case FspFsctlTransactCleanupKind:
+        FspDebugLogResponseStatus(Response, "Cleanup");
+        break;
+    case FspFsctlTransactCloseKind:
+        FspDebugLogResponseStatus(Response, "Close");
+        break;
+    case FspFsctlTransactReadKind:
+        FspDebugLogResponseStatus(Response, "Read");
+        break;
+    case FspFsctlTransactWriteKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "Write");
+        else
+            FspDebugLog("%S[TID=%04lx]: %p: <<Write IoStatus=%lx[%ld] "
+                "FileInfo=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                FspDebugLogFileInfoString(&Response->Rsp.Write.FileInfo, InfoBuf));
+        break;
+    case FspFsctlTransactQueryInformationKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "QueryInformation");
+        else
+            FspDebugLog("%S[TID=%04lx]: %p: <<QueryInformation IoStatus=%lx[%ld] "
+                "FileInfo=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                FspDebugLogFileInfoString(&Response->Rsp.QueryInformation.FileInfo, InfoBuf));
+        break;
+    case FspFsctlTransactSetInformationKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "SetInformation");
+        else
+            FspDebugLog("%S[TID=%04lx]: %p: <<SetInformation IoStatus=%lx[%ld] "
+                "FileInfo=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                FspDebugLogFileInfoString(&Response->Rsp.SetInformation.FileInfo, InfoBuf));
+        break;
+    case FspFsctlTransactQueryEaKind:
+        FspDebugLogResponseStatus(Response, "QUERYEA");
+        break;
+    case FspFsctlTransactSetEaKind:
+        FspDebugLogResponseStatus(Response, "SETEA");
+        break;
+    case FspFsctlTransactFlushBuffersKind:
+        FspDebugLogResponseStatus(Response, "FlushBuffers");
+        break;
+    case FspFsctlTransactQueryVolumeInformationKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "QueryVolumeInformation");
+        else
+            FspDebugLog("%S[TID=%04lx]: %p: <<QueryVolumeInformation IoStatus=%lx[%ld] "
+                "VolumeInfo=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                FspDebugLogVolumeInfoString(&Response->Rsp.QueryVolumeInformation.VolumeInfo, InfoBuf));
+        break;
+    case FspFsctlTransactSetVolumeInformationKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "SetVolumeInformation");
+        else
+            FspDebugLog("%S[TID=%04lx]: %p: <<SetVolumeInformation IoStatus=%lx[%ld] "
+                "VolumeInfo=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                FspDebugLogVolumeInfoString(&Response->Rsp.SetVolumeInformation.VolumeInfo, InfoBuf));
+        break;
+    case FspFsctlTransactQueryDirectoryKind:
+        FspDebugLogResponseStatus(Response, "QueryDirectory");
+        break;
+    case FspFsctlTransactFileSystemControlKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status) ||
+            0 == Response->Rsp.FileSystemControl.Buffer.Size)
+            FspDebugLogResponseStatus(Response, "FileSystemControl");
+        else
+            FspDebugLog("%S[TID=%04lx]: %p: <<FileSystemControl IoStatus=%lx[%ld] "
+                "ReparseData=%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                FspDebugLogReparseDataString(Response->Buffer + Response->Rsp.FileSystemControl.Buffer.Offset,
+                    InfoBuf));
+        break;
+    case FspFsctlTransactDeviceControlKind:
+        FspDebugLogResponseStatus(Response, "DEVICECONTROL");
+        break;
+    case FspFsctlTransactShutdownKind:
+        FspDebugLogResponseStatus(Response, "SHUTDOWN");
+        break;
+    case FspFsctlTransactLockControlKind:
+        FspDebugLogResponseStatus(Response, "LOCKCONTROL");
+        break;
+    case FspFsctlTransactQuerySecurityKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "QuerySecurity");
+        else
+        {
+            if (0 != Response->Rsp.QuerySecurity.SecurityDescriptor.Size)
+                ConvertSecurityDescriptorToStringSecurityDescriptorA(
+                    Response->Buffer + Response->Rsp.QuerySecurity.SecurityDescriptor.Offset,
+                    SDDL_REVISION_1,
+                    OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
+                    DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
+                    &Sddl, 0);
+            FspDebugLog("%S[TID=%04lx]: %p: <<QuerySecurity IoStatus=%lx[%ld] "
+                "Security=%s%s%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                Sddl ? "\"" : "",
+                Sddl ? Sddl : "NULL",
+                Sddl ? "\"" : "");
+            LocalFree(Sddl);
+        }
+        break;
+    case FspFsctlTransactSetSecurityKind:
+        if (!NT_SUCCESS(Response->IoStatus.Status))
+            FspDebugLogResponseStatus(Response, "SetSecurity");
+        else
+        {
+            if (0 != Response->Rsp.SetSecurity.SecurityDescriptor.Size)
+                ConvertSecurityDescriptorToStringSecurityDescriptorA(
+                    Response->Buffer + Response->Rsp.SetSecurity.SecurityDescriptor.Offset,
+                    SDDL_REVISION_1,
+                    OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
+                    DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION,
+                    &Sddl, 0);
+            FspDebugLog("%S[TID=%04lx]: %p: <<SetSecurity IoStatus=%lx[%ld] "
+                "Security=%s%s%s\n",
+                FspDiagIdent(), GetCurrentThreadId(), (PVOID)Response->Hint,
+                Response->IoStatus.Status, Response->IoStatus.Information,
+                Sddl ? "\"" : "",
+                Sddl ? Sddl : "NULL",
+                Sddl ? "\"" : "");
+            LocalFree(Sddl);
+        }
+        break;
+    case FspFsctlTransactQueryStreamInformationKind:
+        FspDebugLogResponseStatus(Response, "QueryStreamInformation");
+        break;
+    default:
+        FspDebugLogResponseStatus(Response, "INVALID");
+        break;
+    }
+}

src/dll/dirbuf.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/dirbuf.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -21,6 +21,11 @@
 
 #include <dll/library.h>
 
+#define FspFileSystemDirectoryBufferLoBound     (256)
+#define FspFileSystemDirectoryBufferHiBound     (1024 * 1024)
+#define FspFileSystemDirectoryBufferLoFactor    (4)
+#define FspFileSystemDirectoryBufferHiFactor    (2)
+
 #define RETURN(R, B)                    \
     do                                  \
     {                                   \
@@ -32,7 +37,7 @@
 typedef struct
 {
     SRWLOCK Lock;
-    ULONG Capacity, LoMark, HiMark;
+    ULONG InitialCapacity, Capacity, LoMark, HiMark;
     PUINT8 Buffer;
 } FSP_FILE_SYSTEM_DIRECTORY_BUFFER;
 
@@ -179,12 +184,15 @@ static VOID FspFileSystemQSortDirectoryBuffer(PUINT8 Buffer, PULONG Index, int l
     {
         while (r > l)
         {
-#if 0
+#if 1
             exch(Index[(l + r) / 2], Index[r - 1]);
             compexch(Index[l], Index[r - 1]);
             compexch(Index[l], Index[r]);
             compexch(Index[r - 1], Index[r]);
 
+            if (r - 1 <= l + 1)
+                break;
+
             i = FspFileSystemPartitionDirectoryBuffer(Buffer, Index, l + 1, r - 1);
 #else
             i = FspFileSystemPartitionDirectoryBuffer(Buffer, Index, l, r);
@@ -224,29 +232,37 @@ static inline VOID FspFileSystemSortDirectoryBuffer(FSP_FILE_SYSTEM_DIRECTORY_BU
     FspFileSystemQSortDirectoryBuffer(Buffer, Index, 0, Count - 1);
 }
 
-FSP_API BOOLEAN FspFileSystemAcquireDirectoryBuffer(PVOID *PDirBuffer,
-    BOOLEAN Reset, PNTSTATUS PResult)
+FSP_API BOOLEAN FspFileSystemAcquireDirectoryBufferEx(PVOID* PDirBuffer,
+    BOOLEAN Reset, ULONG CapacityHint, PNTSTATUS PResult)
 {
-    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = *PDirBuffer;
-    MemoryBarrier();
+    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = FspInterlockedLoadPointer(PDirBuffer);
 
     if (0 == DirBuffer)
     {
         static SRWLOCK CreateLock = SRWLOCK_INIT;
         FSP_FILE_SYSTEM_DIRECTORY_BUFFER *NewDirBuffer;
 
+        /* compute next (or equal) power of 2; ensure fits within bounds */
+        ULONG bitidx;
+        if (_BitScanReverse(&bitidx, CapacityHint - 1))
+            CapacityHint = (1 << (1 + bitidx));
+        CapacityHint = FspFileSystemDirectoryBufferLoBound > CapacityHint ?
+            FspFileSystemDirectoryBufferLoBound : CapacityHint;
+        CapacityHint = FspFileSystemDirectoryBufferHiBound < CapacityHint ?
+            FspFileSystemDirectoryBufferHiBound : CapacityHint;
+
         NewDirBuffer = MemAlloc(sizeof *NewDirBuffer);
         if (0 == NewDirBuffer)
             RETURN(STATUS_INSUFFICIENT_RESOURCES, FALSE);
         memset(NewDirBuffer, 0, sizeof *NewDirBuffer);
+        NewDirBuffer->InitialCapacity = CapacityHint;
         InitializeSRWLock(&NewDirBuffer->Lock);
         AcquireSRWLockExclusive(&NewDirBuffer->Lock);
 
         AcquireSRWLockExclusive(&CreateLock);
-        DirBuffer = *PDirBuffer;
-        MemoryBarrier();
+        DirBuffer = FspInterlockedLoadPointer(PDirBuffer);
         if (0 == DirBuffer)
-            *PDirBuffer = DirBuffer = NewDirBuffer;
+            FspInterlockedStorePointer(PDirBuffer, DirBuffer = NewDirBuffer);
         ReleaseSRWLockExclusive(&CreateLock);
 
         if (DirBuffer == NewDirBuffer)
@@ -269,12 +285,18 @@ FSP_API BOOLEAN FspFileSystemAcquireDirectoryBuffer(PVOID *PDirBuffer,
     RETURN(STATUS_SUCCESS, FALSE);
 }
 
+FSP_API BOOLEAN FspFileSystemAcquireDirectoryBuffer(PVOID *PDirBuffer,
+    BOOLEAN Reset, PNTSTATUS PResult)
+{
+    return FspFileSystemAcquireDirectoryBufferEx(PDirBuffer, Reset, 0, PResult);
+}
+
 FSP_API BOOLEAN FspFileSystemFillDirectoryBuffer(PVOID *PDirBuffer,
     FSP_FSCTL_DIR_INFO *DirInfo, PNTSTATUS PResult)
 {
     /* assume that FspFileSystemAcquireDirectoryBuffer has been called */
 
-    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = *PDirBuffer;
+    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = FspInterlockedLoadPointer(PDirBuffer);
     ULONG Capacity, LoMark, HiMark;
     PUINT8 Buffer;
 
@@ -303,7 +325,7 @@ FSP_API BOOLEAN FspFileSystemFillDirectoryBuffer(PVOID *PDirBuffer,
 
         if (0 == Buffer)
         {
-            Buffer = MemAlloc(Capacity = 512);
+            Buffer = MemAlloc(Capacity = DirBuffer->InitialCapacity);
             if (0 == Buffer)
                 RETURN(STATUS_INSUFFICIENT_RESOURCES, FALSE);
 
@@ -311,7 +333,9 @@ FSP_API BOOLEAN FspFileSystemFillDirectoryBuffer(PVOID *PDirBuffer,
         }
         else
         {
-            Buffer = MemRealloc(Buffer, Capacity = DirBuffer->Capacity * 2);
+            ULONG Factor = FspFileSystemDirectoryBufferHiBound > DirBuffer->Capacity ?
+                FspFileSystemDirectoryBufferLoFactor : FspFileSystemDirectoryBufferHiFactor;
+            Buffer = MemRealloc(Buffer, Capacity = DirBuffer->Capacity * Factor);
             if (0 == Buffer)
                 RETURN(STATUS_INSUFFICIENT_RESOURCES, FALSE);
 
@@ -333,7 +357,7 @@ FSP_API VOID FspFileSystemReleaseDirectoryBuffer(PVOID *PDirBuffer)
 {
     /* assume that FspFileSystemAcquireDirectoryBuffer has been called */
 
-    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = *PDirBuffer;
+    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = FspInterlockedLoadPointer(PDirBuffer);
 
     /* eliminate invalidated entries from the index */
     PULONG Index = (PULONG)(DirBuffer->Buffer + DirBuffer->HiMark);
@@ -356,8 +380,7 @@ FSP_API VOID FspFileSystemReadDirectoryBuffer(PVOID *PDirBuffer,
     PWSTR Marker,
     PVOID Buffer, ULONG Length, PULONG PBytesTransferred)
 {
-    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = *PDirBuffer;
-    MemoryBarrier();
+    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = FspInterlockedLoadPointer(PDirBuffer);
 
     if (0 != DirBuffer)
     {
@@ -396,14 +419,13 @@ FSP_API VOID FspFileSystemReadDirectoryBuffer(PVOID *PDirBuffer,
 
 FSP_API VOID FspFileSystemDeleteDirectoryBuffer(PVOID *PDirBuffer)
 {
-    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = *PDirBuffer;
-    MemoryBarrier();
+    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = FspInterlockedLoadPointer(PDirBuffer);
 
     if (0 != DirBuffer)
     {
         MemFree(DirBuffer->Buffer);
         MemFree(DirBuffer);
-        *PDirBuffer = 0;
+        FspInterlockedStorePointer(PDirBuffer, 0);
     }
 }
 
@@ -412,7 +434,7 @@ VOID FspFileSystemPeekInDirectoryBuffer(PVOID *PDirBuffer,
 {
     /* assume that FspFileSystemAcquireDirectoryBuffer has been called */
 
-    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = *PDirBuffer;
+    FSP_FILE_SYSTEM_DIRECTORY_BUFFER *DirBuffer = FspInterlockedLoadPointer(PDirBuffer);
 
     *PBuffer = DirBuffer->Buffer;
     *PIndex = (PULONG)(DirBuffer->Buffer + DirBuffer->HiMark);

src/dll/eventlog.c

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

src/dll/fs.c

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

src/dll/fsctl.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fsctl.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -26,6 +26,12 @@
 #define PREFIXW                         L"" FSP_FSCTL_VOLUME_PARAMS_PREFIX
 #define PREFIXW_SIZE                    (sizeof PREFIXW - sizeof(WCHAR))
 
+static INIT_ONCE FspFsctlServiceVersionInitOnce = INIT_ONCE_STATIC_INIT;
+static ULONG FspFsctlServiceVersionValue;
+static DWORD FspFsctlTransactCode = FSP_FSCTL_TRANSACT;
+static DWORD FspFsctlTransactBatchCode = FSP_FSCTL_TRANSACT_BATCH;
+
+static VOID FspFsctlServiceVersion(PUINT32 PVersion);
 static NTSTATUS FspFsctlStartService(VOID);
 
 FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath,
@@ -76,6 +82,9 @@ FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath,
     if (!NT_SUCCESS(Result))
         return Result;
 
+    /* initialize FspFsctlTransactCode */
+    FspFsctlServiceVersion(0);
+
     VolumeHandle = CreateFileW(DevicePathBuf,
         0, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
     if (INVALID_HANDLE_VALUE == VolumeHandle)
@@ -127,6 +136,7 @@ FSP_API NTSTATUS FspFsctlTransact(HANDLE VolumeHandle,
     BOOLEAN Batch)
 {
     NTSTATUS Result = STATUS_SUCCESS;
+    DWORD ControlCode;
     DWORD Bytes = 0;
 
     if (0 != PRequestBufSize)
@@ -135,8 +145,18 @@ FSP_API NTSTATUS FspFsctlTransact(HANDLE VolumeHandle,
         *PRequestBufSize = 0;
     }
 
+    /*
+     * During file system volume creation FspFsctlCreateVolume called FspFsctlServiceVersion
+     * which examined the version of the driver in use and initialized the variables
+     * FspFsctlTransactCode and FspFsctlTransactBatchCode with either the new
+     * FSP_IOCTL_TRANSACT* codes or the old FSP_FSCTL_TRANSACT* codes.
+     */
+    ControlCode = Batch ?
+        (DEBUGTEST(50) ? FspFsctlTransactBatchCode : FSP_FSCTL_TRANSACT_BATCH) :
+        (DEBUGTEST(50) ? FspFsctlTransactCode : FSP_FSCTL_TRANSACT);
+
     if (!DeviceIoControl(VolumeHandle,
-        Batch ? FSP_FSCTL_TRANSACT_BATCH : FSP_FSCTL_TRANSACT,
+        ControlCode,
         ResponseBuf, (DWORD)ResponseBufSize, RequestBuf, Bytes,
         &Bytes, 0))
     {
@@ -262,6 +282,79 @@ FSP_API NTSTATUS FspFsctlPreflight(PWSTR DevicePath)
     return STATUS_SUCCESS;
 }
 
+static BOOL WINAPI FspFsctlServiceVersionInitialize(
+    PINIT_ONCE InitOnce, PVOID Parameter, PVOID *Context)
+{
+    PWSTR DriverName = L"" FSP_FSCTL_DRIVER_NAME;
+    PWSTR ModuleFileName;
+    SC_HANDLE ScmHandle = 0;
+    SC_HANDLE SvcHandle = 0;
+    QUERY_SERVICE_CONFIGW *ServiceConfig = 0;
+    DWORD Size;
+
+    ScmHandle = OpenSCManagerW(0, 0, 0);
+    if (0 == ScmHandle)
+        goto exit;
+
+    SvcHandle = OpenServiceW(ScmHandle, DriverName, SERVICE_QUERY_CONFIG);
+    if (0 == SvcHandle)
+        goto exit;
+
+    if (QueryServiceConfig(SvcHandle, 0, 0, &Size) ||
+        ERROR_INSUFFICIENT_BUFFER != GetLastError())
+        goto exit;
+
+    ServiceConfig = MemAlloc(Size);
+    if (0 == ServiceConfig)
+        goto exit;
+
+    if (!QueryServiceConfig(SvcHandle, ServiceConfig, Size, &Size))
+        goto exit;
+
+    ModuleFileName = ServiceConfig->lpBinaryPathName;
+    if (L'\\' == ModuleFileName[0] &&
+        L'?'  == ModuleFileName[1] &&
+        L'?'  == ModuleFileName[2] &&
+        L'\\' == ModuleFileName[3])
+    {
+        if (L'U'  == ModuleFileName[4] &&
+            L'N'  == ModuleFileName[5] &&
+            L'C'  == ModuleFileName[6] &&
+            L'\\' == ModuleFileName[7])
+        {
+            ModuleFileName[6] = L'\\';
+            ModuleFileName = ModuleFileName + 6;
+        }
+        else
+            ModuleFileName = ModuleFileName + 4;
+    }
+
+    FspGetModuleVersion(ModuleFileName, &FspFsctlServiceVersionValue);
+
+    if (0x0001000b /*v1.11*/ <= FspFsctlServiceVersionValue)
+    {
+        FspFsctlTransactCode = FSP_IOCTL_TRANSACT;
+        FspFsctlTransactBatchCode = FSP_IOCTL_TRANSACT_BATCH;
+    }
+
+exit:
+    MemFree(ServiceConfig);
+    if (0 != SvcHandle)
+        CloseServiceHandle(SvcHandle);
+    if (0 != ScmHandle)
+        CloseServiceHandle(ScmHandle);
+
+    return TRUE;
+}
+
+static VOID FspFsctlServiceVersion(PUINT32 PVersion)
+{
+    InitOnceExecuteOnce(&FspFsctlServiceVersionInitOnce, FspFsctlServiceVersionInitialize, 0, 0);
+
+    if (0 != PVersion)
+        *PVersion = FspFsctlServiceVersionValue;
+}
+
 static NTSTATUS FspFsctlStartService(VOID)
 {
     static SRWLOCK Lock = SRWLOCK_INIT;
@@ -429,7 +522,7 @@ static NTSTATUS FspFsctlFixServiceSecurity(HANDLE SvcHandle)
              * required rights are not there if GetEffectiveRightsFromAclW fails; the worst
              * that can happen is that the rights get added twice (which is benign).
              *
-             * See https://github.com/billziss-gh/winfsp/issues/62
+             * See https://github.com/winfsp/winfsp/issues/62
              */
             AccessRights = 0;
     }

src/dll/fsop.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fsop.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -1142,7 +1142,8 @@ FSP_API NTSTATUS FspFileSystemOpSetInformation(FSP_FILE_SYSTEM *FileSystem,
         break;
     case 13/*FileDispositionInformation*/:
     case 64/*FileDispositionInformationEx*/:
-        if (0 == (0x10/*IGNORE_READONLY_ATTRIBUTE*/ & Request->Req.SetInformation.Info.DispositionEx.Flags) &&
+        if (1/*DELETE*/ == (0x11/*DELETE|IGNORE_READONLY_ATTRIBUTE*/ &
+                Request->Req.SetInformation.Info.DispositionEx.Flags) &&
             0 != FileSystem->Interface->GetFileInfo)
         {
             Result = FileSystem->Interface->GetFileInfo(FileSystem,

src/dll/fuse/fuse.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -82,6 +82,8 @@ static struct fuse_opt fsp_fuse_core_opts[] =
     FUSE_OPT_KEY("fstypename=", 'F'),
     FUSE_OPT_KEY("volname=", 'v'),
 
+    FUSE_OPT_KEY("uidmap=", 'm'),
+
     FSP_FUSE_CORE_OPT("SectorSize=%hu", VolumeParams.SectorSize, 4096),
     FSP_FUSE_CORE_OPT("SectorsPerAllocationUnit=%hu", VolumeParams.SectorsPerAllocationUnit, 1),
     FSP_FUSE_CORE_OPT("MaxComponentLength=%hu", VolumeParams.MaxComponentLength, 0),
@@ -293,43 +295,241 @@ static int fsp_fuse_sddl_to_security(const char *Sddl, PUINT8 Security, PULONG P
     return res;
 }
 
-static int fsp_fuse_username_to_uid(const char *username, int *puid)
+static int fsp_fuse_tokenuser_to_sid(HANDLE Token, PSID Sid, PULONG PSidSize)
+{
+    union
+    {
+        TOKEN_USER V;
+        UINT8 B[128];
+    } InfoBuf;
+    PTOKEN_USER InfoPtr = &InfoBuf.V;
+    DWORD Size;
+    int res = -1;
+
+    if (!GetTokenInformation(Token, TokenUser, InfoPtr, sizeof InfoBuf, &Size))
+    {
+        if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
+            goto exit;
+
+        InfoPtr = MemAlloc(Size);
+        if (0 == InfoPtr)
+            goto exit;
+
+        if (!GetTokenInformation(Token, TokenUser, InfoPtr, Size, &Size))
+            goto exit;
+    }
+
+    Size = GetLengthSid(InfoPtr->User.Sid);
+    if (*PSidSize >= Size)
+    {
+        memcpy(Sid, InfoPtr->User.Sid, Size);
+        *PSidSize = Size;
+
+        res = 0;
+    }
+
+exit:
+    if (InfoPtr != &InfoBuf.V)
+        MemFree(InfoPtr);
+
+    return res;
+}
+
+static int fsp_fuse_tokenuser_is_azuread(HANDLE Token)
 {
     union
     {
         SID V;
         UINT8 B[SECURITY_MAX_SID_SIZE];
     } SidBuf;
+    ULONG Size;
+    PSID Sid = &SidBuf.V;
+    BYTE Count, Authority;
+    UINT32 SubAuthority0;
+
+    Size = sizeof SidBuf;
+    if (-1 == fsp_fuse_tokenuser_to_sid(Token, &SidBuf.V, &Size))
+        return 0;
+
+    Count = *GetSidSubAuthorityCount(Sid);
+    Authority = GetSidIdentifierAuthority(Sid)->Value[5];
+    SubAuthority0 = 2 <= Count ? *GetSidSubAuthority(Sid, 0) : 0;
+
+    return 12 == Authority && 1 == SubAuthority0;
+}
+
+static int fsp_fuse_username_to_sid(const char *UserName, PSID Sid, PULONG PSidSize)
+{
+    union
+    {
+        SID V;
+        UINT8 B[SECURITY_MAX_SID_SIZE];
+    } SidBuf;
+    PSID SidPtr = &SidBuf.V;
     char Name[256], Domn[256];
-    DWORD SidSize, NameSize, DomnSize;
+    DWORD Size, NameSize, DomnSize;
     SID_NAME_USE Use;
+    int res = -1;
+
+    if ('S' == UserName[0] && '-' == UserName[1] && '1' == UserName[2] && '-' == UserName[3])
+    {
+        if (!ConvertStringSidToSidA(UserName, &SidPtr))
+            goto exit;
+    }
+    else
+    {
+        NameSize = lstrlenA(UserName) + 1;
+        if (sizeof Name / sizeof Name[0] < NameSize)
+            goto exit;
+        memcpy(Name, UserName, NameSize);
+        for (PSTR P = Name, EndP = P + NameSize; EndP > P; P++)
+            if ('+' == *P)
+                *P = '\\';
+
+        Size = sizeof SidBuf;
+        DomnSize = sizeof Domn / sizeof Domn[0];
+        if (!LookupAccountNameA(0, Name, SidPtr, &Size, Domn, &DomnSize, &Use))
+            goto exit;
+    }
+
+    Size = GetLengthSid(SidPtr);
+    if (*PSidSize >= Size)
+    {
+        memcpy(Sid, SidPtr, Size);
+        *PSidSize = Size;
+
+        res = 0;
+    }
+
+exit:
+    if (SidPtr != &SidBuf.V)
+        LocalFree(SidPtr);
+
+    return res;
+}
+
+static int fsp_fuse_username_to_uid(const char *UserName, int *PUid)
+{
+    union
+    {
+        SID V;
+        UINT8 B[SECURITY_MAX_SID_SIZE];
+    } SidBuf;
+    ULONG SidSize;
     UINT32 Uid;
     NTSTATUS Result;
 
-    *puid = 0;
-
-    NameSize = lstrlenA(username) + 1;
-    if (sizeof Name / sizeof Name[0] < NameSize)
-        return -1;
-    memcpy(Name, username, NameSize);
-    for (PSTR P = Name, EndP = P + NameSize; EndP > P; P++)
-        if ('+' == *P)
-            *P = '\\';
+    *PUid = 0;
 
     SidSize = sizeof SidBuf;
-    DomnSize = sizeof Domn / sizeof Domn[0];
-    if (!LookupAccountNameA(0, Name, &SidBuf, &SidSize, Domn, &DomnSize, &Use))
+    if (-1 == fsp_fuse_username_to_sid(UserName, &SidBuf.V, &SidSize))
         return -1;
 
-    Result = FspPosixMapSidToUid(&SidBuf, &Uid);
+    Result = FspPosixMapSidToUid(&SidBuf.V, &Uid);
     if (!NT_SUCCESS(Result))
         return -1;
 
-    *puid = Uid;
+    *PUid = Uid;
 
     return 0;
 }
 
+static int fsp_fuse_set_uidmap(const char *Spec)
+{
+    char Buf[1024], *P = Buf, *UidP, *UserP, C;
+    int Len;
+    UINT32 Uid[8];
+    PSID Sid[8];
+    union
+    {
+        SID V;
+        UINT8 B[SECURITY_MAX_SID_SIZE];
+    } SidBuf[8];
+    ULONG SidSize;
+    ULONG Count;
+    NTSTATUS Result;
+    int res = -1;
+
+    Len = lstrlenA(Spec);
+    if (sizeof Buf <= Len)
+        return -1;
+    memcpy(Buf, Spec, Len + 1);
+
+    Count = 0;
+    for (;;)
+    {
+        if (sizeof Uid / sizeof Uid[0] <= Count)
+        {
+            /* out of space */
+            goto exit;
+        }
+
+        UidP = P;
+        for (; '\0' != (C = *P) && ';' != C && ':' != C; P++)
+            ;
+        *P = '\0';
+
+        if (UidP == P)
+            break;
+
+        Uid[Count] = strtouint(UidP, 0, 10, 0);
+        if (0 == Uid[Count])
+        {
+            /* invalid uid */
+            goto exit;
+        }
+
+        UserP = 0;
+        if (':' == C)
+        {
+            UserP = ++P;
+            for (; '\0' != (C = *P) && ';' != C; P++)
+                ;
+            *P = '\0';
+        }
+
+        if (0 != UserP && '\0' != *UserP)
+        {
+            SidSize = sizeof SidBuf[Count];
+            if (-1 == fsp_fuse_username_to_sid(UserP, &SidBuf[Count].V, &SidSize))
+            {
+                /* invalid SID */
+                goto exit;
+            }
+            Sid[Count] = &SidBuf[Count].V;
+        }
+        else
+        {
+            HANDLE Token;
+            if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token))
+            {
+                SidSize = sizeof SidBuf[Count];
+                if (-1 == fsp_fuse_tokenuser_to_sid(Token, &SidBuf[Count].V, &SidSize))
+                {
+                    /* invalid SID */
+                    CloseHandle(Token);
+                    goto exit;
+                }
+                CloseHandle(Token);
+                Sid[Count] = &SidBuf[Count].V;
+            }
+        }
+
+        Count++;
+
+        if ('\0' == C)
+            break;
+
+        P++;
+    }
+
+    Result = FspPosixSetUidMap(Uid, Sid, Count);
+    res = NT_SUCCESS(Result) ? 0 : -1;
+
+exit:
+    return res;
+}
+
 static int fsp_fuse_utf8towcs_trunc(
     const char *Str, int StrLen,
     PWSTR Wcs, int WcsLen)
@@ -424,6 +624,7 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
             "    -o KeepFileCache           do not discard cache when files are closed\n"
             "    -o LegacyUnlinkRename      do not support new POSIX unlink/rename\n"
             "    -o ThreadCount             number of file system dispatcher threads\n"
+            "    -o uidmap=UID:SID[;...]    explicit UID <-> SID map (max 8 entries)\n"
             );
         opt_data->help = 1;
         return 1;
@@ -531,6 +732,14 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
         if (0 == opt_data->VolumeLabelLength)
             return -1;
         return 0;
+    case 'm':
+        arg += sizeof "uidmap=" - 1;
+        if (-1 == fsp_fuse_set_uidmap(arg))
+        {
+            opt_data->set_uidmap = -1;
+            return -1;
+        }
+        return 0;
     }
 }
 
@@ -579,6 +788,11 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
             ErrorMessage = L": invalid user or group name.";
             goto fail;
         }
+        else if (-1 == opt_data.set_uidmap)
+        {
+            ErrorMessage = L": invalid uidmap.";
+            goto fail;
+        }
         return 0;
     }
     if (opt_data.help)
@@ -601,6 +815,10 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
 
         if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token))
         {
+            /* if an AzureAD user and no uidmap specified, set a default uidmap that matches Cygwin */
+            if (!opt_data.set_uidmap && fsp_fuse_tokenuser_is_azuread(Token))
+                fsp_fuse_set_uidmap("4096:");
+
             fsp_fuse_get_token_uidgid(Token, TokenUser,
                 opt_data.set_uid && -1 == opt_data.uid ? &opt_data.uid : 0,
                 opt_data.set_gid && -1 == opt_data.gid ? &opt_data.gid : 0);

src/dll/fuse/fuse.pc.in

@@ -5,6 +5,6 @@ implib=${prefix}/bin/winfsp-${arch}.dll
 Name: fuse
 Description: WinFsp FUSE compatible API
 Version: 2.8
-URL: http://www.secfs.net/winfsp/
+URL: https://winfsp.dev
 Libs: "${implib}"
 Cflags: -I"${incdir}"

src/dll/fuse/fuse_compat.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_compat.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 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-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -850,6 +850,29 @@ exit:
     return Result;
 }
 
+static VOID fsp_fuse_intf_GetOpenFileInfoPath(
+    struct fuse *f,
+    const char *PosixPath,
+    struct fuse_file_info *fi,
+    FSP_FSCTL_OPEN_FILE_INFO *OpenFileInfo)
+{
+    char PosixNormalizedName[FSP_FSCTL_TRANSACT_PATH_SIZEMAX / sizeof(WCHAR)];
+    PWSTR NormalizedName;
+    ULONG NormalizedNameSize;
+
+    if (0 == f->ops.getpath(PosixPath, PosixNormalizedName, sizeof PosixNormalizedName, fi) &&
+        NT_SUCCESS(FspPosixMapPosixToWindowsPath(PosixNormalizedName, &NormalizedName)))
+    {
+        NormalizedNameSize = lstrlenW(NormalizedName) * sizeof(WCHAR);
+        if (OpenFileInfo->NormalizedNameSize >= NormalizedNameSize)
+        {
+            OpenFileInfo->NormalizedNameSize = (UINT16)NormalizedNameSize;
+            memcpy(OpenFileInfo->NormalizedName, NormalizedName, NormalizedNameSize);
+        }
+        FspPosixDeletePath(NormalizedName);
+    }
+}
+
 static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
     PWSTR FileName, UINT32 CreateOptions, UINT32 GrantedAccess,
     UINT32 FileAttributes, PSECURITY_DESCRIPTOR SecurityDescriptor, UINT64 AllocationSize,
@@ -1005,7 +1028,7 @@ static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
         {
             Result = FspFileSystemEnumerateEa(FileSystem,
                 fsp_fuse_intf_SetEaEntry, contexthdr->PosixPath, ExtraBuffer, ExtraLength);
-            if (!NT_SUCCESS(Result))
+            if (!NT_SUCCESS(Result) && STATUS_INVALID_DEVICE_REQUEST != Result)
                 goto exit;
         }
         else
@@ -1015,13 +1038,6 @@ static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
             goto exit;
         }
     }
-    /*
-     * Ignore fuse_file_info::direct_io, fuse_file_info::keep_cache.
-     * NOTE: Originally WinFsp dit not support disabling the cache manager
-     * for an individual file. This is now possible and we should revisit.
-     *
-     * Ignore fuse_file_info::nonseekable.
-     */
 
     Result = fsp_fuse_intf_GetFileInfoEx(FileSystem, contexthdr->PosixPath,
         FUSE_FILE_INFO(CreateOptions & FILE_DIRECTORY_FILE, &fi),
@@ -1029,6 +1045,14 @@ static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
     if (!NT_SUCCESS(Result))
         goto exit;
 
+    /*
+     * Ignore fuse_file_info::direct_io, 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.
+     */
+
     *PFileDesc = filedesc;
     memcpy(FileInfo, &FileInfoBuf, sizeof FileInfoBuf);
 
@@ -1040,6 +1064,10 @@ static NTSTATUS fsp_fuse_intf_Create(FSP_FILE_SYSTEM *FileSystem,
     filedesc->DirBuffer = 0;
     contexthdr->PosixPath = 0;
 
+    if (!f->VolumeParams.CaseSensitiveSearch && 0 != f->ops.getpath)
+        fsp_fuse_intf_GetOpenFileInfoPath(f, filedesc->PosixPath, -1 != fi.fh ? &fi : 0,
+            FspFileSystemGetOpenFileInfo(FileInfo));
+
     Result = STATUS_SUCCESS;
 
 exit:
@@ -1163,10 +1191,9 @@ static NTSTATUS fsp_fuse_intf_Open(FSP_FILE_SYSTEM *FileSystem,
         goto exit;
 
     /*
-     * Ignore fuse_file_info::direct_io, fuse_file_info::keep_cache
-     * WinFsp does not currently support disabling the cache manager
-     * for an individual file although it should not be hard to add
-     * if required.
+     * Ignore fuse_file_info::direct_io, fuse_file_info::keep_cache.
+     * NOTE: Originally WinFsp did not support disabling the cache manager
+     * for an individual file. This is now possible and we should revisit.
      *
      * Ignore fuse_file_info::nonseekable.
      */
@@ -1182,6 +1209,10 @@ static NTSTATUS fsp_fuse_intf_Open(FSP_FILE_SYSTEM *FileSystem,
     filedesc->DirBuffer = 0;
     contexthdr->PosixPath = 0;
 
+    if (!f->VolumeParams.CaseSensitiveSearch && 0 != f->ops.getpath)
+        fsp_fuse_intf_GetOpenFileInfoPath(f, filedesc->PosixPath, -1 != fi.fh ? &fi : 0,
+            FspFileSystemGetOpenFileInfo(FileInfo));
+
     Result = STATUS_SUCCESS;
 
 exit:
@@ -1225,7 +1256,7 @@ static NTSTATUS fsp_fuse_intf_Overwrite(FSP_FILE_SYSTEM *FileSystem,
 
         Result = FspFileSystemEnumerateEa(FileSystem,
             fsp_fuse_intf_SetEaEntry, filedesc->PosixPath, Ea, EaLength);
-        if (!NT_SUCCESS(Result))
+        if (!NT_SUCCESS(Result) && STATUS_INVALID_DEVICE_REQUEST != Result)
             return Result;
     }
 
@@ -2112,6 +2143,10 @@ static NTSTATUS fsp_fuse_intf_GetDirInfoByName(FSP_FILE_SYSTEM *FileSystem,
     char PosixPath[FSP_FSCTL_TRANSACT_PATH_SIZEMAX / sizeof(WCHAR)];
     int ParentLength, FSlashLength, PosixNameLength;
     UINT32 Uid, Gid, Mode;
+    char PosixNormalizedName[FSP_FSCTL_TRANSACT_PATH_SIZEMAX / sizeof(WCHAR)];
+    PWSTR NormalizedName, NormalizedNameSuffix;
+    ULONG NormalizedNameSize;
+    BOOLEAN Normalized = FALSE;
     NTSTATUS Result;
 
     if (!filedesc->IsDirectory || filedesc->IsReparsePoint)
@@ -2145,13 +2180,33 @@ static NTSTATUS fsp_fuse_intf_GetDirInfoByName(FSP_FILE_SYSTEM *FileSystem,
         goto exit;
     }
 
-    /*
-     * FUSE does not do FileName normalization; so just return the FileName as given to us!
-     */
-
     //memset(DirInfo->Padding, 0, sizeof DirInfo->Padding);
-    DirInfo->Size = (UINT16)(sizeof(FSP_FSCTL_DIR_INFO) + lstrlenW(FileName) * sizeof(WCHAR));
-    memcpy(DirInfo->FileNameBuf, FileName, DirInfo->Size - sizeof(FSP_FSCTL_DIR_INFO));
+
+    if (!f->VolumeParams.CaseSensitiveSearch && 0 != f->ops.getpath)
+    {
+        if (0 == f->ops.getpath(PosixPath, PosixNormalizedName, sizeof PosixNormalizedName, 0) &&
+            NT_SUCCESS(FspPosixMapPosixToWindowsPath(PosixNormalizedName, &NormalizedName)))
+        {
+            NormalizedNameSuffix = NormalizedName;
+            for (PWSTR P = NormalizedNameSuffix; *P; P++)
+                if (L'\\' == *P)
+                    NormalizedNameSuffix = P + 1;
+            NormalizedNameSize = lstrlenW(NormalizedNameSuffix) * sizeof(WCHAR);
+            if (f->VolumeParams.MaxComponentLength * sizeof(WCHAR) >= NormalizedNameSize)
+            {
+                DirInfo->Size = (UINT16)(sizeof(FSP_FSCTL_DIR_INFO) + NormalizedNameSize);
+                memcpy(DirInfo->FileNameBuf, NormalizedNameSuffix, NormalizedNameSize);
+                Normalized = TRUE;
+            }
+            FspPosixDeletePath(NormalizedName);
+        }
+    }
+
+    if (!Normalized)
+    {
+        DirInfo->Size = (UINT16)(sizeof(FSP_FSCTL_DIR_INFO) + lstrlenW(FileName) * sizeof(WCHAR));
+        memcpy(DirInfo->FileNameBuf, FileName, DirInfo->Size - sizeof(FSP_FSCTL_DIR_INFO));
+    }
 
     Result = STATUS_SUCCESS;
 

src/dll/fuse/fuse_loop.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_loop.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -95,9 +95,9 @@ static NTSTATUS fsp_fuse_loop_start(struct fuse *f)
         context->private_data = f->data = f->ops.init(&conn);
         f->VolumeParams.ReadOnlyVolume = 0 != (conn.want & FSP_FUSE_CAP_READ_ONLY);
         f->VolumeParams.CaseSensitiveSearch = 0 == (conn.want & FSP_FUSE_CAP_CASE_INSENSITIVE);
-        if (!f->VolumeParams.CaseSensitiveSearch)
+        if (!f->VolumeParams.CaseSensitiveSearch && 0 == f->ops.getpath)
             /*
-             * Disable GetDirInfoByName when file system is case-insensitive.
+             * Disable GetDirInfoByName when file system is case-insensitive and getpath == 0.
              * The reason is that Windows always sends us queries with uppercase
              * file names in GetDirInfoByName and we have no way in FUSE to normalize
              * those file names when embedding them in FSP_FSCTL_DIR_INFO.
@@ -184,9 +184,19 @@ static NTSTATUS fsp_fuse_loop_start(struct fuse *f)
             f->has_slashdot = 0 == err && 0040000 == (stbuf.st_mode & 0170000);
         }
     }
+    if (0 == (f->conn_want & FSP_FUSE_CAP_DELETE_ACCESS) || 0 == f->ops.access)
+        f->VolumeParams.PostDispositionWhenNecessaryOnly = 1;
     if (0 != f->ops.listxattr && 0 != f->ops.getxattr &&
         0 != f->ops.setxattr && 0 != f->ops.removexattr)
-        f->VolumeParams.ExtendedAttributes = 1;
+    {
+        char buf[1024];
+        int err;
+
+        /* if this fails with ENOSYS, then no EA support */
+        err = f->ops.getxattr("/",
+            "non-existant-a11ec902d22f4ec49003af15282d3b00", buf, sizeof buf);
+        f->VolumeParams.ExtendedAttributes = -ENOSYS_(f->env) != err;
+    }
 
     /* the FSD does not currently limit these VolumeParams fields; do so here! */
     if (f->VolumeParams.SectorSize < FSP_FUSE_SECTORSIZE_MIN ||
@@ -194,7 +204,7 @@ static NTSTATUS fsp_fuse_loop_start(struct fuse *f)
         f->VolumeParams.SectorSize = FSP_FUSE_SECTORSIZE_MAX;
     if (f->VolumeParams.SectorsPerAllocationUnit == 0)
         f->VolumeParams.SectorsPerAllocationUnit = 1;
-    if (f->VolumeParams.MaxComponentLength > 255)
+    if (f->VolumeParams.MaxComponentLength == 0 || f->VolumeParams.MaxComponentLength > 255)
         f->VolumeParams.MaxComponentLength = 255;
 
     if (0 == f->VolumeParams.VolumeCreationTime)

src/dll/fuse/fuse_main.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/fuse_main.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 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-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.

src/dll/fuse/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/fuse/library.h
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -147,6 +147,7 @@ struct fsp_fuse_core_opt_data
         set_create_dir_umask, create_dir_umask,
         set_uid, uid, username_to_uid_result,
         set_gid, gid,
+        set_uidmap,
         set_attr_timeout, attr_timeout,
         rellinks,
         dothidden;

src/dll/fuse3/fuse2to3.c

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

src/dll/fuse3/fuse3.c

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

src/dll/fuse3/fuse3.pc.in

@@ -5,6 +5,6 @@ implib=${prefix}/bin/winfsp-${arch}.dll
 Name: fuse3
 Description: WinFsp FUSE3 compatible API
 Version: 3.2
-URL: http://www.secfs.net/winfsp/
+URL: https://winfsp.dev
 Libs: "${implib}"
 Cflags: -I"${incdir}"

src/dll/fuse3/fuse3_compat.c

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

src/dll/fuse3/library.h

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

src/dll/launch.c

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

src/dll/ldap.c

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

src/dll/library.c

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

src/dll/library.h

@@ -1,7 +1,7 @@
 /**
  * @file dll/library.h
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -46,6 +46,15 @@
 #define DEBUGLOGSID(fmt, Sid)           ((void)0)
 #endif
 
+/* DEBUGTEST */
+#if !defined(NDEBUG)
+ULONG DebugRandom(VOID);
+#define DEBUGTEST(Percent)              \
+    (DebugRandom() <= (Percent) * 0x7fff / 100)
+#else
+#define DEBUGTEST(Percent)              (TRUE)
+#endif
+
 VOID FspWksidFinalize(BOOLEAN Dynamic);
 VOID FspPosixFinalize(BOOLEAN Dynamic);
 VOID FspEventLogFinalize(BOOLEAN Dynamic);
@@ -72,6 +81,7 @@ ULONG FspLdapGetDefaultNamingContext(PVOID Ldap, PWSTR *PValue);
 ULONG FspLdapGetTrustPosixOffset(PVOID Ldap, PWSTR Context, PWSTR Domain, PWSTR *PValue);
 
 PWSTR FspDiagIdent(VOID);
+NTSTATUS FspGetModuleVersion(PWSTR ModuleFileName, PUINT32 PVersion);
 
 #define FspFileSystemDirectoryBufferEntryInvalid ((ULONG)-1)
 VOID FspFileSystemPeekInDirectoryBuffer(PVOID *PDirBuffer,

src/dll/mount.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/mount.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -20,6 +20,7 @@
  */
 
 #include <dll/library.h>
+#include <dbt.h>
 
 static INIT_ONCE FspMountInitOnce = INIT_ONCE_STATIC_INIT;
 static NTSTATUS (NTAPI *FspNtOpenSymbolicLinkObject)(
@@ -28,28 +29,30 @@ static NTSTATUS (NTAPI *FspNtMakeTemporaryObject)(
     HANDLE Handle);
 static NTSTATUS (NTAPI *FspNtClose)(
     HANDLE Handle);
-static BOOLEAN FspMountDoNotUseLauncher;
+static BOOLEAN FspMountDoNotUseLauncherValue;
+static BOOLEAN FspMountBroadcastDriveChangeValue;
 
 static VOID FspMountInitializeFromRegistry(VOID)
 {
-    HKEY RegKey;
-    LONG Result;
+    DWORD Value;
     DWORD Size;
-    DWORD MountDoNotUseLauncher;
+    LONG Result;
 
-    MountDoNotUseLauncher = 0;
-
-    Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\" FSP_FSCTL_PRODUCT_NAME,
-        0, KEY_READ | KEY_WOW64_32KEY, &RegKey);
+    Value = 0;
+    Size = sizeof Value;
+    Result = RegGetValueW(HKEY_LOCAL_MACHINE, L"" FSP_FSCTL_PRODUCT_FULL_REGKEY,
+        L"MountDoNotUseLauncher",
+        RRF_RT_REG_DWORD, 0, &Value, &Size);
     if (ERROR_SUCCESS == Result)
-    {
-        Size = sizeof MountDoNotUseLauncher;
-        Result = RegGetValueW(RegKey, 0, L"MountDoNotUseLauncher",
-            RRF_RT_REG_DWORD, 0, &MountDoNotUseLauncher, &Size);
-        RegCloseKey(RegKey);
-    }
+        FspMountDoNotUseLauncherValue = !!Value;
 
-    FspMountDoNotUseLauncher = !!MountDoNotUseLauncher;
+    Value = 0;
+    Size = sizeof Value;
+    Result = RegGetValueW(HKEY_LOCAL_MACHINE, L"" FSP_FSCTL_PRODUCT_FULL_REGKEY,
+        L"MountBroadcastDriveChange",
+        RRF_RT_REG_DWORD, 0, &Value, &Size);
+    if (ERROR_SUCCESS == Result)
+        FspMountBroadcastDriveChangeValue = !!Value;
 }
 
 static BOOL WINAPI FspMountInitialize(
@@ -382,6 +385,48 @@ static NTSTATUS FspLauncherDefineDosDevice(
     return !NT_SUCCESS(Result) ? Result : FspNtStatusFromWin32(ErrorCode);
 }
 
+static VOID FspMountBroadcastDriveChange(PWSTR MountPoint, WPARAM WParam)
+{
+    /*
+     * DefineDosDeviceW (either directly or via the CSRSS) broadcasts a WM_DEVICECHANGE message
+     * when a drive is added/removed. Unfortunately on some systems this broadcast fails. The
+     * result is that Explorer does not receive the WM_DEVICECHANGE notification and does not
+     * become aware of the drive change. This results in only minor UI issues for local drives,
+     * but more seriously it makes network drives inaccessible from some Explorer windows.
+     *
+     * The problem is that BroadcastSystemMessage can hang indefinitely when supplied the flags
+     * NOHANG | FORCEIFHUNG | NOTIMEOUTIFNOTHUNG. The NOTIMEOUTIFNOTHUNG flag instructs the BSM
+     * API to not timeout an app that is not considered hung; however an app that is not hung may
+     * still fail to respond to a broadcasted message indefinitely. This can result in the BSM
+     * API never returning ("hanging").
+     *
+     * To resolve this we simply call BroadcastSystemMessage with BSF_POSTMESSAGE. (It would work
+     * with BSF_NOHANG | BSF_FORCEIFHUNG and without NOTIMEOUTIFNOTHUNG, but BSF_POSTMESSAGE is
+     * faster).
+     */
+
+    BOOLEAN IsLocalSystem;
+    DEV_BROADCAST_VOLUME DriveChange;
+    DWORD Flags, Recipients;
+
+    FspServiceContextCheck(0, &IsLocalSystem);
+
+    memset(&DriveChange, 0, sizeof DriveChange);
+    DriveChange.dbcv_size = sizeof DriveChange;
+    DriveChange.dbcv_devicetype = DBT_DEVTYP_VOLUME;
+    DriveChange.dbcv_flags = DBTF_NET;
+    DriveChange.dbcv_unitmask = 1 << (MountPoint[0] - 'a');
+
+    Flags = BSF_POSTMESSAGE;
+    Recipients = BSM_APPLICATIONS | (IsLocalSystem ? BSM_ALLDESKTOPS : 0);
+    BroadcastSystemMessageW(
+        Flags,
+        &Recipients,
+        WM_DEVICECHANGE,
+        WParam,
+        (LPARAM)&DriveChange);
+}
+
 static NTSTATUS FspMountSet_Drive(PWSTR VolumeName, PWSTR MountPoint, PHANDLE PMountHandle)
 {
     NTSTATUS Result;
@@ -391,7 +436,7 @@ static NTSTATUS FspMountSet_Drive(PWSTR VolumeName, PWSTR MountPoint, PHANDLE PM
 
     Result = FspServiceContextCheck(0, &IsLocalSystem);
     IsServiceContext = NT_SUCCESS(Result) && !IsLocalSystem;
-    if (IsServiceContext && !FspMountDoNotUseLauncher)
+    if (IsServiceContext && !FspMountDoNotUseLauncherValue)
     {
         /*
          * If the current process is in the service context but not LocalSystem,
@@ -409,6 +454,13 @@ static NTSTATUS FspMountSet_Drive(PWSTR VolumeName, PWSTR MountPoint, PHANDLE PM
     {
         if (!DefineDosDeviceW(DDD_RAW_TARGET_PATH, MountPoint, VolumeName))
             return FspNtStatusFromWin32(GetLastError());
+
+        /*
+         * On some systems DefineDosDeviceW fails to properly broadcast the WM_DEVICECHANGE
+         * notification. So use a workaround. See comments in FspMountBroadcastDriveChange.
+         */
+        if (FspMountBroadcastDriveChangeValue)
+            FspMountBroadcastDriveChange(MountPoint, DBT_DEVICEARRIVAL);
     }
 
     if (0 != FspNtOpenSymbolicLinkObject)
@@ -464,9 +516,18 @@ static NTSTATUS FspMountRemove_Drive(PWSTR VolumeName, PWSTR MountPoint, HANDLE
          */
         Result = FspLauncherDefineDosDevice(L'-', MountPoint, VolumeName);
     else
+    {
         Result = DefineDosDeviceW(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE,
             MountPoint, VolumeName) ? STATUS_SUCCESS : FspNtStatusFromWin32(GetLastError());
 
+        /*
+         * On some systems DefineDosDeviceW fails to properly broadcast the WM_DEVICECHANGE
+         * notification. So use a workaround. See comments in FspMountBroadcastDriveChange.
+         */
+        if (FspMountBroadcastDriveChangeValue)
+            FspMountBroadcastDriveChange(MountPoint, DBT_DEVICEREMOVECOMPLETE);
+    }
+
     if (0 != MountHandle)
         FspNtClose(MountHandle);
 

src/dll/np.c

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

src/dll/ntstatus.c

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

src/dll/path.c

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

src/dll/security.c

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

src/dll/service.c

@@ -1,7 +1,7 @@
 /**
  * @file dll/service.c
  *
- * @copyright 2015-2021 Bill Zissimopoulos
+ * @copyright 2015-2022 Bill Zissimopoulos
  */
 /*
  * This file is part of WinFsp.
@@ -275,8 +275,7 @@ FSP_API NTSTATUS FspServiceLoop(FSP_SERVICE *Service)
         else
         {
             ResetEvent(FspServiceConsoleModeEvent);
-            FspServiceConsoleCtrlHandlerDisabled = 0;
-            MemoryBarrier();
+            FspInterlockedStore32((INT32 *)&FspServiceConsoleCtrlHandlerDisabled, 0);
         }
 #endif
 
@@ -326,8 +325,7 @@ FSP_API NTSTATUS FspServiceLoop(FSP_SERVICE *Service)
          *
          * What we do instead is disable our handler by setting a variable.
          */
-        FspServiceConsoleCtrlHandlerDisabled = 1;
-        MemoryBarrier();
+        FspInterlockedStore32((INT32 *)&FspServiceConsoleCtrlHandlerDisabled, 1);
     }
 
     Result = STATUS_SUCCESS;
@@ -517,8 +515,7 @@ static DWORD WINAPI FspServiceConsoleModeThread(PVOID Context)
 /* expose FspServiceConsoleCtrlHandler so it can be used from fsp_fuse_signal_handler */
 BOOL WINAPI FspServiceConsoleCtrlHandler(DWORD CtrlType)
 {
-    UINT32 Disabled = FspServiceConsoleCtrlHandlerDisabled;
-    MemoryBarrier();
+    UINT32 Disabled = FspInterlockedLoad32((INT32 *)&FspServiceConsoleCtrlHandlerDisabled);
     if (Disabled)
         return FALSE;