From 812a99e5ca580c4fac1b80e6d9a14fc8054c98f2 Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Sat, 9 Dec 2017 14:35:58 -0500
Subject: [PATCH] utf: fallback to ANSI codepage on windows if UTF8 conversion
 isn't available

---
 libretro-common/encodings/encoding_utf.c | 30 ++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/libretro-common/encodings/encoding_utf.c b/libretro-common/encodings/encoding_utf.c
index 11cf363de1..6a89da543f 100644
--- a/libretro-common/encodings/encoding_utf.c
+++ b/libretro-common/encodings/encoding_utf.c
@@ -397,7 +397,20 @@ wchar_t* utf8_to_utf16_string_alloc(const char *str)
       out_len = MultiByteToWideChar(CP_UTF8, 0, str, -1, buf, len);
    }
    else
-      return strdup(str);
+   {
+      /* fallback to ANSI codepage instead */
+      len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
+
+      if (len)
+      {
+         buf = (wchar_t*)calloc(len, sizeof(wchar_t));
+
+         if (!buf)
+            return NULL;
+
+         out_len = MultiByteToWideChar(CP_ACP, 0, str, -1, buf, len);
+      }
+   }
 
    if (out_len < 0)
    {
@@ -456,7 +469,20 @@ char* utf16_to_utf8_string_alloc(const wchar_t *str)
       out_len = WideCharToMultiByte(CP_UTF8, 0, str, -1, buf, len, NULL, NULL);
    }
    else
-      return strdup(str);
+   {
+      /* fallback to ANSI codepage instead */
+      len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL);
+
+      if (len)
+      {
+         buf = (char*)calloc(len, sizeof(char));
+
+         if (!buf)
+            return NULL;
+
+         out_len = WideCharToMultiByte(CP_ACP, 0, str, -1, buf, len, NULL, NULL);
+      }
+   }
 
    if (out_len < 0)
    {