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

[Kernel] Do not load module explicitly 

Application should be responsible for loading xex modules
This commit is contained in:
Gliniak 2020-05-21 19:37:43 +02:00 committed by illusion
parent 6353577c6d
commit c43fedebce
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/xenia/kernel/kernel_state.cc
View File

@ -229,7 +229,7 @@ object_ref<XModule> KernelState::GetModule(const std::string_view name,
} }
// Module not found, try loading it // Module not found, try loading it
return LoadUserModule(name); return nullptr;
} }
object_ref<XThread> KernelState::LaunchModule(object_ref<UserModule> module) { object_ref<XThread> KernelState::LaunchModule(object_ref<UserModule> module) {
@ -406,7 +406,16 @@ object_ref<UserModule> KernelState::LoadUserModule(
module->Dump(); module->Dump();
if (module->is_dll_module() && module->entry_point() && call_entry) { if (module->is_dll_module() && module->entry_point() && call_entry) {
LaunchModule(module); // Call DllMain(DLL_PROCESS_ATTACH):
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms682583%28v=vs.85%29.aspx
uint64_t args[] = {
module->handle(),
1, // DLL_PROCESS_ATTACH
0, // 0 because always dynamic
};
auto thread_state = XThread::GetCurrentThread()->thread_state();
processor()->Execute(thread_state, module->entry_point(), args,
xe::countof(args));
} }
return module; return module;