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

XAM: Write as many items possible when enumerating. Fixes Nier not detecting system save data (and possibly other games).

This commit is contained in:
gibbed 2017-08-08 04:53:01 -05:00
parent 355d9f6c62
commit 1e92a4e06c
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/xam/xam_content.cc
View File

@ -173,7 +173,7 @@ dword_result_t XamContentCreateEnumerator(dword_t user_index, dword_t device_id,
} }
if (buffer_size_ptr) { if (buffer_size_ptr) {
*buffer_size_ptr = (uint32_t)XCONTENT_DATA::kSize; *buffer_size_ptr = (uint32_t)XCONTENT_DATA::kSize * max_count;
} }
auto e = auto e =

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

@ -199,23 +199,38 @@ dword_result_t XamEnumerate(dword_t handle, dword_t flags, lpvoid_t buffer,
} }
buffer.Zero(buffer_length); buffer.Zero(buffer_length);
X_RESULT result =
e->WriteItem(buffer) ? X_ERROR_SUCCESS : X_ERROR_NO_MORE_FILES; X_RESULT result;
uint32_t item_count = 0;
if (buffer_length < e->item_size()) {
result = X_ERROR_INSUFFICIENT_BUFFER;
} else if (e->current_item() >= e->item_count()) {
result = X_ERROR_NO_MORE_FILES;
} else {
auto item_buffer = buffer.as<uint8_t*>();
auto max_items = buffer_length / e->item_size();
while (max_items--) {
if (!e->WriteItem(item_buffer)) {
break;
}
item_buffer += e->item_size();
item_count++;
}
result = X_ERROR_SUCCESS;
}
// Return X_ERROR_NO_MORE_FILES in HRESULT form. // Return X_ERROR_NO_MORE_FILES in HRESULT form.
X_HRESULT extended_result = X_HRESULT extended_result = result != 0 ? X_HRESULT_FROM_WIN32(result) : 0;
result != 0 ? X_HRESULT_FROM_WIN32(X_ERROR_NO_MORE_FILES) : 0;
if (items_returned) { if (items_returned) {
assert_true(!overlapped); assert_true(!overlapped);
*items_returned = result == X_ERROR_SUCCESS ? 1 : 0; *items_returned = result == X_ERROR_SUCCESS ? item_count : 0;
return result; return result;
} 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, extended_result,
result == X_ERROR_SUCCESS ? e->item_count() : 0); result == X_ERROR_SUCCESS ? item_count : 0);
return X_ERROR_IO_PENDING; return X_ERROR_IO_PENDING;
} else { } else {
assert_always(); assert_always();