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

Changes from code review

Browse source
This commit is contained in:
Alex Barney 2018-09-05 17:05:12 -05:00
commit 9b09156d5b
1 changed files with 61 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,4 @@
using LibHac;
using Ryujinx.HLE.HOS.Font; using Ryujinx.HLE.HOS.Font;
using Ryujinx.HLE.HOS.Kernel; using Ryujinx.HLE.HOS.Kernel;
using Ryujinx.HLE.HOS.SystemState; using Ryujinx.HLE.HOS.SystemState;
@ -8,7 +9,6 @@ using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using LibHac;
namespace Ryujinx.HLE.HOS namespace Ryujinx.HLE.HOS
{ {
@ -32,7 +32,7 @@ namespace Ryujinx.HLE.HOS
internal KEvent VsyncEvent { get; private set; } internal KEvent VsyncEvent { get; private set; }
internal Keyset Keyset { get; private set; } internal Keyset KeySet { get; private set; }
public Horizon(Switch Device) public Horizon(Switch Device)
{ {
@ -57,7 +57,7 @@ namespace Ryujinx.HLE.HOS
VsyncEvent = new KEvent(); VsyncEvent = new KEvent();
LoadDefaultKeyset(); LoadKeySet();
} }
public void LoadCart(string ExeFsDir, string RomFsFile = null) public void LoadCart(string ExeFsDir, string RomFsFile = null)
@ -128,8 +128,17 @@ namespace Ryujinx.HLE.HOS
public void LoadXci(string XciFile) public void LoadXci(string XciFile)
{ {
FileStream File = new FileStream(XciFile, FileMode.Open, FileAccess.Read); FileStream File = new FileStream(XciFile, FileMode.Open, FileAccess.Read);
Xci Xci = new Xci(Keyset, File);
Xci Xci = new Xci(KeySet, File);
Nca Nca = GetXciMainNca(Xci); Nca Nca = GetXciMainNca(Xci);
if (Nca == null)
{
Device.Log.PrintError(LogClass.Loader, "Unable to load XCI");
return;
}
LoadNca(Nca); LoadNca(Nca);
} }
@ -137,8 +146,7 @@ namespace Ryujinx.HLE.HOS
{ {
if (Xci.SecurePartition == null) if (Xci.SecurePartition == null)
{ {
Device.Log.PrintError(LogClass.Loader, "Could not find XCI secure partition"); throw new InvalidDataException("Could not find XCI secure partition");
return null;
} }
Nca MainNca = null; Nca MainNca = null;
@ -146,7 +154,8 @@ namespace Ryujinx.HLE.HOS
foreach (PfsFileEntry FileEntry in Xci.SecurePartition.Files.Where(x => x.Name.EndsWith(".nca"))) foreach (PfsFileEntry FileEntry in Xci.SecurePartition.Files.Where(x => x.Name.EndsWith(".nca")))
{ {
Stream NcaStream = Xci.SecurePartition.OpenFile(FileEntry); Stream NcaStream = Xci.SecurePartition.OpenFile(FileEntry);
Nca Nca = new Nca(Keyset, NcaStream, true);
Nca Nca = new Nca(KeySet, NcaStream, true);
if (Nca.Header.ContentType == ContentType.Program) if (Nca.Header.ContentType == ContentType.Program)
{ {
@ -154,22 +163,28 @@ namespace Ryujinx.HLE.HOS
} }
} }
if (MainNca == null)
{
Device.Log.PrintError(LogClass.Loader, "Could not find an Application NCA in the provided XCI file");
}
return MainNca; return MainNca;
} }
public void LoadNca(string NcaFile) public void LoadNca(string NcaFile)
{ {
FileStream File = new FileStream(NcaFile, FileMode.Open, FileAccess.Read); FileStream File = new FileStream(NcaFile, FileMode.Open, FileAccess.Read);
Nca Nca = new Nca(Keyset, File, true);
Nca Nca = new Nca(KeySet, File, true);
LoadNca(Nca); LoadNca(Nca);
} }
public void LoadNsp(string NspFile) public void LoadNsp(string NspFile)
{ {
FileStream File = new FileStream(NspFile, FileMode.Open, FileAccess.Read); FileStream File = new FileStream(NspFile, FileMode.Open, FileAccess.Read);
Pfs Nsp = new Pfs(File);
Nca ProgramNca = null; Pfs Nsp = new Pfs(File);
PfsFileEntry TicketFile = Nsp.Files.FirstOrDefault(x => x.Name.EndsWith(".tik")); PfsFileEntry TicketFile = Nsp.Files.FirstOrDefault(x => x.Name.EndsWith(".tik"));
@ -177,36 +192,29 @@ namespace Ryujinx.HLE.HOS
if (TicketFile != null) if (TicketFile != null)
{ {
// todo Change when Ticket(Stream) overload is added // todo Change when Ticket(Stream) overload is added
BinaryReader TicketReader = new BinaryReader(Nsp.OpenFile(TicketFile)); Ticket Ticket = new Ticket(new BinaryReader(Nsp.OpenFile(TicketFile)));
Ticket Ticket = new Ticket(TicketReader);
byte[] TitleKey = Ticket.GetTitleKey(Keyset); KeySet.TitleKeys[Ticket.RightsId] = Ticket.GetTitleKey(KeySet);
Keyset.TitleKeys[Ticket.RightsId] = TitleKey;
} }
foreach (PfsFileEntry NcaFile in Nsp.Files.Where(x => x.Name.EndsWith(".nca"))) foreach (PfsFileEntry NcaFile in Nsp.Files.Where(x => x.Name.EndsWith(".nca")))
{ {
Nca Nca = new Nca(Keyset, Nsp.OpenFile(NcaFile), true); Nca Nca = new Nca(KeySet, Nsp.OpenFile(NcaFile), true);
if (Nca.Header.ContentType == ContentType.Program) if (Nca.Header.ContentType == ContentType.Program)
{ {
ProgramNca = Nca; LoadNca(Nca);
break; return;
} }
} }
if (ProgramNca == null) Device.Log.PrintError(LogClass.Loader, "Could not find an Application NCA in the provided NSP file");
{
Device.Log.PrintError(LogClass.Loader, "Could not find program NCA inside NSP file");
}
LoadNca(ProgramNca);
} }
public void LoadNca(Nca Nca) public void LoadNca(Nca Nca)
{ {
NcaSection RomfsSection = Nca.Sections.FirstOrDefault(x => x.Type == SectionType.Romfs); NcaSection RomfsSection = Nca.Sections.FirstOrDefault(x => x?.Type == SectionType.Romfs);
NcaSection ExefsSection = Nca.Sections.FirstOrDefault(x => x.IsExefs); NcaSection ExefsSection = Nca.Sections.FirstOrDefault(x => x?.IsExefs == true);
if (ExefsSection == null) if (ExefsSection == null)
{ {
@ -231,6 +239,7 @@ namespace Ryujinx.HLE.HOS
if (Exefs.FileExists("main.npdm")) if (Exefs.FileExists("main.npdm"))
{ {
Device.Log.PrintInfo(LogClass.Loader, "Loading main.npdm..."); Device.Log.PrintInfo(LogClass.Loader, "Loading main.npdm...");
MetaData = new Npdm(Exefs.OpenFile("main.npdm")); MetaData = new Npdm(Exefs.OpenFile("main.npdm"));
} }
else else
@ -312,33 +321,40 @@ namespace Ryujinx.HLE.HOS
MainProcess.Run(IsNro); MainProcess.Run(IsNro);
} }
public void LoadDefaultKeyset() public void LoadKeySet()
{ {
string home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); string KeyFile = null;
string homeKeyFile = Path.Combine(home, ".switch", "prod.keys"); string TitleKeyFile = null;
string homeTitleKeyFile = Path.Combine(home, ".switch", "title.keys"); string ConsoleKeyFile = null;
string homeConsoleKeyFile = Path.Combine(home, ".switch", "console.keys");
string keyFile = null; string Home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
string titleKeyFile = null;
string consoleKeyFile = null;
if (File.Exists(homeKeyFile)) LoadSetAtPath(Path.Combine(Home, ".switch"));
LoadSetAtPath(Device.FileSystem.GetSystemPath());
KeySet = ExternalKeys.ReadKeyFile(KeyFile, TitleKeyFile, ConsoleKeyFile);
void LoadSetAtPath(string BasePath)
{ {
keyFile = homeKeyFile; string LocalKeyFile = Path.Combine(BasePath, "prod.keys");
} string LocalTitleKeyFile = Path.Combine(BasePath, "title.keys");
string LocalConsoleKeyFile = Path.Combine(BasePath, "console.keys");
if (File.Exists(homeTitleKeyFile)) if (File.Exists(LocalKeyFile))
{ {
titleKeyFile = homeTitleKeyFile; KeyFile = LocalKeyFile;
} }
if (File.Exists(homeConsoleKeyFile)) if (File.Exists(LocalTitleKeyFile))
{ {
consoleKeyFile = homeConsoleKeyFile; TitleKeyFile = LocalTitleKeyFile;
} }
Keyset = ExternalKeys.ReadKeyFile(keyFile, titleKeyFile, consoleKeyFile); if (File.Exists(LocalConsoleKeyFile))
{
ConsoleKeyFile = LocalConsoleKeyFile;
}
}
} }
public void SignalVsync() => VsyncEvent.WaitEvent.Set(); public void SignalVsync() => VsyncEvent.WaitEvent.Set();