From dccea47e9bc322d654902a1db4fc52cbf6dd0cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Tue, 26 Jul 2022 18:51:15 +0200 Subject: Improve Win32Error, library handling code. --- c/common.cpp | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'c/common.cpp') diff --git a/c/common.cpp b/c/common.cpp index 155c099..c4624c0 100644 --- a/c/common.cpp +++ b/c/common.cpp @@ -4,8 +4,8 @@ /* Win32Error: Exception for Windows API errors. */ -Win32Error::Win32Error() : m_dwErr(GetLastError()) {} -Win32Error::Win32Error(const DWORD dwErr) : m_dwErr(dwErr) {} +Win32Error::Win32Error() : dwErr(GetLastError()) {} +Win32Error::Win32Error(const DWORD dwErr) : dwErr(dwErr) {} Win32Error::~Win32Error() { @@ -15,34 +15,6 @@ Win32Error::~Win32Error() HeapFree(GetProcessHeap(), 0, m_wszMsg); } -template <> -const char* Win32Error::what() const noexcept -{ - if (!m_szMsg) - FormatMessageA( - FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - m_dwErr, - MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), - (char*)&m_szMsg, - 0, NULL); - return m_szMsg; -} - -template <> -const wchar_t* Win32Error::what() const noexcept -{ - if (!m_wszMsg) - FormatMessageW( - FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - m_dwErr, - MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), - (wchar_t*)&m_wszMsg, - 0, NULL); - return m_wszMsg; -} - /* Library: Wrapper for loading and freeing dynamically linked libraries. */ Library::Library(const TCHAR* const tszLibrary) -- cgit v1.2.3