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

Tweaks to support missing user settings.

This commit is contained in:
Ben Vanik 2014-10-26 02:41:48 -07:00
parent 5bec5bb203
commit 3024b755da
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/xenia/kernel/xam_user.cc
View File

@ -148,18 +148,30 @@ SHIM_CALL XamUserReadProfileSettings_shim(PPCContext* ppc_state,
const size_t kSettingSize = 4 + 4 + 4 + 4 + 4 + 4 + 16; const size_t kSettingSize = 4 + 4 + 4 + 4 + 4 + 4 + 16;
// Compute required size. // Compute required size.
bool any_missing = false;
uint32_t size_needed = 4 + 4 + setting_count * kSettingSize; uint32_t size_needed = 4 + 4 + setting_count * kSettingSize;
for (uint32_t n = 0; n < setting_count; ++n) { for (uint32_t n = 0; n < setting_count; ++n) {
uint32_t setting_id = SHIM_MEM_32(setting_ids_ptr + n * 4); uint32_t setting_id = SHIM_MEM_32(setting_ids_ptr + n * 4);
auto setting = user_profile->GetSetting(setting_id); auto setting = user_profile->GetSetting(setting_id);
if (setting) { if (setting) {
auto extra_size = static_cast<uint32_t>(setting->extra_size()); auto extra_size = static_cast<uint32_t>(setting->extra_size());
;
size_needed += extra_size; size_needed += extra_size;
} else {
any_missing = true;
XELOGE("XamUserReadProfileSettings requested unimplemented setting %.8X", setting_id);
} }
} }
if (any_missing) {
// TODO(benvanik): don't fail? most games don't even check!
if (overlapped_ptr) {
state->CompleteOverlappedImmediate(overlapped_ptr,
X_ERROR_INVALID_PARAMETER);
}
SHIM_SET_RETURN_32(X_ERROR_INVALID_PARAMETER);
return;
}
SHIM_SET_MEM_32(buffer_size_ptr, size_needed); SHIM_SET_MEM_32(buffer_size_ptr, size_needed);
if (buffer_size < size_needed) { if (!buffer_ptr || buffer_size < size_needed) {
if (overlapped_ptr) { if (overlapped_ptr) {
state->CompleteOverlappedImmediate(overlapped_ptr, state->CompleteOverlappedImmediate(overlapped_ptr,
X_ERROR_INSUFFICIENT_BUFFER); X_ERROR_INSUFFICIENT_BUFFER);