vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-09 20:29:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Quote winedbg arguments instead of using start dir

Browse Source 
Apparently these arguments are all passed as a space separated Win32
command line, so we need to do our own quoting. I was about to submit a
patch for this to Wine, but escaping escaped quotes sounds like a pain.
This commit is contained in:
Robbert van der Helm
2021-10-02 15:04:34 +02:00
parent 6e2b902608
commit f4a5754eae
1 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugin/host-process.cpp
+18 -26
View File
@@ -64,30 +64,29 @@ IndividualHost::IndividualHost(boost::asio::io_context& io_context,
host_path(find_vst_host(plugin_info.native_library_path, host_path(find_vst_host(plugin_info.native_library_path,
plugin_info.plugin_arch, plugin_info.plugin_arch,
false)), false)),
host(launch_host( host(
host_path, launch_host(host_path,
plugin_type_to_string(host_request.plugin_type), plugin_type_to_string(host_request.plugin_type),
#ifdef WITH_WINEDBG #ifdef WITH_WINEDBG
plugin_info.windows_plugin_path.filename(), // Winedbg flattens all command line arguments to a single
// space separate Win32 command line, so we need to do our
// own quoting.
"\"" + plugin_info.windows_plugin_path + "\"",
#else #else
host_request.plugin_path, host_request.plugin_path,
#endif #endif
host_request.endpoint_base_dir, host_request.endpoint_base_dir,
// We pass this process' process ID as an argument so we can run a // We pass this process' process ID as an argument so we
// watchdog on the Wine plugin host process that shuts down the // can run a watchdog on the Wine plugin host process that
// sockets after this process shuts down // shuts down the sockets after this process shuts down
std::to_string(getpid()), std::to_string(getpid()),
bp::env = plugin_info.create_host_env() bp::env = plugin_info.create_host_env())) {
#ifdef WITH_WINEDBG #ifdef WITH_WINEDBG
, // winedbg has no reliable way to escape spaces, so if (plugin_info.windows_plugin_path.string().find('"') !=
// we'll start the process in the plugin's directory
bp::start_dir = plugin_info.windows_plugin_path.parent_path()
#endif
)) {
#ifdef WITH_WINEDBG
if (plugin_info.windows_plugin_path.filename().string().find(' ') !=
std::string::npos) { std::string::npos) {
logger.log("Warning: winedbg does not support paths containing spaces"); logger.log(
"Warning: plugin paths containing double quotes won't be properly "
"escaped");
} }
#endif #endif
} }
@@ -127,13 +126,6 @@ GroupHost::GroupHost(boost::asio::io_context& io_context,
host_path(find_vst_host(plugin_info.native_library_path, host_path(find_vst_host(plugin_info.native_library_path,
plugin_info.plugin_arch, plugin_info.plugin_arch,
true)) { true)) {
#ifdef WITH_WINEDBG
if (plugin_info.windows_plugin_path.string().find(' ') !=
std::string::npos) {
logger.log("Warning: winedbg does not support paths containing spaces");
}
#endif
// When using plugin groups, we'll first try to connect to an existing group // When using plugin groups, we'll first try to connect to an existing group
// host process and ask it to host our plugin. If no such process exists, // host process and ask it to host our plugin. If no such process exists,
// then we'll start a new process. In the event that multiple yabridge // then we'll start a new process. In the event that multiple yabridge