Changeset 1551

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

Location:

branches/eraser6/CodeReview

Files:

• Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (2 diffs)
• Eraser.Manager/EntropySource.cs (modified) (2 diffs)
• Eraser.Util/Eraser.Util.csproj (modified) (1 diff)
• Eraser.Util/StreamInfo.cs (modified) (1 diff)
• Eraser.Util/VolumeInfo.cs (modified) (7 diffs)
• Eraser.Util/Win32ErrorCodes.cs (added)
• Eraser/Program.cs (modified) (1 diff)

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

@@ -93 +93 @@
                 catch (IOException e)
                 {
-                    switch (System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                    switch ((Win32ErrorCodes)System.Runtime.InteropServices.Marshal.GetLastWin32Error())
                     {
-                        case 5: //ERROR_ACCESS_DENIED
+                        case Win32ErrorCodes.AccessDenied:
                             throw new UnauthorizedAccessException(S._("The file {0} could not " +
                                 "be erased because the file's permissions prevent access to the file.",
                                 info.FullName));
 
-                        case 32: //ERROR_SHARING_VIOLATION
+                        case Win32ErrorCodes.SharingViolation:
                             //If after FilenameEraseTries the file is still locked, some program is
                             //definitely using the file; throw an exception.
@@ -126 +126 @@
                 catch (IOException e)
                 {
-                    switch (System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                    switch ((Win32ErrorCodes)System.Runtime.InteropServices.Marshal.GetLastWin32Error())
                     {
-                        case 5: //ERROR_ACCESS_DENIED
+                        case Win32ErrorCodes.AccessDenied:
                             throw new UnauthorizedAccessException(S._("The file {0} could not " +
                                 "be erased because the file's permissions prevent access to the file.",
                                 info.FullName), e);
 
-                        case 32: //ERROR_SHARING_VIOLATION
+                        case Win32ErrorCodes.SharingViolation:
                             //If after FilenameEraseTries the file is still locked, some program is
                             //definitely using the file; throw an exception.

branches/eraser6/CodeReview/Eraser.Manager/EntropySource.cs

@@ -344 +344 @@
                 catch (System.ComponentModel.Win32Exception e)
                 {
-                    if (e.NativeErrorCode != 5) //ERROR_ACCESS_DENIED
+                    if (e.NativeErrorCode != (int)Win32ErrorCodes.AccessDenied)
                         throw;
                 }
@@ -437 +437 @@
                     (uint)infoBuffer.Length, out dataWritten);
 
-                if (sysInfo == 0 /*ERROR_SUCCESS*/ && dataWritten > 0)
+                if (sysInfo == (int)Win32ErrorCodes.Success && dataWritten > 0)
                 {
                     byte[] entropy = new byte[dataWritten];

branches/eraser6/CodeReview/Eraser.Util/Eraser.Util.csproj

@@ -85 +85 @@
   <ItemGroup>
     <Compile Include="NativeMethods\Sfc.cs" />
+    <Compile Include="Win32ErrorCodes.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -133 +133 @@
                     if (!handle.IsInvalid)
                         return true;
-                    else if (Marshal.GetLastWin32Error() == 2 /*ERROR_FILE_NOT_FOUND*/)
+                    else if (Marshal.GetLastWin32Error() == (int)Win32ErrorCodes.FileNotFound)
                         return false;
 

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);
 

branches/eraser6/CodeReview/Eraser/Program.cs

@@ -157 +157 @@
                 catch (UnauthorizedAccessException)
                 {
-                    return 5; //ERROR_ACCESS_DENIED
+                    return (int)Win32ErrorCodes.AccessDenied;
                 }
                 catch (Win32Exception e)