Changeset 1705 for branches/eraser6/CodeReview/Eraser.Util/Win32ErrorCodes.cs

Timestamp:

1/27/2010 5:58:28 AM (3 years ago)

Author:

lowjoel

Message:

Replace all Marshal.GetExceptionForHR with Win32ErrorCode.GetExceptionForWin32Error since we deal with Win32 errors not unlike COM errors, except with a few exceptions and that we should be throwing Win32Exception instead of COMException.

File:

• branches/eraser6/CodeReview/Eraser.Util/Win32ErrorCodes.cs (modified) (2 diffs)

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

@@ -25 +25 @@
 using System.Runtime.InteropServices;
 using System.IO;
+using System.ComponentModel;
 
 namespace Eraser.Util
@@ -53 +54 @@
                 case NoError:           return null;
                 case SharingViolation:  return new IOException();
+            }
 
-                default:
-                    int HR = GetHRForWin32Error(errorCode);
-                    return Marshal.GetExceptionForHR(HR);
-            }
+            int HR = GetHRForWin32Error(errorCode);
+            Exception exception = Marshal.GetExceptionForHR(HR);
+            if (exception.GetType() == typeof(COMException))
+                throw new Win32Exception(errorCode);
+            else
+                throw exception;
         }