Leahnaya/WiiUPluginLoaderBackend
1
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginLoaderBackend.git synced 2026-09-08 11:59:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make PluginLinkInformation not optional anymore in PluginContainer, add stub link data if missing

Browse Source
This commit is contained in:
Maschell
2024-08-04 14:12:52 +02:00
parent 574217eda2
commit eb648ffe21
10 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/utils/config/ConfigUtils.cpp
View File

@@ -77,7 +77,7 @@ void ConfigUtils::displayMenu() {
std::vector<ConfigDisplayItem> configs;
for (const auto &plugin : gLoadedPlugins) {
if (!plugin.isPluginLinkedAndLoaded()) {
if (!plugin.isLinkedAndLoaded()) {
continue;
}
GeneralConfigInformation info;
@@ -102,7 +102,7 @@ void ConfigUtils::displayMenu() {
DEBUG_FUNCTION_LINE_ERR("Failed to create config for plugin: \"%s\"", info.name.c_str());
}
} else {
for (const auto &hook : plugin.getPluginLinkInformation()->getHookDataList()) {
for (const auto &hook : plugin.getPluginLinkInformation().getHookDataList()) {
if (hook.getType() == WUPS_LOADER_HOOK_GET_CONFIG_DEPRECATED) {
if (hook.getFunctionPointer() == nullptr) {
DEBUG_FUNCTION_LINE_ERR("Hook had invalid ptr");

18
source/utils/exports.cpp
View File

@@ -264,7 +264,7 @@ extern "C" PluginBackendApiErrorType WUPSGetNumberOfLoadedPlugins(uint32_t *outC
if (outCount == nullptr) {
return PLUGIN_BACKEND_API_ERROR_INVALID_ARG;
}
*outCount = gLoadedPlugins.size();
*outCount = std::count_if(gLoadedPlugins.begin(), gLoadedPlugins.end(), [](const auto &cur) { return cur.isLinkedAndLoaded(); });
return PLUGIN_BACKEND_API_ERROR_NONE;
}
@@ -276,9 +276,12 @@ extern "C" PluginBackendApiErrorType WUPSGetSectionInformationForPlugin(const wu
if (handle != 0 && plugin_section_list != nullptr && buffer_size != 0) {
bool found = false;
for (const auto &curContainer : gLoadedPlugins) {
if (curContainer.isPluginLinkedAndLoaded() && curContainer.getHandle() == handle) {
if (!curContainer.isLinkedAndLoaded()) {
continue;
}
if (curContainer.getHandle() == handle) {
found = true;
const auto &sectionInfoList = curContainer.getPluginLinkInformation()->getSectionInfoList();
const auto &sectionInfoList = curContainer.getPluginLinkInformation().getSectionInfoList();
uint32_t offset = 0;
for (auto const &sectionInfo : sectionInfoList | std::views::values) {
@@ -320,9 +323,12 @@ extern "C" PluginBackendApiErrorType WUPSGetSectionMemoryAddresses(const wups_ba
return PLUGIN_BACKEND_API_ERROR_INVALID_ARG;
}
for (const auto &curContainer : gLoadedPlugins) {
if (curContainer.isPluginLinkedAndLoaded() && curContainer.getHandle() == handle) {
*textAddress = const_cast<void *>(curContainer.getPluginLinkInformation()->getTextMemory().data());
*dataAddress = const_cast<void *>(curContainer.getPluginLinkInformation()->getDataMemory().data());
if (!curContainer.isLinkedAndLoaded()) {
continue;
}
if (curContainer.getHandle() == handle) {
*textAddress = static_cast<void *>(curContainer.getPluginLinkInformation().getTextMemory().data());
*dataAddress = static_cast<void *>(curContainer.getPluginLinkInformation().getDataMemory().data());
return PLUGIN_BACKEND_API_ERROR_NONE;
}
}