Fix readUnicodeString to properly convert UTF-8 to WideChar

Author: bobtista

Core/GameEngine/Source/Common/System/JSONChunkInput.cpp

@@ -21,6 +21,11 @@
 #include "Common/JSONChunkInput.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/Errors.h"
+#include "Common/UnicodeString.h"
+#include "Common/AsciiString.h"
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 JSONChunkInput::JSONChunkInput( const char* jsonData, size_t jsonSize ) :
 	m_parserList(NULL),
@@ -343,7 +348,27 @@ UnicodeString JSONChunkInput::readUnicodeString(void)
 	}
 
 	std::string str = (*m_chunkStack->data)[m_chunkStack->dataIndex++].get<std::string>();
-	return UnicodeString(str.c_str());
+	if (str.empty()) {
+		return UnicodeString::TheEmptyString;
+	}
+
+#ifdef WIN32
+	int wideLen = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), -1, NULL, 0);
+	if (wideLen <= 0) {
+		DEBUG_CRASH(("Failed to convert UTF-8 string to wide string."));
+		return UnicodeString::TheEmptyString;
+	}
+	WideChar* wideStr = (WideChar*)TheDynamicMemoryAllocator->allocBytes(wideLen * sizeof(WideChar));
+	MultiByteToWideChar(CP_UTF8, 0, str.c_str(), -1, wideStr, wideLen);
+	UnicodeString result(wideStr);
+	TheDynamicMemoryAllocator->freeBytes(wideStr);
+	return result;
+#else
+	AsciiString asciiStr(str.c_str());
+	UnicodeString result;
+	result.translate(asciiStr);
+	return result;
+#endif
 }
 
 NameKeyType JSONChunkInput::readNameKey(void)