Fix string functions on windows

Author: kunitoki

modules/yup_core/text/yup_CharacterFunctions.cpp

@@ -343,6 +343,11 @@ yup_wchar CharacterFunctions::toUpperCase (const yup_wchar character) noexcept
     if (iter != std::cend (lowerCaseToUpperCaseMap()))
         return iter->second;
 
+#if YUP_WINDOWS
+    if (! iswascii ((wint_t) character) || ! iswlower ((wint_t) character))
+        return character;
+#endif
+
     return (yup_wchar) towupper ((wint_t) character);
 }
 
@@ -352,6 +357,11 @@ yup_wchar CharacterFunctions::toLowerCase (const yup_wchar character) noexcept
     if (iter != std::cend (upperCaseToLowerCaseMap()))
         return iter->second;
 
+#if YUP_WINDOWS
+    if (! iswascii ((wint_t) character) || ! iswupper ((wint_t) character))
+        return character;
+#endif
+
     return (yup_wchar) towlower ((wint_t) character);
 }
 

modules/yup_core/text/yup_String.cpp

@@ -2062,29 +2062,34 @@ String String::formattedRaw (const char* pf, ...)
 
         YUP_BEGIN_IGNORE_DEPRECATION_WARNINGS
 
-#if YUP_ANDROID
+#if YUP_WINDOWS
+        // On Windows, use narrow character functions to avoid encoding issues
+        // with mixed narrow format strings and arguments
+        HeapBlock<char> temp (bufferSize);
+        int num = (int) _vsnprintf (temp.get(), bufferSize - 1, pf, args);
+        if (num >= static_cast<int> (bufferSize))
+            num = -1;
+#elif YUP_ANDROID
         HeapBlock<char> temp (bufferSize);
         int num = (int) vsnprintf (temp.get(), bufferSize - 1, pf, args);
         if (num >= static_cast<int> (bufferSize))
             num = -1;
 #else
         String wideCharVersion (pf);
         HeapBlock<wchar_t> temp (bufferSize);
-        const int num = (int)
-#if YUP_WINDOWS
-            _vsnwprintf
-#else
-            vswprintf
-#endif
-            (temp.get(), bufferSize - 1, wideCharVersion.toWideCharPointer(), args);
+        const int num = (int) vswprintf (temp.get(), bufferSize - 1, wideCharVersion.toWideCharPointer(), args);
 #endif
 
         YUP_END_IGNORE_DEPRECATION_WARNINGS
 
         va_end (args);
 
         if (num > 0)
+#if YUP_WINDOWS || YUP_ANDROID
+            return String (CharPointer_UTF8 (temp.get()));
+#else
             return String (temp.get());
+#endif
 
         bufferSize += 256;