Refactoring commands handling (#728)
* Refactoring commands handling - Use Reflection to handle commands ID. - Add all symbols (from SwIPC so not all time accurate). - Re-sort some services commands methods. - Some cleanup. - Keep some empty constructor for consistency. * Fix order in IProfile
This commit is contained in:
Ac_K
gdkchan
parent
f723f6f39a
commit
560ccbeb2d
99 changed files with 1035 additions and 1983 deletions
|
|
@ -1,8 +1,6 @@
|
|||
using LibHac.Fs.NcaUtils;
|
||||
using Ryujinx.HLE.FileSystem;
|
||||
using Ryujinx.HLE.FileSystem.Content;
|
||||
using Ryujinx.HLE.HOS.Ipc;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
using static Ryujinx.HLE.HOS.ErrorCode;
|
||||
|
|
@ -12,170 +10,41 @@ namespace Ryujinx.HLE.HOS.Services.Lr
|
|||
{
|
||||
class ILocationResolver : IpcService
|
||||
{
|
||||
private Dictionary<int, ServiceProcessRequest> _commands;
|
||||
|
||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
|
||||
|
||||
private StorageId _storageId;
|
||||
|
||||
public ILocationResolver(StorageId storageId)
|
||||
{
|
||||
_commands = new Dictionary<int, ServiceProcessRequest>
|
||||
{
|
||||
{ 0, ResolveProgramPath },
|
||||
{ 1, RedirectProgramPath },
|
||||
{ 2, ResolveApplicationControlPath },
|
||||
{ 3, ResolveApplicationHtmlDocumentPath },
|
||||
{ 4, ResolveDataPath },
|
||||
{ 5, RedirectApplicationControlPath },
|
||||
{ 6, RedirectApplicationHtmlDocumentPath },
|
||||
{ 7, ResolveApplicationLegalInformationPath },
|
||||
{ 8, RedirectApplicationLegalInformationPath },
|
||||
{ 9, Refresh },
|
||||
{ 10, SetProgramNcaPath2 },
|
||||
{ 11, ClearLocationResolver2 },
|
||||
{ 12, DeleteProgramNcaPath },
|
||||
{ 13, DeleteControlNcaPath },
|
||||
{ 14, DeleteDocHtmlNcaPath },
|
||||
{ 15, DeleteInfoHtmlNcaPath }
|
||||
};
|
||||
|
||||
_storageId = storageId;
|
||||
}
|
||||
|
||||
// DeleteInfoHtmlNcaPath()
|
||||
public long DeleteInfoHtmlNcaPath(ServiceCtx context)
|
||||
[Command(0)]
|
||||
// ResolveProgramPath()
|
||||
public long ResolveProgramPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
DeleteContentPath(context, titleId, ContentType.Manual);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// DeleteDocHtmlNcaPath()
|
||||
public long DeleteDocHtmlNcaPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
DeleteContentPath(context, titleId, ContentType.Manual);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// DeleteControlNcaPath()
|
||||
public long DeleteControlNcaPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
DeleteContentPath(context, titleId, ContentType.Control);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// DeleteProgramNcaPath()
|
||||
public long DeleteProgramNcaPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
DeleteContentPath(context, titleId, ContentType.Program);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// ClearLocationResolver2()
|
||||
public long ClearLocationResolver2(ServiceCtx context)
|
||||
{
|
||||
context.Device.System.ContentManager.RefreshEntries(_storageId, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// SetProgramNcaPath2()
|
||||
public long SetProgramNcaPath2(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
RedirectPath(context, titleId, 1, ContentType.Program);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// RedirectApplicationControlPath()
|
||||
public long RedirectApplicationControlPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
RedirectPath(context, titleId, 1, ContentType.Control);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// RedirectApplicationHtmlDocumentPath()
|
||||
public long RedirectApplicationHtmlDocumentPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
RedirectPath(context, titleId, 1, ContentType.Manual);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// RedirectApplicationLegalInformationPath()
|
||||
public long RedirectApplicationLegalInformationPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
RedirectPath(context, titleId, 1, ContentType.Manual);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// ResolveDataPath()
|
||||
public long ResolveDataPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
if (ResolvePath(context, titleId, ContentType.Data) || ResolvePath(context, titleId, ContentType.PublicData))
|
||||
if (ResolvePath(context, titleId, ContentType.Program))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return MakeError(ErrorModule.Lr, LrErr.AccessDenied);
|
||||
return MakeError(ErrorModule.Lr, LrErr.ProgramLocationEntryNotFound);
|
||||
}
|
||||
}
|
||||
|
||||
// ResolveApplicationHtmlDocumentPath()
|
||||
public long ResolveApplicationHtmlDocumentPath(ServiceCtx context)
|
||||
[Command(1)]
|
||||
// RedirectProgramPath()
|
||||
public long RedirectProgramPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
if (ResolvePath(context, titleId, ContentType.Manual))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return MakeError(ErrorModule.Lr, LrErr.AccessDenied);
|
||||
}
|
||||
}
|
||||
|
||||
// ResolveApplicationLegalInformationPath()
|
||||
public long ResolveApplicationLegalInformationPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
if (ResolvePath(context, titleId, ContentType.Manual))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return MakeError(ErrorModule.Lr, LrErr.AccessDenied);
|
||||
}
|
||||
RedirectPath(context, titleId, 0, ContentType.Program);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(2)]
|
||||
// ResolveApplicationControlPath()
|
||||
public long ResolveApplicationControlPath(ServiceCtx context)
|
||||
{
|
||||
|
|
@ -191,16 +60,88 @@ namespace Ryujinx.HLE.HOS.Services.Lr
|
|||
}
|
||||
}
|
||||
|
||||
// RedirectProgramPath()
|
||||
public long RedirectProgramPath(ServiceCtx context)
|
||||
[Command(3)]
|
||||
// ResolveApplicationHtmlDocumentPath()
|
||||
public long ResolveApplicationHtmlDocumentPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
RedirectPath(context, titleId, 0, ContentType.Program);
|
||||
if (ResolvePath(context, titleId, ContentType.Manual))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return MakeError(ErrorModule.Lr, LrErr.AccessDenied);
|
||||
}
|
||||
}
|
||||
|
||||
[Command(4)]
|
||||
// ResolveDataPath()
|
||||
public long ResolveDataPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
if (ResolvePath(context, titleId, ContentType.Data) || ResolvePath(context, titleId, ContentType.PublicData))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return MakeError(ErrorModule.Lr, LrErr.AccessDenied);
|
||||
}
|
||||
}
|
||||
|
||||
[Command(5)]
|
||||
// RedirectApplicationControlPath()
|
||||
public long RedirectApplicationControlPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
RedirectPath(context, titleId, 1, ContentType.Control);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(6)]
|
||||
// RedirectApplicationHtmlDocumentPath()
|
||||
public long RedirectApplicationHtmlDocumentPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
RedirectPath(context, titleId, 1, ContentType.Manual);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(7)]
|
||||
// ResolveApplicationLegalInformationPath()
|
||||
public long ResolveApplicationLegalInformationPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
if (ResolvePath(context, titleId, ContentType.Manual))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return MakeError(ErrorModule.Lr, LrErr.AccessDenied);
|
||||
}
|
||||
}
|
||||
|
||||
[Command(8)]
|
||||
// RedirectApplicationLegalInformationPath()
|
||||
public long RedirectApplicationLegalInformationPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
RedirectPath(context, titleId, 1, ContentType.Manual);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(9)]
|
||||
// Refresh()
|
||||
public long Refresh(ServiceCtx context)
|
||||
{
|
||||
|
|
@ -209,19 +150,68 @@ namespace Ryujinx.HLE.HOS.Services.Lr
|
|||
return 0;
|
||||
}
|
||||
|
||||
// ResolveProgramPath()
|
||||
public long ResolveProgramPath(ServiceCtx context)
|
||||
[Command(10)]
|
||||
// SetProgramNcaPath2()
|
||||
public long SetProgramNcaPath2(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
if (ResolvePath(context, titleId, ContentType.Program))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return MakeError(ErrorModule.Lr, LrErr.ProgramLocationEntryNotFound);
|
||||
}
|
||||
RedirectPath(context, titleId, 1, ContentType.Program);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(11)]
|
||||
// ClearLocationResolver2()
|
||||
public long ClearLocationResolver2(ServiceCtx context)
|
||||
{
|
||||
context.Device.System.ContentManager.RefreshEntries(_storageId, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(12)]
|
||||
// DeleteProgramNcaPath()
|
||||
public long DeleteProgramNcaPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
DeleteContentPath(context, titleId, ContentType.Program);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(13)]
|
||||
// DeleteControlNcaPath()
|
||||
public long DeleteControlNcaPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
DeleteContentPath(context, titleId, ContentType.Control);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(14)]
|
||||
// DeleteDocHtmlNcaPath()
|
||||
public long DeleteDocHtmlNcaPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
DeleteContentPath(context, titleId, ContentType.Manual);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
[Command(15)]
|
||||
// DeleteInfoHtmlNcaPath()
|
||||
public long DeleteInfoHtmlNcaPath(ServiceCtx context)
|
||||
{
|
||||
long titleId = context.RequestData.ReadInt64();
|
||||
|
||||
DeleteContentPath(context, titleId, ContentType.Manual);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private void RedirectPath(ServiceCtx context, long titleId, int flag, ContentType contentType)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue