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 support for 8.0.0 Kernel-embedded Ini1 (#51)

Browse source
This commit is contained in:
shchmue 2019-04-23 19:13:46 -04:00 committed by Alex Barney
parent 6764dc7800
commit fbdf6b3be9
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/LibHac/Package2.cs
View file

@ -39,9 +39,18 @@ namespace LibHac
public IStorage OpenDecryptedPackage() public IStorage OpenDecryptedPackage()
{ {
IStorage[] storages = { OpenHeaderPart1(), OpenHeaderPart2(), OpenKernel(), OpenIni1() }; if (Header.SectionSizes[1] == 0)
{
IStorage[] storages = { OpenHeaderPart1(), OpenHeaderPart2(), OpenKernel() };
return new ConcatenationStorage(storages, true); return new ConcatenationStorage(storages, true);
}
else
{
IStorage[] storages = { OpenHeaderPart1(), OpenHeaderPart2(), OpenKernel(), OpenIni1() };
return new ConcatenationStorage(storages, true);
}
} }
private IStorage OpenHeaderPart1() private IStorage OpenHeaderPart1()
@ -72,6 +81,23 @@ namespace LibHac
public IStorage OpenIni1() public IStorage OpenIni1()
{ {
// Handle 8.0.0+ INI1 embedded within Kernel
// Todo: Figure out how to better deal with this once newer versions are released
if (Header.SectionSizes[1] == 0)
{
IStorage kernelStorage = OpenKernel();
var reader = new BinaryReader(kernelStorage.AsStream());
reader.BaseStream.Position = 0x168;
int embeddedIniOffset = (int)reader.ReadInt64();
reader.BaseStream.Position = embeddedIniOffset + 4;
int size = reader.ReadInt32();
return kernelStorage.Slice(embeddedIniOffset, size);
}
int offset = 0x200 + Header.SectionSizes[0]; int offset = 0x200 + Header.SectionSizes[0];
IStorage encStorage = Storage.Slice(offset, Header.SectionSizes[1]); IStorage encStorage = Storage.Slice(offset, Header.SectionSizes[1]);