Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[deploy] fix minor bugs

This commit is contained in:
Nomango 2020-04-07 16:35:26 +08:00
parent 781d1a2f6c
commit 9a0c5b2023
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kiwano/core/String.cpp
View File

@ -40,7 +40,7 @@ String Format(const char* format, ...)
const auto len = static_cast<size_t>(::_vscprintf(format, args) + 1); const auto len = static_cast<size_t>(::_vscprintf(format, args) + 1);
if (len) if (len)
{ {
result.resize(len); result.resize(len - 1);
::_vsnprintf_s(&result[0], len, len, format, args); ::_vsnprintf_s(&result[0], len, len, format, args);
} }
va_end(args); va_end(args);
@ -59,7 +59,7 @@ WideString Format(const wchar_t* format, ...)
const auto len = static_cast<size_t>(::_vscwprintf(format, args) + 1); const auto len = static_cast<size_t>(::_vscwprintf(format, args) + 1);
if (len) if (len)
{ {
result.resize(len); result.resize(len - 1);
::_vsnwprintf_s(&result[0], len, len, format, args); ::_vsnwprintf_s(&result[0], len, len, format, args);
} }
va_end(args); va_end(args);
@ -72,13 +72,13 @@ String ToNarrow(const WideString& str)
if (str.empty()) if (str.empty())
return String(); return String();
int chars_num = ::WideCharToMultiByte(CP_ACP, 0, str.c_str(), -1, NULL, 0, NULL, NULL); int len = ::WideCharToMultiByte(CP_ACP, 0, str.c_str(), -1, NULL, 0, NULL, NULL);
if (chars_num) if (len > 0)
{ {
String result; String result;
result.resize(chars_num); result.resize(len - 1);
::WideCharToMultiByte(CP_ACP, 0, str.c_str(), -1, &result[0], chars_num, NULL, NULL); ::WideCharToMultiByte(CP_ACP, 0, str.c_str(), -1, &result[0], len, NULL, NULL);
return result; return result;
} }
return String(); return String();
@ -89,13 +89,13 @@ WideString ToWide(const String& str)
if (str.empty()) if (str.empty())
return WideString(); return WideString();
int chars_num = ::MultiByteToWideChar(CP_ACP, 0, str.c_str(), -1, NULL, 0); int len = ::MultiByteToWideChar(CP_ACP, 0, str.c_str(), -1, NULL, 0);
if (chars_num) if (len > 0)
{ {
WideString result; WideString result;
result.resize(chars_num); result.resize(len - 1);
::MultiByteToWideChar(CP_ACP, 0, str.c_str(), -1, &result[0], chars_num); ::MultiByteToWideChar(CP_ACP, 0, str.c_str(), -1, &result[0], len);
return result; return result;
} }
return WideString(); return WideString();