Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: report load library failures for the VST3 sdk #1371

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: report load library failures for the VST3 sdk #1371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions ...uce_audio_processors/format_types/VST3_SDK/public.sdk/source/vst/hosting/module_win32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,25 @@ class Win32Module : public Module
}
}

static void getLastError(const std::string& inPath, std::string& errorDescription) {
auto lastError = GetLastError ();
LPVOID lpMessageBuffer {nullptr};
if (FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
nullptr, lastError, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPSTR)&lpMessageBuffer, 0, nullptr) > 0)
{
errorDescription = "LoadLibray failed for path " + inPath + ". " + std::string ((char*)lpMessageBuffer);
LocalFree (lpMessageBuffer);
}
else
{
errorDescription =
"LoadLibrary failed with error number " + std::to_string (lastError) + " for path " + inPath;
}
}

//--- -----------------------------------------------------------------------
HINSTANCE loadAsPackage (const std::string& inPath, const char* archString = architectureString)
HINSTANCE loadAsPackage (const std::string& inPath, std::string& errorDescription, const char* archString = architectureString)
{
filesystem::path p (inPath);
auto filename = p.filename ();
Expand All @@ -179,10 +196,18 @@ class Win32Module : public Module
HINSTANCE instance = LoadLibraryW (reinterpret_cast<LPCWSTR> (wideStr.data ()));
#if SMTG_CPU_ARM_64EC
if (instance == nullptr)
instance = loadAsPackage (inPath, architectureArm64XString);
instance = loadAsPackage (inPath, errorDescription, architectureArm64XString);
if (instance == nullptr)
instance = loadAsPackage (inPath, architectureX64String);
instance = loadAsPackage (inPath, errorDescription, architectureX64String);
if (instance == nullptr) {
Win32Module::getLastError(inPath, errorDescription);
}
#else
if (instance == nullptr) {
Win32Module::getLastError(p.string(), errorDescription);
}
#endif

return instance;
}

Expand All @@ -193,20 +218,7 @@ class Win32Module : public Module
HINSTANCE instance = LoadLibraryW (reinterpret_cast<LPCWSTR> (wideStr.data ()));
if (instance == nullptr)
{
auto lastError = GetLastError ();
LPVOID lpMessageBuffer {nullptr};
if (FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
nullptr, lastError, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPSTR)&lpMessageBuffer, 0, nullptr) > 0)
{
errorDescription = "LoadLibray failed: " + std::string ((char*)lpMessageBuffer);
LocalFree (lpMessageBuffer);
}
else
{
errorDescription =
"LoadLibrary failed with error number : " + std::to_string (lastError);
}
Win32Module::getLastError(inPath, errorDescription);
}
else
{
Expand All @@ -227,7 +239,7 @@ class Win32Module : public Module
if (filesystem::is_directory (tmp))
{
// try as package (bundle)
mModule = loadAsPackage (inPath);
mModule = loadAsPackage (inPath, errorDescription);
}
else
{
Expand Down Expand Up @@ -546,7 +558,7 @@ Module::PathList Module::getModulePaths ()
#endif
findModules (path, list);
}

// find plug-ins located in VST3 (application folder)
WCHAR modulePath[kIPPathNameMax];
GetModuleFileNameW (nullptr, modulePath, kIPPathNameMax);
Expand Down