N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Misc content loading improvements (#432)

Browse source 
* Misc content loading improvements
This commit is contained in:
Alex Barney 2018-10-06 09:11:47 -06:00 committed by emmauss
parent bba9bf97d0
commit 5821ff675d
4 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Ryujinx.HLE/HOS/Horizon.cs
View file

@ -51,6 +51,8 @@ namespace Ryujinx.HLE.HOS
public string CurrentTitle { get; private set; } public string CurrentTitle { get; private set; }
public bool EnableFsIntegrityChecks { get; set; }
public Horizon(Switch Device) public Horizon(Switch Device)
{ {
this.Device = Device; this.Device = Device;
@ -220,12 +222,19 @@ namespace Ryujinx.HLE.HOS
ReadControlData(ControlNca); ReadControlData(ControlNca);
} }
if (PatchNca != null)
{
PatchNca.SetBaseNca(MainNca);
return (PatchNca, ControlNca);
}
return (MainNca, ControlNca); return (MainNca, ControlNca);
} }
public void ReadControlData(Nca ControlNca) public void ReadControlData(Nca ControlNca)
{ {
Romfs ControlRomfs = new Romfs(ControlNca.OpenSection(0, false)); Romfs ControlRomfs = new Romfs(ControlNca.OpenSection(0, false, EnableFsIntegrityChecks));
byte[] ControlFile = ControlRomfs.GetFile("/control.nacp"); byte[] ControlFile = ControlRomfs.GetFile("/control.nacp");
@ -254,8 +263,7 @@ namespace Ryujinx.HLE.HOS
// Load title key from the NSP's ticket in case the user doesn't have a title key file // Load title key from the NSP's ticket in case the user doesn't have a title key file
if (TicketFile != null) if (TicketFile != null)
{ {
// todo Change when Ticket(Stream) overload is added Ticket Ticket = new Ticket(Nsp.OpenFile(TicketFile));
Ticket Ticket = new Ticket(new BinaryReader(Nsp.OpenFile(TicketFile)));
KeySet.TitleKeys[Ticket.RightsId] = Ticket.GetTitleKey(KeySet); KeySet.TitleKeys[Ticket.RightsId] = Ticket.GetTitleKey(KeySet);
} }
@ -289,7 +297,7 @@ namespace Ryujinx.HLE.HOS
public void LoadNca(Nca MainNca, Nca ControlNca) public void LoadNca(Nca MainNca, Nca ControlNca)
{ {
NcaSection RomfsSection = MainNca.Sections.FirstOrDefault(x => x?.Type == SectionType.Romfs); NcaSection RomfsSection = MainNca.Sections.FirstOrDefault(x => x?.Type == SectionType.Romfs || x?.Type == SectionType.Bktr);
NcaSection ExefsSection = MainNca.Sections.FirstOrDefault(x => x?.IsExefs == true); NcaSection ExefsSection = MainNca.Sections.FirstOrDefault(x => x?.IsExefs == true);
if (ExefsSection == null) if (ExefsSection == null)
@ -301,16 +309,16 @@ namespace Ryujinx.HLE.HOS
if (RomfsSection == null) if (RomfsSection == null)
{ {
Device.Log.PrintError(LogClass.Loader, "No RomFS found in NCA"); Device.Log.PrintWarning(LogClass.Loader, "No RomFS found in NCA");
}
else
{
Stream RomfsStream = MainNca.OpenSection(RomfsSection.SectionNum, false, EnableFsIntegrityChecks);
return; Device.FileSystem.SetRomFs(RomfsStream);
} }
Stream RomfsStream = MainNca.OpenSection(RomfsSection.SectionNum, false); Stream ExefsStream = MainNca.OpenSection(ExefsSection.SectionNum, false, EnableFsIntegrityChecks);
Device.FileSystem.SetRomFs(RomfsStream);
Stream ExefsStream = MainNca.OpenSection(ExefsSection.SectionNum, false);
Pfs Exefs = new Pfs(ExefsStream); Pfs Exefs = new Pfs(ExefsStream);
@ -350,7 +358,7 @@ namespace Ryujinx.HLE.HOS
Nacp ReadControlData() Nacp ReadControlData()
{ {
Romfs ControlRomfs = new Romfs(ControlNca.OpenSection(0, false)); Romfs ControlRomfs = new Romfs(ControlNca.OpenSection(0, false, EnableFsIntegrityChecks));
byte[] ControlFile = ControlRomfs.GetFile("/control.nacp"); byte[] ControlFile = ControlRomfs.GetFile("/control.nacp");

2
Ryujinx.HLE/Ryujinx.HLE.csproj
View file

@ -25,7 +25,7 @@
<ProjectReference Include="..\ChocolArm64\ChocolArm64.csproj" /> <ProjectReference Include="..\ChocolArm64\ChocolArm64.csproj" />
<ProjectReference Include="..\Ryujinx.Audio\Ryujinx.Audio.csproj" /> <ProjectReference Include="..\Ryujinx.Audio\Ryujinx.Audio.csproj" />
<ProjectReference Include="..\Ryujinx.Graphics\Ryujinx.Graphics.csproj" /> <ProjectReference Include="..\Ryujinx.Graphics\Ryujinx.Graphics.csproj" />
<PackageReference Include="LibHac" Version="0.1.1" /> <PackageReference Include="LibHac" Version="0.1.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Ryujinx/Config.cs
View file

@ -68,6 +68,8 @@ namespace Ryujinx
Device.System.EnableMultiCoreScheduling(); Device.System.EnableMultiCoreScheduling();
} }
Device.System.EnableFsIntegrityChecks = Convert.ToBoolean(Parser.Value("Enable_FS_Integrity_Checks"));
JoyConKeyboard = new JoyConKeyboard( JoyConKeyboard = new JoyConKeyboard(
new JoyConKeyboardLeft new JoyConKeyboardLeft

3
Ryujinx/Ryujinx.conf
View file

@ -31,6 +31,9 @@ Enable_Vsync = true
#Enable or Disable Multi-core scheduling of threads #Enable or Disable Multi-core scheduling of threads
Enable_MultiCore_Scheduling = false Enable_MultiCore_Scheduling = false
#Enable integrity checks on Switch content files
Enable_FS_Integrity_Checks = true
#Controller Device Index #Controller Device Index
GamePad_Index = 0 GamePad_Index = 0