Changeset 2194

Timestamp:

06/18/10 15:14:57 (3 years ago)

Author:

lowjoel

Message:

Change all internal OpenHandle? functions to private, since they should not be callable from outside the class.

Location:

trunk/eraser/Eraser.Util

Files:

• ExtensionMethods/IO.cs (modified) (3 diffs)
• StreamInfo.cs (modified) (1 diff)

trunk/eraser/Eraser.Util/ExtensionMethods/IO.cs

@@ -82 +82 @@
             DateTime createdTime, DateTime lastModifiedTime, DateTime lastAccessedTime)
         {
-            using (SafeFileHandle streamHandle = new StreamInfo(info.FullName).
-                OpenHandle(FileMode.Open, NativeMethods.FILE_WRITE_ATTRIBUTES,
-                    FileShare.ReadWrite, FileOptions.None))
-            {
-                SetTimes(streamHandle, updateTime, createdTime, lastModifiedTime, lastAccessedTime);
+            using (SafeFileHandle handle = NativeMethods.CreateFile(info.FullName,
+                NativeMethods.FILE_WRITE_ATTRIBUTES, 0, IntPtr.Zero,
+                NativeMethods.OPEN_EXISTING, 0, IntPtr.Zero))
+            {
+                SetTimes(handle, updateTime, createdTime, lastModifiedTime, lastAccessedTime);
             }
         }
@@ -101 +101 @@
             DateTime createdTime, DateTime lastModifiedTime, DateTime lastAccessedTime)
         {
-            using (SafeFileHandle streamHandle = new StreamInfo(info.FullName).
-                OpenHandle(FileMode.Open, NativeMethods.FILE_WRITE_ATTRIBUTES,
-                    FileShare.ReadWrite, (FileOptions)NativeMethods.FILE_FLAG_BACKUP_SEMANTICS))
-            {
-                SetTimes(streamHandle, updateTime, createdTime, lastModifiedTime, lastAccessedTime);
+            using (SafeFileHandle handle = NativeMethods.CreateFile(info.FullName,
+                NativeMethods.FILE_WRITE_ATTRIBUTES, (uint)FileShare.ReadWrite, IntPtr.Zero,
+                NativeMethods.OPEN_EXISTING, NativeMethods.FILE_FLAG_BACKUP_SEMANTICS, IntPtr.Zero))
+            {
+                SetTimes(handle, updateTime, createdTime, lastModifiedTime, lastAccessedTime);
             }
         }
@@ -424 +424 @@
         {
             List<StreamInfo> result = new List<StreamInfo>();
-            using (FileStream stream = new StreamInfo(info.FullName).Open(FileMode.Open,
-                FileAccess.Read, FileShare.ReadWrite))
-            using (SafeFileHandle streamHandle = stream.SafeFileHandle)
-            {
+            using (SafeFileHandle streamHandle = NativeMethods.CreateFile(info.FullName,
+                NativeMethods.GENERIC_READ, (uint)FileShare.ReadWrite, IntPtr.Zero,
+                (uint)FileMode.Open, (uint)FileOptions.None, IntPtr.Zero))
+            {
+                if (streamHandle.IsInvalid)
+                    throw Win32ErrorCode.GetExceptionForWin32Error(Marshal.GetLastWin32Error());
+
                 //Allocate the structures
                 NativeMethods.FILE_STREAM_INFORMATION[] streams = GetADSes(streamHandle);

trunk/eraser/Eraser.Util/StreamInfo.cs

@@ -313 +313 @@
         }
 
-        internal SafeFileHandle OpenHandle(FileMode mode, uint access, FileShare share,
+        private SafeFileHandle OpenHandle(FileMode mode, uint access, FileShare share,
             FileOptions options)
         {