Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 08:22:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get max char size from ANSI codepage instead of IsDBCSLeadChar()

Browse Source
This commit is contained in:
Brad Hughes 2016-03-22 21:15:46 -04:00
parent e7c1d09000
commit 1c7f05a833
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/osd/strconv.cpp
View File

@ -109,13 +109,23 @@ char *utf8_from_wstring(const WCHAR *wstring)
int osd_uchar_from_osdchar(UINT32 *uchar, const char *osdchar, size_t count)
{
WCHAR wch;
CPINFO cp;
count = MIN(count, IsDBCSLeadByte(*osdchar) ? 2 : 1);
if (MultiByteToWideChar(CP_ACP, 0, osdchar, (DWORD)count, &wch, 1) != 0)
*uchar = wch;
else
*uchar = 0;
return (int) count;
if (!GetCPInfo(CP_ACP, &cp))
goto error;
// The multibyte char can't be bigger than the max character size
count = MIN(count, cp.MaxCharSize);
if (!MultiByteToWideChar(CP_ACP, 0, osdchar, static_cast<DWORD>(count), &wch, 1) != 0)
goto error;
*uchar = wch;
return static_cast<int>(count);
error:
*uchar = 0;
return static_cast<int>(count);
}
#else