Cleaned up exception handling

We now use std::system_error where possible to report Win32 system errors. We still have WindowsException for general HRESULT based errors but we should phase it out where possible

1 files changed, 4 insertions, 14 deletions

diff --git a/zencore/include/zencore/except.h b/zencore/include/zencore/except.h
index 8f5f50e86..782dbeed0 100644
--- a/zencore/include/zencore/except.h
+++ b/zencore/include/zencore/except.h
@@ -11,18 +11,12 @@ namespace zen {
 class WindowsException : public std::exception
 {
 public:
-	WindowsException(const char* Message)
+	WindowsException(std::string_view Message)
 	{
 		m_hResult = HRESULT_FROM_WIN32(GetLastError());
 		m_Message = Message;
 	}
 
-	WindowsException(HRESULT hRes, const char* Message)
-	{
-		m_hResult = hRes;
-		m_Message = Message;
-	}
-
 	WindowsException(HRESULT hRes, std::string_view Message)
 	{
 		m_hResult = hRes;
@@ -49,18 +43,14 @@ private:
 	HRESULT		m_hResult;
 };
 
-ZENCORE_API void ThrowSystemException(HRESULT hRes, const char* Message);
+ZENCORE_API void ThrowSystemException(HRESULT hRes, std::string_view Message);
+
 inline void
 ThrowSystemException(const char* Message)
 {
 	throw WindowsException(Message);
 }
 
-inline void
-ThrowIfFailed(HRESULT hRes, const char* Message)
-{
-	if (FAILED(hRes))
-		ThrowSystemException(hRes, Message);
-}
+ZENCORE_API void ThrowLastError(std::string_view Message);
 
 }  // namespace zen