tools: run-tests: disable passthrough-cpp that is no longer included in installer

Changelog.asciidoc

@@ -5,6 +5,22 @@ v1.1 (2017.1)::
 
 This release brings some major new components and improvements.
 
+- A .NET layer that allows the creation of file systems in managed mode. This is contained in the new `winfsp-msil.dll`. The new .NET layer is being tested with the WinFsp test suites and Microsoft's ifstest.
+- FUSE for Cygwin is now included with the installer.
+- FUSE now has a `-ovolname=VOLNAME` parameter that allows setting the volume label. Thanks @samkelly.
+- A number of other FUSE improvements have been made (see issue #85).
+
+NOTE: The C++ layer included in the v1.1 beta releases is not part of this release as it is still work in progress. It can be found in `inc/winfsp/winfsp.hpp` in the WinFsp source repository.
+
+
+v1.1B3 (2017.1 B3)::
+
+v1.1B2 (2017.1 B2)::
+
+v1.1B1 (2017.1 BETA)::
+
+This release brings some major new components and improvements.
+
 - A .NET layer that allows the creation of file systems in managed mode. This is contained in the new `winfsp-msil.dll`. The new .NET layer is being tested with the WinFsp test suites and Microsoft's ifstest.
 - A simple C++ layer can be found in `inc/winfsp/winfsp.hpp`.
 - FUSE for Cygwin is now included with the installer.

build/VStudio/installer/Product.wxs

@@ -252,9 +252,9 @@
                 <Component Id="C.winfsp.h">
                     <File Name="winfsp.h" KeyPath="yes" />
                 </Component>
-                <Component Id="C.winfsp.hpp">
+                <!--Component Id="C.winfsp.hpp">
                     <File Name="winfsp.hpp" KeyPath="yes" />
-                </Component>
+                </Component-->
             </Directory>
             <Directory Id="INCDIR.fuse" Name="fuse">
                 <Component Id="C.fuse.h">
@@ -301,9 +301,16 @@
         </DirectoryRef>
         <DirectoryRef Id="OPTDIR">
             <Directory Id="OPTDIR.cygfuse" Name="cygfuse" FileSource="..\..\..\opt\cygfuse\dist">
-                <Component Id="C.fuse.tar.xz">
+                <Directory Id="OPTDIR.cygfuse.x64" Name="x64">
-                    <File Name="fuse-2.8-4.tar.xz" KeyPath="yes" />
+                    <Component Id="C.fuse.tar.xz.x64">
-                </Component>
+                        <File Id="FILE.fuse.tar.xz.x64" Name="fuse-2.8-5.tar.xz" KeyPath="yes" />
+                    </Component>
+                </Directory>
+                <Directory Id="OPTDIR.cygfuse.x86" Name="x86">
+                    <Component Id="C.fuse.tar.xz.x86">
+                        <File Id="FILE.fuse.tar.xz.x86" Name="fuse-2.8-5.tar.xz" KeyPath="yes" />
+                    </Component>
+                </Directory>
                 <Component Id="C.fuse.install.sh">
                     <File Name="install.sh" KeyPath="yes" />
                 </Component>
@@ -343,7 +350,7 @@
                     <File Name="passthrough.vcxproj.filters" KeyPath="yes" />
                 </Component>
             </Directory>
-            <Directory Id="SMPDIR.passthrough_cpp" Name="passthrough-cpp">
+            <!--Directory Id="SMPDIR.passthrough_cpp" Name="passthrough-cpp">
                 <Component Id="C.passthrough_cpp.cpp">
                     <File Name="passthrough-cpp.cpp" KeyPath="yes" />
                 </Component>
@@ -356,7 +363,7 @@
                 <Component Id="C.passthrough_cpp.vcxproj.filters">
                     <File Name="passthrough-cpp.vcxproj.filters" KeyPath="yes" />
                 </Component>
-            </Directory>
+            </Directory-->
             <Directory Id="SMPDIR.passthrough_fuse" Name="passthrough-fuse">
                 <Component Id="C.passthrough_fuse.c">
                     <File Name="passthrough-fuse.c" KeyPath="yes" />
@@ -447,7 +454,7 @@
         <ComponentGroup Id="C.WinFsp.inc">
             <ComponentRef Id="C.fsctl.h" />
             <ComponentRef Id="C.winfsp.h" />
-            <ComponentRef Id="C.winfsp.hpp" />
+            <!--ComponentRef Id="C.winfsp.hpp" /-->
             <ComponentRef Id="C.fuse.h" />
             <ComponentRef Id="C.fuse_common.h" />
             <ComponentRef Id="C.fuse_opt.h" />
@@ -460,7 +467,8 @@
             <ComponentRef Id="C.fuse_x86.pc" />
         </ComponentGroup>
         <ComponentGroup Id="C.WinFsp.opt.fuse">
-            <ComponentRef Id="C.fuse.tar.xz" />
+            <ComponentRef Id="C.fuse.tar.xz.x64" />
+            <ComponentRef Id="C.fuse.tar.xz.x86" />
             <ComponentRef Id="C.fuse.install.sh" />
             <ComponentRef Id="C.fuse.uninstall.sh" />
         </ComponentGroup>
@@ -474,10 +482,10 @@
             <ComponentRef Id="C.passthrough.sln" />
             <ComponentRef Id="C.passthrough.vcxproj" />
             <ComponentRef Id="C.passthrough.vcxproj.filters" />
-            <ComponentRef Id="C.passthrough_cpp.cpp" />
+            <!--ComponentRef Id="C.passthrough_cpp.cpp" /-->
-            <ComponentRef Id="C.passthrough_cpp.sln" />
+            <!--ComponentRef Id="C.passthrough_cpp.sln" /-->
-            <ComponentRef Id="C.passthrough_cpp.vcxproj" />
+            <!--ComponentRef Id="C.passthrough_cpp.vcxproj" /-->
-            <ComponentRef Id="C.passthrough_cpp.vcxproj.filters" />
+            <!--ComponentRef Id="C.passthrough_cpp.vcxproj.filters" /-->
             <ComponentRef Id="C.passthrough_fuse.c" />
             <ComponentRef Id="C.passthrough_fuse.winposix.c" />
             <ComponentRef Id="C.passthrough_fuse.winposix.h" />
@@ -568,7 +576,7 @@
                 Id="F.Cygfuse"
                 Level="1000"
                 Title="FUSE for Cygwin"
-                Description="From a Cygwin prompt change to $InstallDir/opt/cygfuse and run install.sh."
+                Description="From a Cygwin prompt change to &lt;InstallDir&gt;/opt/cygfuse and run install.sh."
                 AllowAdvertise="no"
                 InstallDefault="local"
                 Absent="allow">

build/VStudio/version.properties

@@ -17,8 +17,8 @@
 
         <MyCanonicalVersion>1.1</MyCanonicalVersion>
 
-        <MyProductVersion>2017.1 B2</MyProductVersion>
+        <MyProductVersion>2017.1</MyProductVersion>
-        <MyProductStage>Beta</MyProductStage>
+        <MyProductStage>Gold</MyProductStage>
 
         <MyVersion>$(MyCanonicalVersion).$(MyBuildNumber)</MyVersion>
         <MyVersionWithCommas>$(MyVersion.Replace('.',',')),0</MyVersionWithCommas>

doc/Frequently-Asked-Questions.asciidoc

@@ -10,6 +10,11 @@ I am running Windows 7 and I am finding that the installed driver is not signed.
 	https://technet.microsoft.com/en-us/library/security/3033929.aspx
 
 
+Disconnecting (unmapping) a network drive does not work. [@carlreinke]::
+
+    You may have Dokany installed. Dokany installs its own Network Provider DLL that unfortunately interferes with the WinFsp handling of network drives. The solution is to change your system's Network Provider order and ensure that the WinFsp Network Provider runs before the Dokany one. Instructions on how to change the Network Provider order can be found in this http://blogs.interfacett.com/changing-the-network-provider-order-in-windows-10[article].
+
+
 Why is the DLL not installed in the Windows system directories? [@netheril96]::
 
     It is true that this would make it convenient to load the DLL, because the Windows loader looks into the Windows system directories when it loads DLL's. However, in the opinion of the WinFsp author, software that does not ship with the OS should not be installing components in the system directories.

doc/Known-File-Systems.asciidoc

@@ -5,6 +5,8 @@ This document contains a list of known file systems and file system libraries th
 == File Systems
 
 - https://github.com/billziss-gh/nfs-win[nfs-win] - NFS for Windows
+- https://github.com/ncw/rclone[rclone] - rsync for cloud storage
+- https://github.com/hasse69/rar2fs[rar2fs] - FUSE file system for reading RAR archives
 - https://github.com/billziss-gh/redditfs[redditfs] - ls -l /r/programming
 - https://github.com/netheril96/securefs[securefs] - Filesystem in userspace (FUSE) with transparent authenticated encryption
 - https://github.com/billziss-gh/sshfs-win[sshfs-win] - SSHFS for Windows

doc/WinFsp-Service-Architecture.asciidoc

@@ -38,7 +38,7 @@ For example, the MEMFS sample adds the following registry entries in a 64-bit sy
     "Security"="D:P(A;;RPWPLC;;;WD)"
     "JobControl"=dword:00000001
 
-When the WinFsp.Launcher starts up it creates a named pipe that applications can use to start, stop, get information about and list service instances. A small command line utility (`launchctl`) can be used to issue those commands. The CallNamedPipeW API can be used as well.
+When the WinFsp.Launcher starts up it creates a named pipe that applications can use to start, stop, get information about and list service instances. A small command line utility (`launchctl`) can be used to issue those commands. The `CallNamedPipeW` API can be used as well.
 
 One final note regarding security. Notice the `Security` registry value in the example above. This registry value uses SDDL syntax to instruct WinFsp.Launcher to allow Everyone (`WD`) to start (`RP`), stop (`WP`) and get information (`LC`) about the service instance. If the `Security` registry value is missing the default is to allow only LocalSystem and Administrators to control the service instance.
 
@@ -47,3 +47,13 @@ One final note regarding security. Notice the `Security` registry value in the e
 WinFsp includes a Network Provider that integrates with Windows and can be used to start and stop user mode file systems from the Windows shell. To achieve this the Network Provider (implemented as part of the WinFsp DLL) works closely with the WinFsp.Launcher service.
 
 For example, if a user uses the Windows Explorer to map `\\memfs64\share` to the `Z:` drive, the Network Provider will instruct the WinFsp.Launcher to start an instance of the memfs64 service with command line `-i -F NTFS -n 65536 -s 67108864 -u \\memfs64\share -m Z:`. When the user disconnects the `Z:` drive, the Network Provider will instruct the WinFsp.Launcher to stop the previously started instance of the memfs64 service.
+
+== File System Credential Support
+
+Some file systems require credentials in order to allow access and be mounted. Such file systems must add a registry value `Credentials`:
+
+    "Credentials"=dword:00000001
+
+This will instruct the WinFsp Network Provider to request a password from the user prior to starting the file system. This password will then be securely passed to the WinFsp Launcher which in turn will pass it to the user mode file system on its standard input. The user mode file system must respond `OK` if the password is correct and allows access to the user mode file system. Any other response from the user mode file system (including a timeout without a response) is interpreted as an authentication failure.
+
+NOTE: During password entry the user may also choose to "remember" the password in which case it will be saved in the Windows Credential Manager.

inc/fuse/fuse.h

@@ -118,6 +118,8 @@ FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_loop_mt)(struct fsp_fuse_env *env,
     struct fuse *f);
 FSP_FUSE_API void FSP_FUSE_API_NAME(fsp_fuse_exit)(struct fsp_fuse_env *env,
     struct fuse *f);
+FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_exited)(struct fsp_fuse_env *env,
+    struct fuse *f);
 FSP_FUSE_API struct fuse_context *FSP_FUSE_API_NAME(fsp_fuse_get_context)(struct fsp_fuse_env *env);
 
 FSP_FUSE_SYM(
@@ -171,6 +173,13 @@ void fuse_exit(struct fuse *f),
         (fsp_fuse_env(), f);
 })
 
+FSP_FUSE_SYM(
+int fuse_exited(struct fuse *f),
+{
+    return FSP_FUSE_API_CALL(fsp_fuse_exited)
+        (fsp_fuse_env(), f);
+})
+
 FSP_FUSE_SYM(
 struct fuse_context *fuse_get_context(void),
 {

inc/fuse/winfsp_fuse.h

@@ -178,6 +178,7 @@ struct fuse_flock
         fsp_fuse_daemonize,             \
         fsp_fuse_set_signal_handlers,   \
         0/*conv_to_win_path*/,          \
+        { 0 },                          \
     }
 #else
 #define FSP_FUSE_ENV_INIT               \
@@ -187,6 +188,7 @@ struct fuse_flock
         fsp_fuse_daemonize,             \
         fsp_fuse_set_signal_handlers,   \
         0/*conv_to_win_path*/,          \
+        { 0 },                          \
     }
 #endif
 
@@ -229,6 +231,7 @@ struct fuse_flock
         fsp_fuse_daemonize,             \
         fsp_fuse_set_signal_handlers,   \
         fsp_fuse_conv_to_win_path,      \
+        { 0 },                          \
     }
 
 /*

opt/cygfuse/Makefile

@@ -18,3 +18,11 @@ cygport:
 			> opt/cygfuse/winfsp-work.tar.gz\
 	)
 	CYGPORT_SRC_URI=winfsp-work.tar.gz CYGPORT_SRC_DIR=winfsp-work cygport fuse.cygport download prep compile install package
+
+dist: cygport
+	case $(shell uname -m) in \
+	x86_64)\
+		cp fuse-*/dist/fuse/fuse-*[0-9].tar.xz dist/x64 ;;\
+	*)\
+		cp fuse-*/dist/fuse/fuse-*[0-9].tar.xz dist/x86 ;;\
+	esac

opt/cygfuse/cygfuse.c

@@ -17,22 +17,39 @@
 
 #include <dlfcn.h>
 #include <pthread.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/cygwin.h>
 
+static void *cygfuse_init_slow(int force);
 static void *cygfuse_init_winfsp();
-static void *cygfuse_init_fail();
 
 static pthread_mutex_t cygfuse_mutex = PTHREAD_MUTEX_INITIALIZER;
 static void *cygfuse_handle = 0;
 
-static inline void cygfuse_init(int force)
+static inline void *cygfuse_init_fast(void)
 {
+    void *handle = cygfuse_handle;
+    __sync_synchronize(); /* memory barrier */
+    if (0 == handle)
+        handle = cygfuse_init_slow(0);
+    return handle;
+}
+
+static void *cygfuse_init_slow(int force)
+{
+    void *handle;
     pthread_mutex_lock(&cygfuse_mutex);
-    if (force || 0 == cygfuse_handle)
+    handle = cygfuse_handle;
-        cygfuse_handle = cygfuse_init_winfsp();
+    if (force || 0 == handle)
+    {
+        handle = cygfuse_init_winfsp();
+        __sync_synchronize(); /* memory barrier */
+        cygfuse_handle = handle;
+    }
     pthread_mutex_unlock(&cygfuse_mutex);
+    return handle;
 }
 
 /*
@@ -50,7 +67,7 @@ static inline int cygfuse_daemon(int nochdir, int noclose)
         return -1;
 
     /* force reload of WinFsp DLL to workaround fork() problems */
-    cygfuse_init(1);
+    cygfuse_init_slow(1);
 
     return 0;
 }
@@ -58,7 +75,7 @@ static inline int cygfuse_daemon(int nochdir, int noclose)
 
 #define FSP_FUSE_API                    static
 #define FSP_FUSE_API_NAME(api)          (* pfn_ ## api)
-#define FSP_FUSE_API_CALL(api)          (cygfuse_init(0), pfn_ ## api)
+#define FSP_FUSE_API_CALL(api)          (cygfuse_init_fast(), pfn_ ## api)
 #define FSP_FUSE_SYM(proto, ...)        __attribute__ ((visibility("default"))) proto { __VA_ARGS__ }
 #include <fuse_common.h>
 #include <fuse.h>
@@ -74,6 +91,7 @@ static inline int cygfuse_daemon(int nochdir, int noclose)
     if (0 == (*(void **)&(pfn_ ## n) = dlsym(h, #n)))\
         return cygfuse_init_fail();
 
+static void *cygfuse_init_fail();
 static void *cygfuse_init_winfsp()
 {
     void *h;
@@ -125,6 +143,7 @@ static void *cygfuse_init_winfsp()
     CYGFUSE_GET_API(h, fsp_fuse_loop);
     CYGFUSE_GET_API(h, fsp_fuse_loop_mt);
     CYGFUSE_GET_API(h, fsp_fuse_exit);
+    CYGFUSE_GET_API(h, fsp_fuse_exited);
     CYGFUSE_GET_API(h, fsp_fuse_get_context);
 
     /* fuse_opt.h */
@@ -141,6 +160,7 @@ static void *cygfuse_init_winfsp()
 
 static void *cygfuse_init_fail()
 {
-    abort();
+    fprintf(stderr, "cygfuse: initialization failed: " CYGFUSE_WINFSP_NAME " not found\n");
+    exit(1);
     return 0;
 }

opt/cygfuse/dist/install.sh

@@ -1 +1,8 @@
-tar -C/ -xaf fuse-2.8-*.tar.xz
+cd "$(dirname "$0")"
+case $(uname -m) in
+x86_64)
+    tar -C/ -xaf x64/fuse-2.8-*.tar.xz ;;
+*)
+    tar -C/ -xaf x86/fuse-2.8-*.tar.xz ;;
+esac
+echo FUSE for Cygwin installed.

opt/cygfuse/dist/uninstall.sh

@@ -1 +1,8 @@
-tar -taf fuse-2.8-*.tar.xz | sed -e '/\/$/d' -e 's/.*/\/&/' | xargs rm -f
+cd "$(dirname "$0")"
+case $(uname -m) in
+x86_64)
+    tar -taf x64/fuse-2.8-*.tar.xz | sed -e '/\/$/d' -e 's/.*/\/&/' | xargs rm -f ;;
+*)
+    tar -taf x86/fuse-2.8-*.tar.xz | sed -e '/\/$/d' -e 's/.*/\/&/' | xargs rm -f ;;
+esac
+echo FUSE for Cygwin uninstalled.

opt/cygfuse/fuse.cygport

@@ -1,6 +1,6 @@
 NAME="fuse"
 VERSION=2.8
-RELEASE=4
+RELEASE=5
 CATEGORY="Utils"
 SUMMARY="WinFsp-FUSE compatibility layer"
 DESCRIPTION="WinFsp-FUSE enables FUSE file systems to be run on Cygwin."

src/dll/fuse/fuse.c

@@ -96,8 +96,11 @@ static struct fuse_opt fsp_fuse_core_opts[] =
     FSP_FUSE_CORE_OPT("VolumeSerialNumber=%lx", VolumeParams.VolumeSerialNumber, 0),
     FSP_FUSE_CORE_OPT("FileInfoTimeout=", set_FileInfoTimeout, 1),
     FSP_FUSE_CORE_OPT("FileInfoTimeout=%d", VolumeParams.FileInfoTimeout, 0),
+    FUSE_OPT_KEY("UNC=", 'U'),
     FUSE_OPT_KEY("--UNC=", 'U'),
+    FUSE_OPT_KEY("VolumePrefix=", 'U'),
     FUSE_OPT_KEY("--VolumePrefix=", 'U'),
+    FUSE_OPT_KEY("FileSystemName=", 'F'),
     FUSE_OPT_KEY("--FileSystemName=", 'F'),
 
     FUSE_OPT_END,
@@ -457,17 +460,27 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
     default:
         return 1;
     case 'h':
+        /* Note: The limit on FspServiceLog messages is 1024 bytes. This is getting close. */
         FspServiceLog(EVENTLOG_ERROR_TYPE, L""
             FSP_FUSE_LIBRARY_NAME " options:\n"
-            "    -o DebugLog=FILE           debug log file (deflt: stderr)\n"
+            "    -o umask=MASK              set file permissions (octal)\n"
-            "    -o SectorSize=N            sector size for Windows (512-4096, deflt: 4096)\n"
+            "    -o uid=N                   set file owner (-1 for mounting user id)\n"
-            "    -o SectorsPerAllocationUnit=N  sectors per allocation unit (deflt: 1)\n"
+            "    -o gid=N                   set file group (-1 for mounting user group)\n"
-            "    -o MaxComponentLength=N    max file name component length (deflt: 255)\n"
+            "    -o rellinks                interpret absolute symlinks as volume relative\n"
-            "    -o VolumeCreationTime=T    volume creation time (FILETIME hex format)\n"
+            "    -o volname=NAME            set volume label\n"
-            "    -o VolumeSerialNumber=N    32-bit wide\n"
+            "    -o VolumePrefix=UNC        set UNC prefix (/Server/Share)\n"
-            "    -o FileInfoTimeout=N       FileInfo/Security/VolumeInfo timeout (millisec)\n"
+            "        --VolumePrefix=UNC     set UNC prefix (\\Server\\Share)\n"
-            "    --UNC=U --VolumePrefix=U   UNC prefix (\\Server\\Share)\n"
+            "    -o FileSystemName=NAME     set file system name\n"
-            "    --FileSystemName=FSN       Name of user mode file system\n");
+            "    -o DebugLog=FILE           debug log file (requires -d)\n"
+            "\n"
+            FSP_FUSE_LIBRARY_NAME " advanced options:\n"
+            "    -o FileInfoTimeout=N       metadata timeout (millis, -1 for data caching)\n"
+            "    -o SectorSize=N            (512-4096, deflt: 4096)\n"
+            "    -o SectorsPerAllocationUnit=N  (deflt: 1)\n"
+            "    -o MaxComponentLength=N    (deflt: 255)\n"
+            "    -o VolumeCreationTime=T    (FILETIME hex format)\n"
+            "    -o VolumeSerialNumber=N    (32-bit wide)\n"
+            );
         opt_data->help = 1;
         return 1;
     case 'V':
@@ -488,8 +501,12 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
             0);
         return 0;
     case 'U':
-        if ('U' == arg[2])
+        if ('U' == arg[0])
+            arg += sizeof "UNC=" - 1;
+        else if ('U' == arg[2])
             arg += sizeof "--UNC=" - 1;
+        else if ('V' == arg[0])
+            arg += sizeof "VolumePrefix=" - 1;
         else if ('V' == arg[2])
             arg += sizeof "--VolumePrefix=" - 1;
         if (0 == MultiByteToWideChar(CP_UTF8, 0, arg, -1,
@@ -497,10 +514,15 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
             return -1;
         opt_data->VolumeParams.Prefix
             [sizeof opt_data->VolumeParams.Prefix / sizeof(WCHAR) - 1] = L'\0';
+        for (PWSTR P = opt_data->VolumeParams.Prefix; *P; P++)
+            if (L'/' == *P)
+                *P = '\\';
         return 0;
     case 'F':
         if ('f' == arg[0])
             arg += sizeof "fstypename=" - 1;
+        else if ('F' == arg[0])
+            arg += sizeof "FileSystemName=" - 1;
         else if ('F' == arg[2])
             arg += sizeof "--FileSystemName=" - 1;
         if (0 == MultiByteToWideChar(CP_UTF8, 0, arg, -1,
@@ -687,6 +709,13 @@ FSP_FUSE_API void fsp_fuse_exit(struct fsp_fuse_env *env,
 {
     if (0 != f->Service)
         FspServiceStop(f->Service);
+    f->exited = 1;
+}
+
+FSP_FUSE_API int FSP_FUSE_API_NAME(fsp_fuse_exited)(struct fsp_fuse_env *env,
+    struct fuse *f)
+{
+    return f->exited;
 }
 
 FSP_FUSE_API struct fuse_context *fsp_fuse_get_context(struct fsp_fuse_env *env)

src/dll/fuse/library.h

@@ -50,6 +50,7 @@ struct fuse
     PWSTR MountPoint;
     FSP_FILE_SYSTEM *FileSystem;
     FSP_SERVICE *Service; /* weak */
+    volatile int exited;
 };
 
 struct fsp_fuse_context_header

tools/run-tests.bat

@@ -62,15 +62,17 @@ set dfl_tests=^
     winfstest-memfs-x86-net ^
     fscrash-x86 ^
     winfsp-tests-dotnet-external ^
-    winfsp-tests-dotnet-external-share
+    winfsp-tests-dotnet-external-share ^
+    fsx-memfs-dotnet-disk ^
+    fsx-memfs-dotnet-net ^
+    winfstest-memfs-dotnet-disk ^
+    winfstest-memfs-dotnet-net
 set opt_tests=^
     ifstest-memfs-x64-disk ^
     ifstest-memfs-x86-disk ^
     ifstest-memfs-dotnet-disk ^
     sample-passthrough-x64 ^
     sample-passthrough-x86 ^
-    sample-passthrough-cpp-x64 ^
-    sample-passthrough-cpp-x86 ^
     sample-passthrough-fuse-x64 ^
     sample-passthrough-fuse-x86 ^
     sample-passthrough-dotnet
@@ -387,6 +389,34 @@ Q:
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:fsx-memfs-dotnet-disk
+Q:
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 goto fail
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -f foo -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:fsx-memfs-dotnet-net
+R:
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 goto fail
+"%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -f foo -N 5000 test xxxxxx
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:winfstest-memfs-dotnet-disk
+Q:
+call "%ProjRoot%\ext\test\winfstest\run-winfstest.bat"
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:winfstest-memfs-dotnet-net
+R:
+call "%ProjRoot%\ext\test\winfstest\run-winfstest.bat"
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :ifstest-memfs-x64-disk
 call :__ifstest-memfs M: \Device\WinFsp.Disk C:
 if !ERRORLEVEL! neq 0 goto fail

tst/memfs/memfs.cpp

@@ -192,7 +192,7 @@ typedef struct _MEMFS_FILE_NODE
     SIZE_T ReparseDataSize;
     PVOID ReparseData;
 #endif
-    ULONG RefCount;
+    volatile LONG RefCount;
 #if defined(MEMFS_NAMED_STREAMS)
     struct _MEMFS_FILE_NODE *MainFileNode;
 #endif
@@ -260,13 +260,13 @@ VOID MemfsFileNodeDelete(MEMFS_FILE_NODE *FileNode)
 static inline
 VOID MemfsFileNodeReference(MEMFS_FILE_NODE *FileNode)
 {
-    FileNode->RefCount++;
+    InterlockedIncrement(&FileNode->RefCount);
 }
 
 static inline
 VOID MemfsFileNodeDereference(MEMFS_FILE_NODE *FileNode)
 {
-    if (0 == --FileNode->RefCount)
+    if (0 == InterlockedDecrement(&FileNode->RefCount))
         MemfsFileNodeDelete(FileNode);
 }
 
@@ -850,14 +850,18 @@ static NTSTATUS Overwrite(FSP_FILE_SYSTEM *FileSystem,
     NTSTATUS Result;
 
 #if defined(MEMFS_NAMED_STREAMS)
-    MEMFS_FILE_NODE_MAP_ENUM_CONTEXT Context = { FALSE };
+    MEMFS_FILE_NODE_MAP_ENUM_CONTEXT Context = { TRUE };
     ULONG Index;
 
     MemfsFileNodeMapEnumerateNamedStreams(Memfs->FileNodeMap, FileNode,
         MemfsFileNodeMapEnumerateFn, &Context);
     for (Index = 0; Context.Count > Index; Index++)
-        if (1 >= Context.FileNodes[Index]->RefCount)
+    {
+        LONG RefCount = Context.FileNodes[Index]->RefCount;
+        MemoryBarrier();
+        if (2 >= RefCount)
             MemfsFileNodeMapRemove(Memfs->FileNodeMap, Context.FileNodes[Index]);
+    }
     MemfsFileNodeMapEnumerateFree(&Context);
 #endif