mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Ncm.ProgramLocation

Browse source
This commit is contained in:
Alex Barney 2021-04-22 13:39:22 -07:00
parent 1744e0a562
commit 52c0903f61
3 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/LibHac/Horizon.cs
View file

@ -1,4 +1,5 @@
using System.Threading; using System;
using System.Threading;
using LibHac.Common; using LibHac.Common;
using LibHac.Diag; using LibHac.Diag;
using LibHac.Fs.Shim; using LibHac.Fs.Shim;
@ -50,12 +51,10 @@ namespace LibHac
return new HorizonClient(this, new ProcessId(processId)); return new HorizonClient(this, new ProcessId(processId));
} }
public HorizonClient CreateHorizonClient(ProgramId programId, AccessControlBits.Bits fsPermissions) public HorizonClient CreateHorizonClient(ProgramLocation location, AccessControlBits.Bits fsPermissions)
{ {
HorizonClient client = CreateHorizonClient();
var dataHeader = new AccessControlDataHeader();
var descriptor = new AccessControlDescriptor(); var descriptor = new AccessControlDescriptor();
var dataHeader = new AccessControlDataHeader();
descriptor.Version = 1; descriptor.Version = 1;
dataHeader.Version = 1; dataHeader.Version = 1;
@ -63,11 +62,25 @@ namespace LibHac
descriptor.AccessFlags = (ulong)fsPermissions; descriptor.AccessFlags = (ulong)fsPermissions;
dataHeader.AccessFlags = (ulong)fsPermissions; dataHeader.AccessFlags = (ulong)fsPermissions;
LoaderClient.Fs.RegisterProgram(client.ProcessId.Value, programId, StorageId.BuiltInUser, return CreateHorizonClientImpl(location, SpanHelpers.AsReadOnlyByteSpan(in dataHeader),
SpanHelpers.AsReadOnlyByteSpan(in dataHeader), SpanHelpers.AsReadOnlyByteSpan(in descriptor)) SpanHelpers.AsReadOnlyByteSpan(in descriptor));
.ThrowIfFailure(); }
public HorizonClient CreateHorizonClient(ProgramLocation location, ReadOnlySpan<byte> fsAccessControlData,
ReadOnlySpan<byte> fsAccessControlDescriptor)
{
return CreateHorizonClientImpl(location, fsAccessControlData, fsAccessControlDescriptor);
}
private HorizonClient CreateHorizonClientImpl(ProgramLocation location, ReadOnlySpan<byte> accessControlData,
ReadOnlySpan<byte> accessControlDescriptor)
{
HorizonClient client = CreateHorizonClient();
LoaderClient.Fs.RegisterProgram(client.ProcessId.Value, location.ProgramId, location.StorageId,
accessControlData, accessControlDescriptor).ThrowIfFailure();
return client; return client;
} }
} }
} }

14
src/LibHac/Ncm/ProgramLocation.cs Normal file
View file

@ -0,0 +1,14 @@
namespace LibHac.Ncm
{
public readonly struct ProgramLocation
{
public readonly ProgramId ProgramId;
public readonly StorageId StorageId;
public ProgramLocation(ProgramId programId, StorageId storageId)
{
ProgramId = programId;
StorageId = storageId;
}
}
}

9
tests/LibHac.Tests/FsSrv/ProgramIndexMapInfoTests.cs
View file

@ -20,11 +20,14 @@ namespace LibHac.Tests.FsSrv
var programs = new HorizonClient[count]; var programs = new HorizonClient[count];
programs[0] = hos.CreateHorizonClient(new ProgramId(1), AccessControlBits.Bits.RegisterProgramIndexMapInfo); programs[0] = hos.CreateHorizonClient(new ProgramLocation(new ProgramId(1), StorageId.BuiltInSystem),
AccessControlBits.Bits.RegisterProgramIndexMapInfo);
for (int i = 1; i < programs.Length; i++) for (int i = 1; i < programs.Length; i++)
{ {
programs[i] = hos.CreateHorizonClient(new ProgramId((ulong)(i + 1)), AccessControlBits.Bits.None); programs[i] =
hos.CreateHorizonClient(new ProgramLocation(new ProgramId((ulong)(i + 1)), StorageId.BuiltInSystem),
AccessControlBits.Bits.None);
} }
var map = new ProgramIndexMapInfo[count]; var map = new ProgramIndexMapInfo[count];
@ -191,4 +194,4 @@ namespace LibHac.Tests.FsSrv
Assert.False(manager.Get(new ProgramId(2)).HasValue); Assert.False(manager.Get(new ProgramId(2)).HasValue);
} }
} }
} }