fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Kernel] Maybe fix XamEnumerate, again?

Browse Source 
Some titles, when using XamEnumerate synchronously, expect X_ERROR_NO_MORE_FILES as the return value.
Some titles, when using XamEnumerate asynchronously, expect X_ERROR_FUNCTION_FAILED as the overlapped result.
This commit is contained in:
gibbed
2018-11-26 19:53:03 -06:00
parent 2398b1b8f4
commit 248b661d14
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/kernel/xam/xam_info.cc
View File

@@ -373,7 +373,7 @@ dword_result_t XamEnumerate(dword_t handle, dword_t flags, lpvoid_t buffer,
if (actual_buffer_length < e->item_size()) { if (actual_buffer_length < e->item_size()) {
result = X_ERROR_INSUFFICIENT_BUFFER; result = X_ERROR_INSUFFICIENT_BUFFER;
} else if (e->current_item() >= e->item_count()) { } else if (e->current_item() >= e->item_count()) {
result = X_ERROR_FUNCTION_FAILED; result = X_ERROR_NO_MORE_FILES;
} else { } else {
auto item_buffer = buffer.as<uint8_t*>(); auto item_buffer = buffer.as<uint8_t*>();
auto max_items = actual_buffer_length / e->item_size(); auto max_items = actual_buffer_length / e->item_size();
@@ -387,8 +387,6 @@ dword_result_t XamEnumerate(dword_t handle, dword_t flags, lpvoid_t buffer,
result = X_ERROR_SUCCESS; result = X_ERROR_SUCCESS;
} }
// Return X_ERROR_NO_MORE_FILES in HRESULT form.
X_HRESULT extended_result = result != 0 ? X_HRESULT_FROM_WIN32(result) : 0;
if (items_returned) { if (items_returned) {
assert_true(!overlapped); assert_true(!overlapped);
*items_returned = result == X_ERROR_SUCCESS ? item_count : 0; *items_returned = result == X_ERROR_SUCCESS ? item_count : 0;
@@ -396,7 +394,9 @@ dword_result_t XamEnumerate(dword_t handle, dword_t flags, lpvoid_t buffer,
} else if (overlapped) { } else if (overlapped) {
assert_true(!items_returned); assert_true(!items_returned);
kernel_state()->CompleteOverlappedImmediateEx( kernel_state()->CompleteOverlappedImmediateEx(
overlapped, result, extended_result, overlapped,
result == X_ERROR_SUCCESS ? X_ERROR_SUCCESS : X_ERROR_FUNCTION_FAILED,
X_RESULT_FROM_WIN32(result),
result == X_ERROR_SUCCESS ? item_count : 0); result == X_ERROR_SUCCESS ? item_count : 0);
return X_ERROR_IO_PENDING; return X_ERROR_IO_PENDING;
} else { } else {