ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7578 from jordan-woyak/master 

Fix spurious error logs for conversions of empty strings on Windows.
This commit is contained in:
Pierre Bourdon 2018-11-22 06:51:23 +01:00 committed by GitHub
parent 0c6d677233 fae368d2ee
commit 2bb61afe6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/Common/StringUtil.cpp
View File

@ -471,20 +471,25 @@ std::wstring CPToUTF16(u32 code_page, const std::string& input)
std::string UTF16ToCP(u32 code_page, const std::wstring& input)
{
auto const size = WideCharToMultiByte(code_page, 0, input.data(), static_cast<int>(input.size()),
nullptr, 0, nullptr, false);
std::string output;
output.resize(size);
if (size == 0 ||
size != WideCharToMultiByte(code_page, 0, input.data(), static_cast<int>(input.size()),
&output[0], static_cast<int>(output.size()), nullptr, false))
if (0 != input.size())
{
const DWORD error_code = GetLastError();
ERROR_LOG(COMMON, "WideCharToMultiByte Error in String '%s': %lu", input.c_str(), error_code);
output.clear();
// "If cchWideChar [input buffer size] is set to 0, the function fails." -MSDN
auto const size = WideCharToMultiByte(
code_page, 0, input.data(), static_cast<int>(input.size()), nullptr, 0, nullptr, false);
output.resize(size);
if (size != WideCharToMultiByte(code_page, 0, input.data(), static_cast<int>(input.size()),
&output[0], static_cast<int>(output.size()), nullptr, false))
{
const DWORD error_code = GetLastError();
ERROR_LOG(COMMON, "WideCharToMultiByte Error in String '%s': %lu", input.c_str(), error_code);
output.clear();
}
}
return output;
}