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

Changes based on feedback

Browse source
This commit is contained in:
Alex Barney 2018-12-29 20:23:45 -07:00
parent 78140f5cd0
commit 65dc392f36
8 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.HLE/FileSystem/Content/ContentManager.cs
View file

@ -1,10 +1,10 @@
using LibHac;
using LibHac.IO;
using Ryujinx.HLE.Utilities;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using LibHac.IO;
namespace Ryujinx.HLE.FileSystem.Content
{

3
Ryujinx.HLE/FileSystem/PFsProvider.cs
View file

@ -1,11 +1,12 @@
using LibHac;
using LibHac.IO;
using Ryujinx.HLE.HOS;
using Ryujinx.HLE.HOS.Services.FspSrv;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using LibHac.IO;
using static Ryujinx.HLE.HOS.ErrorCode;
namespace Ryujinx.HLE.FileSystem

3
Ryujinx.HLE/FileSystem/RomFsProvider.cs
View file

@ -1,11 +1,12 @@
using LibHac;
using LibHac.IO;
using Ryujinx.HLE.HOS;
using Ryujinx.HLE.HOS.Services.FspSrv;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using LibHac.IO;
using static Ryujinx.HLE.HOS.ErrorCode;
namespace Ryujinx.HLE.FileSystem

3
Ryujinx.HLE/HOS/Font/SharedFontManager.cs
View file

@ -1,4 +1,5 @@
using LibHac;
using LibHac.IO;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.FileSystem.Content;
using Ryujinx.HLE.Resource;
@ -6,7 +7,7 @@ using Ryujinx.HLE.Utilities;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using LibHac.IO;
using static Ryujinx.HLE.Utilities.FontUtils;
namespace Ryujinx.HLE.HOS.Font

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

@ -1,4 +1,5 @@
using LibHac;
using LibHac.IO;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.FileSystem.Content;
using Ryujinx.HLE.HOS.Font;
@ -16,7 +17,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
using LibHac.IO;
using NxStaticObject = Ryujinx.HLE.Loaders.Executables.NxStaticObject;
namespace Ryujinx.HLE.HOS
@ -281,7 +282,7 @@ namespace Ryujinx.HLE.HOS
foreach (PfsFileEntry fileEntry in xci.SecurePartition.Files.Where(x => x.Name.EndsWith(".nca")))
{
LibHac.IO.IStorage ncaStorage = xci.SecurePartition.OpenFile(fileEntry);
IStorage ncaStorage = xci.SecurePartition.OpenFile(fileEntry);
Nca nca = new Nca(KeySet, ncaStorage, true);
@ -328,7 +329,7 @@ namespace Ryujinx.HLE.HOS
{
Romfs controlRomfs = new Romfs(controlNca.OpenSection(0, false, FsIntegrityCheckLevel, true));
LibHac.IO.IStorage controlFile = controlRomfs.OpenFile("/control.nacp");
IStorage controlFile = controlRomfs.OpenFile("/control.nacp");
ControlData = new Nacp(controlFile.AsStream());
}
@ -394,8 +395,8 @@ namespace Ryujinx.HLE.HOS
return;
}
LibHac.IO.IStorage romfsStorage = mainNca.OpenSection(ProgramPartitionType.Data, false, FsIntegrityCheckLevel, false);
LibHac.IO.IStorage exefsStorage = mainNca.OpenSection(ProgramPartitionType.Code, false, FsIntegrityCheckLevel, true);
IStorage romfsStorage = mainNca.OpenSection(ProgramPartitionType.Data, false, FsIntegrityCheckLevel, false);
IStorage exefsStorage = mainNca.OpenSection(ProgramPartitionType.Code, false, FsIntegrityCheckLevel, true);
if (exefsStorage == null)
{
@ -453,7 +454,7 @@ namespace Ryujinx.HLE.HOS
{
Romfs controlRomfs = new Romfs(controlNca.OpenSection(0, false, FsIntegrityCheckLevel, true));
LibHac.IO.IStorage controlFile = controlRomfs.OpenFile("/control.nacp");
IStorage controlFile = controlRomfs.OpenFile("/control.nacp");
Nacp controlData = new Nacp(controlFile.AsStream());

3
Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
View file

@ -1,11 +1,12 @@
using LibHac;
using LibHac.IO;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.Utilities;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using LibHac.IO;
using static Ryujinx.HLE.FileSystem.VirtualFileSystem;
using static Ryujinx.HLE.HOS.ErrorCode;
using static Ryujinx.HLE.Utilities.StringUtils;

12
Ryujinx.HLE/HOS/Services/Set/ISystemSettingsServer.cs
View file

@ -1,13 +1,13 @@
using LibHac;
using LibHac.IO;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.HOS.SystemState;
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using LibHac;
using LibHac.IO;
using Ryujinx.HLE.FileSystem;
namespace Ryujinx.HLE.HOS.Services.Set
{
@ -186,8 +186,8 @@ namespace Ryujinx.HLE.HOS.Services.Set
using(FileStream firmwareStream = File.Open(firmwareTitlePath, FileMode.Open, FileAccess.Read))
{
Nca firmwareContent = new Nca(device.System.KeySet, firmwareStream.AsStorage(), false);
LibHac.IO.IStorage romFsStorage = firmwareContent.OpenSection(0, false, device.System.FsIntegrityCheckLevel, false);
Nca firmwareContent = new Nca(device.System.KeySet, firmwareStream.AsStorage(), false);
IStorage romFsStorage = firmwareContent.OpenSection(0, false, device.System.FsIntegrityCheckLevel, false);
if(romFsStorage == null)
{
@ -196,7 +196,7 @@ namespace Ryujinx.HLE.HOS.Services.Set
Romfs firmwareRomFs = new Romfs(romFsStorage);
LibHac.IO.IStorage firmwareFile = firmwareRomFs.OpenFile("/file");
IStorage firmwareFile = firmwareRomFs.OpenFile("/file");
byte[] data = new byte[firmwareFile.Length];

3
Ryujinx/Config.cs
View file

@ -1,4 +1,4 @@
using LibHac;
using LibHac.IO;
using Ryujinx.Common.Logging;
using Ryujinx.HLE;
using Ryujinx.HLE.Input;
@ -9,7 +9,6 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using LibHac.IO;
namespace Ryujinx
{