R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

PluginSystem_Reload logic

Browse Source
This commit is contained in:
Marvin D 2022-08-20 11:28:28 +02:00
parent 5284e8987f
commit 0a8a463245
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
r5dev/pluginsystem/pluginsystem.cpp
View File

@ -35,7 +35,26 @@ void CPluginSystem::PluginSystem_Init()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CPluginSystem::PluginSystem_Reload() void CPluginSystem::PluginSystem_Reload()
{ {
CreateDirectories("bin\\x64_plugins\\.");
for (auto& it : fs::directory_iterator("bin\\x64_plugins"))
{
if (!it.is_regular_file())
continue;
if (auto path = it.path(); path.has_filename() && path.has_extension() && path.extension().compare(".dll") == 0)
{
bool addInstance = true;
for (auto& inst : pluginInstances)
{
if (inst.m_svPluginFullPath.compare(path.u8string()) == 0)
addInstance = false;
}
if (addInstance)
pluginInstances.push_back(PluginInstance(path.filename().u8string(), path.u8string()));
}
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -45,18 +64,17 @@ void CPluginSystem::PluginSystem_Reload()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CPluginSystem::LoadPluginInstance(PluginInstance& pluginInst) bool CPluginSystem::LoadPluginInstance(PluginInstance& pluginInst)
{ {
if (pluginInst.m_bIsLoaded) // Ugh need to make proper module manager. if (pluginInst.m_bIsLoaded)
return false; return false;
HMODULE loadedPlugin = LoadLibraryA(pluginInst.m_svPluginFullPath.c_str()); HMODULE loadedPlugin = LoadLibraryA(pluginInst.m_svPluginFullPath.c_str());
if (!loadedPlugin) if (loadedPlugin == INVALID_HANDLE_VALUE)
return false; return false;
pluginInst.m_hModule = CModule(pluginInst.m_svPluginName); pluginInst.m_hModule = CModule(pluginInst.m_svPluginName);
auto onLoadFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_OnLoad").RCast<PluginInstance::OnLoad>(); auto onLoadFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_OnLoad").RCast<PluginInstance::OnLoad>();
if (!onLoadFn) Assert(onLoadFn);
return false;
onLoadFn(pluginInst.m_hModule, g_GameDll); onLoadFn(pluginInst.m_hModule, g_GameDll);
@ -68,7 +86,7 @@ bool CPluginSystem::LoadPluginInstance(PluginInstance& pluginInst)
if (getDescFn) if (getDescFn)
pluginInst.m_svDescription = getDescFn(); pluginInst.m_svDescription = getDescFn();
return pluginInst.m_bIsLoaded = true; // Change this sooooooon. return pluginInst.m_bIsLoaded = true;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -81,16 +99,16 @@ bool CPluginSystem::UnloadPluginInstance(PluginInstance& pluginInst)
if (!pluginInst.m_bIsLoaded) if (!pluginInst.m_bIsLoaded)
return false; return false;
if (!pluginInst.m_hModule.GetModuleBase()) Assert(pluginInst.m_hModule.GetModuleBase());
return false;
auto onUnloadFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_OnUnload").RCast<PluginInstance::OnUnload>(); auto onUnloadFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_OnUnload").RCast<PluginInstance::OnUnload>();
if (onUnloadFn) if (onUnloadFn)
onUnloadFn(g_GameDll); onUnloadFn(g_GameDll);
bool unloadOk = FreeLibrary((HMODULE)pluginInst.m_hModule.GetModuleBase()); bool unloadOk = FreeLibrary((HMODULE)pluginInst.m_hModule.GetModuleBase());
if (unloadOk) Assert(unloadOk);
pluginInst.m_bIsLoaded = false;
pluginInst.m_bIsLoaded = false;
return unloadOk; return unloadOk;
} }