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] Fixed remaining issues with APC 

Seems like processing APC never overwrites initial result value in favor of APC
This commit is contained in:
Gliniak 2024-08-29 19:47:18 +02:00
parent 2044013b50
commit 59eed7818f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,10 +416,7 @@ uint32_t KeDelayExecutionThread(uint32_t processor_mode, uint32_t alertable,
X_STATUS result = thread->Delay(processor_mode, alertable, *interval_ptr); X_STATUS result = thread->Delay(processor_mode, alertable, *interval_ptr);
if (result == X_STATUS_USER_APC) { if (result == X_STATUS_USER_APC) {
result = xeProcessUserApcs(ctx); xeProcessUserApcs(ctx);
if (result == X_STATUS_USER_APC) {
return result;
}
} }
return result; return result;
@ -931,7 +928,7 @@ uint32_t xeKeWaitForSingleObject(void* object_ptr, uint32_t wait_reason,
object->Wait(wait_reason, processor_mode, alertable, timeout_ptr); object->Wait(wait_reason, processor_mode, alertable, timeout_ptr);
if (alertable) { if (alertable) {
if (result == X_STATUS_USER_APC) { if (result == X_STATUS_USER_APC) {
result = xeProcessUserApcs(nullptr); xeProcessUserApcs(nullptr);
} }
} }
return result; return result;
@ -1009,7 +1006,7 @@ dword_result_t KeWaitForMultipleObjects_entry(
wait_reason, processor_mode, alertable, timeout_ptr ? &timeout : nullptr); wait_reason, processor_mode, alertable, timeout_ptr ? &timeout : nullptr);
if (alertable) { if (alertable) {
if (result == X_STATUS_USER_APC) { if (result == X_STATUS_USER_APC) {
result = xeProcessUserApcs(nullptr); xeProcessUserApcs(nullptr);
} }
} }
return result; return result;
@ -1053,7 +1050,7 @@ uint32_t xeNtWaitForMultipleObjectsEx(uint32_t count, xe::be<uint32_t>* handles,
wait_type, 6, wait_mode, alertable, timeout_ptr); wait_type, 6, wait_mode, alertable, timeout_ptr);
if (alertable) { if (alertable) {
if (result == X_STATUS_USER_APC) { if (result == X_STATUS_USER_APC) {
result = xeProcessUserApcs(nullptr); xeProcessUserApcs(nullptr);
} }
} }
return result; return result;
@ -1098,7 +1095,7 @@ dword_result_t NtSignalAndWaitForSingleObjectEx_entry(dword_t signal_handle,
if (alertable) { if (alertable) {
if (result == X_STATUS_USER_APC) { if (result == X_STATUS_USER_APC) {
result = xeProcessUserApcs(nullptr); xeProcessUserApcs(nullptr);
} }
} }
return result; return result;