From 4bf4a0eeea84080a05a3b181f16b2a39799bf931 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 3 May 2020 12:25:38 +0200 Subject: [PATCH] Formatting --- source/PluginManagement.cpp | 48 ++++++++++++++++++------------------- source/PluginManagement.h | 6 ++--- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/source/PluginManagement.cpp b/source/PluginManagement.cpp index 8770b0a..bf6b7e2 100644 --- a/source/PluginManagement.cpp +++ b/source/PluginManagement.cpp @@ -8,14 +8,14 @@ #include "hooks.h" -bool PluginManagement::doRelocation(const std::vector &relocData, relocation_trampolin_entry_t * tramp_data, uint32_t tramp_length, uint32_t trampolinID) { - std::map moduleHandleCache; - for (auto const& cur : relocData) { +bool PluginManagement::doRelocation(const std::vector &relocData, relocation_trampolin_entry_t *tramp_data, uint32_t tramp_length, uint32_t trampolinID) { + std::map moduleHandleCache; + for (auto const &cur : relocData) { std::string functionName = cur.getName(); std::string rplName = cur.getImportRPLInformation().getName(); int32_t isData = cur.getImportRPLInformation().isData(); OSDynLoad_Module rplHandle = 0; - if(moduleHandleCache.count(rplName) > 0) { + if (moduleHandleCache.count(rplName) > 0) { rplHandle = moduleHandleCache[rplName]; } else { OSDynLoad_Acquire(rplName.c_str(), &rplHandle); @@ -23,14 +23,14 @@ bool PluginManagement::doRelocation(const std::vector &relocData } uint32_t functionAddress = 0; - OSDynLoad_FindExport(rplHandle, isData, functionName.c_str(), (void**) &functionAddress); - if(functionAddress == 0) { + OSDynLoad_FindExport(rplHandle, isData, functionName.c_str(), (void **) &functionAddress); + if (functionAddress == 0) { DEBUG_FUNCTION_LINE("Failed to find export for %s", functionName.c_str()); return false; } else { //DEBUG_FUNCTION_LINE("Found export for %s %s", rplName.c_str(), functionName.c_str()); } - if(!ElfUtils::elfLinkOne(cur.getType(), cur.getOffset(), cur.getAddend(), (uint32_t) cur.getDestination(), functionAddress, tramp_data, tramp_length, RELOC_TYPE_IMPORT,trampolinID)) { + if (!ElfUtils::elfLinkOne(cur.getType(), cur.getOffset(), cur.getAddend(), (uint32_t) cur.getDestination(), functionAddress, tramp_data, tramp_length, RELOC_TYPE_IMPORT, trampolinID)) { DEBUG_FUNCTION_LINE("Relocation failed\n"); return false; } @@ -42,27 +42,27 @@ bool PluginManagement::doRelocation(const std::vector &relocData } -void PluginManagement::doRelocations(std::vector plugins, relocation_trampolin_entry_t * trampData, uint32_t tramp_size) { - for(auto & pluginContainer : plugins) { +void PluginManagement::doRelocations(const std::vector &plugins, relocation_trampolin_entry_t *trampData, uint32_t tramp_size) { + for (auto &pluginContainer : plugins) { DEBUG_FUNCTION_LINE("Doing relocations for plugin: %s", pluginContainer.getMetaInformation().getName().c_str()); - if(!PluginManagement::doRelocation(pluginContainer.getPluginInformation().getRelocationDataList(), trampData, tramp_size, pluginContainer.getPluginInformation().getTrampolinId())) { + if (!PluginManagement::doRelocation(pluginContainer.getPluginInformation().getRelocationDataList(), trampData, tramp_size, pluginContainer.getPluginInformation().getTrampolinId())) { DEBUG_FUNCTION_LINE("Relocation failed"); } } } -void PluginManagement::memsetBSS(std::vector plugins) { - for(auto & pluginContainer : plugins) { +void PluginManagement::memsetBSS(const std::vector &plugins) { + for (auto &pluginContainer : plugins) { auto sbssSection = pluginContainer.getPluginInformation().getSectionInfo(".sbss"); - if(sbssSection){ + if (sbssSection) { DEBUG_FUNCTION_LINE("memset .sbss %08X (%d)", sbssSection->getAddress(), sbssSection->getSize()); - memset((void*)sbssSection->getAddress(), 0, sbssSection->getSize()); + memset((void *) sbssSection->getAddress(), 0, sbssSection->getSize()); } auto bssSection = pluginContainer.getPluginInformation().getSectionInfo(".bss"); - if(bssSection) { + if (bssSection) { DEBUG_FUNCTION_LINE("memset .bss %08X (%d)", bssSection->getAddress(), bssSection->getSize()); - memset((void*)bssSection->getAddress(), 0, bssSection->getSize()); + memset((void *) bssSection->getAddress(), 0, bssSection->getSize()); } } } @@ -75,18 +75,18 @@ void PluginManagement::callInitHooks(plugin_information_t *pluginInformation) { DEBUG_FUNCTION_LINE("Done calling init hooks"); } -void PluginManagement::PatchFunctionsAndCallHooks(plugin_information_t* gPluginInformation) { +void PluginManagement::PatchFunctionsAndCallHooks(plugin_information_t *gPluginInformation) { DEBUG_FUNCTION_LINE("Patching functions"); PatchInvidualMethodHooks(method_hooks_hooks_static, method_hooks_size_hooks_static, method_calls_hooks_static); PatchInvidualMethodHooks(method_hooks_hooks, method_hooks_size_hooks, method_calls_hooks); - for(int32_t plugin_index=0; plugin_indexnumber_used_plugins; plugin_index++) { - CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_INIT_WUT_MALLOC,plugin_index); - CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_INIT_WUT_NEWLIB,plugin_index); - CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_INIT_WUT_STDCPP,plugin_index); - CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_INIT_WUT_DEVOPTAB,plugin_index); - CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_APPLICATION_START,plugin_index); + for (int32_t plugin_index = 0; plugin_index < gPluginInformation->number_used_plugins; plugin_index++) { + CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_INIT_WUT_MALLOC, plugin_index); + CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_INIT_WUT_NEWLIB, plugin_index); + CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_INIT_WUT_STDCPP, plugin_index); + CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_INIT_WUT_DEVOPTAB, plugin_index); + CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_APPLICATION_START, plugin_index); new_PatchInvidualMethodHooks(&(gPluginInformation->plugin_data[plugin_index].info)); - CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_FUNCTIONS_PATCHED,plugin_index); + CallHookEx(gPluginInformation, WUPS_LOADER_HOOK_FUNCTIONS_PATCHED, plugin_index); } } diff --git a/source/PluginManagement.h b/source/PluginManagement.h index 4c3aad3..7df8cdf 100644 --- a/source/PluginManagement.h +++ b/source/PluginManagement.h @@ -7,10 +7,8 @@ class PluginManagement { public: - static void Init(std::vector pInformation); - - static void doRelocations(std::vector plugins, relocation_trampolin_entry_t *trampData, uint32_t tramp_size); - static void memsetBSS(std::vector plugins); + static void doRelocations(const std::vector& plugins, relocation_trampolin_entry_t *trampData, uint32_t tramp_size); + static void memsetBSS(const std::vector& plugins); static void callInitHooks(plugin_information_t *pluginInformation);