Use std::system_error consistently

dechamps · May 26, 2024 · 71aab1a · 71aab1a
1 parent f05ee9f
commit 71aab1a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 60 deletions.
diff --git a/src/flexasio/FlexASIO/CMakeLists.txt b/src/flexasio/FlexASIO/CMakeLists.txt
@@ -44,7 +44,6 @@ add_library(FlexASIO_control_panel STATIC EXCLUDE_FROM_ALL control_panel.cpp)
 target_link_libraries(FlexASIO_control_panel
 	PRIVATE FlexASIO_log
 	PRIVATE FlexASIOUtil_windows_com
-	PRIVATE FlexASIOUtil_windows_error
 	PRIVATE FlexASIOUtil_windows_registry
 	PRIVATE FlexASIOUtil_windows_string
 	PRIVATE dechamps_CMakeUtils_version

diff --git a/src/flexasio/FlexASIO/control_panel.cpp b/src/flexasio/FlexASIO/control_panel.cpp
@@ -3,7 +3,6 @@
 #include "control_panel.h"
 
 #include "../FlexASIOUtil/windows_com.h"
-#include "../FlexASIOUtil/windows_error.h"
 #include "../FlexASIOUtil/windows_registry.h"
 #include "../FlexASIOUtil/windows_string.h"
 
@@ -14,6 +13,8 @@
 
 #include <Windows.h>
 
+#include <system_error>
+
 namespace flexasio {
 
 	namespace {
@@ -34,7 +35,7 @@ namespace flexasio {
 
 			Log() << "Executing: " << ConvertToUTF8(file);
 			if (!::ShellExecuteW(windowHandle, NULL, file.c_str(), NULL, NULL, SW_SHOWNORMAL))
-				throw std::runtime_error("Execution failed: " + GetWindowsErrorString(::GetLastError()));
+				throw std::system_error(::GetLastError(), std::system_category(), "ShellExecuteW failed");
 		}
 
 		std::wstring GetStringRegistryValue(HKEY registryKey, LPCWSTR valueName) {
@@ -49,7 +50,7 @@ namespace flexasio {
 					value.resize(valueSize);
 					continue;
 				}
-				if (regQueryValueError != ERROR_SUCCESS) throw std::runtime_error("Unable to query string registry value: " + GetWindowsErrorString(regQueryValueError));
+				if (regQueryValueError != ERROR_SUCCESS) throw std::system_error(regQueryValueError, std::system_category(), "Unable to query string registry value");
 				Log() << "Registry value size: " << valueSize;
 				if (valueType != REG_SZ) throw std::runtime_error("Expected string registry value type, got " + std::to_string(valueType));
 				value.resize(valueSize);
@@ -67,7 +68,7 @@ namespace flexasio {
 		UniqueHKEY OpenFlexAsioGuiInstallRegistryKey() {
 			HKEY registryKey;
 			const auto regOpenKeyError = ::RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Fabrikat\\FlexASIOGUI\\Install", {}, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &registryKey);
-			if (regOpenKeyError != ERROR_SUCCESS) throw std::runtime_error("Unable to open FlexASIOGUI registry key: " + GetWindowsErrorString(regOpenKeyError));
+			if (regOpenKeyError != ERROR_SUCCESS) throw std::system_error(regOpenKeyError, std::system_category(), "Unable to open FlexASIOGUI registry key");
 			return UniqueHKEY(registryKey);
 		}
 

diff --git a/src/flexasio/FlexASIOUtil/CMakeLists.txt b/src/flexasio/FlexASIOUtil/CMakeLists.txt
@@ -7,18 +7,7 @@ target_link_libraries(FlexASIOUtil_portaudio
 add_library(FlexASIOUtil_shell STATIC shell.cpp)
 
 add_library(FlexASIOUtil_windows_com STATIC windows_com.cpp)
-target_link_libraries(FlexASIOUtil_windows_com
-	PRIVATE FlexASIOUtil_windows_error
-)
-
-add_library(FlexASIOUtil_windows_error STATIC windows_error.cpp)
 
 add_library(FlexASIOUtil_windows_registry STATIC windows_registry.cpp)
-target_link_libraries(FlexASIOUtil_windows_registry
-	PRIVATE FlexASIOUtil_windows_error
-)
 
 add_library(FlexASIOUtil_windows_string STATIC windows_string.cpp)
-target_link_libraries(FlexASIOUtil_windows_string
-	PRIVATE FlexASIOUtil_windows_error
-)
diff --git a/src/flexasio/FlexASIOUtil/windows_com.cpp b/src/flexasio/FlexASIOUtil/windows_com.cpp
@@ -1,15 +1,14 @@
 #include "windows_com.h"
 
-#include "windows_error.h"
-
 #include <stdexcept>
+#include <system_error>
 
 namespace flexasio {
 
 	COMInitializer::COMInitializer(DWORD coInit) {
 		const auto coInitializeResult = CoInitializeEx(NULL, coInit);
 		if (FAILED(coInitializeResult))
-			throw std::runtime_error("Failed to initialize COM: " + GetWindowsErrorString(coInitializeResult));
+			throw std::system_error(coInitializeResult, std::system_category(), "Failed to initialize COM");
 	}
 
 	COMInitializer::~COMInitializer() {

diff --git a/src/flexasio/FlexASIOUtil/windows_error.cpp b/src/flexasio/FlexASIOUtil/windows_error.cpp
diff --git a/src/flexasio/FlexASIOUtil/windows_error.h b/src/flexasio/FlexASIOUtil/windows_error.h
diff --git a/src/flexasio/FlexASIOUtil/windows_registry.cpp b/src/flexasio/FlexASIOUtil/windows_registry.cpp
@@ -1,15 +1,14 @@
 #include "windows_registry.h"
 
-#include "windows_error.h"
-
 #include <stdexcept>
+#include <system_error>
 
 namespace flexasio {
 
 	void HKEYDeleter::operator()(HKEY hkey) const {
 		const auto regCloseKeyError = ::RegCloseKey(hkey);
 		if (regCloseKeyError != ERROR_SUCCESS)
-			throw std::runtime_error("Unable to close registry key: " + GetWindowsErrorString(regCloseKeyError));
+			throw std::system_error(regCloseKeyError, std::system_category(), "Unable to close registry key");
 	}
 
 }
diff --git a/src/flexasio/FlexASIOUtil/windows_string.cpp b/src/flexasio/FlexASIOUtil/windows_string.cpp
@@ -1,34 +1,33 @@
 #include "windows_string.h"
 
-#include "windows_error.h"
-
 #include <Windows.h>
 
 #include <stdexcept>
+#include <system_error>
 
 namespace flexasio {
 
 	std::string ConvertToUTF8(std::wstring_view input) {
 		if (input.size() == 0) return {};
 
 		const auto size = ::WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, input.data(), static_cast<int>(input.size()), NULL, 0, NULL, NULL);
-		if (size <= 0) throw std::runtime_error("Unable to get size for string conversion to UTF-8: " + GetWindowsErrorString(::GetLastError()));
+		if (size <= 0) throw std::system_error(::GetLastError(), std::system_category(), "Unable to get size for string conversion to UTF-8");
 
 		std::string result(size, 0);
 		if (::WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, input.data(), int(input.size()), result.data(), int(result.size()), NULL, NULL) != int(result.size()))
-			throw std::runtime_error("Unable to convert string to UTF-8: " + GetWindowsErrorString(::GetLastError()));
+			throw std::system_error(::GetLastError(), std::system_category(), "Unable to convert string to UTF-8");
 		return result;
 	}
 
 	std::wstring ConvertFromUTF8(std::string_view input) {
 		if (input.size() == 0) return {};
 
 		const auto size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, input.data(), int(input.size()), NULL, 0);
-		if (size <= 0) throw std::runtime_error("Unable to get size for string conversion from UTF-8: " + GetWindowsErrorString(::GetLastError()));
+		if (size <= 0) throw std::system_error(::GetLastError(), std::system_category(), "Unable to get size for string conversion from UTF-8");
 
 		std::wstring result(size, 0);
 		if (::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, input.data(), int(input.size()), result.data(), int(result.size())) != int(result.size()))
-			throw std::runtime_error("Unable to convert string from UTF-8: " + GetWindowsErrorString(::GetLastError()));
+			throw std::system_error(::GetLastError(), std::system_category(), "Unable to convert string from UTF-8");
 		return result;
 	}