Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-25 10:29:37 +00:00
Code Issues Projects Releases Wiki Activity

libyaml supports UTF-8 and not accented ANSI characters - so convert to UTF-8 (Fixes GH#838)

Browse Source
This commit is contained in:
tomcw 2020-09-25 18:17:03 +01:00
parent a5ebd1d4cd
commit 09a5ac4761
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
source/YamlHelper.cpp
View File

@ -57,8 +57,10 @@ void YamlHelper::GetNextEvent(bool bInMap /*= false*/)
{
if (!yaml_parser_parse(&m_parser, &m_newEvent))
{
//printf("Parser error %d\n", m_parser.error);
throw std::string("Parser error");
std::string error = std::string("Save-state parser error: ");
if (m_parser.problem != NULL) error += std::string(m_parser.problem);
else error += std::string("unknown");
throw error;
}
}
@ -451,7 +453,52 @@ void YamlSaveHelper::SaveBool(const char* key, bool value)
void YamlSaveHelper::SaveString(const char* key, const char* value)
{
Save("%s: %s\n", key, (value[0] != 0) ? value : "\"\"");
if (value[0] == 0)
value = "\"\"";
LPWSTR pWcStr = NULL;
LPSTR pMbStr = NULL;
// libyaml supports UTF-8 and not accented ANSI characters (GH#838)
// . So convert ANSI to UTF-8, which is a 2-step process:
// 1) ANSI -> unicode
{
int wcStrSize = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, value, -1, NULL, 0);
if (wcStrSize == 0)
{
delete[] pWcStr; delete[] pMbStr;
throw std::string("Unable to convert to unicode: ") + std::string(value);
}
pWcStr = new WCHAR[wcStrSize];
int res = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, value, -1, pWcStr, wcStrSize);
if (!res)
{
delete[] pWcStr; delete[] pMbStr;
throw std::string("Unable to convert to unicode: ") + std::string(value);
}
}
// 2) unicode -> UTF-8
{
// NB. WC_ERR_INVALID_CHARS only defined when WIN_VER >= 0x600 - but stdafx.h defines it as 0x500
int mbStrSize = WideCharToMultiByte(CP_UTF8, 0/*WC_ERR_INVALID_CHARS*/, pWcStr, -1, NULL, 0, NULL, NULL);
if (mbStrSize == 0)
{
delete[] pWcStr; delete[] pMbStr;
throw std::string("Unable to convert to UTF-8: ") + std::string(value);
}
pMbStr = new char[mbStrSize];
int res = WideCharToMultiByte(CP_UTF8, 0/*WC_ERR_INVALID_CHARS*/, pWcStr, -1, pMbStr, mbStrSize, NULL, NULL);
if (!res)
{
delete [] pWcStr; delete [] pMbStr;
throw std::string("Unable to convert to UTF-8: ") + std::string(value);
}
}
Save("%s: %s\n", key, pMbStr);
delete[] pWcStr; delete[] pMbStr;
}
void YamlSaveHelper::SaveString(const char* key, const std::string & value)

1
source/YamlHelper.h
View File

@ -29,6 +29,7 @@ public:
YamlHelper(void) :
m_hFile(NULL)
{
memset(&m_parser, 0, sizeof(m_parser));
MakeAsciiToHexTable();
}