From ef7bd49eae82bbcf4928fbfc11338184b326994e Mon Sep 17 00:00:00 2001 From: Thog Date: Mon, 8 Oct 2018 19:49:42 +0200 Subject: [PATCH] Add NRR and NRO constants --- Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs index 51ee76df91..a22e30043d 100644 --- a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs @@ -85,6 +85,9 @@ namespace Ryujinx.HLE.HOS.Services.Ldr private const int MaxNrr = 0x40; private const int MaxNro = 0x40; + private const uint NrrMagic = 0x3052524E; + private const uint NroMagic = 0x304F524E; + private List NrrInfos; private List NroInfos; @@ -121,7 +124,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldr StructReader Reader = new StructReader(Context.Memory, NrrAddress); NrrHeader Header = Reader.Read(); - if (Header.Magic != 0x3052524E) + if (Header.Magic != NrrMagic) { return MakeError(ErrorModule.Loader, LoaderErr.InvalidNrr); } @@ -195,7 +198,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldr uint Magic = Context.Memory.ReadUInt32(NroHeapAddress + 0x10); uint NroFileSize = Context.Memory.ReadUInt32(NroHeapAddress + 0x18); - if (Magic != 0x304F524E || NroSize != NroFileSize) + if (Magic != NroMagic || NroSize != NroFileSize) { return MakeError(ErrorModule.Loader, LoaderErr.InvalidNro); }