Use winhttp handle for its errors (fixes #164)

namazso · Jul 15, 2023 · 998f813 · 998f813
1 parent d402df3
commit 998f813
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/OpenHashTab/utl.cpp b/OpenHashTab/utl.cpp
@@ -363,19 +363,28 @@ std::wstring utl::ErrorToString(DWORD error) {
   // FormatMessageW: "This buffer cannot be larger than 64K bytes."
   wstr.resize(64 * 1024 / sizeof(wchar_t));
 
+  HMODULE source = nullptr;
+  DWORD flags = FORMAT_MESSAGE_IGNORE_INSERTS;
+  if (error >= WINHTTP_ERROR_BASE && error < WINHTTP_ERROR_BASE + 1000) {
+    source = GetModuleHandleW(L"winhttp");
+    flags |= FORMAT_MESSAGE_FROM_HMODULE;
+  } else {
+    flags |= FORMAT_MESSAGE_FROM_SYSTEM;
+  }
+
   const auto size = FormatMessageW(
-    FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-    nullptr,
+    flags,
+    source,
     error,
-    MAKELANGID(LANG_USER_DEFAULT, SUBLANG_DEFAULT),
+    0,
     wstr.data(),
     static_cast<DWORD>(wstr.size()),
     nullptr
   );
   wstr.resize(size);
   const auto pos = wstr.find_last_not_of(L"\r\n");
   if (pos != std::wstring::npos)
-    wstr.resize(pos);
+    wstr.resize(pos + 1);
   return wstr;
 }