JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-05-30 08:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: chore: Fix object creation in HLE project

Browse Source
This commit is contained in:
Evan Husted
2025-01-26 15:15:26 -06:00
parent f1fd5c9366
commit beab133c8d
48 changed files with 194 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Ryujinx.HLE/FileSystem/ContentManager.cs
View File

@@ -217,8 +217,8 @@ namespace Ryujinx.HLE.FileSystem
if (AocData.TryGetValue(aocTitleId, out AocItem aoc))
{
FileStream file = new FileStream(aoc.ContainerPath, FileMode.Open, FileAccess.Read);
using UniqueRef<IFile> ncaFile = new UniqueRef<IFile>();
FileStream file = new(aoc.ContainerPath, FileMode.Open, FileAccess.Read);
using UniqueRef<IFile> ncaFile = new();
switch (Path.GetExtension(aoc.ContainerPath))
{
@@ -227,7 +227,7 @@ namespace Ryujinx.HLE.FileSystem
xci.OpenFile(ref ncaFile.Ref, aoc.NcaPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
break;
case ".nsp":
PartitionFileSystem pfs = new PartitionFileSystem();
PartitionFileSystem pfs = new();
pfs.Initialize(file.AsStorage());
pfs.OpenFile(ref ncaFile.Ref, aoc.NcaPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
break;
@@ -627,7 +627,7 @@ namespace Ryujinx.HLE.FileSystem
private static IFile OpenPossibleFragmentedFile(IFileSystem filesystem, string path, OpenMode mode)
{
using UniqueRef<IFile> file = new UniqueRef<IFile>();
using UniqueRef<IFile> file = new();
if (filesystem.FileExists($"{path}/00"))
{
@@ -733,11 +733,11 @@ namespace Ryujinx.HLE.FileSystem
string cnmtPath = fs.EnumerateEntries("/", "*.cnmt").Single().FullPath;
using UniqueRef<IFile> metaFile = new UniqueRef<IFile>();
using UniqueRef<IFile> metaFile = new();
if (fs.OpenFile(ref metaFile.Ref, cnmtPath.ToU8Span(), OpenMode.Read).IsSuccess())
{
Cnmt meta = new Cnmt(metaFile.Get.AsStream());
Cnmt meta = new(metaFile.Get.AsStream());
if (meta.Type == ContentMetaType.SystemUpdate)
{
@@ -762,7 +762,7 @@ namespace Ryujinx.HLE.FileSystem
IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
using UniqueRef<IFile> systemVersionFile = new UniqueRef<IFile>();
using UniqueRef<IFile> systemVersionFile = new();
if (romfs.OpenFile(ref systemVersionFile.Ref, "/file".ToU8Span(), OpenMode.Read).IsSuccess())
{
@@ -798,11 +798,11 @@ namespace Ryujinx.HLE.FileSystem
string cnmtPath = fs.EnumerateEntries("/", "*.cnmt").Single().FullPath;
using UniqueRef<IFile> metaFile = new UniqueRef<IFile>();
using UniqueRef<IFile> metaFile = new();
if (fs.OpenFile(ref metaFile.Ref, cnmtPath.ToU8Span(), OpenMode.Read).IsSuccess())
{
Cnmt meta = new Cnmt(metaFile.Get.AsStream());
Cnmt meta = new(metaFile.Get.AsStream());
IStorage contentStorage = contentNcaStream.AsStorage();
if (contentStorage.GetSize(out long size).IsSuccess())
@@ -867,11 +867,11 @@ namespace Ryujinx.HLE.FileSystem
string cnmtPath = fs.EnumerateEntries("/", "*.cnmt").Single().FullPath;
using UniqueRef<IFile> metaFile = new UniqueRef<IFile>();
using UniqueRef<IFile> metaFile = new();
if (fs.OpenFile(ref metaFile.Ref, cnmtPath.ToU8Span(), OpenMode.Read).IsSuccess())
{
Cnmt meta = new Cnmt(metaFile.Get.AsStream());
Cnmt meta = new(metaFile.Get.AsStream());
if (meta.Type == ContentMetaType.SystemUpdate)
{
@@ -885,7 +885,7 @@ namespace Ryujinx.HLE.FileSystem
{
IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
using UniqueRef<IFile> systemVersionFile = new UniqueRef<IFile>();
using UniqueRef<IFile> systemVersionFile = new();
if (romfs.OpenFile(ref systemVersionFile.Ref, "/file".ToU8Span(), OpenMode.Read).IsSuccess())
{
@@ -935,11 +935,11 @@ namespace Ryujinx.HLE.FileSystem
string cnmtPath = fs.EnumerateEntries("/", "*.cnmt").Single().FullPath;
using UniqueRef<IFile> metaFile = new UniqueRef<IFile>();
using UniqueRef<IFile> metaFile = new();
if (fs.OpenFile(ref metaFile.Ref, cnmtPath.ToU8Span(), OpenMode.Read).IsSuccess())
{
Cnmt meta = new Cnmt(metaFile.Get.AsStream());
Cnmt meta = new(metaFile.Get.AsStream());
if (contentStorage.GetSize(out long size).IsSuccess())
{
@@ -1002,7 +1002,7 @@ namespace Ryujinx.HLE.FileSystem
{
IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
using UniqueRef<IFile> systemVersionFile = new UniqueRef<IFile>();
using UniqueRef<IFile> systemVersionFile = new();
if (romfs.OpenFile(ref systemVersionFile.Ref, "/file".ToU8Span(), OpenMode.Read).IsSuccess())
{

10
src/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
View File

@@ -61,7 +61,7 @@ namespace Ryujinx.HLE.FileSystem
public void LoadRomFs(ulong pid, string fileName)
{
FileStream romfsStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
FileStream romfsStream = new(fileName, FileMode.Open, FileAccess.Read);
_romFsByPid.AddOrUpdate(pid, romfsStream, (pid, oldStream) =>
{
@@ -194,7 +194,7 @@ namespace Ryujinx.HLE.FileSystem
}
fsServerClient = horizon.CreatePrivilegedHorizonClient();
FileSystemServer fsServer = new FileSystemServer(fsServerClient);
FileSystemServer fsServer = new(fsServerClient);
RandomDataGenerator randomGenerator = Random.Shared.NextBytes;
@@ -208,7 +208,7 @@ namespace Ryujinx.HLE.FileSystem
SdCard.SetSdCardInserted(true);
FileSystemServerConfig fsServerConfig = new FileSystemServerConfig
FileSystemServerConfig fsServerConfig = new()
{
ExternalKeySet = KeySet.ExternalKeySet,
FsCreators = fsServerObjects.FsCreators,
@@ -270,7 +270,7 @@ namespace Ryujinx.HLE.FileSystem
{
foreach (DirectoryEntryEx ticketEntry in fs.EnumerateEntries("/", "*.tik"))
{
using UniqueRef<IFile> ticketFile = new UniqueRef<IFile>();
using UniqueRef<IFile> ticketFile = new();
Result result = fs.OpenFile(ref ticketFile.Ref, ticketEntry.FullPath.ToU8Span(), OpenMode.Read);
@@ -334,7 +334,7 @@ namespace Ryujinx.HLE.FileSystem
{
Span<SaveDataInfo> info = stackalloc SaveDataInfo[8];
using UniqueRef<SaveDataIterator> iterator = new UniqueRef<SaveDataIterator>();
using UniqueRef<SaveDataIterator> iterator = new();
Result rc = hos.Fs.OpenSaveDataIterator(ref iterator.Ref, spaceId);
if (rc.IsFailure())