Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge from Git repository

Browse source 
--HG--
branch : develop
This commit is contained in:
NO-BREAK SPACE OÜ 2019-05-08 21:31:02 +00:00
commit 15bcece747
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/misc/string_common.cpp
View file

@ -146,7 +146,7 @@ std::string winCpToCp(const char *str, size_t len, UINT srcCp, UINT dstCp)
return std::string(); return std::string();
int tmpLen = MultiByteToWideChar(srcCp, 0, 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) * 2));
if (tmpLen <= 1) if (tmpLen <= 1)
{ {
_freea(tmp); _freea(tmp);
@ -172,7 +172,7 @@ std::wstring winCpToWide(const char *str, size_t len, UINT cp)
return std::wstring(); return std::wstring();
int tmpLen = MultiByteToWideChar(cp, 0, 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) * 2));
if (tmpLen <= 1) if (tmpLen <= 1)
{ {
_freea(tmp); _freea(tmp);