From 2a84229da3885d5958ede4408225ff341cae2705 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Mon, 7 Dec 2015 16:54:49 -0800
Subject: [PATCH] sys: IRP_MJ_CREATE

---
 inc/winfsp/fsctl.h |  2 +-
 src/sys/create.c   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/inc/winfsp/fsctl.h b/inc/winfsp/fsctl.h
index 46a9c68d..25555085 100644
--- a/inc/winfsp/fsctl.h
+++ b/inc/winfsp/fsctl.h
@@ -106,8 +106,8 @@ typedef struct
             UINT32 UserMode:1;          /* request originated in user mode */
             UINT32 HasTraversePrivilege:1;  /* requestor has TOKEN_HAS_TRAVERSE_PRIVILEGE */
             UINT32 OpenTargetDirectory:1;   /* open target dir and report FILE_{EXISTS,DOES_NOT_EXIST} */
-            UINT32 HasTrailingBackslash:1;  /* original FileName (sent by CreateFile) has trailing backslash */
             UINT32 CaseSensitive:1;         /* FileName comparisons should be case-sensitive */
+            UINT32 HasTrailingBackslash:1;  /* reserved: do not use */
         } Create;
         struct
         {
diff --git a/src/sys/create.c b/src/sys/create.c
index 1340e48e..4bc8ea42 100644
--- a/src/sys/create.c
+++ b/src/sys/create.c
@@ -378,6 +378,7 @@ VOID FspFsvolCreateComplete(
     PFILE_OBJECT FileObject = IrpSp->FileObject;
     PACCESS_STATE AccessState = IrpSp->Parameters.Create.SecurityContext->AccessState;
     ULONG CreateOptions = IrpSp->Parameters.Create.Options & 0xffffff;
+    BOOLEAN FileCreated = FILE_CREATED == Response->IoStatus.Information;
     UINT32 ResponseFileAttributes = Response->Rsp.Create.Opened.FileAttributes;
     PSECURITY_DESCRIPTOR SecurityDescriptor;
     ULONG SecurityDescriptorSize;
@@ -454,9 +455,13 @@ VOID FspFsvolCreateComplete(
         FSP_RETURN();
     }
 
+    /* record the user-mode file system contexts */
+    FsContext->UserContext = Response->Rsp.Create.Opened.UserContext;
+    FileObject->FsContext2 = (PVOID)(UINT_PTR)Response->Rsp.Create.Opened.UserContext2;
+
     /* check for trailing backslash */
     if (HasTrailingBackslash &&
-        !FlagOn(ResponseFileAttributes, FILE_ATTRIBUTE_DIRECTORY))
+        !FileCreated && !FlagOn(ResponseFileAttributes, FILE_ATTRIBUTE_DIRECTORY))
     {
         FspFsvolCreateClose(Irp, Response);
         FSP_RETURN(Result = STATUS_OBJECT_NAME_INVALID);
@@ -466,8 +471,7 @@ VOID FspFsvolCreateComplete(
     if (!FsvrtDeviceExtension->VolumeParams.NoSystemAccessCheck)
     {
         /* read-only attribute check */
-        if (FILE_CREATED != Response->IoStatus.Information &&
-            FlagOn(ResponseFileAttributes, FILE_ATTRIBUTE_READONLY))
+        if (!FileCreated && FlagOn(ResponseFileAttributes, FILE_ATTRIBUTE_READONLY))
         {
             /* from fastfat: allowed accesses when read-only */
             ACCESS_MASK Allowed =
@@ -539,22 +543,18 @@ VOID FspFsvolCreateComplete(
 
     /* were we asked to open a directory or non-directory? */
     if (FlagOn(CreateOptions, FILE_DIRECTORY_FILE) &&
-        !FlagOn(ResponseFileAttributes, FILE_ATTRIBUTE_DIRECTORY))
+        !FileCreated && !FlagOn(ResponseFileAttributes, FILE_ATTRIBUTE_DIRECTORY))
     {
         FspFsvolCreateClose(Irp, Response);
         FSP_RETURN(Result = STATUS_NOT_A_DIRECTORY);
     }
     if (FlagOn(CreateOptions, FILE_NON_DIRECTORY_FILE) &&
-        FlagOn(ResponseFileAttributes, FILE_ATTRIBUTE_DIRECTORY))
+        !FileCreated && FlagOn(ResponseFileAttributes, FILE_ATTRIBUTE_DIRECTORY))
     {
         FspFsvolCreateClose(Irp, Response);
         FSP_RETURN(Result = STATUS_FILE_IS_A_DIRECTORY);
     }
 
-    /* record the user-mode file system contexts */
-    FsContext->UserContext = Response->Rsp.Create.Opened.UserContext;
-    FileObject->FsContext2 = (PVOID)(UINT_PTR)Response->Rsp.Create.Opened.UserContext2;
-
     /*
      * The following must be done under the file system volume device Resource,
      * because we are manipulating its GenericTable and accessing foreign FsContext's.