Changeset 1548

Timestamp:

1/18/2010 4:51:59 AM (3 years ago)

Author:

lowjoel

Message:

Reviewed File.cs to get it to compile after the NativeMethods? refactor. Create a new file Sfc.cs for SfcIsFileProtected?. Addresses #284: Eraser.Util rewrite

Location:

branches/eraser6/CodeReview/Eraser.Util

Files:

• Eraser.Util.csproj (modified) (1 diff)
• File.cs (modified) (7 diffs)
• NativeMethods/Sfc.cs (added)

branches/eraser6/CodeReview/Eraser.Util/Eraser.Util.csproj

@@ -83 +83 @@
     </CodeAnalysisDictionary>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="NativeMethods\Sfc.cs" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/eraser6/CodeReview/Eraser.Util/File.cs

@@ -50 +50 @@
             {
                 //Allocate the structures
-                NTApi.NativeMethods.FILE_STREAM_INFORMATION[] streams =
-                    NTApi.NativeMethods.NtQueryInformationFile(streamHandle);
-
-                foreach (NTApi.NativeMethods.FILE_STREAM_INFORMATION streamInfo in streams)
+                NativeMethods.FILE_STREAM_INFORMATION[] streams =
+                    NTApi.NtQueryInformationFile(streamHandle);
+
+                foreach (NativeMethods.FILE_STREAM_INFORMATION streamInfo in streams)
                 {
                     //Get the name of the stream. The raw value is :NAME:$DATA
@@ -77 +77 @@
         public static string GetFileDescription(string path)
         {
-            ShellApi.NativeMethods.SHFILEINFO shfi = new ShellApi.NativeMethods.SHFILEINFO();
-            ShellApi.NativeMethods.SHGetFileInfo(path, 0, ref shfi, Marshal.SizeOf(shfi),
-                ShellApi.NativeMethods.SHGetFileInfoFlags.SHGFI_DISPLAYNAME);
+            NativeMethods.SHFILEINFO shfi = new NativeMethods.SHFILEINFO();
+            NativeMethods.SHGetFileInfo(path, 0, ref shfi, Marshal.SizeOf(shfi),
+                NativeMethods.SHGetFileInfoFlags.SHGFI_DISPLAYNAME);
             return shfi.szDisplayName;
         }
@@ -93 +93 @@
         public static Icon GetFileIcon(string path)
         {
-            ShellApi.NativeMethods.SHFILEINFO shfi = new ShellApi.NativeMethods.SHFILEINFO();
-            ShellApi.NativeMethods.SHGetFileInfo(path, 0, ref shfi, Marshal.SizeOf(shfi),
-                ShellApi.NativeMethods.SHGetFileInfoFlags.SHGFI_SMALLICON |
-                ShellApi.NativeMethods.SHGetFileInfoFlags.SHGFI_ICON);
+            NativeMethods.SHFILEINFO shfi = new NativeMethods.SHFILEINFO();
+            NativeMethods.SHGetFileInfo(path, 0, ref shfi, Marshal.SizeOf(shfi),
+                NativeMethods.SHGetFileInfoFlags.SHGFI_SMALLICON |
+                NativeMethods.SHGetFileInfoFlags.SHGFI_ICON);
 
             if (shfi.hIcon != IntPtr.Zero)
@@ -132 +132 @@
                 while (g.MeasureString(builder.ToString(), drawFont).Width > newWidth)
                 {
-                    if (!ShellApi.NativeMethods.PathCompactPathEx(builder, longPath,
+                    if (!NativeMethods.PathCompactPathEx(builder, longPath,
                         (uint)charCount--, 0))
                     {
@@ -150 +150 @@
         public static bool IsProtectedSystemFile(string filePath)
         {
-            return SfcIsFileProtected(IntPtr.Zero, filePath);
+            return NativeMethods.SfcIsFileProtected(IntPtr.Zero, filePath);
         }
 
@@ -163 +163 @@
             uint bytesReturned = 0;
 
-            using (FileStream strm = new FileStream(
-                KernelApi.NativeMethods.CreateFile(path,
-                KernelApi.NativeMethods.GENERIC_READ | KernelApi.NativeMethods.GENERIC_WRITE,
-                0, IntPtr.Zero, KernelApi.NativeMethods.OPEN_EXISTING,
-                KernelApi.NativeMethods.FILE_FLAG_BACKUP_SEMANTICS, IntPtr.Zero), FileAccess.Read))
-            {
-                if (KernelApi.NativeMethods.DeviceIoControl(strm.SafeFileHandle,
-                    KernelApi.NativeMethods.FSCTL_GET_COMPRESSION, IntPtr.Zero, 0,
+            using (FileStream strm = new FileStream(NativeMethods.CreateFile(path,
+                NativeMethods.GENERIC_READ | NativeMethods.GENERIC_WRITE,
+                0, IntPtr.Zero, NativeMethods.OPEN_EXISTING,
+                NativeMethods.FILE_FLAG_BACKUP_SEMANTICS, IntPtr.Zero), FileAccess.Read))
+            {
+                if (NativeMethods.DeviceIoControl(strm.SafeFileHandle,
+                    NativeMethods.FSCTL_GET_COMPRESSION, IntPtr.Zero, 0,
                     out compressionStatus, sizeof(ushort), out bytesReturned, IntPtr.Zero))
                 {
-                    return compressionStatus != KernelApi.NativeMethods.COMPRESSION_FORMAT_NONE;
+                    return compressionStatus != NativeMethods.COMPRESSION_FORMAT_NONE;
                 }
             }
@@ -188 +187 @@
         {
             ushort compressionStatus = compressed ?
-                KernelApi.NativeMethods.COMPRESSION_FORMAT_DEFAULT :
-                KernelApi.NativeMethods.COMPRESSION_FORMAT_NONE;
+                NativeMethods.COMPRESSION_FORMAT_DEFAULT :
+                NativeMethods.COMPRESSION_FORMAT_NONE;
             uint bytesReturned = 0;
 
-            using (FileStream strm = new FileStream(
-                KernelApi.NativeMethods.CreateFile(path,
-                KernelApi.NativeMethods.GENERIC_READ | KernelApi.NativeMethods.GENERIC_WRITE,
-                0, IntPtr.Zero, KernelApi.NativeMethods.OPEN_EXISTING,
-                KernelApi.NativeMethods.FILE_FLAG_BACKUP_SEMANTICS, IntPtr.Zero), FileAccess.ReadWrite))
-            {
-                return KernelApi.NativeMethods.DeviceIoControl(strm.SafeFileHandle,
-                    KernelApi.NativeMethods.FSCTL_SET_COMPRESSION, ref compressionStatus,
+            using (FileStream strm = new FileStream(NativeMethods.CreateFile(path,
+                NativeMethods.GENERIC_READ | NativeMethods.GENERIC_WRITE,
+                0, IntPtr.Zero, NativeMethods.OPEN_EXISTING,
+                NativeMethods.FILE_FLAG_BACKUP_SEMANTICS, IntPtr.Zero), FileAccess.ReadWrite))
+            {
+                return NativeMethods.DeviceIoControl(strm.SafeFileHandle,
+                    NativeMethods.FSCTL_SET_COMPRESSION, ref compressionStatus,
                     sizeof(ushort), IntPtr.Zero, 0, out bytesReturned, IntPtr.Zero);
             }
         }
-
-        /// <summary>
-        /// Determines whether the specified file is protected. Applications
-        /// should avoid replacing protected system files.
-        /// </summary>
-        /// <param name="RpcHandle">This parameter must be NULL.</param>
-        /// <param name="ProtFileName">The name of the file.</param>
-        /// <returns>If the file is protected, the return value is true.</returns>
-        [DllImport("Sfc.dll", CharSet = CharSet.Unicode)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool SfcIsFileProtected(IntPtr RpcHandle,
-            string ProtFileName);
 
         /// <summary>