Changeset 2178 for trunk/eraser/Eraser.Util/VolumeInfo.cs

Timestamp:

6/18/2010 6:44:31 AM (2 years ago)

Author:

lowjoel

Message:

Fixed error in marshalling managed to unmanaged -- the mount points for any volume would only return a maximum of 1 regardless of how many mountpoints there really were due to the array being null-terminated.

File:

• trunk/eraser/Eraser.Util/VolumeInfo.cs (modified) (3 diffs)

trunk/eraser/Eraser.Util/VolumeInfo.cs

@@ -98 +98 @@
             {
                 uint returnLength = 0;
-                StringBuilder pathNamesBuffer = new StringBuilder();
-                pathNamesBuffer.EnsureCapacity(NativeMethods.MaxPath);
+                char[] pathNamesBuffer = new char[NativeMethods.MaxPath];
                 while (!NativeMethods.GetVolumePathNamesForVolumeName(VolumeId,
-                    pathNamesBuffer, (uint)pathNamesBuffer.Capacity, out returnLength))
+                    pathNamesBuffer, (uint)pathNamesBuffer.Length, out returnLength))
                 {
                     int errorCode = Marshal.GetLastWin32Error();
@@ -110 +109 @@
                             return result;
                         case Win32ErrorCode.MoreData:
-                            pathNamesBuffer.EnsureCapacity((int)returnLength);
+                            pathNamesBuffer = new char[pathNamesBuffer.Length * 2];
                             break;
                         default:
@@ -117 +116 @@
                 }
 
-                if (pathNamesBuffer.Length < returnLength)
-                    pathNamesBuffer.Length = (int)returnLength;
-                pathNames = pathNamesBuffer.ToString().Substring(0, (int)returnLength);
+                pathNames = new string(pathNamesBuffer, 0, (int)returnLength);
             }