Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 22:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Error: Strip trailing whitespace from Windows errors

Browse source
This commit is contained in:
Stenzek 2024-05-12 15:20:39 +10:00
parent 0a63bec65c
commit c85e743573
No known key found for this signature in database
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/error.cpp
View file

@ -6,6 +6,7 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <cwctype>
#include <type_traits> #include <type_traits>
#include "fmt/format.h" #include "fmt/format.h"
@ -99,8 +100,11 @@ void Error::SetWin32(std::string_view prefix, unsigned long err)
m_type = Type::Win32; m_type = Type::Win32;
WCHAR buf[128]; 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); static_cast<DWORD>(std::size(buf)), nullptr);
while (r > 0 && std::iswspace(buf[r - 1]))
r--;
if (r > 0) if (r > 0)
{ {
m_description = m_description =
@ -134,8 +138,11 @@ void Error::SetHResult(std::string_view prefix, long err)
m_type = Type::HResult; m_type = Type::HResult;
WCHAR buf[128]; 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); static_cast<DWORD>(std::size(buf)), nullptr);
while (r > 0 && std::iswspace(buf[r - 1]))
r--;
if (r > 0) if (r > 0)
{ {
m_description = fmt::format("{}HRESULT {:08X}: {}", prefix, static_cast<unsigned>(err), m_description = fmt::format("{}HRESULT {:08X}: {}", prefix, static_cast<unsigned>(err),