mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2025-07-28 16:37:13 +02:00
[Ryujinx.HLE] Address dotnet-format issues (#5380)
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
This commit is contained in:
TSRBerry
GitHub
parent
fec8291c17
commit
326749498b
1015 changed files with 8173 additions and 7615 deletions
|
|
@ -9,17 +9,17 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
|
||||
public ulong TitleId { get; set; }
|
||||
|
||||
public int FsVersion { get; private set; }
|
||||
public int FsVersion { get; private set; }
|
||||
public ulong FsPermissionsBitmask { get; private set; }
|
||||
|
||||
public ServiceAccessControl ServiceAccessControl { get; private set; }
|
||||
public KernelAccessControl KernelAccessControl { get; private set; }
|
||||
public KernelAccessControl KernelAccessControl { get; private set; }
|
||||
|
||||
public Aci0(Stream stream, int offset)
|
||||
{
|
||||
stream.Seek(offset, SeekOrigin.Begin);
|
||||
|
||||
BinaryReader reader = new BinaryReader(stream);
|
||||
BinaryReader reader = new(stream);
|
||||
|
||||
if (reader.ReadInt32() != Aci0Magic)
|
||||
{
|
||||
|
|
@ -33,16 +33,16 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
// Reserved.
|
||||
stream.Seek(8, SeekOrigin.Current);
|
||||
|
||||
int fsAccessHeaderOffset = reader.ReadInt32();
|
||||
int fsAccessHeaderSize = reader.ReadInt32();
|
||||
int fsAccessHeaderOffset = reader.ReadInt32();
|
||||
int fsAccessHeaderSize = reader.ReadInt32();
|
||||
int serviceAccessControlOffset = reader.ReadInt32();
|
||||
int serviceAccessControlSize = reader.ReadInt32();
|
||||
int kernelAccessControlOffset = reader.ReadInt32();
|
||||
int kernelAccessControlSize = reader.ReadInt32();
|
||||
int serviceAccessControlSize = reader.ReadInt32();
|
||||
int kernelAccessControlOffset = reader.ReadInt32();
|
||||
int kernelAccessControlSize = reader.ReadInt32();
|
||||
|
||||
FsAccessHeader fsAccessHeader = new FsAccessHeader(stream, offset + fsAccessHeaderOffset, fsAccessHeaderSize);
|
||||
FsAccessHeader fsAccessHeader = new(stream, offset + fsAccessHeaderOffset, fsAccessHeaderSize);
|
||||
|
||||
FsVersion = fsAccessHeader.Version;
|
||||
FsVersion = fsAccessHeader.Version;
|
||||
FsPermissionsBitmask = fsAccessHeader.PermissionsBitmask;
|
||||
|
||||
ServiceAccessControl = new ServiceAccessControl(stream, offset + serviceAccessControlOffset, serviceAccessControlSize);
|
||||
|
|
|
|||
|
|
@ -8,25 +8,25 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
private const int AcidMagic = 'A' << 0 | 'C' << 8 | 'I' << 16 | 'D' << 24;
|
||||
|
||||
public byte[] Rsa2048Signature { get; private set; }
|
||||
public byte[] Rsa2048Modulus { get; private set; }
|
||||
public int Unknown1 { get; private set; }
|
||||
public int Flags { get; private set; }
|
||||
public byte[] Rsa2048Modulus { get; private set; }
|
||||
public int Unknown1 { get; private set; }
|
||||
public int Flags { get; private set; }
|
||||
|
||||
public long TitleIdRangeMin { get; private set; }
|
||||
public long TitleIdRangeMax { get; private set; }
|
||||
|
||||
public FsAccessControl FsAccessControl { get; private set; }
|
||||
public FsAccessControl FsAccessControl { get; private set; }
|
||||
public ServiceAccessControl ServiceAccessControl { get; private set; }
|
||||
public KernelAccessControl KernelAccessControl { get; private set; }
|
||||
public KernelAccessControl KernelAccessControl { get; private set; }
|
||||
|
||||
public Acid(Stream stream, int offset)
|
||||
{
|
||||
stream.Seek(offset, SeekOrigin.Begin);
|
||||
|
||||
BinaryReader reader = new BinaryReader(stream);
|
||||
BinaryReader reader = new(stream);
|
||||
|
||||
Rsa2048Signature = reader.ReadBytes(0x100);
|
||||
Rsa2048Modulus = reader.ReadBytes(0x100);
|
||||
Rsa2048Modulus = reader.ReadBytes(0x100);
|
||||
|
||||
if (reader.ReadInt32() != AcidMagic)
|
||||
{
|
||||
|
|
@ -44,12 +44,12 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
TitleIdRangeMin = reader.ReadInt64();
|
||||
TitleIdRangeMax = reader.ReadInt64();
|
||||
|
||||
int fsAccessControlOffset = reader.ReadInt32();
|
||||
int fsAccessControlSize = reader.ReadInt32();
|
||||
int fsAccessControlOffset = reader.ReadInt32();
|
||||
int fsAccessControlSize = reader.ReadInt32();
|
||||
int serviceAccessControlOffset = reader.ReadInt32();
|
||||
int serviceAccessControlSize = reader.ReadInt32();
|
||||
int kernelAccessControlOffset = reader.ReadInt32();
|
||||
int kernelAccessControlSize = reader.ReadInt32();
|
||||
int serviceAccessControlSize = reader.ReadInt32();
|
||||
int kernelAccessControlOffset = reader.ReadInt32();
|
||||
int kernelAccessControlSize = reader.ReadInt32();
|
||||
|
||||
FsAccessControl = new FsAccessControl(stream, offset + fsAccessControlOffset, fsAccessControlSize);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,25 +4,25 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
{
|
||||
public class FsAccessControl
|
||||
{
|
||||
public int Version { get; private set; }
|
||||
public int Version { get; private set; }
|
||||
public ulong PermissionsBitmask { get; private set; }
|
||||
public int Unknown1 { get; private set; }
|
||||
public int Unknown2 { get; private set; }
|
||||
public int Unknown3 { get; private set; }
|
||||
public int Unknown4 { get; private set; }
|
||||
public int Unknown1 { get; private set; }
|
||||
public int Unknown2 { get; private set; }
|
||||
public int Unknown3 { get; private set; }
|
||||
public int Unknown4 { get; private set; }
|
||||
|
||||
public FsAccessControl(Stream stream, int offset, int size)
|
||||
{
|
||||
stream.Seek(offset, SeekOrigin.Begin);
|
||||
|
||||
BinaryReader reader = new BinaryReader(stream);
|
||||
BinaryReader reader = new(stream);
|
||||
|
||||
Version = reader.ReadInt32();
|
||||
Version = reader.ReadInt32();
|
||||
PermissionsBitmask = reader.ReadUInt64();
|
||||
Unknown1 = reader.ReadInt32();
|
||||
Unknown2 = reader.ReadInt32();
|
||||
Unknown3 = reader.ReadInt32();
|
||||
Unknown4 = reader.ReadInt32();
|
||||
Unknown1 = reader.ReadInt32();
|
||||
Unknown2 = reader.ReadInt32();
|
||||
Unknown3 = reader.ReadInt32();
|
||||
Unknown4 = reader.ReadInt32();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
{
|
||||
class FsAccessHeader
|
||||
{
|
||||
public int Version { get; private set; }
|
||||
public int Version { get; private set; }
|
||||
public ulong PermissionsBitmask { get; private set; }
|
||||
|
||||
public FsAccessHeader(Stream stream, int offset, int size)
|
||||
{
|
||||
stream.Seek(offset, SeekOrigin.Begin);
|
||||
|
||||
BinaryReader reader = new BinaryReader(stream);
|
||||
BinaryReader reader = new(stream);
|
||||
|
||||
Version = reader.ReadInt32();
|
||||
Version = reader.ReadInt32();
|
||||
PermissionsBitmask = reader.ReadUInt64();
|
||||
|
||||
int dataSize = reader.ReadInt32();
|
||||
|
|
@ -24,8 +24,9 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
{
|
||||
throw new InvalidNpdmException("FsAccessHeader is corrupted!");
|
||||
}
|
||||
|
||||
int contentOwnerIdSize = reader.ReadInt32();
|
||||
#pragma warning disable IDE0059 // Remove unnecessary value assignment
|
||||
int contentOwnerIdSize = reader.ReadInt32();
|
||||
#pragma warning restore IDE0059
|
||||
int dataAndContentOwnerIdSize = reader.ReadInt32();
|
||||
|
||||
if (dataAndContentOwnerIdSize != 0x1c)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
|
||||
Capabilities = new int[size / 4];
|
||||
|
||||
BinaryReader reader = new BinaryReader(stream);
|
||||
BinaryReader reader = new(stream);
|
||||
|
||||
for (int index = 0; index < Capabilities.Length; index++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,22 +11,22 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
{
|
||||
private const int MetaMagic = 'M' << 0 | 'E' << 8 | 'T' << 16 | 'A' << 24;
|
||||
|
||||
public byte ProcessFlags { get; private set; }
|
||||
public bool Is64Bit { get; private set; }
|
||||
public byte MainThreadPriority { get; private set; }
|
||||
public byte DefaultCpuId { get; private set; }
|
||||
public int PersonalMmHeapSize { get; private set; }
|
||||
public int Version { get; private set; }
|
||||
public int MainThreadStackSize { get; private set; }
|
||||
public string TitleName { get; set; }
|
||||
public byte[] ProductCode { get; private set; }
|
||||
public byte ProcessFlags { get; private set; }
|
||||
public bool Is64Bit { get; private set; }
|
||||
public byte MainThreadPriority { get; private set; }
|
||||
public byte DefaultCpuId { get; private set; }
|
||||
public int PersonalMmHeapSize { get; private set; }
|
||||
public int Version { get; private set; }
|
||||
public int MainThreadStackSize { get; private set; }
|
||||
public string TitleName { get; set; }
|
||||
public byte[] ProductCode { get; private set; }
|
||||
|
||||
public Aci0 Aci0 { get; private set; }
|
||||
public Acid Acid { get; private set; }
|
||||
|
||||
public Npdm(Stream stream)
|
||||
{
|
||||
BinaryReader reader = new BinaryReader(stream);
|
||||
BinaryReader reader = new(stream);
|
||||
|
||||
if (reader.ReadInt32() != MetaMagic)
|
||||
{
|
||||
|
|
@ -42,7 +42,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
reader.ReadByte();
|
||||
|
||||
MainThreadPriority = reader.ReadByte();
|
||||
DefaultCpuId = reader.ReadByte();
|
||||
DefaultCpuId = reader.ReadByte();
|
||||
|
||||
reader.ReadInt32();
|
||||
|
||||
|
|
@ -61,9 +61,11 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
stream.Seek(0x30, SeekOrigin.Current);
|
||||
|
||||
int aci0Offset = reader.ReadInt32();
|
||||
int aci0Size = reader.ReadInt32();
|
||||
#pragma warning disable IDE0059 // Remove unnecessary value assignment
|
||||
int aci0Size = reader.ReadInt32();
|
||||
int acidOffset = reader.ReadInt32();
|
||||
int acidSize = reader.ReadInt32();
|
||||
int acidSize = reader.ReadInt32();
|
||||
#pragma warning restore IDE0059
|
||||
|
||||
Aci0 = new Aci0(stream, aci0Offset);
|
||||
Acid = new Acid(stream, acidOffset);
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
{
|
||||
stream.Seek(offset, SeekOrigin.Begin);
|
||||
|
||||
BinaryReader reader = new BinaryReader(stream);
|
||||
BinaryReader reader = new(stream);
|
||||
|
||||
int bytesRead = 0;
|
||||
|
||||
Dictionary<string, bool> services = new Dictionary<string, bool>();
|
||||
Dictionary<string, bool> services = new();
|
||||
|
||||
while (bytesRead != size)
|
||||
{
|
||||
|
|
@ -28,7 +28,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
|
|||
break;
|
||||
}
|
||||
|
||||
int length = (controlByte & 0x07) + 1;
|
||||
int length = (controlByte & 0x07) + 1;
|
||||
bool registerAllowed = (controlByte & 0x80) != 0;
|
||||
|
||||
services[Encoding.ASCII.GetString(reader.ReadBytes(length))] = registerAllowed;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue