piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

WX: Fix argument parsing

Browse Source 
Manually convert each argument to a UTF-8 std::string, because the
implicit conversion for wxCmdLineArgsArray to char** calls ToAscii
(which is obviously undesired).

Fixes https://bugs.dolphin-emu.org/issues/10274
This commit is contained in:
Léo Lam 2017-11-26 17:22:37 +01:00
parent 96e094e127
commit 60afb1d1b4
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/Main.cpp
View File

@ -165,7 +165,14 @@ bool DolphinApp::OnInit()
void DolphinApp::ParseCommandLine()
{
auto parser = CommandLineParse::CreateParser(CommandLineParse::ParserOptions::IncludeGUIOptions);
optparse::Values& options = CommandLineParse::ParseArguments(parser.get(), argc, argv);
// Manually convert each argument to a UTF-8 std::string, because the implicit
// conversion of wxCmdLineArgsArray to char** calls ToAscii (which is undesired).
std::vector<std::string> utf8_argv;
for (int i = 1; i < argc; ++i)
utf8_argv.emplace_back(argv[i].utf8_str());
optparse::Values& options = CommandLineParse::ParseArguments(parser.get(), utf8_argv);
std::vector<std::string> args = parser->args();
if (options.is_set("exec"))

20
Source/Core/UICommon/CommandLineParse.cpp
View File

@ -105,17 +105,29 @@ std::unique_ptr<optparse::OptionParser> CreateParser(ParserOptions options)
return parser;
}
optparse::Values& ParseArguments(optparse::OptionParser* parser, int argc, char** argv)
static void AddConfigLayer(const optparse::Values& options)
{
optparse::Values& options = parser->parse_args(argc, argv);
const std::list<std::string>& config_args = options.all("config");
if (config_args.size())
if (!config_args.empty())
{
Config::AddLayer(std::make_unique<CommandLineConfigLayerLoader>(
config_args, static_cast<const char*>(options.get("video_backend")),
static_cast<const char*>(options.get("audio_emulation"))));
}
}
optparse::Values& ParseArguments(optparse::OptionParser* parser, int argc, char** argv)
{
optparse::Values& options = parser->parse_args(argc, argv);
AddConfigLayer(options);
return options;
}
optparse::Values& ParseArguments(optparse::OptionParser* parser,
const std::vector<std::string>& arguments)
{
optparse::Values& options = parser->parse_args(arguments);
AddConfigLayer(options);
return options;
}
}

4
Source/Core/UICommon/CommandLineParse.h
View File

@ -3,6 +3,8 @@
// Refer to the license.txt file included.
#include <memory>
#include <string>
#include <vector>
namespace optparse
{
@ -20,4 +22,6 @@ enum class ParserOptions
std::unique_ptr<optparse::OptionParser> CreateParser(ParserOptions options);
optparse::Values& ParseArguments(optparse::OptionParser* parser, int argc, char** argv);
optparse::Values& ParseArguments(optparse::OptionParser* parser,
const std::vector<std::string>& arguments);
}