Changeset 293

Timestamp:

3/25/2008 12:39:31 PM (5 years ago)

Author:

lowjoel

Message:

When calling File.GetFileDescription? or File.GetFileIcon?, the path provided must end with a trailing \ if the path is a directory or volume.

Location:

branches/eraser6

Files:

• Eraser/TaskDataSelectionForm.cs (modified) (1 diff)
• Util/File.cs (modified) (3 diffs)

branches/eraser6/Eraser/TaskDataSelectionForm.cs

@@ -45 +45 @@
                     DriveItem item = new DriveItem();
                     item.Drive = drive.Substring(0, drive.Length - 1);
-                    item.Label = Eraser.Util.File.GetFileDescription(item.Drive);
-                    item.Icon = Eraser.Util.File.GetFileIcon(item.Drive);
+                    item.Label = Eraser.Util.File.GetFileDescription(item.Drive +
+                        Path.DirectorySeparatorChar);
+                    item.Icon = Eraser.Util.File.GetFileIcon(item.Drive +
+                        Path.DirectorySeparatorChar);
                     unusedDisk.Items.Add(item);
                 }

branches/eraser6/Util/File.cs

@@ -78 +78 @@
         /// </summary>
         /// <param name="path">A string that contains the path and file name for
-        /// the file in question. Both absolute and relative paths are valid.</param>
+        /// the file in question. Both absolute and relative paths are valid.
+        /// Directories and volumes must contain the trailing \</param>
         /// <returns>A string containing the description</returns>
         public static string GetFileDescription(string path)
@@ -93 +94 @@
         /// </summary>
         /// <param name="path">A string that contains the path and file name for
-        /// the file in question. Both absolute and relative paths are valid.</param>
+        /// the file in question. Both absolute and relative paths are valid.
+        /// Directories and volumes must contain the trailing \</param>
         /// <returns>An Icon object containing the bitmap</returns>
         public static Icon GetFileIcon(string path)
         {
             SHFILEINFO shfi = new SHFILEINFO();
-            SHGetFileInfo(path + "\\", 0, ref shfi, Marshal.SizeOf(shfi),
+            SHGetFileInfo(path, 0, ref shfi, Marshal.SizeOf(shfi),
                 SHGetFileInfoFlags.SHGFI_SMALLICON | SHGetFileInfoFlags.SHGFI_ICON);
             return Icon.FromHandle(shfi.hIcon);
@@ -399 +401 @@
         }
 
+        [StructLayout(LayoutKind.Sequential)]
         private struct SHFILEINFO
         {