FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows string conversion for SGPath

Browse Source
This commit is contained in:
James Turner
2016-07-03 22:56:04 +01:00
parent 5ab595b401
commit c037a0e461
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/misc/sg_path.cxx
+5 -2
View File
@@ -987,8 +987,11 @@ std::string SGPath::join(const std::vector<SGPath>& paths, const std::string& jo
std::wstring SGPath::wstr() const std::wstring SGPath::wstr() const
{ {
#ifdef SG_WINDOWS #ifdef SG_WINDOWS
size_t buflen = mbstowcs(NULL, path.c_str(), 0)+1; simgear::strutils::WCharVec ws = simgear::strutils::convertUtf8ToWString(path);
wchar_t* wideBuf = (wchar_t*)malloc(buflen * sizeof(int)); return std::wstring(ws.data(), ws.size());
#else
const size_t buflen = mbstowcs(NULL, path.c_str(), 0)+1;
wchar_t* wideBuf = (wchar_t*)malloc(buflen * sizeof(wchar_t));
if (wideBuf) { if (wideBuf) {
size_t count = mbstowcs(wideBuf, path.c_str(), buflen); size_t count = mbstowcs(wideBuf, path.c_str(), buflen);
if (count == (size_t)-1) { if (count == (size_t)-1) {