Changeset 2251

Timestamp:

10/23/2010 4:18:25 PM (3 years ago)

Author:

lowjoel

Message:

Supplements r2249: compile fixes and remove redundant code in the v6.0 branch (some changes were specific to 6.2)

Location:

branches/eraser6/6.0

Files:

• Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (4 diffs)
• Eraser.Util/KernelApi.cs (modified) (1 diff)
• Eraser.Util/StreamInfo.cs (modified) (2 diffs)

branches/eraser6/6.0/Eraser.DefaultPlugins/FileSystems/Windows.cs

@@ -36 +36 @@
     public abstract class WindowsFileSystem : FileSystem
     {
-        public override void ResetFileTimes(FileSystemInfo info)
-        {
-            //Reset the file access times: after every rename the file times may change.
-            info.SetTimes(MinTimestamp, MinTimestamp, MinTimestamp, MinTimestamp);
-        }
-
         public override void DeleteFile(FileInfo info)
         {
@@ -57 +51 @@
                 try
                 {
-                    ResetFileTimes(info);
+                    info.CreationTime = info.LastWriteTime = info.LastAccessTime = MinTimestamp;
                     info.MoveTo(newPath);
                     ++i;
@@ -81 +75 @@
                             break;
 
-                        case Win32ErrorCode.DiskFull:
+                        case 112: //ERROR_DISK_FULL
                             //If the disk is full, we can't do anything except manually deleting
                             //the file, break out of this loop.
@@ -373 +367 @@
                 }
             }
-            finally
-            {
-                //Reset the file times
-                streamInfo.SetTimes(MinTimestamp, created, lastWrite, lastAccess);
-            }
         }
 

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

@@ -612 +612 @@
                 uint dwFlagsAndAttributes, IntPtr hTemplateFile);
 
+            public const uint FILE_READ_ATTRIBUTES = 0x0080;
+            public const uint FILE_WRITE_ATTRIBUTES = 0x0100;
             public const uint GENERIC_READ = 0x80000000;
             public const uint GENERIC_WRITE = 0x40000000;

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

@@ -387 +387 @@
             }
 
-            return OpenHandle(mode, iAccess, share, options);
-        }
-
-        internal SafeFileHandle OpenHandle(FileMode mode, uint access, FileShare share,
-            FileOptions options)
-        {
             //Sharing mode
             if ((share & FileShare.Inheritable) != 0)
@@ -414 +408 @@
         }
 
-        public void SetTimes(DateTime updateTime, DateTime createdTime, DateTime lastModifiedTime,
-            DateTime lastAccessedTime)
-        {
-            using (SafeFileHandle streamHandle = OpenHandle(FileMode.Open,
-                    NativeMethods.FILE_WRITE_ATTRIBUTES, FileShare.ReadWrite,
-                    FileOptions.None))
-            {
-                ExtensionMethods.IO.SetTimes(streamHandle, updateTime, createdTime,
-                    lastModifiedTime, lastAccessedTime);
-            }
-        }
-
         /// <summary>
         /// Returns the path as a string.