ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Patcher] Ensure hash is checked when loading title plugins 

Fixes bug where plugin loader would load all defined plugins if at least one was valid
This commit is contained in:
Michael Oliver 2025-02-26 12:33:29 +00:00 committed by Radosław Gliński
parent ac6692fc65
commit 9555e7bde4
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xenia/emulator.cc
View File

@ -1526,7 +1526,8 @@ X_STATUS Emulator::CompleteLaunch(const std::filesystem::path& path,
if (cvars::allow_plugins) {
if (plugin_loader_->IsAnyPluginForTitleAvailable(title_id_.value(),
module->hash().value())) {
plugin_loader_->LoadTitlePlugins(title_id_.value());
plugin_loader_->LoadTitlePlugins(title_id_.value(),
module->hash().value());
}
}

11
src/xenia/patcher/plugin_loader.cc
View File

@ -174,13 +174,18 @@ bool PluginLoader::IsAnyPluginForTitleAvailable(
return result != plugin_configs_.cend();
}
void PluginLoader::LoadTitlePlugins(const uint32_t title_id) {
void PluginLoader::LoadTitlePlugins(const uint32_t title_id,
const uint64_t module_hash) {
std::vector<PluginInfoEntry> title_plugins;
std::copy_if(plugin_configs_.cbegin(), plugin_configs_.cend(),
std::back_inserter(title_plugins),
[title_id](const PluginInfoEntry& entry) {
return entry.is_enabled && entry.title_id == title_id;
[title_id, module_hash](const PluginInfoEntry& entry) {
const auto hash_exists =
std::find(entry.hashes.cbegin(), entry.hashes.cend(),
module_hash) != entry.hashes.cend();
return entry.is_enabled && entry.title_id == title_id &&
hash_exists;
});
if (title_plugins.empty()) {

2
src/xenia/patcher/plugin_loader.h
View File

@ -31,7 +31,7 @@ class PluginLoader {
PluginLoader(kernel::KernelState* kernel_state,
const std::filesystem::path plugins_root);
void LoadTitlePlugins(const uint32_t title_id);
void LoadTitlePlugins(const uint32_t title_id, const uint64_t module_hash);
bool IsAnyPluginForTitleAvailable(const uint32_t title_id,
const uint64_t module_hash) const;
bool IsAnyPluginLoaded() { return is_any_plugin_loaded_; }