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

Merge pull request #447 from DrChat/excreatethread_ptr_fix 

Fix ExCreateThread returning a handle when game requests a pointer
This commit is contained in:
Ben Vanik 2015-11-03 20:01:12 -08:00
parent da4a7e1bf2 cee0e582c2
commit b9326be93c
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/xenia/kernel/xboxkrnl/xboxkrnl_threading.cc
View File

@ -139,7 +139,11 @@ SHIM_CALL ExCreateThread_shim(PPCContext* ppc_context,
if (XSUCCEEDED(result)) { if (XSUCCEEDED(result)) {
if (handle_ptr) { if (handle_ptr) {
SHIM_SET_MEM_32(handle_ptr, thread->handle()); if (creation_flags & 0x80) {
SHIM_SET_MEM_32(handle_ptr, thread->guest_object());
} else {
SHIM_SET_MEM_32(handle_ptr, thread->handle());
}
} }
if (thread_id_ptr) { if (thread_id_ptr) {
SHIM_SET_MEM_32(thread_id_ptr, thread->thread_id()); SHIM_SET_MEM_32(thread_id_ptr, thread->thread_id());
@ -283,18 +287,8 @@ SHIM_CALL KeSetBasePriorityThread_shim(PPCContext* ppc_context,
XELOGD("KeSetBasePriorityThread(%.8X, %.8X)", thread_ptr, increment); XELOGD("KeSetBasePriorityThread(%.8X, %.8X)", thread_ptr, increment);
int32_t prev_priority = 0; int32_t prev_priority = 0;
auto thread = XObject::GetNativeObject<XThread>(kernel_state,
object_ref<XThread> thread; SHIM_MEM_ADDR(thread_ptr));
if (thread_ptr < 0x1000) {
// They passed in a handle (for some reason)
thread = kernel_state->object_table()->LookupObject<XThread>(thread_ptr);
// Log it in case this is the source of any problems in the future
XELOGD("KeSetBasePriorityThread - Interpreting thread ptr as handle!");
} else {
thread = XObject::GetNativeObject<XThread>(kernel_state,
SHIM_MEM_ADDR(thread_ptr));
}
if (thread) { if (thread) {
prev_priority = thread->QueryPriority(); prev_priority = thread->QueryPriority();
@ -870,17 +864,8 @@ SHIM_CALL KeWaitForSingleObject_shim(PPCContext* ppc_context,
XELOGD("KeWaitForSingleObject(%.8X, %.8X, %.8X, %.1X, %.8X)", object_ptr, XELOGD("KeWaitForSingleObject(%.8X, %.8X, %.8X, %.1X, %.8X)", object_ptr,
wait_reason, processor_mode, alertable, timeout_ptr); wait_reason, processor_mode, alertable, timeout_ptr);
object_ref<XObject> object; auto object = XObject::GetNativeObject<XObject>(kernel_state,
if (object_ptr < 0x1000) { SHIM_MEM_ADDR(object_ptr));
// They passed in a handle (for some reason)
object = kernel_state->object_table()->LookupObject<XObject>(object_ptr);
// Log it in case this is the source of any problems in the future
XELOGD("KeWaitForSingleObject - Interpreting object ptr as handle!");
} else {
object = XObject::GetNativeObject<XObject>(kernel_state,
SHIM_MEM_ADDR(object_ptr));
}
if (!object) { if (!object) {
// The only kind-of failure code. // The only kind-of failure code.