mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 3090c9f236 into 3c4dafff3f

Browse source
This commit is contained in:
emmauss 2018-06-17 10:28:52 +00:00 • committed by GitHub
commit efa6adc2df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 114 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Ryujinx.HLE/Loaders/Archives/ControlArchive.cs Normal file
View file

@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
namespace Ryujinx.HLE.Loaders.Archives
{
public class ControlArchive
{
public LanguageEntry[] LanguageEntries { get; set; }
public long ApplicationTitleID { get; set; }
public long BaseTitleID { get; set; }
public long ProductCode { get; set; }
public string ApplicationVersion { get; set; }
public ControlArchive(Stream Input)
{
BinaryReader Reader = new BinaryReader(Input);
byte[] LanguageEntryData = Reader.ReadBytes(0x3000);
Input.Seek(0x3060, SeekOrigin.Begin);
ApplicationVersion = Encoding.ASCII.GetString(Reader.ReadBytes(0x10));
BaseTitleID = Reader.ReadInt64();
ApplicationTitleID = Reader.ReadInt64();
Input.Seek(0x30a8, SeekOrigin.Begin);
ProductCode = Reader.ReadInt64();
LanguageEntries = new LanguageEntry[16];
using (MemoryStream LanguageStream = new MemoryStream(LanguageEntryData))
{
BinaryReader LanguageReader = new BinaryReader(LanguageStream);
for (int index = 0; index < 16; index++)
{
LanguageEntries[index] = new LanguageEntry()
{
AplicationName = Encoding.ASCII.GetString(LanguageReader.ReadBytes(0x200)).Trim('\0'),
DeveloperName = Encoding.ASCII.GetString(LanguageReader.ReadBytes(0x100)).Trim('\0')
};
}
}
}
}
public struct LanguageEntry
{
public string AplicationName;
public string DeveloperName;
}
}

74
Ryujinx.HLE/Loaders/Executables/Nro.cs
View file

@ -1,4 +1,8 @@
using System;
using System.Drawing;
using System.IO; using System.IO;
using System.Text;
using Ryujinx.HLE.Loaders.Archives;
namespace Ryujinx.HLE.Loaders.Executables namespace Ryujinx.HLE.Loaders.Executables
{ {
@ -6,15 +10,22 @@ namespace Ryujinx.HLE.Loaders.Executables
{ {
public string Name { get; private set; } public string Name { get; private set; }
public byte[] Text { get; private set; } public byte[] Text { get; private set; }
public byte[] RO { get; private set; } public byte[] RO { get; private set; }
public byte[] Data { get; private set; } public byte[] Data { get; private set; }
public byte[] AssetRomfData { get; set; }
public byte[] IconData { get; set; }
public int Mod0Offset { get; private set; } public int Mod0Offset { get; private set; }
public int TextOffset { get; private set; } public int TextOffset { get; private set; }
public int ROOffset { get; private set; } public int ROOffset { get; private set; }
public int DataOffset { get; private set; } public int DataOffset { get; private set; }
public int BssSize { get; private set; } public int BssSize { get; private set; }
public int AssetOffset { get; set; }
public ControlArchive ControlArchive { get; set; }
private byte[] NACPData { get; set; }
public Nro(Stream Input, string Name) public Nro(Stream Input, string Name)
{ {
@ -39,11 +50,12 @@ namespace Ryujinx.HLE.Loaders.Executables
int DataSize = Reader.ReadInt32(); int DataSize = Reader.ReadInt32();
int BssSize = Reader.ReadInt32(); int BssSize = Reader.ReadInt32();
this.Mod0Offset = Mod0Offset; this.Mod0Offset = Mod0Offset;
this.TextOffset = TextOffset; this.TextOffset = TextOffset;
this.ROOffset = ROOffset; this.ROOffset = ROOffset;
this.DataOffset = DataOffset; this.DataOffset = DataOffset;
this.BssSize = BssSize; this.BssSize = BssSize;
this.AssetOffset = FileSize;
byte[] Read(long Position, int Size) byte[] Read(long Position, int Size)
{ {
@ -55,6 +67,42 @@ namespace Ryujinx.HLE.Loaders.Executables
Text = Read(TextOffset, TextSize); Text = Read(TextOffset, TextSize);
RO = Read(ROOffset, ROSize); RO = Read(ROOffset, ROSize);
Data = Read(DataOffset, DataSize); Data = Read(DataOffset, DataSize);
if (Input.Length > FileSize)
{
string AssetMagic = Encoding.ASCII.GetString(Read(AssetOffset, 4));
if (AssetMagic == "ASET")
{
Input.Seek(AssetOffset, SeekOrigin.Begin);
int AssetMagic0 = Reader.ReadInt32();
int AssetFormat = Reader.ReadInt32();
byte[] IconSectionInfo = Reader.ReadBytes(0x10);
byte[] NACPSectionInfo = Reader.ReadBytes(0x10);
byte[] AssetRomfSectionInfo = Reader.ReadBytes(0x10);
long IconOffset = BitConverter.ToInt64(IconSectionInfo, 0);
long IconSize = BitConverter.ToInt64(IconSectionInfo, 8);
long NACPOffset = BitConverter.ToInt64(NACPSectionInfo, 0);
long NACPSize = BitConverter.ToInt64(NACPSectionInfo, 8);
long RomfOffset = BitConverter.ToInt64(AssetRomfSectionInfo, 0);
long RomfSize = BitConverter.ToInt64(AssetRomfSectionInfo, 8);
Input.Seek(AssetOffset + IconOffset, SeekOrigin.Begin);
IconData = Reader.ReadBytes((int)IconSize);
Input.Seek(AssetOffset + NACPOffset, SeekOrigin.Begin);
NACPData = Reader.ReadBytes((int)NACPSize);
Input.Seek(AssetOffset + RomfOffset, SeekOrigin.Begin);
AssetRomfData = Reader.ReadBytes((int)RomfSize);
}
}
using(MemoryStream NACPStream = new MemoryStream(NACPData))
{
ControlArchive = new ControlArchive(NACPStream);
}
} }
} }
} }