daniel/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-12-23 11:11:22 -08:00
Code Issues Packages Projects Releases Wiki Activity

caps: Stubs GetAlbumFileList0AafeAruidDeprecated and GetAlbumFileList3AaeAruid (#2403)

Browse Source 
This PR stubs caps service call `GetAlbumFileList0AafeAruidDeprecated` and `GetAlbumFileList3AaeAruid` (Closes #2035, Closes #2401), both are checked by RE.
This avoid using "ignore missing services" when you want to play World of Light in Super Smash Bros Ultimate.
This commit is contained in:
Ac_K 2021-06-25 00:37:48 +02:00 committed by GitHub
parent 3359b0fd97
commit eac659e37b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs
View File

@ -1,4 +1,6 @@
using Ryujinx.Common.Logging;
using Ryujinx.Cpu;
using Ryujinx.HLE.HOS.Services.Caps.Types;
namespace Ryujinx.HLE.HOS.Services.Caps
{
@ -13,5 +15,55 @@ namespace Ryujinx.HLE.HOS.Services.Caps
{
return context.Device.System.CaptureManager.SetShimLibraryVersion(context);
}
[CommandHipc(102)]
// GetAlbumFileList0AafeAruidDeprecated(pid, u16 content_type, u64 start_time, u64 end_time, nn::applet::AppletResourceUserId) -> (u64 count, buffer<ApplicationAlbumFileEntry, 0x6>)
public ResultCode GetAlbumFileList0AafeAruidDeprecated(ServiceCtx context)
{
// NOTE: ApplicationAlbumFileEntry size is 0x30.
return GetAlbumFileList(context);
}
[CommandHipc(142)]
// GetAlbumFileList3AaeAruid(pid, u16 content_type, u64 start_time, u64 end_time, nn::applet::AppletResourceUserId) -> (u64 count, buffer<ApplicationAlbumFileEntry, 0x6>)
public ResultCode GetAlbumFileList3AaeAruid(ServiceCtx context)
{
// NOTE: ApplicationAlbumFileEntry size is 0x20.
return GetAlbumFileList(context);
}
private ResultCode GetAlbumFileList(ServiceCtx context)
{
ResultCode resultCode = ResultCode.Success;
ulong count = 0;
ContentType contentType = (ContentType)context.RequestData.ReadUInt16();
ulong startTime = context.RequestData.ReadUInt64();
ulong endTime = context.RequestData.ReadUInt64();
context.RequestData.ReadUInt16(); // Alignment.
ulong appletResourceUserId = context.RequestData.ReadUInt64();
ulong applicationAlbumFileEntryPosition = context.Request.ReceiveBuff[0].Position;
ulong applicationAlbumFileEntrySize = context.Request.ReceiveBuff[0].Size;
MemoryHelper.FillWithZeros(context.Memory, applicationAlbumFileEntryPosition, (int)applicationAlbumFileEntrySize);
if (contentType > ContentType.Unknown || contentType == ContentType.ExtraMovie)
{
resultCode = ResultCode.InvalidContentType;
}
// TODO: Service checks if the pid is present in an internal list and returns ResultCode.BlacklistedPid if it is.
// The list contents needs to be determined.
// Service populate the buffer with a ApplicationAlbumFileEntry related to the pid.
Logger.Stub?.PrintStub(LogClass.ServiceCaps, new { contentType, startTime, endTime, appletResourceUserId });
context.ResponseData.Write(count);
return resultCode;
}
}
}

1
Ryujinx.HLE/HOS/Services/Caps/ResultCode.cs
View File

@ -10,6 +10,7 @@
InvalidArgument = (2 << ErrorCodeShift) | ModuleId,
ShimLibraryVersionAlreadySet = (7 << ErrorCodeShift) | ModuleId,
OutOfRange = (8 << ErrorCodeShift) | ModuleId,
InvalidContentType = (14 << ErrorCodeShift) | ModuleId,
NullOutputBuffer = (141 << ErrorCodeShift) | ModuleId,
NullInputBuffer = (142 << ErrorCodeShift) | ModuleId,
BlacklistedPid = (822 << ErrorCodeShift) | ModuleId

3
Ryujinx.HLE/HOS/Services/Caps/Types/ContentType.cs
View File

@ -4,6 +4,7 @@
{
Screenshot,
Movie,
ExtraMovie
ExtraMovie,
Unknown
}
}