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

Fix for unknown kernel modules.

This commit is contained in:
Ben Vanik 2015-07-19 10:55:12 -07:00
parent 352bae30cb
commit 5c7f42e9d1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/cpu/xex_module.cc
View File

@ -339,12 +339,11 @@ bool XexModule::SetupLibraryImports(const char* name,
if (kernel_resolver) { if (kernel_resolver) {
kernel_export = kernel_resolver->GetExportByOrdinal(name, ordinal); kernel_export = kernel_resolver->GetExportByOrdinal(name, ordinal);
} else { } else if (user_module) {
user_export_addr = user_module->GetProcAddressByOrdinal(ordinal); user_export_addr = user_module->GetProcAddressByOrdinal(ordinal);
} }
// Import not resolved? // Import not resolved?
assert_not_zero(kernel_export || user_export_addr);
if (!kernel_export && !user_export_addr) { if (!kernel_export && !user_export_addr) {
XELOGW( XELOGW(
"WARNING: an import variable was not resolved! (library: %s, import " "WARNING: an import variable was not resolved! (library: %s, import "
@ -358,7 +357,7 @@ bool XexModule::SetupLibraryImports(const char* name,
import_name.AppendFormat("__imp__"); import_name.AppendFormat("__imp__");
if (kernel_export) { if (kernel_export) {
import_name.AppendFormat("%s", kernel_export->name); import_name.AppendFormat("%s", kernel_export->name);
} else if (user_export_addr) { } else {
import_name.AppendFormat("%s_%.3X", libbasename.c_str(), ordinal); import_name.AppendFormat("%s_%.3X", libbasename.c_str(), ordinal);
} }
@ -396,7 +395,7 @@ bool XexModule::SetupLibraryImports(const char* name,
// Thunk. // Thunk.
if (kernel_export) { if (kernel_export) {
import_name.AppendFormat("%s", kernel_export->name); import_name.AppendFormat("%s", kernel_export->name);
} else if (user_export_addr) { } else {
import_name.AppendFormat("__%s_%.3X", libbasename.c_str(), ordinal); import_name.AppendFormat("__%s_%.3X", libbasename.c_str(), ordinal);
} }