From 0795774e9ef917aa428e004042701fd84009c4e1 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Mon, 27 Mar 2017 17:38:52 -0700
Subject: [PATCH] inc: winfsp.hpp: testing

---
 inc/winfsp/winfsp.hpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/inc/winfsp/winfsp.hpp b/inc/winfsp/winfsp.hpp
index 797b8d7f..af5d5c0e 100644
--- a/inc/winfsp/winfsp.hpp
+++ b/inc/winfsp/winfsp.hpp
@@ -56,14 +56,13 @@ public:
     /* ctor/dtor */
     FileSystem() : _VolumeParams(), _FileSystem(0)
     {
-        static NTSTATUS LoadResult = FspLoad(0);
         _VolumeParams.SectorSize = 4096;
         _VolumeParams.SectorsPerAllocationUnit = 1;
         _VolumeParams.MaxComponentLength = 255;
         _VolumeParams.FileInfoTimeout = 1000;
         GetSystemTimeAsFileTime((PFILETIME)&_VolumeParams.VolumeCreationTime);
         _VolumeParams.VolumeSerialNumber = (UINT32)(_VolumeParams.VolumeCreationTime / (10000 * 1000));
-        _VolumeParams.UmFileContextIsUserContext2 = 1;
+        _VolumeParams.UmFileContextIsFullContext = 1;
     }
     virtual ~FileSystem()
     {
@@ -170,20 +169,17 @@ public:
             _VolumeParams.Prefix[0] ? L"WinFsp.Net" : L"WinFsp.Disk",
             &_VolumeParams, Interface(), &_FileSystem);
         if (NT_SUCCESS(Result))
-        {
-            Result = FspFileSystemSetMountPointEx(_FileSystem, MountPoint, SecurityDescriptor);
-            if (NT_SUCCESS(Result))
-                Result = FspFileSystemStartDispatcher(_FileSystem, 0);
-        }
-        if (NT_SUCCESS(Result))
         {
             _FileSystem->UserContext = this;
             FspFileSystemSetOperationGuardStrategy(_FileSystem, Synchronized ?
                 FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY_COARSE :
                 FSP_FILE_SYSTEM_OPERATION_GUARD_STRATEGY_FINE);
             FspFileSystemSetDebugLog(_FileSystem, DebugLog);
+            Result = FspFileSystemSetMountPointEx(_FileSystem, MountPoint, SecurityDescriptor);
+            if (NT_SUCCESS(Result))
+                Result = FspFileSystemStartDispatcher(_FileSystem, 0);
         }
-        else if (0 != _FileSystem)
+        if (!NT_SUCCESS(Result) && 0 != _FileSystem)
         {
             FspFileSystemDelete(_FileSystem);
             _FileSystem = 0;