thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sync with ScummVM rev. 654b8208b8

Browse source
This commit is contained in:
Pawel Kolodziejski 2020-06-22 08:14:16 +02:00
parent 2fa313def1
commit 8f4e1c6cf3
185 changed files with 6769 additions and 2586 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backends/platform/sdl/win32/win32.cpp
View file

@ -33,6 +33,7 @@
#define _WIN32_IE 0x500
#endif
#include <shlobj.h>
#include <wchar.h>
#include "common/scummsys.h"
#include "common/config-manager.h"
@ -436,9 +437,11 @@ char *OSystem_Win32::convertEncoding(const char* to, const char *from, const cha
#endif
// UTF-32 is really important for us, because it is used for the
// transliteration in Common::Encoding and Win32 cannot convert it
Common::String tempString;
if (Common::String(from).hasPrefixIgnoreCase("utf-32")) {
Common::U32String UTF32Str((const uint32 *)string, length / 4);
string = Common::convertUtf32ToUtf8(UTF32Str).c_str();
tempString = Common::convertUtf32ToUtf8(UTF32Str);
string = tempString.c_str();
from = "utf-8";
}
if (Common::String(to).hasPrefixIgnoreCase("utf-32")) {