mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-08-19 23:28:42 +02:00
pctl: refactoring IParentalControlServiceFactory and IParentalControl… (#1219)
* pctl: refactoring IParentalControlServiceFactory and IParentalControlService call Our previous implementation was totally guessed. Now it's implemented according to RE, even if it's stubbed because we will not support Parental Control for now. * unknownFlag > permissionFlag
This commit is contained in:
parent
430a48338b
commit
b2e5855928
3 changed files with 82 additions and 19 deletions
|
@ -2,19 +2,25 @@ using Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory;
|
|||
|
||||
namespace Ryujinx.HLE.HOS.Services.Pctl
|
||||
{
|
||||
[Service("pctl")]
|
||||
[Service("pctl:a")]
|
||||
[Service("pctl:r")]
|
||||
[Service("pctl:s")]
|
||||
[Service("pctl", 0x303)]
|
||||
[Service("pctl:a", 0x83BE)]
|
||||
[Service("pctl:r", 0x8040)]
|
||||
[Service("pctl:s", 0x838E)]
|
||||
class IParentalControlServiceFactory : IpcService
|
||||
{
|
||||
public IParentalControlServiceFactory(ServiceCtx context) { }
|
||||
private int _permissionFlag;
|
||||
|
||||
public IParentalControlServiceFactory(ServiceCtx context, int permissionFlag)
|
||||
{
|
||||
_permissionFlag = permissionFlag;
|
||||
}
|
||||
|
||||
[Command(0)]
|
||||
// CreateService(u64, pid) -> object<nn::pctl::detail::ipc::IParentalControlService>
|
||||
public ResultCode CreateService(ServiceCtx context)
|
||||
{
|
||||
MakeObject(context, new IParentalControlService());
|
||||
// TODO: Should pass the pid.
|
||||
MakeObject(context, new IParentalControlService(context, true, _permissionFlag));
|
||||
|
||||
return ResultCode.Success;
|
||||
}
|
||||
|
@ -23,7 +29,8 @@ namespace Ryujinx.HLE.HOS.Services.Pctl
|
|||
// CreateServiceWithoutInitialize(u64, pid) -> object<nn::pctl::detail::ipc::IParentalControlService>
|
||||
public ResultCode CreateServiceWithoutInitialize(ServiceCtx context)
|
||||
{
|
||||
MakeObject(context, new IParentalControlService(false));
|
||||
// TODO: Should pass the pid.
|
||||
MakeObject(context, new IParentalControlService(context, false, _permissionFlag));
|
||||
|
||||
return ResultCode.Success;
|
||||
}
|
||||
|
|
|
@ -1,32 +1,69 @@
|
|||
using Ryujinx.Common.Logging;
|
||||
using Ryujinx.HLE.HOS.Services.Arp;
|
||||
using System;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory
|
||||
{
|
||||
class IParentalControlService : IpcService
|
||||
{
|
||||
private bool _initialized = false;
|
||||
private int _permissionFlag;
|
||||
private ulong _titleId;
|
||||
private bool _freeCommunicationEnabled;
|
||||
private int[] _ratingAge;
|
||||
|
||||
private bool _needInitialize;
|
||||
|
||||
public IParentalControlService(bool needInitialize = true)
|
||||
public IParentalControlService(ServiceCtx context, bool withInitialize, int permissionFlag)
|
||||
{
|
||||
_needInitialize = needInitialize;
|
||||
_permissionFlag = permissionFlag;
|
||||
|
||||
if (withInitialize)
|
||||
{
|
||||
Initialize(context);
|
||||
}
|
||||
}
|
||||
|
||||
[Command(1)] // 4.0.0+
|
||||
// Initialize()
|
||||
public ResultCode Initialize(ServiceCtx context)
|
||||
{
|
||||
if (_needInitialize && !_initialized)
|
||||
if ((_permissionFlag & 0x8001) == 0)
|
||||
{
|
||||
_initialized = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Logger.PrintWarning(LogClass.ServicePctl, "Service is already initialized!");
|
||||
return ResultCode.PermissionDenied;
|
||||
}
|
||||
|
||||
return ResultCode.Success;
|
||||
ResultCode resultCode = ResultCode.InvalidPid;
|
||||
|
||||
if (context.Process.Pid != 0)
|
||||
{
|
||||
if ((_permissionFlag & 0x40) == 0)
|
||||
{
|
||||
ulong titleId = ApplicationLaunchProperty.GetByPid(context).TitleId;
|
||||
|
||||
if (titleId != 0)
|
||||
{
|
||||
_titleId = titleId;
|
||||
|
||||
// TODO: Call nn::arp::GetApplicationControlProperty here when implemented, if it return ResultCode.Success we assign fields.
|
||||
_ratingAge = Array.ConvertAll(context.Device.System.ControlData.Value.RatingAge.ToArray(), Convert.ToInt32);
|
||||
_freeCommunicationEnabled = context.Device.System.ControlData.Value.ParentalControl == LibHac.Ns.ParentalControlFlagValue.FreeCommunication;
|
||||
}
|
||||
}
|
||||
|
||||
if (_titleId != 0)
|
||||
{
|
||||
// TODO: Service store some private fields in another static object.
|
||||
|
||||
if ((_permissionFlag & 0x8040) == 0)
|
||||
{
|
||||
// TODO: Service store TitleId and FreeCommunicationEnabled in another static object.
|
||||
// When it's done it signal an event in this static object.
|
||||
Logger.PrintStub(LogClass.ServicePctl);
|
||||
}
|
||||
}
|
||||
|
||||
resultCode = ResultCode.Success;
|
||||
}
|
||||
|
||||
return resultCode;
|
||||
}
|
||||
|
||||
[Command(1001)]
|
||||
|
@ -35,6 +72,11 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory
|
|||
{
|
||||
Logger.PrintStub(LogClass.ServicePctl);
|
||||
|
||||
if (!_freeCommunicationEnabled)
|
||||
{
|
||||
return ResultCode.FreeCommunicationDisabled;
|
||||
}
|
||||
|
||||
return ResultCode.Success;
|
||||
}
|
||||
}
|
||||
|
|
14
Ryujinx.HLE/HOS/Services/Pctl/ResultCode.cs
Normal file
14
Ryujinx.HLE/HOS/Services/Pctl/ResultCode.cs
Normal file
|
@ -0,0 +1,14 @@
|
|||
namespace Ryujinx.HLE.HOS.Services.Pctl
|
||||
{
|
||||
enum ResultCode
|
||||
{
|
||||
ModuleId = 142,
|
||||
ErrorCodeShift = 9,
|
||||
|
||||
Success = 0,
|
||||
|
||||
FreeCommunicationDisabled = (101 << ErrorCodeShift) | ModuleId,
|
||||
InvalidPid = (131 << ErrorCodeShift) | ModuleId,
|
||||
PermissionDenied = (133 << ErrorCodeShift) | ModuleId
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue