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

Formatting

This commit is contained in:
Dr. Chat 2015-05-04 20:58:30 -05:00
parent 1571c51a56
commit 9603a0a683
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenia/kernel/xboxkrnl_modules.cc
View File

@ -249,12 +249,13 @@ SHIM_CALL XexGetProcedureAddress_shim(PPCContext* ppc_state,
const char *name = (const char *)SHIM_MEM_ADDR(ordinal); const char *name = (const char *)SHIM_MEM_ADDR(ordinal);
uint32_t out_function_ptr = SHIM_GET_ARG_32(2); uint32_t out_function_ptr = SHIM_GET_ARG_32(2);
if (ordinal < 0x10000) if (ordinal < 0x10000) {
XELOGD("XexGetProcedureAddress(%.8X, %.8X, %.8X)", module_handle, ordinal, XELOGD("XexGetProcedureAddress(%.8X, %.8X, %.8X)", module_handle, ordinal,
out_function_ptr); out_function_ptr);
else } else {
XELOGD("XexGetProcedureAddress(%.8X, %.8X(%s), %.8X)", module_handle, ordinal, XELOGD("XexGetProcedureAddress(%.8X, %.8X(%s), %.8X)", module_handle, ordinal,
name, out_function_ptr); name, out_function_ptr);
}
X_STATUS result = X_STATUS_INVALID_HANDLE; X_STATUS result = X_STATUS_INVALID_HANDLE;
SHIM_SET_MEM_32(out_function_ptr, 0xDEADF00D); SHIM_SET_MEM_32(out_function_ptr, 0xDEADF00D);
@ -268,6 +269,8 @@ SHIM_CALL XexGetProcedureAddress_shim(PPCContext* ppc_state,
state->object_table()->GetObject(module_handle, (XObject**)&module); state->object_table()->GetObject(module_handle, (XObject**)&module);
} }
result = X_STATUS_UNSUCCESSFUL;
if (XSUCCEEDED(result)) { if (XSUCCEEDED(result)) {
if (ordinal < 0x10000) { if (ordinal < 0x10000) {
// Ordinal. // Ordinal.
@ -281,8 +284,7 @@ SHIM_CALL XexGetProcedureAddress_shim(PPCContext* ppc_state,
uint64_t ptr = (uint64_t)module->GetProcAddressByName(name); uint64_t ptr = (uint64_t)module->GetProcAddressByName(name);
// FYI: We don't need to generate this function now. It'll // FYI: We don't need to generate this function now. It'll
// be done automatically by xenia when it gets called // be done automatically by xenia when it gets called.
if (ptr) { if (ptr) {
SHIM_SET_MEM_32(out_function_ptr, ptr); SHIM_SET_MEM_32(out_function_ptr, ptr);
result = X_STATUS_SUCCESS; result = X_STATUS_SUCCESS;