diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 48511677..00000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -################################################################################ -# This .gitignore file was automatically created by Microsoft(R) Visual Studio. -################################################################################ - -*.db -*.opendb diff --git a/build/VStudio/.gitignore b/build/VStudio/.gitignore deleted file mode 100644 index c23cca77..00000000 --- a/build/VStudio/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -build -*.ncb -*.suo -*.vcproj.* -*.vcxproj.user -*.csproj.user diff --git a/src/dotnet/FileSystemHost.cs b/src/dotnet/FileSystemHost.cs index 7d7cd53e..4bb9fc26 100644 --- a/src/dotnet/FileSystemHost.cs +++ b/src/dotnet/FileSystemHost.cs @@ -353,10 +353,10 @@ namespace Fsp return Api.SetDebugLogFile(FileName); } /// - /// Return the installed version for WinFSP + /// Return the installed version of WinFsp. /// /// - public static Version GetFspVersion() + public static Version Version() { return Api.GetFspVersion(); } diff --git a/src/dotnet/Interop.cs b/src/dotnet/Interop.cs index b00915e8..01e5f4e1 100644 --- a/src/dotnet/Interop.cs +++ b/src/dotnet/Interop.cs @@ -955,9 +955,9 @@ namespace Fsp.Interop { fixed (Byte *C = CurrentReparseData) fixed (Byte *R = ReplaceReparseData) - return _FspFileSystemCanReplaceReparsePoint( - (IntPtr)C, (UIntPtr)CurrentReparseData.Length, - (IntPtr)R, (UIntPtr)ReplaceReparseData.Length); + return _FspFileSystemCanReplaceReparsePoint( + (IntPtr)C, (UIntPtr)CurrentReparseData.Length, + (IntPtr)R, (UIntPtr)ReplaceReparseData.Length); } internal static Int32 SetDebugLogFile(String FileName) @@ -982,11 +982,9 @@ namespace Fsp.Interop internal static Version GetFspVersion() { - UInt32 Version = 0, VersionMajor, VersionMinor; + UInt32 Version = 0; FspVersion(out Version); - VersionMajor = Version >> 16; - VersionMinor = Version & 0xFFFF; - return new System.Version((Int32)VersionMajor, (Int32)VersionMinor); + return new System.Version((Int32)Version >> 16, (Int32)Version & 0xFFFF); } /* initialization */ diff --git a/tst/memfs-dotnet/Program.cs b/tst/memfs-dotnet/Program.cs index f3d8c838..fd258cd9 100644 --- a/tst/memfs-dotnet/Program.cs +++ b/tst/memfs-dotnet/Program.cs @@ -255,7 +255,6 @@ namespace memfs Host.NamedStreams = true; Host.PostCleanupWhenModifiedOnly = true; Host.PassQueryDirectoryFileName = true; - Host.FlushAndPurgeOnCleanup = true; return STATUS_SUCCESS; }