Changeset 602 for trunk

Timestamp:

Aug 21, 2008, 11:01:02 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

Exception.ToStringでHRESULTをFormatMessageで文字列化したものを出力するようにした（要#192）。

File:

• trunk/ab5.0/ablib/src/Classes/System/Exception.ab (modified) (2 diffs)

trunk/ab5.0/ablib/src/Classes/System/Exception.ab

@@ -33 +33 @@
 InvalidProgramException
 MemberAccessException
-    FieldAccessException 
-    MethodAccessException 
-    MissingMemberException 
+    FieldAccessException
+    MethodAccessException
+    MissingMemberException
 MulticastNotSupportedException
 NullReferenceException
@@ -99 +99 @@
     */
     Override Function ToString() As String
-        If Object.ReferenceEquals(toStr, Nothing) Then
+        Imports ActiveBasic.Strings.Detail
+        If ActiveBasic.IsNothing(toStr) Then
             Dim sb = New System.Text.StringBuilder
-            sb.Append(GetType().FullName).Append(": ")
-            sb.Append(Message)
-            toStr = sb.ToString
+            With sb
+                .Append(GetType().FullName).Append(": ")
+                .Append(Message)
+                .Append(" (Error code: ")
+                .Append(FormatIntegerX(hr As DWord, 8, 0, BPrefix))
+                Dim s = ActiveBasic.Windows.HResultToString(hr)
+                If Not String.IsNullOrEmpty(s) Then
+                    .Append(" ").Append(s)
+                End If
+                .Append(")")
+                toStr = .ToString
+            End With
         End If
         Return toStr