Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix convertArgsToUtf8()

This commit is contained in:
Martchus 2017-03-22 00:59:34 +01:00
parent 0327049b99
commit 9a395a45d3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/commandlineutils.cpp
View File

@ -69,6 +69,7 @@ void startConsole()
setvbuf(stderr, NULL, _IONBF, 0);
#ifdef CPP_UTILITIES_FORCE_UTF8_CODEPAGE
// set console to handle UTF-8 IO correctly
// however, this doesn't work as intended and is therefore disabled by default
SetConsoleCP(CP_UTF8);
SetConsoleOutputCP(CP_UTF8);
#endif
@ -92,14 +93,14 @@ pair<vector<unique_ptr<char[]> >, vector<char *> > convertArgsToUtf8()
res.first.reserve(static_cast<size_t>(argc));
res.second.reserve(static_cast<size_t>(argc));
for(; argv_w; ++argv_w) {
int requiredSize = WideCharToMultiByte(CP_UTF8, 0, *argv_w, -1, nullptr, 0, 0, 0);
for(LPWSTR *i = argv_w, *end = argv_w + argc; i != end; ++i) {
int requiredSize = WideCharToMultiByte(CP_UTF8, 0, *i, -1, nullptr, 0, 0, 0);
if(requiredSize <= 0) {
break; // just stop on error
}
auto argv = make_unique<char[]>(static_cast<size_t>(requiredSize));
requiredSize = WideCharToMultiByte(CP_UTF8, 0, *argv_w, -1, argv.get(), requiredSize, 0, 0);
requiredSize = WideCharToMultiByte(CP_UTF8, 0, *i, -1, argv.get(), requiredSize, 0, 0);
if(requiredSize <= 0) {
break;
}