1 files changed, 6 insertions, 33 deletions

diff --git a/c/common.h b/c/common.h
index 3f27ba4..9efaf59 100644
--- a/c/common.h
+++ b/c/common.h
@@ -11,51 +11,25 @@
 #define WA "A"
 #endif
 
-template <typename T> std::basic_string<T> BstrFromSz(const char* sz, int iCp = CP_UTF8);
-int EBMessageBox(const TCHAR* tszText, const TCHAR* tszCaption, unsigned uType);
-
-/* Conditionally choose between two values. */
-template <bool B, typename X, typename Y>
-constexpr std::enable_if_t<B == true, X> choose(X x, Y) { return x; }
-template <bool B, typename X, typename Y>
-constexpr std::enable_if_t<B == false, Y> choose(X, Y y) { return y; }
-
-/* Conditionally choose between ANSI and wide string literal. */
-#define AWTEXT(t, s) choose<std::is_same_v<t, wchar_t>>(L"" s, s)
-
-/* Conditionally choose between ANSI and wide Windows API function. */
-#define AWFUN(t, f) choose<std::is_same_v<t, wchar_t>>(f##W, f##A)
+std::wstring WstrFromSz(const char* sz, int iCp = CP_UTF8);
+int EBMessageBox(const wchar_t* wszText, const wchar_t* wszCaption, unsigned uType);
 
 struct Win32Error : public std::exception
 {
 	Win32Error();
 	Win32Error(DWORD dwErr);
 	~Win32Error();
-	template <typename T = char> const T* what() const noexcept;
+	const char* what() const noexcept;
+	const wchar_t* WhatW() const noexcept;
 	DWORD dwErr;
 private:
 	char* m_szMsg = NULL;
 	wchar_t* m_wszMsg = NULL;
 };
 
-template <typename T>
-const T* Win32Error::what() const noexcept
-{
-	TCHAR* tszMsg = choose<std::is_same_v<T, wchar_t>>(m_wszMsg, m_szMsg);
-	if (!tszMsg)
-		AWFUN(T, FormatMessage)(
-		    FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
-		    NULL,
-		    dwErr,
-		    MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
-		    (TCHAR*)&tszMsg,
-		    0, NULL);
-	return tszMsg;
-}
-
 struct Library
 {
-	Library(const TCHAR* tszLibrary);
+	Library(const wchar_t* wszLibrary);
 	~Library();
 	template <class T> T* GetProcAddress(const char* szProc);
 private:
@@ -98,8 +72,7 @@ template <typename T>
 inline T prefer(const T x)
 {
 	if (!x) {
-		EBMessageBox(Win32Error().what<TCHAR>(),
-		    TEXT("System Error"), MB_ICONWARNING);
+		EBMessageBox(Win32Error().WhatW(), L"System Error", MB_ICONWARNING);
 		return (T)NULL;
 	}
 	return x;