aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDLL
diff options
context:
space:
mode:
authorMaya <11448698+RoyalBlue1@users.noreply.github.com>2023-11-27 23:50:38 +0100
committerGitHub <noreply@github.com>2023-11-27 23:50:38 +0100
commitc427fe4abc3df657dd4b924343bc6f464e4cd05e (patch)
treea8dc6434a68c32704eafece47bda60c01f88354f /NorthstarDLL
parentcfc53081ff38a7a0e29cc0b89644760a7ade33a1 (diff)
downloadNorthstarLauncher-c427fe4abc3df657dd4b924343bc6f464e4cd05e.tar.gz
NorthstarLauncher-c427fe4abc3df657dd4b924343bc6f464e4cd05e.zip
Load plugin dependencies from lib folder (#590)
Disables recursive search for plugins in plugin folders and if it exists adds lib folder within plugin folder to DLL load dirs
Diffstat (limited to 'NorthstarDLL')
-rw-r--r--NorthstarDLL/plugins/plugins.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/NorthstarDLL/plugins/plugins.cpp b/NorthstarDLL/plugins/plugins.cpp
index 121512e5..d8087e5c 100644
--- a/NorthstarDLL/plugins/plugins.cpp
+++ b/NorthstarDLL/plugins/plugins.cpp
@@ -134,7 +134,8 @@ std::optional<Plugin> PluginManager::LoadPlugin(fs::path path, PluginInitFuncs*
}
// Passed all checks, going to actually load it now
- HMODULE pluginLib = LoadLibraryW(wpptr); // Load the DLL as a data file
+ HMODULE pluginLib =
+ LoadLibraryExW(wpptr, 0, LOAD_LIBRARY_SEARCH_USER_DIRS | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); // Load the DLL with lib folders
if (pluginLib == NULL)
{
NS::log::PLUGINSYS->info("Failed to load library '{}': ", std::system_category().message(GetLastError()));
@@ -197,7 +198,7 @@ inline void FindPlugins(fs::path pluginPath, std::vector<fs::path>& paths)
return;
}
- for (const fs::directory_entry& entry : fs::recursive_directory_iterator(pluginPath))
+ for (const fs::directory_entry& entry : fs::directory_iterator(pluginPath))
{
if (fs::is_regular_file(entry) && entry.path().extension() == ".dll")
paths.emplace_back(entry.path());
@@ -229,6 +230,10 @@ bool PluginManager::LoadPlugins()
data.version = ns_version.c_str();
data.northstarModule = g_NorthstarModule;
+ fs::path libPath = fs::absolute(pluginPath + "\\lib");
+ if (fs::exists(libPath) && fs::is_directory(libPath))
+ AddDllDirectory(libPath.wstring().c_str());
+
FindPlugins(pluginPath, paths);
// Special case for Thunderstore mods dir
@@ -244,6 +249,11 @@ bool PluginManager::LoadPlugins()
spdlog::warn("The following directory did not match 'AUTHOR-MOD-VERSION': {}", dir.path().string());
continue; // skip loading package that doesn't match
}
+
+ fs::path libDir = fs::absolute(pluginsDir / "lib");
+ if (fs::exists(libDir) && fs::is_directory(libDir))
+ AddDllDirectory(libDir.wstring().c_str());
+
FindPlugins(pluginsDir, paths);
}