From 3acb6da4babff4ccefa52f69c46862d2cff0ce75 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Mon, 4 Jan 2016 17:29:16 -0800 Subject: [PATCH] dll: create --- inc/winfsp/winfsp.h | 4 ++-- src/dll/create.c | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/inc/winfsp/winfsp.h b/inc/winfsp/winfsp.h index c9aed9c7..dc564c27 100644 --- a/inc/winfsp/winfsp.h +++ b/inc/winfsp/winfsp.h @@ -60,10 +60,10 @@ typedef struct _FSP_FILE_SYSTEM_INTERFACE FSP_FSCTL_TRANSACT_REQ *Request, FSP_FILE_NODE **PFileNode); NTSTATUS (*Open)(FSP_FILE_SYSTEM *FileSystem, FSP_FSCTL_TRANSACT_REQ *Request, FSP_FILE_NODE **PFileNode); - NTSTATUS (*Overwrite)(FSP_FILE_SYSTEM *FileSystem, - FSP_FSCTL_TRANSACT_REQ *Request, BOOLEAN Supersede, FSP_FILE_NODE **PFileNode); NTSTATUS (*OpenParentDirectory)(FSP_FILE_SYSTEM *FileSystem, FSP_FSCTL_TRANSACT_REQ *Request, FSP_FILE_NODE **PFileNode, PBOOLEAN PFileExists); + NTSTATUS (*Overwrite)(FSP_FILE_SYSTEM *FileSystem, + FSP_FSCTL_TRANSACT_REQ *Request, BOOLEAN ReplaceFileAttributes, FSP_FILE_NODE *FileNode); NTSTATUS (*Cleanup)(FSP_FILE_SYSTEM *FileSystem, FSP_FSCTL_TRANSACT_REQ *Request, FSP_FILE_NODE *FileNode); NTSTATUS (*Close)(FSP_FILE_SYSTEM *FileSystem, diff --git a/src/dll/create.c b/src/dll/create.c index d68625d7..e3713360 100644 --- a/src/dll/create.c +++ b/src/dll/create.c @@ -166,7 +166,7 @@ static NTSTATUS FspFileSystemOpCreate_FileOverwrite(FSP_FILE_SYSTEM *FileSystem, (~DELETE | (Request->Req.Create.DesiredAccess & DELETE)) : (~FILE_WRITE_DATA | (Request->Req.Create.DesiredAccess & FILE_WRITE_DATA)); - Result = FileSystem->Interface->Overwrite(FileSystem, Request, Supersede, &FileNode); + Result = FileSystem->Interface->Open(FileSystem, Request, &FileNode); if (!NT_SUCCESS(Result)) return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result); @@ -178,6 +178,14 @@ static NTSTATUS FspFileSystemOpCreate_FileOverwrite(FSP_FILE_SYSTEM *FileSystem, return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result); } + Result = FileSystem->Interface->Overwrite(FileSystem, Request, Supersede, FileNode); + if (!NT_SUCCESS(Result)) + { + if (0 != FileSystem->Interface->Close) + FileSystem->Interface->Close(FileSystem, Request, FileNode); + return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result); + } + return FspFileSystemSendCreateResponse(FileSystem, Request, Supersede ? FILE_SUPERSEDED : FILE_OVERWRITTEN, FileNode, GrantedAccess); } @@ -210,7 +218,7 @@ static NTSTATUS FspFileSystemOpCreate_FileOverwriteIf(FSP_FILE_SYSTEM *FileSyste if (!Create) { - Result = FileSystem->Interface->Overwrite(FileSystem, Request, FALSE, &FileNode); + Result = FileSystem->Interface->Open(FileSystem, Request, &FileNode); if (!NT_SUCCESS(Result)) { if (STATUS_OBJECT_NAME_NOT_FOUND != Result) @@ -241,6 +249,17 @@ static NTSTATUS FspFileSystemOpCreate_FileOverwriteIf(FSP_FILE_SYSTEM *FileSyste return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result); } + if (!Create) + { + Result = FileSystem->Interface->Overwrite(FileSystem, Request, FALSE, FileNode); + if (!NT_SUCCESS(Result)) + { + if (0 != FileSystem->Interface->Close) + FileSystem->Interface->Close(FileSystem, Request, FileNode); + return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result); + } + } + return FspFileSystemSendCreateResponse(FileSystem, Request, Create ? FILE_CREATED : FILE_OVERWRITTEN, FileNode, GrantedAccess); }