1 files changed, 47 insertions, 31 deletions
diff --git a/CruUI/exception.h b/CruUI/exception.h
index c7d6f996..2817f261 100644
--- a/CruUI/exception.h
+++ b/CruUI/exception.h
@@ -2,41 +2,57 @@
 
 #include "system_headers.h"
 #include <optional>
+#include <string_view>
 
 #include "base.h"
 
 
 namespace cru {
-	class HResultError : public std::runtime_error
-	{
-	public:
-		explicit HResultError(HRESULT h_result);
-		HResultError(HRESULT h_result, const std::string& message);
-	    HResultError(const HResultError& other) = default;
-	    HResultError(HResultError&& other) = default;
-	    HResultError& operator=(const HResultError& other) = default;
-	    HResultError& operator=(HResultError&& other) = default;
-		~HResultError() override = default;
-
-		HRESULT GetHResult() const
-		{
+    class HResultError : public std::runtime_error
+    {
+    public:
+        explicit HResultError(HRESULT h_result, std::optional<std::string_view> additional_message = std::nullopt);
+        HResultError(const HResultError& other) = default;
+        HResultError(HResultError&& other) = default;
+        HResultError& operator=(const HResultError& other) = default;
+        HResultError& operator=(HResultError&& other) = default;
+        ~HResultError() override = default;
+
+        HRESULT GetHResult() const
+        {
             return h_result_;
-		}
-
-	private:
-	    static std::string MakeMessage(HRESULT h_result, std::optional<std::string> message);
-
-	private:
-		HRESULT h_result_;
-	};
-
-	inline void ThrowIfFailed(const HRESULT h_result) {
-		if (FAILED(h_result))
-			throw HResultError(h_result);
-	}
-
-	inline void ThrowIfFailed(const HRESULT h_result, const std::string& message) {
-		if (FAILED(h_result))
-			throw HResultError(h_result, message);
-	}
+        }
+
+    private:
+        HRESULT h_result_;
+    };
+
+    inline void ThrowIfFailed(const HRESULT h_result) {
+        if (FAILED(h_result))
+            throw HResultError(h_result);
+    }
+
+    inline void ThrowIfFailed(const HRESULT h_result, const std::string& message) {
+        if (FAILED(h_result))
+            throw HResultError(h_result, message);
+    }
+
+    class Win32Error : public std::runtime_error
+    {
+    public:
+        explicit Win32Error(DWORD error_code, std::optional<std::string_view> additional_message = std::nullopt);
+        Win32Error(const Win32Error& other) = default;
+        Win32Error(Win32Error&& other) = default;
+        Win32Error& operator=(const Win32Error& other) = default;
+        Win32Error& operator=(Win32Error&& other) = default;
+        ~Win32Error() override = default;
+
+        HRESULT GetErrorCode() const
+        {
+            return error_code_;
+        }
+
+    private:
+        DWORD error_code_;
+    };
 }