Improvements to HRESULT

elachlan · elachlan · commit cc78d53b5877 · 2022-08-25T14:21:03.000+10:00
diff --git a/src/Microsoft.Windows.CsWin32/templates/HRESULT.cs b/src/Microsoft.Windows.CsWin32/templates/HRESULT.cs
@@ -61,7 +61,9 @@ internal HRESULT ThrowOnFailure(IntPtr errorInfo = default)
         return this;
     }
 
-    public override string ToString() => this.Value.ToString();
+	internal static HRESULT HRESULT_FROM_WIN32(WIN32_ERROR error) => new(((int)error & 0x0000FFFF) | unchecked((int)0x80070000));
 
-    internal string ToString(string format, IFormatProvider formatProvider) => ((uint)this.Value).ToString(format, formatProvider);
+	public override string ToString() => $"0x{this.Value:X8}";
+
+	internal string ToString(string format, IFormatProvider formatProvider) => ((uint)this.Value).ToString(format, formatProvider);
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ internal HRESULT ThrowOnFailure(IntPtr errorInfo = default)`
`61`	`61`	`return this;`
`62`	`62`	`}`
`63`	`63`
`64`		`- public override string ToString() => this.Value.ToString();`
	`64`	`+ internal static HRESULT HRESULT_FROM_WIN32(WIN32_ERROR error) => new(((int)error & 0x0000FFFF) \| unchecked((int)0x80070000));`
`65`	`65`
`66`		`- internal string ToString(string format, IFormatProvider formatProvider) => ((uint)this.Value).ToString(format, formatProvider);`
	`66`	`+ public override string ToString() => $"0x{this.Value:X8}";`
	`67`	`+`
	`68`	`+ internal string ToString(string format, IFormatProvider formatProvider) => ((uint)this.Value).ToString(format, formatProvider);`
`67`	`69`	`}`