The-Homebrew-Cloud/WUMSLoader
2
0
Fork 0
mirror of https://github.com/wiiu-env/WUMSLoader.git synced 2024-11-23 08:19:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Call INIT_WUT and FINI_WUT for modules, make sure APPLICATION_ENDS and FINI_WUT hooks are actually called by a sepeate module

Browse Source
This commit is contained in:
Maschell 2021-01-01 02:06:03 +01:00
parent 98c8de7479
commit fddf436554
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
relocator/src/entry.cpp
View File

@ -115,6 +115,27 @@ extern "C" void doStart(int argc, char **argv) {
std::vector<ModuleData> loadedModulesUnordered = ModuleDataPersistence::loadModuleData(gModuleData); std::vector<ModuleData> loadedModulesUnordered = ModuleDataPersistence::loadModuleData(gModuleData);
std::vector<ModuleData> loadedModules = OrderModulesByDependencies(loadedModulesUnordered); std::vector<ModuleData> loadedModules = OrderModulesByDependencies(loadedModulesUnordered);
bool applicationEndHookLoaded = false;
for (auto &curModule : loadedModules) {
if (curModule.getExportName() == "homebrew_applicationendshook") {
DEBUG_FUNCTION_LINE("We have ApplicationEndsHook Module!\n");
applicationEndHookLoaded = true;
break;
}
}
// Make sure WUMS_HOOK_APPLICATION_ENDS and WUMS_HOOK_FINI_WUT are called
for (auto &curModule : loadedModules) {
for (auto &curHook : curModule.getHookDataList()) {
if (curHook.getType() == WUMS_HOOK_APPLICATION_ENDS || curHook.getType() == WUMS_HOOK_FINI_WUT) {
if (!applicationEndHookLoaded) {
OSFatal_printf("%s requires module homebrew_applicationendshook", curModule.getExportName().c_str());
}
}
}
}
DEBUG_FUNCTION_LINE("Number of modules %d\n", gModuleData->number_used_modules); DEBUG_FUNCTION_LINE("Number of modules %d\n", gModuleData->number_used_modules);
if (!gInitCalled) { if (!gInitCalled) {
gInitCalled = 1; gInitCalled = 1;
@ -124,13 +145,16 @@ extern "C" void doStart(int argc, char **argv) {
for (auto &curModule : loadedModules) { for (auto &curModule : loadedModules) {
if (curModule.isInitBeforeRelocationDoneHook()) { if (curModule.isInitBeforeRelocationDoneHook()) {
CallHook(loadedModules, WUMS_HOOK_INIT_WUT);
CallHook(curModule, WUMS_HOOK_INIT); CallHook(curModule, WUMS_HOOK_INIT);
CallHook(loadedModules, WUMS_HOOK_FINI_WUT);
} }
} }
DEBUG_FUNCTION_LINE("Relocations done\n"); DEBUG_FUNCTION_LINE("Relocations done\n");
CallHook(loadedModules, WUMS_HOOK_RELOCATIONS_DONE); CallHook(loadedModules, WUMS_HOOK_RELOCATIONS_DONE);
for (int i = 0; i < gModuleData->number_used_modules; i++) { for (int i = 0; i < gModuleData->number_used_modules; i++) {
if (!gModuleData->module_data[i].skipEntrypoint) { if (!gModuleData->module_data[i].skipEntrypoint) {
DEBUG_FUNCTION_LINE("About to call %08X\n", gModuleData->module_data[i].entrypoint); DEBUG_FUNCTION_LINE("About to call %08X\n", gModuleData->module_data[i].entrypoint);
@ -141,7 +165,9 @@ extern "C" void doStart(int argc, char **argv) {
for (auto &curModule : loadedModules) { for (auto &curModule : loadedModules) {
if (!curModule.isInitBeforeRelocationDoneHook()) { if (!curModule.isInitBeforeRelocationDoneHook()) {
CallHook(loadedModules, WUMS_HOOK_INIT_WUT);
CallHook(curModule, WUMS_HOOK_INIT); CallHook(curModule, WUMS_HOOK_INIT);
CallHook(loadedModules, WUMS_HOOK_FINI_WUT);
} }
} }
} else { } else {
@ -149,12 +175,9 @@ extern "C" void doStart(int argc, char **argv) {
ResolveRelocations(loadedModules); ResolveRelocations(loadedModules);
CallHook(loadedModules, WUMS_HOOK_RELOCATIONS_DONE); CallHook(loadedModules, WUMS_HOOK_RELOCATIONS_DONE);
} }
CallHook(loadedModules, WUMS_HOOK_INIT_WUT);
// TODO: Implement Application ends hook
// CallHook(loadedModules, WUMS_HOOK_FINI_WUT);
// CallHook(loadedModules, WUMS_HOOK_INIT_WUT);
CallHook(loadedModules, WUMS_HOOK_APPLICATION_STARTS); CallHook(loadedModules, WUMS_HOOK_APPLICATION_STARTS);
//CallHook(loadedModules, WUMS_HOOK_FINI_WUT);
} }
std::vector<ModuleData> OrderModulesByDependencies(const std::vector<ModuleData> &loadedModules) { std::vector<ModuleData> OrderModulesByDependencies(const std::vector<ModuleData> &loadedModules) {