From 82a0ea69f94c7ec58269155542b5e9076219f8ca Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 12 Feb 2024 13:02:06 +0100 Subject: [PATCH] unicode: don't specify MB_PRECOMPOSED for UTF-7&8 MultiByteToWideChar returns ERROR_INVALID_FLAGS on pre Windows 10. Signed-off-by: Simon Rozman --- include/stdex/unicode.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/stdex/unicode.hpp b/include/stdex/unicode.hpp index abd63e33f..c92f836cf 100644 --- a/include/stdex/unicode.hpp +++ b/include/stdex/unicode.hpp @@ -181,7 +181,7 @@ namespace stdex return; #ifdef _WIN32 - constexpr DWORD dwFlagsMBWC = MB_PRECOMPOSED; + DWORD dwFlagsMBWC = static_cast(m_from_wincp) < CP_UTF7 ? MB_PRECOMPOSED : 0; constexpr DWORD dwFlagsWCMB = 0; constexpr LPCCH lpDefaultChar = NULL;