From ccf48eb93a101ba2412497ad5f3966e4f31d2178 Mon Sep 17 00:00:00 2001
From: Yuqian Yang <crupest@crupest.life>
Date: Fri, 7 Nov 2025 00:11:38 +0800
Subject: Win Resource.h to Base.h.

---
 src/base/platform/win/Base.cpp                 | 37 ++++++++++++++++++++++++++
 src/base/platform/win/BrigdeComStream.h        |  3 +--
 src/base/platform/win/ComAutoInit.cpp          |  1 -
 src/base/platform/win/Exception.cpp            | 37 --------------------------
 src/base/platform/win/StreamConvert.cpp        |  2 --
 src/base/platform/win/Win32FileStream.cpp      |  1 -
 src/base/platform/win/Win32FileStreamPrivate.h |  2 +-
 7 files changed, 39 insertions(+), 44 deletions(-)
 create mode 100644 src/base/platform/win/Base.cpp
 delete mode 100644 src/base/platform/win/Exception.cpp

(limited to 'src/base/platform')

diff --git a/src/base/platform/win/Base.cpp b/src/base/platform/win/Base.cpp
new file mode 100644
index 00000000..5edf9779
--- /dev/null
+++ b/src/base/platform/win/Base.cpp
@@ -0,0 +1,37 @@
+#include "cru/base/platform/win/Base.h"
+
+#include <format>
+#include <optional>
+
+namespace cru::platform::win {
+
+inline std::string HResultMakeMessage(HRESULT h_result,
+                                      std::optional<std::string_view> message) {
+  if (message.has_value())
+    return std::format("HRESULT: {}. Message: {}", h_result, *message);
+  else
+    return std::format("HRESULT: {}.", h_result);
+}
+
+HResultError::HResultError(HRESULT h_result)
+    : Exception(HResultMakeMessage(h_result, std::nullopt)),
+      h_result_(h_result) {}
+
+HResultError::HResultError(HRESULT h_result,
+                           std::string_view additional_message)
+    : Exception(HResultMakeMessage(h_result, additional_message)),
+      h_result_(h_result) {}
+
+inline std::string Win32MakeMessage(DWORD error_code,
+                                    std::string_view message) {
+  return std::format("Last error code: {}.\nMessage: {}\n", error_code,
+                     message);
+}
+
+Win32Error::Win32Error(std::string_view message)
+    : Win32Error(::GetLastError(), message) {}
+
+Win32Error::Win32Error(DWORD error_code, std::string_view message)
+    : Exception(Win32MakeMessage(error_code, message)),
+      error_code_(error_code) {}
+}  // namespace cru::platform::win
diff --git a/src/base/platform/win/BrigdeComStream.h b/src/base/platform/win/BrigdeComStream.h
index 1621b567..ee189433 100644
--- a/src/base/platform/win/BrigdeComStream.h
+++ b/src/base/platform/win/BrigdeComStream.h
@@ -1,6 +1,5 @@
 #pragma once
-#include "cru/base/platform/win/WinPreConfig.h"
-
+#include "cru/base/platform/win/Base.h"
 #include "cru/base/io/Stream.h"
 
 #include <objidlbase.h>
diff --git a/src/base/platform/win/ComAutoInit.cpp b/src/base/platform/win/ComAutoInit.cpp
index 548a7bea..75ced601 100644
--- a/src/base/platform/win/ComAutoInit.cpp
+++ b/src/base/platform/win/ComAutoInit.cpp
@@ -1,5 +1,4 @@
 #include "cru/base/platform/win/ComAutoInit.h"
-#include "cru/base/platform/win/Exception.h"
 
 #include <combaseapi.h>
 
diff --git a/src/base/platform/win/Exception.cpp b/src/base/platform/win/Exception.cpp
deleted file mode 100644
index adc59e3c..00000000
--- a/src/base/platform/win/Exception.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "cru/base/platform/win/Exception.h"
-
-#include <format>
-#include <optional>
-
-namespace cru::platform::win {
-
-inline std::string HResultMakeMessage(HRESULT h_result,
-                                      std::optional<std::string_view> message) {
-  if (message.has_value())
-    return std::format("HRESULT: {}. Message: {}", h_result, *message);
-  else
-    return std::format("HRESULT: {}.", h_result);
-}
-
-HResultError::HResultError(HRESULT h_result)
-    : Exception(HResultMakeMessage(h_result, std::nullopt)),
-      h_result_(h_result) {}
-
-HResultError::HResultError(HRESULT h_result,
-                           std::string_view additional_message)
-    : Exception(HResultMakeMessage(h_result, additional_message)),
-      h_result_(h_result) {}
-
-inline std::string Win32MakeMessage(DWORD error_code,
-                                    std::string_view message) {
-  return std::format("Last error code: {}.\nMessage: {}\n", error_code,
-                     message);
-}
-
-Win32Error::Win32Error(std::string_view message)
-    : Win32Error(::GetLastError(), message) {}
-
-Win32Error::Win32Error(DWORD error_code, std::string_view message)
-    : Exception(Win32MakeMessage(error_code, message)),
-      error_code_(error_code) {}
-}  // namespace cru::platform::win
diff --git a/src/base/platform/win/StreamConvert.cpp b/src/base/platform/win/StreamConvert.cpp
index e0266765..cb353fd3 100644
--- a/src/base/platform/win/StreamConvert.cpp
+++ b/src/base/platform/win/StreamConvert.cpp
@@ -2,9 +2,7 @@
 #include "BrigdeComStream.h"
 #include "Win32FileStreamPrivate.h"
 #include "cru/base/io/MemoryStream.h"
-#include "cru/base/io/OpenFileFlag.h"
 #include "cru/base/platform/win/ComAutoInit.h"
-#include "cru/base/platform/win/Exception.h"
 #include "cru/base/platform/win/Win32FileStream.h"
 
 #include <shlwapi.h>
diff --git a/src/base/platform/win/Win32FileStream.cpp b/src/base/platform/win/Win32FileStream.cpp
index 618ce386..96a3dc67 100644
--- a/src/base/platform/win/Win32FileStream.cpp
+++ b/src/base/platform/win/Win32FileStream.cpp
@@ -3,7 +3,6 @@
 #include "Win32FileStreamPrivate.h"
 #include "cru/base/StringUtil.h"
 #include "cru/base/io/OpenFileFlag.h"
-#include "cru/base/platform/win/Exception.h"
 
 #include <Windows.h>
 #include <coml2api.h>
diff --git a/src/base/platform/win/Win32FileStreamPrivate.h b/src/base/platform/win/Win32FileStreamPrivate.h
index 718f8d9a..c49fa913 100644
--- a/src/base/platform/win/Win32FileStreamPrivate.h
+++ b/src/base/platform/win/Win32FileStreamPrivate.h
@@ -1,4 +1,4 @@
-#include "cru/base/platform/win/WinPreConfig.h"
+#include "cru/base/platform/win/Base.h"
 
 #include <objidl.h>
 
-- 
cgit v1.2.3