mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-01 03:32:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for cellUserInfoGetList

Browse Source 
- Don't allow all args to be nullptr at once.
- Fill listBuf with zeroes for unwritten entries
- Fix userId set in listBuf

Similarly to what the firmware does
This commit is contained in:
Eladash 2019-10-16 06:46:43 +03:00 committed by Ivan
parent 47c3d945aa
commit 6dd96d3db9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Emu/Cell/Modules/cellUserInfo.cpp
View File

@ -104,9 +104,12 @@ error_code cellUserInfoGetList(vm::ptr<u32> listNum, vm::ptr<CellUserInfoUserLis
cellUserInfo.todo("cellUserInfoGetList(listNum=*0x%x, listBuf=*0x%x, currentUserId=*0x%x)", listNum, listBuf, currentUserId);
// If only listNum is NULL, an error will be returned
if (listBuf && !listNum)
if (!listNum)
{
return CELL_USERINFO_ERROR_PARAM;
if (listBuf || !currentUserId)
{
return CELL_USERINFO_ERROR_PARAM;
}
}
if (listNum)
@ -116,7 +119,10 @@ error_code cellUserInfoGetList(vm::ptr<u32> listNum, vm::ptr<CellUserInfoUserLis
if (listBuf)
{
listBuf->userId[0] = 1;
std::memset(listBuf.get_ptr(), 0, listBuf.size());
// We report only one user, so it must be the current user
listBuf->userId[0] = Emu.GetUsrId();
}
if (currentUserId)