Changeset 1474 for branches/eraser6/6.0

Timestamp:

1/6/2010 5:11:47 AM (3 years ago)

Author:

lowjoel

Message:

No need to call GetLastError? to get the error code for SfcIsFileProtected?: the last error code is not set by the function. Fixes #286.

Location:

branches/eraser6/6.0

Files:

• . (modified) (1 prop)
• Eraser.Util/File.cs (modified) (2 diffs)

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

@@ -150 +150 @@
         public static bool IsProtectedSystemFile(string filePath)
         {
-            if (filePath.Length > 255)
-                return false;
-            if (SfcIsFileProtected(IntPtr.Zero, filePath))
-                return true;
-
-            switch (Marshal.GetLastWin32Error())
-            {
-                case 0: //ERROR_SUCCESS
-                case 2: //ERROR_FILE_NOT_FOUND
-                    return false;
-
-                default:
-                    throw Marshal.GetExceptionForHR(Marshal.GetHRForLastWin32Error());
-            }
+            return SfcIsFileProtected(IntPtr.Zero, filePath);
         }
 
@@ -223 +210 @@
         /// <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.
-        /// 
-        /// If the file is not protected, the return value is false and
-        /// Marshal.GetLastWin32Error() returns ERROR_FILE_NOT_FOUND. If the
-        /// function fails, Marshal.GetLastWin32Error() will return a different
-        /// error code.</returns>
-        [DllImport("Sfc.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        /// <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,