diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs index 438c337b9c..0deb7ac163 100644 --- a/Ryujinx.HLE/HOS/Horizon.cs +++ b/Ryujinx.HLE/HOS/Horizon.cs @@ -307,17 +307,22 @@ namespace Ryujinx.HLE.HOS foreach (DirectoryEntryEx ticketEntry in securePartition.EnumerateEntries("/", "*.tik")) { Result result = securePartition.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read); - if (result.IsFailure()) continue; - Ticket ticket = new Ticket(ticketFile.AsStream()); + if (result.IsSuccess()) + { + Ticket ticket = new Ticket(ticketFile.AsStream()); - KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet))); + KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet))); + } } foreach (DirectoryEntryEx fileEntry in securePartition.EnumerateEntries("/", "*.nca")) { Result result = securePartition.OpenFile(out IFile ncaFile, fileEntry.FullPath, OpenMode.Read); - if (result.IsFailure()) continue; + if (result.IsFailure()) + { + continue; + } Nca nca = new Nca(KeySet, ncaFile.AsStorage()); @@ -358,11 +363,13 @@ namespace Ryujinx.HLE.HOS IFileSystem controlFs = controlNca.OpenFileSystem(NcaSectionType.Data, FsIntegrityCheckLevel); Result result = controlFs.OpenFile(out IFile controlFile, "/control.nacp", OpenMode.Read); - if (result.IsFailure()) return; - ControlData = new Nacp(controlFile.AsStream()); + if (result.IsSuccess()) + { + ControlData = new Nacp(controlFile.AsStream()); - TitleName = CurrentTitle = ControlData.Descriptions[(int)State.DesiredTitleLanguage].Title; + TitleName = CurrentTitle = ControlData.Descriptions[(int) State.DesiredTitleLanguage].Title; + } } public void LoadNca(string ncaFile) @@ -383,11 +390,13 @@ namespace Ryujinx.HLE.HOS foreach (DirectoryEntryEx ticketEntry in nsp.EnumerateEntries("/", "*.tik")) { Result result = nsp.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read); - if (result.IsFailure()) continue; - Ticket ticket = new Ticket(ticketFile.AsStream()); + if (result.IsSuccess()) + { + Ticket ticket = new Ticket(ticketFile.AsStream()); - KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet))); + KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet))); + } } Nca mainNca = null; diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs index 90d5504e52..13909b34d6 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs @@ -29,7 +29,10 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy LocalFileSystem fileSystem = new LocalFileSystem(savePath); Result result = DirectorySaveDataFileSystem.CreateNew(out DirectorySaveDataFileSystem dirFileSystem, fileSystem); - if (result.IsFailure()) return (ResultCode)result.Value; + if (result.IsFailure()) + { + return (ResultCode)result.Value; + } LibHac.Fs.IFileSystem saveFileSystem = dirFileSystem; @@ -121,7 +124,10 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy string filename = fullPath.Replace(archivePath.FullName, string.Empty).TrimStart('\\'); Result result = nsp.OpenFile(out LibHac.Fs.IFile ncaFile, filename, OpenMode.Read); - if (result.IsFailure()) return (ResultCode)result.Value; + if (result.IsFailure()) + { + return (ResultCode)result.Value; + } return OpenNcaFs(context, fullPath, ncaFile.AsStorage(), out openedFileSystem); } @@ -139,11 +145,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy foreach (DirectoryEntryEx ticketEntry in nsp.EnumerateEntries("/", "*.tik")) { Result result = nsp.OpenFile(out LibHac.Fs.IFile ticketFile, ticketEntry.FullPath, OpenMode.Read); - if (result.IsFailure()) continue; - Ticket ticket = new Ticket(ticketFile.AsStream()); + if (result.IsSuccess()) + { + Ticket ticket = new Ticket(ticketFile.AsStream()); - keySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(keySet))); + keySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(keySet))); + } } } } diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs index 9ae001d802..ed7ae0c178 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs @@ -106,13 +106,15 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy string name = ReadUtf8String(context); Result result = _fileSystem.OpenFile(out LibHac.Fs.IFile file, name, mode); - if (result.IsFailure()) return (ResultCode)result.Value; - IFile fileInterface = new IFile(file); + if (result.IsSuccess()) + { + IFile fileInterface = new IFile(file); - MakeObject(context, fileInterface); + MakeObject(context, fileInterface); + } - return ResultCode.Success; + return (ResultCode)result.Value; } [Command(9)] @@ -124,13 +126,15 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy string name = ReadUtf8String(context); Result result = _fileSystem.OpenDirectory(out LibHac.Fs.IDirectory dir, name, mode); - if (result.IsFailure()) return (ResultCode)result.Value; - IDirectory dirInterface = new IDirectory(dir); + if (result.IsSuccess()) + { + IDirectory dirInterface = new IDirectory(dir); - MakeObject(context, dirInterface); + MakeObject(context, dirInterface); + } - return ResultCode.Success; + return (ResultCode)result.Value; } [Command(10)] @@ -182,7 +186,6 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy string name = ReadUtf8String(context); Result result = _fileSystem.GetFileTimeStampRaw(out FileTimeStampRaw timestamp, name); - if (result.IsFailure()) return (ResultCode)result.Value; context.ResponseData.Write(timestamp.Created); context.ResponseData.Write(timestamp.Modified); @@ -195,7 +198,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy context.ResponseData.Write(data); - return ResultCode.Success; + return (ResultCode)result.Value; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs index 0f173f0a9f..3811101998 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs @@ -140,11 +140,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs GameCardPartitionRaw partitionId = (GameCardPartitionRaw)context.RequestData.ReadInt32(); Result result = _baseFileSystemProxy.OpenGameCardStorage(out LibHac.Fs.IStorage storage, handle, partitionId); - if (result.IsFailure()) return (ResultCode)result.Value; - MakeObject(context, new FileSystemProxy.IStorage(storage)); + if (result.IsSuccess()) + { + MakeObject(context, new FileSystemProxy.IStorage(storage)); + } - return ResultCode.Success; + return (ResultCode)result.Value; } [Command(51)] @@ -273,11 +275,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs public ResultCode OpenDeviceOperator(ServiceCtx context) { Result result = _baseFileSystemProxy.OpenDeviceOperator(out LibHac.FsService.IDeviceOperator deviceOperator); - if (result.IsFailure()) return (ResultCode)result.Value; - MakeObject(context, new IDeviceOperator(deviceOperator)); + if (result.IsSuccess()) + { + MakeObject(context, new IDeviceOperator(deviceOperator)); + } - return 0; + return (ResultCode)result.Value; } [Command(1005)] diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs index 6a2056deed..490d0e8ef0 100644 --- a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs +++ b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs @@ -188,15 +188,24 @@ namespace Ryujinx.HLE.HOS.Services.Settings IFileSystem firmwareRomFs = firmwareContent.OpenFileSystem(NcaSectionType.Data, device.System.FsIntegrityCheckLevel); Result result = firmwareRomFs.OpenFile(out IFile firmwareFile, "/file", OpenMode.Read); - if (result.IsFailure()) return null; + if (result.IsFailure()) + { + return null; + } result = firmwareFile.GetSize(out long fileSize); - if (result.IsFailure()) return null; + if (result.IsFailure()) + { + return null; + } byte[] data = new byte[fileSize]; result = firmwareFile.Read(out _, 0, data); - if (result.IsFailure()) return null; + if (result.IsFailure()) + { + return null; + } return data; } diff --git a/Ryujinx/Ui/ApplicationLibrary.cs b/Ryujinx/Ui/ApplicationLibrary.cs index 7ec3cb8060..949f72fb77 100644 --- a/Ryujinx/Ui/ApplicationLibrary.cs +++ b/Ryujinx/Ui/ApplicationLibrary.cs @@ -353,11 +353,13 @@ namespace Ryujinx.UI foreach (DirectoryEntryEx ticketEntry in Pfs.EnumerateEntries("/", "*.tik")) { Result result = Pfs.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read); - if (result.IsFailure()) continue; - Ticket ticket = new Ticket(ticketFile.AsStream()); + if (result.IsSuccess()) + { + Ticket ticket = new Ticket(ticketFile.AsStream()); - KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet))); + KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet))); + } } // Find the Control NCA and store it in variable called controlNca