7344dee475
* account: Adds Account Manager In a way to have Custom User Profiles merged in master faster, this PR adds a `AccountManager` class (based on `AccountUtils` class) and the following changes have been made: - Adds a "default profile values" which were the old hardcoded ones. - The image profile is moved to the Account service folder. - The hardcoded UserId for the savedata is now using the `AccountManager` last opened one. - The DeviceId in Mii service is changed to the right value (checked by REd sys:set call). * Fix csproj * Addresses gdkchan's comments * Fix UserProfile fields * Fix mii GetDeviceId() * Update Ryujinx.HLE.csproj
223 lines
7.0 KiB
C#
223 lines
7.0 KiB
C#
using Ryujinx.Common;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Cpu;
|
|
using Ryujinx.HLE.HOS.Services.Account.Acc.AccountService;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.Account.Acc
|
|
{
|
|
class ApplicationServiceServer
|
|
{
|
|
readonly AccountServiceFlag _serviceFlag;
|
|
|
|
public ApplicationServiceServer(AccountServiceFlag serviceFlag)
|
|
{
|
|
_serviceFlag = serviceFlag;
|
|
}
|
|
|
|
public ResultCode GetUserCountImpl(ServiceCtx context)
|
|
{
|
|
context.ResponseData.Write(context.Device.System.AccountManager.GetUserCount());
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode GetUserExistenceImpl(ServiceCtx context)
|
|
{
|
|
ResultCode resultCode = CheckUserId(context, out UserId userId);
|
|
|
|
if (resultCode != ResultCode.Success)
|
|
{
|
|
return resultCode;
|
|
}
|
|
|
|
context.ResponseData.Write(context.Device.System.AccountManager.TryGetUser(userId, out _));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode ListAllUsers(ServiceCtx context)
|
|
{
|
|
return WriteUserList(context, context.Device.System.AccountManager.GetAllUsers());
|
|
}
|
|
|
|
public ResultCode ListOpenUsers(ServiceCtx context)
|
|
{
|
|
return WriteUserList(context, context.Device.System.AccountManager.GetOpenedUsers());
|
|
}
|
|
|
|
private ResultCode WriteUserList(ServiceCtx context, IEnumerable<UserProfile> profiles)
|
|
{
|
|
if (context.Request.RecvListBuff.Count == 0)
|
|
{
|
|
return ResultCode.InvalidBuffer;
|
|
}
|
|
|
|
long outputPosition = context.Request.RecvListBuff[0].Position;
|
|
long outputSize = context.Request.RecvListBuff[0].Size;
|
|
|
|
MemoryHelper.FillWithZeros(context.Memory, outputPosition, (int)outputSize);
|
|
|
|
ulong offset = 0;
|
|
|
|
foreach (UserProfile userProfile in profiles)
|
|
{
|
|
if (offset + 0x10 > (ulong)outputSize)
|
|
{
|
|
break;
|
|
}
|
|
|
|
context.Memory.Write((ulong)outputPosition + offset, userProfile.UserId.High);
|
|
context.Memory.Write((ulong)outputPosition + offset + 8, userProfile.UserId.Low);
|
|
|
|
offset += 0x10;
|
|
}
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode GetLastOpenedUser(ServiceCtx context)
|
|
{
|
|
context.Device.System.AccountManager.LastOpenedUser.UserId.Write(context.ResponseData);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode GetProfile(ServiceCtx context, out IProfile profile)
|
|
{
|
|
profile = default;
|
|
|
|
ResultCode resultCode = CheckUserId(context, out UserId userId);
|
|
|
|
if (resultCode != ResultCode.Success)
|
|
{
|
|
return resultCode;
|
|
}
|
|
|
|
if (!context.Device.System.AccountManager.TryGetUser(userId, out UserProfile userProfile))
|
|
{
|
|
Logger.Warning?.Print(LogClass.ServiceAcc, $"User 0x{userId} not found!");
|
|
|
|
return ResultCode.UserNotFound;
|
|
}
|
|
|
|
profile = new IProfile(userProfile);
|
|
|
|
// Doesn't occur in our case.
|
|
// return ResultCode.NullObject;
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode IsUserRegistrationRequestPermitted(ServiceCtx context)
|
|
{
|
|
context.ResponseData.Write(_serviceFlag != AccountServiceFlag.Application);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode TrySelectUserWithoutInteraction(ServiceCtx context)
|
|
{
|
|
if (context.Device.System.AccountManager.GetUserCount() != 1)
|
|
{
|
|
// Invalid UserId.
|
|
UserId.Null.Write(context.ResponseData);
|
|
|
|
return ResultCode.UserNotFound;
|
|
}
|
|
|
|
bool isNetworkServiceAccountRequired = context.RequestData.ReadBoolean();
|
|
|
|
if (isNetworkServiceAccountRequired)
|
|
{
|
|
// NOTE: This checks something related to baas (online), and then return an invalid UserId if the check in baas returns an error code.
|
|
// In our case, we can just log it for now.
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceAcc, new { isNetworkServiceAccountRequired });
|
|
}
|
|
|
|
// NOTE: As we returned an invalid UserId if there is more than one user earlier, now we can return only the first one.
|
|
context.Device.System.AccountManager.GetFirst().UserId.Write(context.ResponseData);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode StoreSaveDataThumbnail(ServiceCtx context)
|
|
{
|
|
ResultCode resultCode = CheckUserId(context, out UserId userId);
|
|
|
|
if (resultCode != ResultCode.Success)
|
|
{
|
|
return resultCode;
|
|
}
|
|
|
|
if (context.Request.SendBuff.Count == 0)
|
|
{
|
|
return ResultCode.InvalidBuffer;
|
|
}
|
|
|
|
long inputPosition = context.Request.SendBuff[0].Position;
|
|
long inputSize = context.Request.SendBuff[0].Size;
|
|
|
|
if (inputSize != 0x24000)
|
|
{
|
|
return ResultCode.InvalidBufferSize;
|
|
}
|
|
|
|
byte[] thumbnailBuffer = new byte[inputSize];
|
|
|
|
context.Memory.Read((ulong)inputPosition, thumbnailBuffer);
|
|
|
|
// NOTE: Account service call nn::fs::WriteSaveDataThumbnailFile().
|
|
// TODO: Store thumbnailBuffer somewhere, in save data 0x8000000000000010 ?
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceAcc);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode ClearSaveDataThumbnail(ServiceCtx context)
|
|
{
|
|
ResultCode resultCode = CheckUserId(context, out UserId userId);
|
|
|
|
if (resultCode != ResultCode.Success)
|
|
{
|
|
return resultCode;
|
|
}
|
|
|
|
/*
|
|
// NOTE: Doesn't occur in our case.
|
|
if (userId == null)
|
|
{
|
|
return ResultCode.InvalidArgument;
|
|
}
|
|
*/
|
|
|
|
// NOTE: Account service call nn::fs::WriteSaveDataThumbnailFileHeader();
|
|
// TODO: Clear the Thumbnail somewhere, in save data 0x8000000000000010 ?
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceAcc);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode ListQualifiedUsers(ServiceCtx context)
|
|
{
|
|
// TODO: Determine how users are "qualified". We assume all users are "qualified" for now.
|
|
|
|
return WriteUserList(context, context.Device.System.AccountManager.GetAllUsers());
|
|
}
|
|
|
|
public ResultCode CheckUserId(ServiceCtx context, out UserId userId)
|
|
{
|
|
userId = context.RequestData.ReadStruct<UserId>();
|
|
|
|
if (userId.IsNull)
|
|
{
|
|
return ResultCode.NullArgument;
|
|
}
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
}
|
|
} |