Changeset 1551 for branches/eraser6/CodeReview/Eraser.Util/VolumeInfo.cs

Timestamp:

1/18/2010 5:23:07 AM (3 years ago)

Author:

lowjoel

Message:

Replace all ERROR_* constants with the Win32ErrorCodes class (to be more descriptive.) Addresses #284: Eraser.Util rewrite

File:

• branches/eraser6/CodeReview/Eraser.Util/VolumeInfo.cs (modified) (7 diffs)

branches/eraser6/CodeReview/Eraser.Util/VolumeInfo.cs

@@ -52 +52 @@
                     pathNamesBuffer, (uint)pathNamesBuffer.Capacity, out returnLength))
                 {
-                    if (Marshal.GetLastWin32Error() == 234 /*ERROR_MORE_DATA*/)
+                    if (Marshal.GetLastWin32Error() == (int)Win32ErrorCodes.MoreData)
                         pathNamesBuffer.EnsureCapacity((int)returnLength);
                     else
@@ -93 +93 @@
             {
                 int lastError = Marshal.GetLastWin32Error();
-                switch (lastError)
-                {
-                    case 0:     //ERROR_NO_ERROR
-                    case 21:    //ERROR_NOT_READY
-                    case 87:    //ERROR_INVALID_PARAMETER: when the volume given is not mounted.
-                    case 1005:  //ERROR_UNRECOGNIZED_VOLUME
+                switch ((Win32ErrorCodes)lastError)
+                {
+                    case Win32ErrorCodes.Success:
+                    case Win32ErrorCodes.NotReady:
+                    case Win32ErrorCodes.InvalidParameter:  //when the volume given is not mounted.
+                    case Win32ErrorCodes.UnrecognizedVolume:
                         break;
 
@@ -148 +148 @@
 
                 //Close the handle
-                if (Marshal.GetLastWin32Error() == 18 /*ERROR_NO_MORE_FILES*/)
+                if (Marshal.GetLastWin32Error() == (int)Win32ErrorCodes.NoMoreFiles)
                     NativeMethods.FindVolumeClose(handle);
 
@@ -177 +177 @@
                 else
                 {
-                    switch (Marshal.GetLastWin32Error())
+                    switch ((Win32ErrorCodes)Marshal.GetLastWin32Error())
                     {
-                        case 1: //ERROR_INVALID_FUNCTION
-                        case 2: //ERROR_FILE_NOT_FOUND
-                        case 3: //ERROR_PATH_NOT_FOUND
-                        case 4390: //ERROR_NOT_A_REPARSE_POINT
+                        case Win32ErrorCodes.InvalidFunction:
+                        case Win32ErrorCodes.FileNotFound:
+                        case Win32ErrorCodes.PathNotFound:
+                        case Win32ErrorCodes.NotAReparsePoint:
                             break;
                         default:
@@ -194 +194 @@
 
             throw Marshal.GetExceptionForHR(KernelApi.GetHRForWin32Error(
-                4390 /*ERROR_NOT_A_REPARSE_POINT*/));
+                (int)Win32ErrorCodes.NotAReparsePoint));
         }
 
@@ -272 +272 @@
                     return totalNumberOfFreeBytes != freeBytesAvailable;
                 }
-                else if (Marshal.GetLastWin32Error() == 21 /*ERROR_NOT_READY*/)
+                else if (Marshal.GetLastWin32Error() == (int)Win32ErrorCodes.NotReady)
                 {
                     //For the lack of more appropriate responses.
@@ -362 +362 @@
 
                 //Close the handle
-                if (Marshal.GetLastWin32Error() == 18 /*ERROR_NO_MORE_FILES*/)
+                if (Marshal.GetLastWin32Error() == (int)Win32ErrorCodes.NoMoreFiles)
                     NativeMethods.FindVolumeMountPointClose(handle);