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

Merge branch 'master' into d3d12

Browse Source
This commit is contained in:
Triang3l
2018-11-23 19:08:43 +03:00
parent da280347c4 996093e499
commit ff363d85be
8 changed files with 107 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,12 +198,16 @@ dword_result_t XamEnumerate(dword_t handle, dword_t flags, lpvoid_t buffer,
}
}
size_t actual_buffer_length = e->item_size() * e->items_per_enumerate();
if (actual_buffer_length != buffer_length) {
size_t actual_buffer_length = (uint32_t)buffer_length;
if (buffer_length == e->items_per_enumerate()) {
actual_buffer_length = e->item_size() * e->items_per_enumerate();
// Known culprits:
// Final Fight: Double Impact
XELOGW("Broken usage of XamEnumerate! %.X vs %.X", buffer_length,
actual_buffer_length);
// 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());
}
buffer.Zero(actual_buffer_length);

3
src/xenia/kernel/xam/xam_user.cc
View File

@@ -49,7 +49,8 @@ dword_result_t XamUserGetSigninState(dword_t user_index) {
return 0;
}
}
DECLARE_XAM_EXPORT1(XamUserGetSigninState, kUserProfiles, kImplemented);
DECLARE_XAM_EXPORT2(XamUserGetSigninState, kUserProfiles, kImplemented,
kHighFrequency);
typedef struct {
xe::be<uint64_t> xuid;