Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge from Git repository

Browse Source 
--HG--
branch : develop
kaetemi-develop
NO-BREAK SPACE OÜ 6 years ago
parent f5424aac3e b7aa2a6999
commit 09e21a115f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
code/nel/src/misc/string_common.cpp
Unescape Escape View File

@ -144,7 +144,7 @@ std::string winCpToCp(const char *str, size_t len, UINT srcCp, UINT dstCp)
wchar_t *tmp = (wchar_t *)_malloca((len + 1) * 4); wchar_t *tmp = (wchar_t *)_malloca((len + 1) * 4);
if (!tmp) if (!tmp)
return std::string(); return std::string();
int tmpLen = MultiByteToWideChar(srcCp, MB_PRECOMPOSED, int tmpLen = MultiByteToWideChar(srcCp, 0,
str, (int)(len + 1), /* include null-termination */ str, (int)(len + 1), /* include null-termination */
tmp, (int)((len + 1) * 4)); tmp, (int)((len + 1) * 4));
if (tmpLen <= 1) if (tmpLen <= 1)
@ -170,7 +170,7 @@ std::wstring winCpToWide(const char *str, size_t len, UINT cp)
wchar_t *tmp = (wchar_t *)_malloca((len + 1) * 4); wchar_t *tmp = (wchar_t *)_malloca((len + 1) * 4);
if (!tmp) if (!tmp)
return std::wstring(); return std::wstring();
int tmpLen = MultiByteToWideChar(cp, MB_PRECOMPOSED, int tmpLen = MultiByteToWideChar(cp, 0,
str, (int)(len + 1), /* include null-termination */ str, (int)(len + 1), /* include null-termination */
tmp, (int)((len + 1) * 4)); tmp, (int)((len + 1) * 4));
if (tmpLen <= 1) if (tmpLen <= 1)

Write Preview
Loading…
Cancel
Save