directory notifications excluded when populate by STREAM

Author: jessk-msft

source/P4VFS.Console/P4VFS.Notes.txt

@@ -1,5 +1,16 @@
 Microsoft P4VFS Release Notes
 
+Version [1.29.0.0]
+* Fixing virtual file hydration to be excluded from system directory notifications.
+  This avoids unecessary FILE_NOTIFY_INFORMATION or DirectoryWatcher events indicating
+  a virtual file has been modified, when it's only been hydrated as-expected on read.
+  This technique is common across filter drivers. This is only supported for STREAM 
+  populate method (default). New unit test TestReadDirectoryChanges for verification.  
+* Additional unit test varible P4VFS_TEST_SERVER_ROOT for overriding the root directory
+  for the test servers. This better facilitates running all tests remotely on a local
+  virtual machine with including kernel mode debugging. Includes support for 
+  RestartPerforceServer script to quick spin-up of existing server on override drive
+
 Version [1.28.4.0]
 * Addition of optional service commandline argument to launch with debugger attached. 
   This is done as needed from admin command prompt "sc.exe start P4VFS.Service --break"

source/P4VFS.Core/Include/FileOperations.h

@@ -10,6 +10,17 @@ namespace Microsoft {
 namespace P4VFS {
 namespace FileOperations {
 
+	HRESULT 
+	RestrictFileTimeChange(
+		HANDLE hFile
+		);
+
+	HRESULT 
+	SetFileAttributesOnHandle(
+		HANDLE hFile,
+		DWORD dwFileAttributes
+		);
+
 	bool 
 	SleepAndVerifyFileExists(
 		const WCHAR* filePath, 

source/P4VFS.Core/Source/FileOperations.cpp

@@ -71,6 +71,23 @@ RestrictFileTimeChange(
 	return S_OK;
 }
 
+HRESULT 
+SetFileAttributesOnHandle(
+	HANDLE hFile,
+	DWORD dwFileAttributes
+	)
+{
+	FILE_BASIC_INFO basicInfo = {0};
+	basicInfo.FileAttributes = dwFileAttributes;
+
+	if (!SetFileInformationByHandle(hFile, FileBasicInfo, &basicInfo, sizeof(basicInfo)))
+	{
+		return HRESULT_FROM_WIN32(GetLastError());
+	}
+
+	return S_OK;
+}
+
 bool 
 SleepAndVerifyFileExists(
 	const WCHAR* filePath,
@@ -1116,12 +1133,6 @@ PopulateFileByStream(
 		return hr;
 	}
 
-	if (SetFileAttributes(fileToPopulate.c_str(), dstFileAttributes & ~FILE_ATTRIBUTE_READONLY) == FALSE)
-	{
-		hr = HRESULT_FROM_WIN32(GetLastError());
-		return hr;
-	}
-
 	FileCore::FileStream* fileToPopulateFrom = srcFileStream;
 	if (fileToPopulateFrom == nullptr || fileToPopulateFrom->CanRead() == false)
 	{
@@ -1170,17 +1181,16 @@ PopulateFileByStream(
 	hr = RemoveSparseFileSizeOnHandle(dstFile.Handle());
 	if (FAILED(hr))
 	{
-		return hr;		
+		return hr;
 	}
 
-	dstFile.Close();
-
-	if (!SetFileAttributes(fileToPopulate.c_str(), dstFileAttributes & ~(FILE_ATTRIBUTE_OFFLINE)))
+	hr = SetFileAttributesOnHandle(dstFile.Handle(), dstFileAttributes & ~(FILE_ATTRIBUTE_OFFLINE));
+	if (FAILED(hr))
 	{
-		hr = HRESULT_FROM_WIN32(GetLastError());
 		return hr;
 	}
 
+	dstFile.Close();
 	return S_OK;
 }
 

source/P4VFS.Driver/Include/DriverVersion.h

@@ -5,7 +5,7 @@
 #define P4VFS_VER_MAJOR					1			// Increment this number almost never
 #define P4VFS_VER_MINOR					28			// Increment this number whenever the driver changes
 #define P4VFS_VER_BUILD					4			// Increment this number when a major user mode change has been made
-#define P4VFS_VER_REVISION				6			// Increment this number when we rebuild with any change
+#define P4VFS_VER_REVISION				7			// Increment this number when we rebuild with any change
 
 #define P4VFS_VER_STRINGIZE_EX(v)		L#v
 #define P4VFS_VER_STRINGIZE(v)			P4VFS_VER_STRINGIZE_EX(v)

source/P4VFS.UnitTest/Scripts/RestartPerforceServer.bat

@@ -14,7 +14,12 @@ PUSHD "%SCRIPT_FOLDER%\..\..\.."
 SET REPO_FOLDER=%CD%
 POPD
 
-SET SERVER_FOLDER=%REPO_FOLDER%\intermediate\1666
+IF NOT "%P4VFS_TEST_SERVER_ROOT%"=="" (
+	SET SERVER_FOLDER=%P4VFS_TEST_SERVER_ROOT%\1666
+) ELSE (
+	SET SERVER_FOLDER=%REPO_FOLDER%\intermediate\1666
+)
+
 SET P4D_EXE=%SERVER_FOLDER%\p4d.exe
 SET P4_EXE=p4.exe
 FOR /F "tokens=*" %%A IN ('dir /s /b "%REPO_FOLDER%\external\P4API\p4.exe"') DO (