Prevent win_eventlog_sink from silently discarding errors when wide support is enabled

include/spdlog/common.h

@@ -103,6 +103,7 @@ using err_handler = std::function<void(const std::string &err_msg)>;
 using string_view_t = fmt::basic_string_view<char>;
 using wstring_view_t = fmt::basic_string_view<wchar_t>;
 using memory_buf_t = fmt::basic_memory_buffer<char, 250>;
+using wmemory_buf_t = fmt::basic_memory_buffer<wchar_t, 250>;
 using filename_memory_buf_t = fmt::basic_memory_buffer<filename_t::value_type, 250>;
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT

include/spdlog/details/os-inl.h

@@ -469,7 +469,7 @@ SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target)
     throw_spdlog_ex(fmt::format("WideCharToMultiByte failed. Last error: {}", ::GetLastError()));
 }
 
-SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, memory_buf_t &target)
+SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target)
 {
     if (str.size() > static_cast<size_t>((std::numeric_limits<int>::max)()))
     {
@@ -484,7 +484,7 @@ SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, memory_buf_t &target)
     }
 
     int result_size = static_cast<int>(target.capacity());
-    if ((str_size + 1) * 2 < result_size)
+    if (str_size + 1 > result_size)
     {
         result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, NULL, 0);
     }
@@ -492,7 +492,7 @@ SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, memory_buf_t &target)
     if (result_size > 0)
     {
         target.resize(result_size);
-        result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, (LPWSTR)target.data(), result_size);
+        result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, target.data(), result_size);
 
         if (result_size > 0)
         {

include/spdlog/details/os.h

@@ -91,7 +91,7 @@ SPDLOG_API bool in_terminal(FILE *file) SPDLOG_NOEXCEPT;
 #if (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32)
 SPDLOG_API void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target);
 
-SPDLOG_API void utf8_to_wstrbuf(string_view_t str, memory_buf_t &target);
+SPDLOG_API void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target);
 #endif
 
 // Return directory name from given path or empty string

include/spdlog/sinks/win_eventlog_sink.h

@@ -224,35 +224,22 @@ protected:
         formatted.push_back('\0');
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-        try
+        wmemory_buf_t buf;
-        {
+        details::os::utf8_to_wstrbuf(string_view_t(formatted.data(), formatted.size()), buf);
-            memory_buf_t buf;
-            details::os::utf8_to_wstrbuf(string_view_t(formatted.data(), formatted.size()), buf);
 
-            LPCWSTR lp_wstr = reinterpret_cast<LPCWSTR>(buf.data());
+        LPCWSTR lp_wstr = buf.data();
-            succeeded = ::ReportEventW(event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg), event_id_,
+        succeeded = ::ReportEventW(event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg), event_id_,
                 current_user_sid_.as_sid(), 1, 0, &lp_wstr, nullptr);
-
-            if (!succeeded)
-            {
-                SPDLOG_THROW(win32_error("ReportEvent"));
-            }
-        }
-        catch (...)
-        {
-            // WCHAR string conversion can fail and if it does, we shouldn't call to report event function.
-        }
 #else
-        LPCSTR lp_str = reinterpret_cast<LPCSTR>(formatted.data());
+        LPCSTR lp_str = formatted.data();
-
         succeeded = ::ReportEventA(event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg), event_id_,
                 current_user_sid_.as_sid(), 1, 0, &lp_str, nullptr);
+#endif
 
         if (!succeeded)
         {
             SPDLOG_THROW(win32_error("ReportEvent"));
         }
-#endif
     }
 
     void flush_() override {}