diff options
author | jduncanator <1518948+jduncanator@users.noreply.github.com> | 2018-11-29 13:01:19 +1100 |
---|---|---|
committer | gdkchan <gab.dark.100@gmail.com> | 2018-11-29 00:01:19 -0200 |
commit | 9b22e8af5ee3e0896fc5f464022579ef0713e504 (patch) | |
tree | a80e584b75091eae7e839fdbe3548adf6b0a948c | |
parent | 59964f667c38d9d0550a3b5ef3970433493f4991 (diff) |
Normalize all the line endings (#518)
-rw-r--r-- | Ryujinx.HLE/Loaders/Npdm/ACI0.cs | 106 | ||||
-rw-r--r-- | Ryujinx.HLE/Loaders/Npdm/ACID.cs | 122 | ||||
-rw-r--r-- | Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs | 46 | ||||
-rw-r--r-- | Ryujinx.HLE/Loaders/Npdm/Npdm.cs | 144 | ||||
-rw-r--r-- | Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs | 84 | ||||
-rw-r--r-- | appveyor.yml | 56 |
6 files changed, 279 insertions, 279 deletions
diff --git a/Ryujinx.HLE/Loaders/Npdm/ACI0.cs b/Ryujinx.HLE/Loaders/Npdm/ACI0.cs index fd6fd6c3..4bec93e4 100644 --- a/Ryujinx.HLE/Loaders/Npdm/ACI0.cs +++ b/Ryujinx.HLE/Loaders/Npdm/ACI0.cs @@ -1,53 +1,53 @@ -using Ryujinx.HLE.Exceptions;
-using System.IO;
-
-namespace Ryujinx.HLE.Loaders.Npdm
-{
- class ACI0
- {
- private const int ACI0Magic = 'A' << 0 | 'C' << 8 | 'I' << 16 | '0' << 24;
-
- public long TitleId { 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 ACI0(Stream Stream, int Offset)
- {
- Stream.Seek(Offset, SeekOrigin.Begin);
-
- BinaryReader Reader = new BinaryReader(Stream);
-
- if (Reader.ReadInt32() != ACI0Magic)
- {
- throw new InvalidNpdmException("ACI0 Stream doesn't contain ACI0 section!");
- }
-
- Stream.Seek(0xc, SeekOrigin.Current);
-
- TitleId = Reader.ReadInt64();
-
- //Reserved.
- Stream.Seek(8, SeekOrigin.Current);
-
- int FsAccessHeaderOffset = Reader.ReadInt32();
- int FsAccessHeaderSize = Reader.ReadInt32();
- int ServiceAccessControlOffset = Reader.ReadInt32();
- int ServiceAccessControlSize = Reader.ReadInt32();
- int KernelAccessControlOffset = Reader.ReadInt32();
- int KernelAccessControlSize = Reader.ReadInt32();
-
- FsAccessHeader FsAccessHeader = new FsAccessHeader(Stream, Offset + FsAccessHeaderOffset, FsAccessHeaderSize);
-
- FsVersion = FsAccessHeader.Version;
- FsPermissionsBitmask = FsAccessHeader.PermissionsBitmask;
-
- ServiceAccessControl = new ServiceAccessControl(Stream, Offset + ServiceAccessControlOffset, ServiceAccessControlSize);
-
- KernelAccessControl = new KernelAccessControl(Stream, Offset + KernelAccessControlOffset, KernelAccessControlSize);
- }
- }
-}
+using Ryujinx.HLE.Exceptions; +using System.IO; + +namespace Ryujinx.HLE.Loaders.Npdm +{ + class ACI0 + { + private const int ACI0Magic = 'A' << 0 | 'C' << 8 | 'I' << 16 | '0' << 24; + + public long TitleId { 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 ACI0(Stream Stream, int Offset) + { + Stream.Seek(Offset, SeekOrigin.Begin); + + BinaryReader Reader = new BinaryReader(Stream); + + if (Reader.ReadInt32() != ACI0Magic) + { + throw new InvalidNpdmException("ACI0 Stream doesn't contain ACI0 section!"); + } + + Stream.Seek(0xc, SeekOrigin.Current); + + TitleId = Reader.ReadInt64(); + + //Reserved. + Stream.Seek(8, SeekOrigin.Current); + + int FsAccessHeaderOffset = Reader.ReadInt32(); + int FsAccessHeaderSize = Reader.ReadInt32(); + int ServiceAccessControlOffset = Reader.ReadInt32(); + int ServiceAccessControlSize = Reader.ReadInt32(); + int KernelAccessControlOffset = Reader.ReadInt32(); + int KernelAccessControlSize = Reader.ReadInt32(); + + FsAccessHeader FsAccessHeader = new FsAccessHeader(Stream, Offset + FsAccessHeaderOffset, FsAccessHeaderSize); + + FsVersion = FsAccessHeader.Version; + FsPermissionsBitmask = FsAccessHeader.PermissionsBitmask; + + ServiceAccessControl = new ServiceAccessControl(Stream, Offset + ServiceAccessControlOffset, ServiceAccessControlSize); + + KernelAccessControl = new KernelAccessControl(Stream, Offset + KernelAccessControlOffset, KernelAccessControlSize); + } + } +} diff --git a/Ryujinx.HLE/Loaders/Npdm/ACID.cs b/Ryujinx.HLE/Loaders/Npdm/ACID.cs index 7ead3294..9206ee7b 100644 --- a/Ryujinx.HLE/Loaders/Npdm/ACID.cs +++ b/Ryujinx.HLE/Loaders/Npdm/ACID.cs @@ -1,61 +1,61 @@ -using Ryujinx.HLE.Exceptions;
-using System.IO;
-
-namespace Ryujinx.HLE.Loaders.Npdm
-{
- class ACID
- {
- 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 long TitleIdRangeMin { get; private set; }
- public long TitleIdRangeMax { get; private set; }
-
- public FsAccessControl FsAccessControl { get; private set; }
- public ServiceAccessControl ServiceAccessControl { 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);
-
- RSA2048Signature = Reader.ReadBytes(0x100);
- RSA2048Modulus = Reader.ReadBytes(0x100);
-
- if (Reader.ReadInt32() != ACIDMagic)
- {
- throw new InvalidNpdmException("ACID Stream doesn't contain ACID section!");
- }
-
- //Size field used with the above signature (?).
- Unknown1 = Reader.ReadInt32();
-
- Reader.ReadInt32();
-
- //Bit0 must be 1 on retail, on devunit 0 is also allowed. Bit1 is unknown.
- Flags = Reader.ReadInt32();
-
- TitleIdRangeMin = Reader.ReadInt64();
- TitleIdRangeMax = Reader.ReadInt64();
-
- int FsAccessControlOffset = Reader.ReadInt32();
- int FsAccessControlSize = Reader.ReadInt32();
- int ServiceAccessControlOffset = Reader.ReadInt32();
- int ServiceAccessControlSize = Reader.ReadInt32();
- int KernelAccessControlOffset = Reader.ReadInt32();
- int KernelAccessControlSize = Reader.ReadInt32();
-
- FsAccessControl = new FsAccessControl(Stream, Offset + FsAccessControlOffset, FsAccessControlSize);
-
- ServiceAccessControl = new ServiceAccessControl(Stream, Offset + ServiceAccessControlOffset, ServiceAccessControlSize);
-
- KernelAccessControl = new KernelAccessControl(Stream, Offset + KernelAccessControlOffset, KernelAccessControlSize);
- }
- }
-}
+using Ryujinx.HLE.Exceptions; +using System.IO; + +namespace Ryujinx.HLE.Loaders.Npdm +{ + class ACID + { + 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 long TitleIdRangeMin { get; private set; } + public long TitleIdRangeMax { get; private set; } + + public FsAccessControl FsAccessControl { get; private set; } + public ServiceAccessControl ServiceAccessControl { 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); + + RSA2048Signature = Reader.ReadBytes(0x100); + RSA2048Modulus = Reader.ReadBytes(0x100); + + if (Reader.ReadInt32() != ACIDMagic) + { + throw new InvalidNpdmException("ACID Stream doesn't contain ACID section!"); + } + + //Size field used with the above signature (?). + Unknown1 = Reader.ReadInt32(); + + Reader.ReadInt32(); + + //Bit0 must be 1 on retail, on devunit 0 is also allowed. Bit1 is unknown. + Flags = Reader.ReadInt32(); + + TitleIdRangeMin = Reader.ReadInt64(); + TitleIdRangeMax = Reader.ReadInt64(); + + int FsAccessControlOffset = Reader.ReadInt32(); + int FsAccessControlSize = Reader.ReadInt32(); + int ServiceAccessControlOffset = Reader.ReadInt32(); + int ServiceAccessControlSize = Reader.ReadInt32(); + int KernelAccessControlOffset = Reader.ReadInt32(); + int KernelAccessControlSize = Reader.ReadInt32(); + + FsAccessControl = new FsAccessControl(Stream, Offset + FsAccessControlOffset, FsAccessControlSize); + + ServiceAccessControl = new ServiceAccessControl(Stream, Offset + ServiceAccessControlOffset, ServiceAccessControlSize); + + KernelAccessControl = new KernelAccessControl(Stream, Offset + KernelAccessControlOffset, KernelAccessControlSize); + } + } +} diff --git a/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs index cd3d3252..611eda39 100644 --- a/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs +++ b/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs @@ -1,23 +1,23 @@ -using System.IO;
-
-namespace Ryujinx.HLE.Loaders.Npdm
-{
- class KernelAccessControl
- {
- public int[] Capabilities { get; private set; }
-
- public KernelAccessControl(Stream Stream, int Offset, int Size)
- {
- Stream.Seek(Offset, SeekOrigin.Begin);
-
- Capabilities = new int[Size / 4];
-
- BinaryReader Reader = new BinaryReader(Stream);
-
- for (int Index = 0; Index < Capabilities.Length; Index++)
- {
- Capabilities[Index] = Reader.ReadInt32();
- }
- }
- }
-}
+using System.IO; + +namespace Ryujinx.HLE.Loaders.Npdm +{ + class KernelAccessControl + { + public int[] Capabilities { get; private set; } + + public KernelAccessControl(Stream Stream, int Offset, int Size) + { + Stream.Seek(Offset, SeekOrigin.Begin); + + Capabilities = new int[Size / 4]; + + BinaryReader Reader = new BinaryReader(Stream); + + for (int Index = 0; Index < Capabilities.Length; Index++) + { + Capabilities[Index] = Reader.ReadInt32(); + } + } + } +} diff --git a/Ryujinx.HLE/Loaders/Npdm/Npdm.cs b/Ryujinx.HLE/Loaders/Npdm/Npdm.cs index 9c2fdb38..6d74668a 100644 --- a/Ryujinx.HLE/Loaders/Npdm/Npdm.cs +++ b/Ryujinx.HLE/Loaders/Npdm/Npdm.cs @@ -1,72 +1,72 @@ -using Ryujinx.HLE.Exceptions;
-using System.IO;
-using System.Text;
-
-namespace Ryujinx.HLE.Loaders.Npdm
-{
- //https://github.com/SciresM/hactool/blob/master/npdm.c
- //https://github.com/SciresM/hactool/blob/master/npdm.h
- //http://switchbrew.org/index.php?title=NPDM
- class Npdm
- {
- private const int MetaMagic = 'M' << 0 | 'E' << 8 | 'T' << 16 | 'A' << 24;
-
- public byte MmuFlags { get; private set; }
- public bool Is64Bits { get; private set; }
- public byte MainThreadPriority { get; private set; }
- public byte DefaultCpuId { get; private set; }
- public int PersonalMmHeapSize { get; private set; }
- public int ProcessCategory { get; private set; }
- public int MainThreadStackSize { get; private set; }
- public string TitleName { get; private 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);
-
- if (Reader.ReadInt32() != MetaMagic)
- {
- throw new InvalidNpdmException("NPDM Stream doesn't contain NPDM file!");
- }
-
- Reader.ReadInt64();
-
- MmuFlags = Reader.ReadByte();
-
- Is64Bits = (MmuFlags & 1) != 0;
-
- Reader.ReadByte();
-
- MainThreadPriority = Reader.ReadByte();
- DefaultCpuId = Reader.ReadByte();
-
- Reader.ReadInt32();
-
- PersonalMmHeapSize = Reader.ReadInt32();
-
- ProcessCategory = Reader.ReadInt32();
-
- MainThreadStackSize = Reader.ReadInt32();
-
- byte[] TempTitleName = Reader.ReadBytes(0x10);
-
- TitleName = Encoding.UTF8.GetString(TempTitleName, 0, TempTitleName.Length).Trim('\0');
-
- ProductCode = Reader.ReadBytes(0x10);
-
- Stream.Seek(0x30, SeekOrigin.Current);
-
- int ACI0Offset = Reader.ReadInt32();
- int ACI0Size = Reader.ReadInt32();
- int ACIDOffset = Reader.ReadInt32();
- int ACIDSize = Reader.ReadInt32();
-
- ACI0 = new ACI0(Stream, ACI0Offset);
- ACID = new ACID(Stream, ACIDOffset);
- }
- }
-}
+using Ryujinx.HLE.Exceptions; +using System.IO; +using System.Text; + +namespace Ryujinx.HLE.Loaders.Npdm +{ + //https://github.com/SciresM/hactool/blob/master/npdm.c + //https://github.com/SciresM/hactool/blob/master/npdm.h + //http://switchbrew.org/index.php?title=NPDM + class Npdm + { + private const int MetaMagic = 'M' << 0 | 'E' << 8 | 'T' << 16 | 'A' << 24; + + public byte MmuFlags { get; private set; } + public bool Is64Bits { get; private set; } + public byte MainThreadPriority { get; private set; } + public byte DefaultCpuId { get; private set; } + public int PersonalMmHeapSize { get; private set; } + public int ProcessCategory { get; private set; } + public int MainThreadStackSize { get; private set; } + public string TitleName { get; private 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); + + if (Reader.ReadInt32() != MetaMagic) + { + throw new InvalidNpdmException("NPDM Stream doesn't contain NPDM file!"); + } + + Reader.ReadInt64(); + + MmuFlags = Reader.ReadByte(); + + Is64Bits = (MmuFlags & 1) != 0; + + Reader.ReadByte(); + + MainThreadPriority = Reader.ReadByte(); + DefaultCpuId = Reader.ReadByte(); + + Reader.ReadInt32(); + + PersonalMmHeapSize = Reader.ReadInt32(); + + ProcessCategory = Reader.ReadInt32(); + + MainThreadStackSize = Reader.ReadInt32(); + + byte[] TempTitleName = Reader.ReadBytes(0x10); + + TitleName = Encoding.UTF8.GetString(TempTitleName, 0, TempTitleName.Length).Trim('\0'); + + ProductCode = Reader.ReadBytes(0x10); + + Stream.Seek(0x30, SeekOrigin.Current); + + int ACI0Offset = Reader.ReadInt32(); + int ACI0Size = Reader.ReadInt32(); + int ACIDOffset = Reader.ReadInt32(); + int ACIDSize = Reader.ReadInt32(); + + ACI0 = new ACI0(Stream, ACI0Offset); + ACID = new ACID(Stream, ACIDOffset); + } + } +} diff --git a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs index b18538e5..707be603 100644 --- a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs +++ b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs @@ -1,42 +1,42 @@ -using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Text;
-
-namespace Ryujinx.HLE.Loaders.Npdm
-{
- class ServiceAccessControl
- {
- public IReadOnlyDictionary<string, bool> Services { get; private set; }
-
- public ServiceAccessControl(Stream Stream, int Offset, int Size)
- {
- Stream.Seek(Offset, SeekOrigin.Begin);
-
- BinaryReader Reader = new BinaryReader(Stream);
-
- int ByteReaded = 0;
-
- Dictionary<string, bool> Services = new Dictionary<string, bool>();
-
- while (ByteReaded != Size)
- {
- byte ControlByte = Reader.ReadByte();
-
- if (ControlByte == 0)
- {
- break;
- }
-
- int Length = (ControlByte & 0x07) + 1;
- bool RegisterAllowed = (ControlByte & 0x80) != 0;
-
- Services.Add(Encoding.ASCII.GetString(Reader.ReadBytes(Length), 0, Length), RegisterAllowed);
-
- ByteReaded += Length + 1;
- }
-
- this.Services = new ReadOnlyDictionary<string, bool>(Services);
- }
- }
-}
+using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Text; + +namespace Ryujinx.HLE.Loaders.Npdm +{ + class ServiceAccessControl + { + public IReadOnlyDictionary<string, bool> Services { get; private set; } + + public ServiceAccessControl(Stream Stream, int Offset, int Size) + { + Stream.Seek(Offset, SeekOrigin.Begin); + + BinaryReader Reader = new BinaryReader(Stream); + + int ByteReaded = 0; + + Dictionary<string, bool> Services = new Dictionary<string, bool>(); + + while (ByteReaded != Size) + { + byte ControlByte = Reader.ReadByte(); + + if (ControlByte == 0) + { + break; + } + + int Length = (ControlByte & 0x07) + 1; + bool RegisterAllowed = (ControlByte & 0x80) != 0; + + Services.Add(Encoding.ASCII.GetString(Reader.ReadBytes(Length), 0, Length), RegisterAllowed); + + ByteReaded += Length + 1; + } + + this.Services = new ReadOnlyDictionary<string, bool>(Services); + } + } +} diff --git a/appveyor.yml b/appveyor.yml index 53921281..b29a9233 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,28 +1,28 @@ -version: 1.0.{build}
-branches:
- only:
- - master
-image: Visual Studio 2017
-configuration: Release
-build_script:
-- ps: >-
- dotnet --version
-
- dotnet publish -c Release -r win-x64
-
- dotnet publish -c Release -r linux-x64
-
- dotnet publish -c Release -r osx-x64
-
- 7z a ryujinx-$env:APPVEYOR_BUILD_VERSION-win_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\Release\netcoreapp2.1\win-x64\publish\
-
- 7z a ryujinx-$env:APPVEYOR_BUILD_VERSION-linux_x64.tar $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\Release\netcoreapp2.1\linux-x64\publish\
-
- 7z a ryujinx-$env:APPVEYOR_BUILD_VERSION-linux_x64.tar.gz ryujinx-$env:APPVEYOR_BUILD_VERSION-linux_x64.tar
-
- 7z a ryujinx-$env:APPVEYOR_BUILD_VERSION-osx_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\Release\netcoreapp2.1\osx-x64\publish\
-
-artifacts:
-- path: ryujinx-%APPVEYOR_BUILD_VERSION%-win_x64.zip
-- path: ryujinx-%APPVEYOR_BUILD_VERSION%-linux_x64.tar.gz
-- path: ryujinx-%APPVEYOR_BUILD_VERSION%-osx_x64.zip
+version: 1.0.{build} +branches: + only: + - master +image: Visual Studio 2017 +configuration: Release +build_script: +- ps: >- + dotnet --version + + dotnet publish -c Release -r win-x64 + + dotnet publish -c Release -r linux-x64 + + dotnet publish -c Release -r osx-x64 + + 7z a ryujinx-$env:APPVEYOR_BUILD_VERSION-win_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\Release\netcoreapp2.1\win-x64\publish\ + + 7z a ryujinx-$env:APPVEYOR_BUILD_VERSION-linux_x64.tar $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\Release\netcoreapp2.1\linux-x64\publish\ + + 7z a ryujinx-$env:APPVEYOR_BUILD_VERSION-linux_x64.tar.gz ryujinx-$env:APPVEYOR_BUILD_VERSION-linux_x64.tar + + 7z a ryujinx-$env:APPVEYOR_BUILD_VERSION-osx_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\Release\netcoreapp2.1\osx-x64\publish\ + +artifacts: +- path: ryujinx-%APPVEYOR_BUILD_VERSION%-win_x64.zip +- path: ryujinx-%APPVEYOR_BUILD_VERSION%-linux_x64.tar.gz +- path: ryujinx-%APPVEYOR_BUILD_VERSION%-osx_x64.zip |