Stub the application copyright framebuffer api (#921)
* Stub the application copyright framebuffer api As we currently don't support multi layers on vi/nvnflinger, this PR implement a stub of this API. * Address Cyuubi's comments * Add IPC checks and comments for future reversing Co-authored-by: Ac_K <Acoustik666@gmail.com> Co-authored-by: Ac_K <Acoustik666@gmail.com>
This commit is contained in:
parent
e7a4e0a328
commit
c464e1ec52
3 changed files with 116 additions and 6 deletions
|
@ -128,7 +128,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
|
||||||
|
|
||||||
if (cpuBoostMode > 1)
|
if (cpuBoostMode > 1)
|
||||||
{
|
{
|
||||||
return ResultCode.CpuBoostModeInvalid;
|
return ResultCode.InvalidParameters;
|
||||||
}
|
}
|
||||||
|
|
||||||
_cpuBoostMode = (CpuBoostMode)cpuBoostMode;
|
_cpuBoostMode = (CpuBoostMode)cpuBoostMode;
|
||||||
|
|
|
@ -8,6 +8,7 @@ using Ryujinx.Common;
|
||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.HLE.HOS.Ipc;
|
using Ryujinx.HLE.HOS.Ipc;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Common;
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
||||||
|
using Ryujinx.HLE.HOS.Kernel.Memory;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Threading;
|
using Ryujinx.HLE.HOS.Kernel.Threading;
|
||||||
using Ryujinx.HLE.HOS.Services.Am.AppletAE.Storage;
|
using Ryujinx.HLE.HOS.Services.Am.AppletAE.Storage;
|
||||||
using Ryujinx.HLE.HOS.Services.Sdb.Pdm.QueryService;
|
using Ryujinx.HLE.HOS.Services.Sdb.Pdm.QueryService;
|
||||||
|
@ -168,6 +169,114 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
|
||||||
return ResultCode.Success;
|
return ResultCode.Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Command(100)] // 5.0.0+
|
||||||
|
// InitializeApplicationCopyrightFrameBuffer(s32 width, s32 height, handle<copy, transfer_memory> transfer_memory, u64 transfer_memory_size)
|
||||||
|
public ResultCode InitializeApplicationCopyrightFrameBuffer(ServiceCtx context)
|
||||||
|
{
|
||||||
|
int width = context.RequestData.ReadInt32();
|
||||||
|
int height = context.RequestData.ReadInt32();
|
||||||
|
ulong transferMemorySize = context.RequestData.ReadUInt64();
|
||||||
|
int transferMemoryHandle = context.Request.HandleDesc.ToCopy[0];
|
||||||
|
ulong transferMemoryAddress = context.Process.HandleTable.GetObject<KTransferMemory>(transferMemoryHandle).Address;
|
||||||
|
|
||||||
|
ResultCode resultCode = ResultCode.InvalidParameters;
|
||||||
|
|
||||||
|
if (((transferMemorySize & 0x3FFFF) == 0) && width <= 1280 && height <= 720)
|
||||||
|
{
|
||||||
|
resultCode = InitializeApplicationCopyrightFrameBufferImpl(transferMemoryAddress, transferMemorySize, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
if (transferMemoryHandle)
|
||||||
|
{
|
||||||
|
svcCloseHandle(transferMemoryHandle);
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
return resultCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResultCode InitializeApplicationCopyrightFrameBufferImpl(ulong transferMemoryAddress, ulong transferMemorySize, int width, int height)
|
||||||
|
{
|
||||||
|
ResultCode resultCode = ResultCode.ObjectInvalid;
|
||||||
|
|
||||||
|
if ((transferMemorySize & 0x3FFFF) != 0)
|
||||||
|
{
|
||||||
|
return ResultCode.InvalidParameters;
|
||||||
|
}
|
||||||
|
|
||||||
|
// if (_copyrightBuffer == null)
|
||||||
|
{
|
||||||
|
// TODO: Initialize buffer and object.
|
||||||
|
|
||||||
|
Logger.PrintStub(LogClass.ServiceAm, new { transferMemoryAddress, transferMemorySize, width, height });
|
||||||
|
|
||||||
|
resultCode = ResultCode.Success;
|
||||||
|
}
|
||||||
|
|
||||||
|
return resultCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
[Command(101)] // 5.0.0+
|
||||||
|
// SetApplicationCopyrightImage(buffer<bytes, 0x45> frame_buffer, s32 x, s32 y, s32 width, s32 height, s32 window_origin_mode)
|
||||||
|
public ResultCode SetApplicationCopyrightImage(ServiceCtx context)
|
||||||
|
{
|
||||||
|
long frameBufferPos = context.Request.SendBuff[0].Position;
|
||||||
|
long frameBufferSize = context.Request.SendBuff[0].Size;
|
||||||
|
int x = context.RequestData.ReadInt32();
|
||||||
|
int y = context.RequestData.ReadInt32();
|
||||||
|
int width = context.RequestData.ReadInt32();
|
||||||
|
int height = context.RequestData.ReadInt32();
|
||||||
|
uint windowOriginMode = context.RequestData.ReadUInt32();
|
||||||
|
|
||||||
|
ResultCode resultCode = ResultCode.InvalidParameters;
|
||||||
|
|
||||||
|
if (((y | x) >= 0) && width >= 1 && height >= 1)
|
||||||
|
{
|
||||||
|
ResultCode result = SetApplicationCopyrightImageImpl(x, y, width, height, frameBufferPos, frameBufferSize, windowOriginMode);
|
||||||
|
|
||||||
|
if (resultCode != ResultCode.Success)
|
||||||
|
{
|
||||||
|
resultCode = result;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
resultCode = ResultCode.Success;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger.PrintStub(LogClass.ServiceAm, new { frameBufferPos, frameBufferSize, x, y, width, height, windowOriginMode });
|
||||||
|
|
||||||
|
return resultCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResultCode SetApplicationCopyrightImageImpl(int x, int y, int width, int height, long frameBufferPos, long frameBufferSize, uint windowOriginMode)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
if (_copyrightBuffer == null)
|
||||||
|
{
|
||||||
|
return ResultCode.NullCopyrightObject;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
Logger.PrintStub(LogClass.ServiceAm, new { x, y, width, height, frameBufferPos, frameBufferSize, windowOriginMode });
|
||||||
|
|
||||||
|
return ResultCode.Success;
|
||||||
|
}
|
||||||
|
|
||||||
|
[Command(102)] // 5.0.0+
|
||||||
|
// SetApplicationCopyrightVisibility(bool visible)
|
||||||
|
public ResultCode SetApplicationCopyrightVisibility(ServiceCtx context)
|
||||||
|
{
|
||||||
|
bool visible = context.RequestData.ReadBoolean();
|
||||||
|
|
||||||
|
Logger.PrintStub(LogClass.ServiceAm, new { visible });
|
||||||
|
|
||||||
|
// NOTE: It sets an internal field and return ResultCode.Success in all case.
|
||||||
|
|
||||||
|
return ResultCode.Success;
|
||||||
|
}
|
||||||
|
|
||||||
[Command(110)] // 5.0.0+
|
[Command(110)] // 5.0.0+
|
||||||
// QueryApplicationPlayStatistics(buffer<bytes, 5> title_id_list) -> (buffer<bytes, 6> entries, s32 entries_count)
|
// QueryApplicationPlayStatistics(buffer<bytes, 5> title_id_list) -> (buffer<bytes, 6> entries, s32 entries_count)
|
||||||
public ResultCode QueryApplicationPlayStatistics(ServiceCtx context)
|
public ResultCode QueryApplicationPlayStatistics(ServiceCtx context)
|
||||||
|
|
|
@ -11,6 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
|
||||||
NoMessages = (3 << ErrorCodeShift) | ModuleId,
|
NoMessages = (3 << ErrorCodeShift) | ModuleId,
|
||||||
ObjectInvalid = (500 << ErrorCodeShift) | ModuleId,
|
ObjectInvalid = (500 << ErrorCodeShift) | ModuleId,
|
||||||
OutOfBounds = (503 << ErrorCodeShift) | ModuleId,
|
OutOfBounds = (503 << ErrorCodeShift) | ModuleId,
|
||||||
CpuBoostModeInvalid = (506 << ErrorCodeShift) | ModuleId
|
InvalidParameters = (506 << ErrorCodeShift) | ModuleId,
|
||||||
|
NullObject = (518 << ErrorCodeShift) | ModuleId
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue