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

Always initialize Microsoft COM unconditionally

Browse Source
This commit is contained in:
Robbert van der Helm
2021-06-07 22:24:48 +02:00
parent a7496fae77
commit da5f6e9e7d
5 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/bridges/vst2.cpp
-15
View File
@@ -137,21 +137,6 @@ Vst2Bridge::Vst2Bridge(MainContext& main_context,
logger(generic_logger),
plugin_handle(LoadLibrary(plugin_dll_path.c_str()), FreeLibrary),
sockets(main_context.context, endpoint_base_dir, false) {
// HACK: If the plugin library was unable to load, then there's a tiny
// chance that the plugin expected the COM library to already be
// initialized. I've only seen PSPaudioware's InfiniStrip do this. In
// that case, we'll initialize the COM library for them and try again.
if (!plugin_handle) {
OleInitialize(nullptr);
plugin_handle.reset(LoadLibrary(plugin_dll_path.c_str()));
if (plugin_handle) {
std::cerr << "WARNING: '" << plugin_dll_path << "'" << std::endl;
std::cerr << " could only load after we manually"
<< std::endl;
std::cerr << " initialized the COM library." << std::endl;
}
}
if (!plugin_handle) {
throw std::runtime_error("Could not load the Windows .dll file at '" +
plugin_dll_path + "'");