From 2ed65999ef6f3e1156427dd3efe04353ae657882 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 25 Jan 2022 17:30:46 +0800 Subject: ... --- include/cru/win/Exception.hpp | 51 +--------------------------------------- include/cru/win/WinPreConfig.hpp | 17 +------------- 2 files changed, 2 insertions(+), 66 deletions(-) (limited to 'include/cru/win') diff --git a/include/cru/win/Exception.hpp b/include/cru/win/Exception.hpp index 3a95aa5d..d3ac69a7 100644 --- a/include/cru/win/Exception.hpp +++ b/include/cru/win/Exception.hpp @@ -1,51 +1,2 @@ #pragma once -#include "WinPreConfig.hpp" - -#include "cru/platform/Exception.hpp" - -#include -#include - -namespace cru::platform::win { -class HResultError : public platform::PlatformException { - public: - explicit HResultError(HRESULT h_result); - explicit HResultError(HRESULT h_result, std::string_view message); - - CRU_DEFAULT_COPY(HResultError) - CRU_DEFAULT_MOVE(HResultError) - - ~HResultError() override = default; - - HRESULT GetHResult() const { return h_result_; } - - 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, std::string_view message) { - if (FAILED(h_result)) throw HResultError(h_result, message); -} - -class Win32Error : public platform::PlatformException { - public: - // ::GetLastError is automatically called to get the error code. - // The same as Win32Error(::GetLastError(), message) - explicit Win32Error(std::string_view message); - Win32Error(DWORD error_code, std::string_view message); - - CRU_DEFAULT_COPY(Win32Error) - CRU_DEFAULT_MOVE(Win32Error) - - ~Win32Error() override = default; - - DWORD GetErrorCode() const { return error_code_; } - - private: - DWORD error_code_; -}; -} // namespace cru::platform::win +#include "cru/common/platform/win/Exception.hpp" diff --git a/include/cru/win/WinPreConfig.hpp b/include/cru/win/WinPreConfig.hpp index 1bd494f2..1658e45d 100644 --- a/include/cru/win/WinPreConfig.hpp +++ b/include/cru/win/WinPreConfig.hpp @@ -1,17 +1,2 @@ #pragma once - -#include "cru/common/PreConfig.hpp" - -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN -#include -#undef CreateWindow -#undef DrawText -#undef CreateFont -#undef CreateEvent - -#include -#include -#include -#include -#include +#include "cru/common/platform/win/WinPreConfig.hpp" -- cgit v1.2.3