From 49a17b3a2ec5b7eb987291a54ea33cef685590ad Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 15 May 2024 08:13:26 +1000
Subject: [PATCH] Error: Strip trailing whitespace from Windows errors

Backport of https://github.com/stenzek/duckstation/commit/c85e74357356fd0d9b5b0c7711cf514ef47feeea
---
 common/Error.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/Error.cpp b/common/Error.cpp
index 8ace1f9412..687eaeaebd 100644
--- a/common/Error.cpp
+++ b/common/Error.cpp
@@ -8,6 +8,7 @@
 
 #include <cstdlib>
 #include <cstring>
+#include <cwctype>
 #include <type_traits>
 
 // Platform-specific includes
@@ -108,8 +109,11 @@ void Error::SetWin32(std::string_view prefix, unsigned long err)
 	m_type = Type::Win32;
 
 	WCHAR buf[128];
-	const DWORD r = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, err, LANG_USER_DEFAULT, buf,
+	DWORD r = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, err, LANG_USER_DEFAULT, buf,
 		static_cast<DWORD>(std::size(buf)), nullptr);
+	while (r > 0 && std::iswspace(buf[r - 1]))
+		r--;
+
 	if (r > 0)
 	{
 		m_description =
@@ -143,8 +147,11 @@ void Error::SetHResult(std::string_view prefix, long err)
 	m_type = Type::HResult;
 
 	WCHAR buf[128];
-	const DWORD r = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, err, LANG_USER_DEFAULT, buf,
+	DWORD r = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, err, LANG_USER_DEFAULT, buf,
 		static_cast<DWORD>(std::size(buf)), nullptr);
+	while (r > 0 && std::iswspace(buf[r - 1]))
+		r--;
+
 	if (r > 0)
 	{
 		m_description = fmt::format("{}HRESULT {:08X}: {}", prefix, static_cast<unsigned>(err),