FILE_APPEND_DATA bug

EncFSy_lib/EncFSFile.cpp

@@ -24,7 +24,6 @@ namespace EncFS {
 		}
 		string fileHeader;
 		fileHeader.resize(EncFSVolume::HEADER_SIZE);
-
 		DWORD ReadLength;
 		if (!ReadFile(this->handle, &fileHeader[0], (DWORD)fileHeader.size(), (LPDWORD)&ReadLength, NULL)) {
 			return false;
@@ -152,7 +151,7 @@ namespace EncFS {
 				SetLastError(ERROR_FILE_CORRUPT);
 				return -1;
 			}
-			//printf("write %d %d %d %d\n", fileSize, fileIv, off, len);
+			//printf("write %d %ld %d %d\n", fileSize, fileIv, off, len);
 
 			if (off > fileSize) {
 				// Expand file.

EncFSy_lib/EncFSy.cpp

@@ -449,17 +449,17 @@ EncFSCreateFile(LPCWSTR FileName, PDOKAN_IO_SECURITY_CONTEXT SecurityContext,
 			}
 		}
 
-		// Read access is required to read file header
-		if (genericDesiredAccess & GENERIC_WRITE) {
-			genericDesiredAccess |= GENERIC_READ;
+		// Read/write access are required to modify file header
+		if (genericDesiredAccess & GENERIC_WRITE
+			|| genericDesiredAccess & FILE_WRITE_DATA
+			|| genericDesiredAccess & FILE_APPEND_DATA) {
+			genericDesiredAccess |= FILE_READ_DATA | FILE_WRITE_DATA;
 			if (ShareAccess & FILE_SHARE_WRITE) {
 				ShareAccess |= FILE_SHARE_READ;
 			}
 		}
-
-		// Read/write access are required to modify file header
 		if (genericDesiredAccess & DELETE) {
-			genericDesiredAccess |= GENERIC_READ | GENERIC_WRITE;
+			genericDesiredAccess |= FILE_READ_DATA | FILE_WRITE_DATA;
 			if (ShareAccess & FILE_SHARE_DELETE) {
 				ShareAccess |= FILE_SHARE_WRITE | FILE_SHARE_READ;
 			}
@@ -470,7 +470,7 @@ EncFSCreateFile(LPCWSTR FileName, PDOKAN_IO_SECURITY_CONTEXT SecurityContext,
 			fileAttributesAndFlags = FILE_ATTRIBUTE_NORMAL;
 		}
 
-		// Cannot suppot no buffering mode (Encrypted files cannot align on the secter size)
+		// Cannot suppot no buffering mode (Encrypted files cannot align on the sector size)
 		if (fileAttributesAndFlags & FILE_FLAG_NO_BUFFERING) {
 			fileAttributesAndFlags ^= FILE_FLAG_NO_BUFFERING;
 		}

EncFSy_test/main.cpp

@@ -56,6 +56,40 @@ int main()
         CloseHandle(h);
     }
 
+    // file append
+    {
+        DWORD dwDesiredAccess = FILE_APPEND_DATA;
+        DWORD dwShareMode = FILE_SHARE_WRITE;
+        DWORD dwCreationDisposition = CREATE_ALWAYS;
+        DWORD dwFlagsAndAttribute = FILE_ATTRIBUTE_NORMAL;
+        HANDLE h = CreateFileW(file, dwDesiredAccess, dwShareMode, NULL,
+            dwCreationDisposition, dwFlagsAndAttribute, NULL);
+        if (h == INVALID_HANDLE_VALUE) {
+            DWORD lastError = GetLastError();
+            printf("CreateFileW ERROR: %d\n", lastError);
+            return -1;
+        }
+
+        LARGE_INTEGER distanceToMove;
+        distanceToMove.QuadPart = 0;
+        if (!SetFilePointerEx(h, distanceToMove, NULL, FILE_BEGIN)) {
+            DWORD lastError = GetLastError();
+            printf("SetFilePointerEx ERROR: %d\n", lastError);
+            return -1;
+        }
+
+        const char* writeData = "ABCDEFG";
+        const DWORD size = sizeof(writeData);
+        DWORD readLen;
+        if (!WriteFile(h, writeData, size, &readLen, NULL)) {
+            DWORD lastError = GetLastError();
+            printf("WriteFile ERROR: %d\n", lastError);
+            return -1;
+        }
+
+        CloseHandle(h);
+    }
+
     // no buffering mode
     {
         DWORD dwDesiredAccess = GENERIC_READ | GENERIC_WRITE;

installer/installer.nsi

@@ -1,4 +1,4 @@
-!define VERSION "0.15"
+!define VERSION "0.16"
 
 !include LogicLib.nsh
 !include x64.nsh