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

further ajustment to buffer size to fix regression

This commit is contained in:
Cancerous 2019-12-06 12:20:34 -05:00 committed by illusion
parent 5c7032c826
commit 523fbcf130
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,9 +353,21 @@ dword_result_t XamEnumerate(dword_t handle, dword_t flags, lpvoid_t buffer,
}
}
// Don't trust buffer_length. It might be invalid (Based on "Resonance of fate")
// also fixes "Angry Birds" - Thanks Gliniak
size_t actual_buffer_length = e->item_count() * e->item_size();
size_t actual_buffer_length = (uint32_t)buffer_length;
if (buffer_length == e->items_per_enumerate()) {
// Known culprits:
// Final Fight: Double Impact (saves)
XELOGW(
"Broken usage of XamEnumerate! buffer length=%.X vs actual length=%.X "
"(item size=%.X, items per enumerate=%u)",
(uint32_t)buffer_length, actual_buffer_length, e->item_size(),
e->items_per_enumerate());
// actual_buffer_length = e->item_size() * e->items_per_enumerate();
// leaving old method commented for now until more widely tested
// Don't trust buffer_length. It might be invalid (Based on "Resonance of fate")
// also fixes "Angry Birds" - Thanks Gliniak
actual_buffer_length = e->item_count() * e->item_size();
}
X_RESULT result;
uint32_t item_count = 0;