diff options
Diffstat (limited to 'Ryujinx.HLE/HOS')
| -rw-r--r-- | Ryujinx.HLE/HOS/ApplicationLoader.cs | 116 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Horizon.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/Process/ProcessCreationInfo.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/ModLoader.cs | 536 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/ProgramLoader.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs | 30 |
7 files changed, 635 insertions, 63 deletions
diff --git a/Ryujinx.HLE/HOS/ApplicationLoader.cs b/Ryujinx.HLE/HOS/ApplicationLoader.cs index bc7016bd..994d0f25 100644 --- a/Ryujinx.HLE/HOS/ApplicationLoader.cs +++ b/Ryujinx.HLE/HOS/ApplicationLoader.cs @@ -43,7 +43,8 @@ namespace Ryujinx.HLE.HOS public bool EnablePtc => _device.System.EnablePtc; - public IntegrityCheckLevel FsIntegrityCheckLevel => _device.System.FsIntegrityCheckLevel; + // Binaries from exefs are loaded into mem in this order. Do not change. + private static readonly string[] ExeFsPrefixes = { "rtld", "main", "subsdk*", "sdk" }; public ApplicationLoader(Switch device, VirtualFileSystem fileSystem, ContentManager contentManager) { @@ -52,6 +53,9 @@ namespace Ryujinx.HLE.HOS _fileSystem = fileSystem; ControlData = new BlitStruct<ApplicationControlProperty>(1); + + // Clear Mods cache + _fileSystem.ModLoader.Clear(); } public void LoadCart(string exeFsDir, string romFsFile = null) @@ -63,12 +67,14 @@ namespace Ryujinx.HLE.HOS LocalFileSystem codeFs = new LocalFileSystem(exeFsDir); - LoadExeFs(codeFs, out _); + Npdm metaData = ReadNpdm(codeFs); if (TitleId != 0) { EnsureSaveData(new TitleId(TitleId)); } + + LoadExeFs(codeFs, metaData); } private (Nca main, Nca patch, Nca control) GetGameData(PartitionFileSystem pfs) @@ -191,7 +197,7 @@ namespace Ryujinx.HLE.HOS } // This is not a normal NSP, it's actually a ExeFS as a NSP - LoadExeFs(nsp, out _); + LoadExeFs(nsp); } public void LoadNca(string ncaFile) @@ -272,24 +278,24 @@ namespace Ryujinx.HLE.HOS { if (mainNca.CanOpenSection(NcaSectionType.Data)) { - dataStorage = mainNca.OpenStorage(NcaSectionType.Data, FsIntegrityCheckLevel); + dataStorage = mainNca.OpenStorage(NcaSectionType.Data, _device.System.FsIntegrityCheckLevel); } if (mainNca.CanOpenSection(NcaSectionType.Code)) { - codeFs = mainNca.OpenFileSystem(NcaSectionType.Code, FsIntegrityCheckLevel); + codeFs = mainNca.OpenFileSystem(NcaSectionType.Code, _device.System.FsIntegrityCheckLevel); } } else { if (patchNca.CanOpenSection(NcaSectionType.Data)) { - dataStorage = mainNca.OpenStorageWithPatch(patchNca, NcaSectionType.Data, FsIntegrityCheckLevel); + dataStorage = mainNca.OpenStorageWithPatch(patchNca, NcaSectionType.Data, _device.System.FsIntegrityCheckLevel); } if (patchNca.CanOpenSection(NcaSectionType.Code)) { - codeFs = mainNca.OpenFileSystemWithPatch(patchNca, NcaSectionType.Code, FsIntegrityCheckLevel); + codeFs = mainNca.OpenFileSystemWithPatch(patchNca, NcaSectionType.Code, _device.System.FsIntegrityCheckLevel); } } @@ -300,37 +306,65 @@ namespace Ryujinx.HLE.HOS return; } - if (dataStorage == null) + Npdm metaData = ReadNpdm(codeFs); + + _fileSystem.ModLoader.CollectMods(TitleId, _fileSystem.GetBaseModsPath()); + + if (controlNca != null) { - Logger.PrintWarning(LogClass.Loader, "No RomFS found in NCA"); + ReadControlData(controlNca); } else { - _fileSystem.SetRomFs(dataStorage.AsStream(FileAccess.Read)); + ControlData.ByteSpan.Clear(); } - if (controlNca != null) + if (dataStorage == null) { - ReadControlData(controlNca); + Logger.PrintWarning(LogClass.Loader, "No RomFS found in NCA"); } else { - ControlData.ByteSpan.Clear(); + IStorage newStorage = _fileSystem.ModLoader.ApplyRomFsMods(TitleId, dataStorage); + _fileSystem.SetRomFs(newStorage.AsStream(FileAccess.Read)); } - LoadExeFs(codeFs, out _); - if (TitleId != 0) { EnsureSaveData(new TitleId(TitleId)); } + LoadExeFs(codeFs, metaData); + Logger.PrintInfo(LogClass.Loader, $"Application Loaded: {TitleName} v{DisplayVersion} [{TitleIdText}] [{(TitleIs64Bit ? "64-bit" : "32-bit")}]"); } - public void ReadControlData(Nca controlNca) + // Sets TitleId, so be sure to call before using it + private Npdm ReadNpdm(IFileSystem fs) + { + Result result = fs.OpenFile(out IFile npdmFile, "/main.npdm".ToU8Span(), OpenMode.Read); + Npdm metaData; + + if (ResultFs.PathNotFound.Includes(result)) + { + Logger.PrintWarning(LogClass.Loader, "NPDM file not found, using default values!"); + + metaData = GetDefaultNpdm(); + } + else + { + metaData = new Npdm(npdmFile.AsStream()); + } + + TitleId = metaData.Aci0.TitleId; + TitleIs64Bit = metaData.Is64Bit; + + return metaData; + } + + private void ReadControlData(Nca controlNca) { - IFileSystem controlFs = controlNca.OpenFileSystem(NcaSectionType.Data, FsIntegrityCheckLevel); + IFileSystem controlFs = controlNca.OpenFileSystem(NcaSectionType.Data, _device.System.FsIntegrityCheckLevel); Result result = controlFs.OpenFile(out IFile controlFile, "/control.nacp".ToU8Span(), OpenMode.Read); @@ -358,26 +392,20 @@ namespace Ryujinx.HLE.HOS } } - private void LoadExeFs(IFileSystem codeFs, out Npdm metaData) + private void LoadExeFs(IFileSystem codeFs, Npdm metaData = null) { - Result result = codeFs.OpenFile(out IFile npdmFile, "/main.npdm".ToU8Span(), OpenMode.Read); - - if (ResultFs.PathNotFound.Includes(result)) + if (_fileSystem.ModLoader.ReplaceExefsPartition(TitleId, ref codeFs)) { - Logger.PrintWarning(LogClass.Loader, "NPDM file not found, using default values!"); - - metaData = GetDefaultNpdm(); - } - else - { - metaData = new Npdm(npdmFile.AsStream()); + metaData = null; //TODO: Check if we should retain old npdm } - List<IExecutable> nsos = new List<IExecutable>(); + metaData ??= ReadNpdm(codeFs); + + List<NsoExecutable> nsos = new List<NsoExecutable>(); - void LoadNso(string filename) + foreach (string exePrefix in ExeFsPrefixes) // Load binaries with standard prefixes { - foreach (DirectoryEntryEx file in codeFs.EnumerateEntries("/", $"{filename}*")) + foreach (DirectoryEntryEx file in codeFs.EnumerateEntries("/", exePrefix)) { if (Path.GetExtension(file.Name) != string.Empty) { @@ -388,25 +416,29 @@ namespace Ryujinx.HLE.HOS codeFs.OpenFile(out IFile nsoFile, file.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure(); - NsoExecutable nso = new NsoExecutable(nsoFile.AsStorage()); + NsoExecutable nso = new NsoExecutable(nsoFile.AsStorage(), file.Name); nsos.Add(nso); } } - TitleId = metaData.Aci0.TitleId; - TitleIs64Bit = metaData.Is64Bit; + // ExeFs file replacements + bool modified = _fileSystem.ModLoader.ApplyExefsMods(TitleId, nsos); + + var programs = nsos.ToArray(); - LoadNso("rtld"); - LoadNso("main"); - LoadNso("subsdk"); - LoadNso("sdk"); + modified |= _fileSystem.ModLoader.ApplyNsoPatches(TitleId, programs); _contentManager.LoadEntries(_device); - Ptc.Initialize(TitleIdText, DisplayVersion, EnablePtc); + if (EnablePtc && modified) + { + Logger.PrintWarning(LogClass.Ptc, $"Detected exefs modifications. PPTC disabled."); + } + + Ptc.Initialize(TitleIdText, DisplayVersion, EnablePtc && !modified); - ProgramLoader.LoadNsos(_device.System.KernelContext, metaData, executables: nsos.ToArray()); + ProgramLoader.LoadNsos(_device.System.KernelContext, metaData, executables: programs); } public void LoadProgram(string filePath) @@ -420,7 +452,7 @@ namespace Ryujinx.HLE.HOS if (isNro) { FileStream input = new FileStream(filePath, FileMode.Open); - NroExecutable obj = new NroExecutable(input); + NroExecutable obj = new NroExecutable(input.AsStorage()); executable = obj; // homebrew NRO can actually have some data after the actual NRO @@ -493,7 +525,7 @@ namespace Ryujinx.HLE.HOS } else { - executable = new NsoExecutable(new LocalStorage(filePath, FileAccess.Read)); + executable = new NsoExecutable(new LocalStorage(filePath, FileAccess.Read), Path.GetFileNameWithoutExtension(filePath)); } _contentManager.LoadEntries(_device); diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs index c1baae30..b3af3290 100644 --- a/Ryujinx.HLE/HOS/Horizon.cs +++ b/Ryujinx.HLE/HOS/Horizon.cs @@ -184,11 +184,11 @@ namespace Ryujinx.HLE.HOS InitLibHacHorizon(); } - public void LoadKip(string kipFile) + public void LoadKip(string kipPath) { - using IStorage fs = new LocalStorage(kipFile, FileAccess.Read); + using IStorage kipFile = new LocalStorage(kipPath, FileAccess.Read); - ProgramLoader.LoadKip(KernelContext, new KipExecutable(fs)); + ProgramLoader.LoadKip(KernelContext, new KipExecutable(kipFile)); } private void InitLibHacHorizon() diff --git a/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs b/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs index 81f8bb6a..c67e5c5c 100644 --- a/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs +++ b/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs @@ -66,7 +66,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process private ulong _imageSize; private ulong _mainThreadStackSize; private ulong _memoryUsageCapacity; - private int _category; + private int _version; public KHandleTable HandleTable { get; private set; } @@ -377,7 +377,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process _creationTimestamp = PerformanceCounter.ElapsedMilliseconds; MmuFlags = creationInfo.MmuFlags; - _category = creationInfo.Category; + _version = creationInfo.Version; TitleId = creationInfo.TitleId; _entrypoint = creationInfo.CodeAddress; _imageSize = (ulong)creationInfo.CodePagesCount * KMemoryManager.PageSize; diff --git a/Ryujinx.HLE/HOS/Kernel/Process/ProcessCreationInfo.cs b/Ryujinx.HLE/HOS/Kernel/Process/ProcessCreationInfo.cs index 7431d7dd..a5820865 100644 --- a/Ryujinx.HLE/HOS/Kernel/Process/ProcessCreationInfo.cs +++ b/Ryujinx.HLE/HOS/Kernel/Process/ProcessCreationInfo.cs @@ -4,7 +4,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process { public string Name { get; private set; } - public int Category { get; private set; } + public int Version { get; private set; } public ulong TitleId { get; private set; } public ulong CodeAddress { get; private set; } @@ -25,7 +25,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process int personalMmHeapPagesCount) { Name = name; - Category = category; + Version = category; TitleId = titleId; CodeAddress = codeAddress; CodePagesCount = codePagesCount; diff --git a/Ryujinx.HLE/HOS/ModLoader.cs b/Ryujinx.HLE/HOS/ModLoader.cs new file mode 100644 index 00000000..654d0cbe --- /dev/null +++ b/Ryujinx.HLE/HOS/ModLoader.cs @@ -0,0 +1,536 @@ +using LibHac.Common; +using LibHac.Fs; +using LibHac.FsSystem; +using LibHac.FsSystem.RomFs; +using Ryujinx.Common.Logging; +using Ryujinx.HLE.Loaders.Mods; +using Ryujinx.HLE.Loaders.Executables; +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Linq; +using System.IO; + +namespace Ryujinx.HLE.HOS +{ + public class ModLoader + { + private const string RomfsDir = "romfs"; + private const string ExefsDir = "exefs"; + private const string RomfsContainer = "romfs.bin"; + private const string ExefsContainer = "exefs.nsp"; + private const string StubExtension = ".stub"; + + private const string AmsContentsDir = "contents"; + private const string AmsNsoPatchDir = "exefs_patches"; + private const string AmsNroPatchDir = "nro_patches"; + private const string AmsKipPatchDir = "kip_patches"; + + public struct Mod<T> where T : FileSystemInfo + { + public readonly string Name; + public readonly T Path; + + public Mod(string name, T path) + { + Name = name; + Path = path; + } + } + + // Title dependent mods + public class ModCache + { + public List<Mod<FileInfo>> RomfsContainers { get; } + public List<Mod<FileInfo>> ExefsContainers { get; } + + public List<Mod<DirectoryInfo>> RomfsDirs { get; } + public List<Mod<DirectoryInfo>> ExefsDirs { get; } + + public ModCache() + { + RomfsContainers = new List<Mod<FileInfo>>(); + ExefsContainers = new List<Mod<FileInfo>>(); + RomfsDirs = new List<Mod<DirectoryInfo>>(); + ExefsDirs = new List<Mod<DirectoryInfo>>(); + } + } + + // Title independent mods + public class PatchCache + { + public List<Mod<DirectoryInfo>> NsoPatches { get; } + public List<Mod<DirectoryInfo>> NroPatches { get; } + public List<Mod<DirectoryInfo>> KipPatches { get; } + + public HashSet<string> SearchedDirs { get; } + + public PatchCache() + { + NsoPatches = new List<Mod<DirectoryInfo>>(); + NroPatches = new List<Mod<DirectoryInfo>>(); + KipPatches = new List<Mod<DirectoryInfo>>(); + + SearchedDirs = new HashSet<string>(); + } + } + + public Dictionary<ulong, ModCache> AppMods; // key is TitleId + public PatchCache Patches; + + private static readonly EnumerationOptions _dirEnumOptions; + + static ModLoader() + { + _dirEnumOptions = new EnumerationOptions + { + MatchCasing = MatchCasing.CaseInsensitive, + MatchType = MatchType.Simple, + RecurseSubdirectories = false, + ReturnSpecialDirectories = false + }; + } + + public ModLoader() + { + AppMods = new Dictionary<ulong, ModCache>(); + Patches = new PatchCache(); + } + + public void Clear() + { + AppMods.Clear(); + Patches = new PatchCache(); + } + + private static bool StrEquals(string s1, string s2) => string.Equals(s1, s2, StringComparison.OrdinalIgnoreCase); + + public void EnsureBaseDirStructure(string modsBasePath) + { + var modsDir = new DirectoryInfo(modsBasePath); + modsDir.Create(); + + modsDir.CreateSubdirectory(AmsContentsDir); + modsDir.CreateSubdirectory(AmsNsoPatchDir); + modsDir.CreateSubdirectory(AmsNroPatchDir); + // modsDir.CreateSubdirectory(AmsKipPatchDir); // uncomment when KIPs are supported + } + + private static DirectoryInfo FindTitleDir(DirectoryInfo contentsDir, string titleId) + => contentsDir.EnumerateDirectories($"{titleId}*", _dirEnumOptions).FirstOrDefault(); + + public string GetTitleDir(string modsBasePath, string titleId) + { + var contentsDir = new DirectoryInfo(Path.Combine(modsBasePath, AmsContentsDir)); + var titleModsPath = FindTitleDir(contentsDir, titleId); + + if (titleModsPath == null) + { + Logger.PrintInfo(LogClass.ModLoader, $"Creating mods dir for Title {titleId.ToUpper()}"); + titleModsPath = contentsDir.CreateSubdirectory(titleId); + } + + return titleModsPath.FullName; + } + + // Static Query Methods + public static void QueryPatchDirs(PatchCache cache, DirectoryInfo patchDir, DirectoryInfo searchDir) + { + if (!patchDir.Exists || cache.SearchedDirs.Contains(searchDir.FullName)) return; + + var patches = cache.KipPatches; + string type = null; + + if (StrEquals(AmsNsoPatchDir, patchDir.Name)) { patches = cache.NsoPatches; type = "NSO"; } + else if (StrEquals(AmsNroPatchDir, patchDir.Name)) { patches = cache.NroPatches; type = "NRO"; } + else if (StrEquals(AmsKipPatchDir, patchDir.Name)) { patches = cache.KipPatches; type = "KIP"; } + else return; + + foreach (var modDir in patchDir.EnumerateDirectories()) + { + patches.Add(new Mod<DirectoryInfo>(modDir.Name, modDir)); + Logger.PrintInfo(LogClass.ModLoader, $"Found {type} patch '{modDir.Name}'"); + } + } + + public static void QueryTitleDir(ModCache mods, DirectoryInfo titleDir) + { + if (!titleDir.Exists) return; + + var fsFile = new FileInfo(Path.Combine(titleDir.FullName, RomfsContainer)); + if (fsFile.Exists) + { + mods.RomfsContainers.Add(new Mod<FileInfo>($"<{titleDir.Name} RomFs>", fsFile)); + } + + fsFile = new FileInfo(Path.Combine(titleDir.FullName, ExefsContainer)); + if (fsFile.Exists) + { + mods.ExefsContainers.Add(new Mod<FileInfo>($"<{titleDir.Name} ExeFs>", fsFile)); + } + + System.Text.StringBuilder types = new System.Text.StringBuilder(5); + + foreach (var modDir in titleDir.EnumerateDirectories()) + { + types.Clear(); + Mod<DirectoryInfo> mod = new Mod<DirectoryInfo>("", null); + + if (StrEquals(RomfsDir, modDir.Name)) + { + mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>($"<{titleDir.Name} RomFs>", modDir)); + types.Append('R'); + } + else if (StrEquals(ExefsDir, modDir.Name)) + { + mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>($"<{titleDir.Name} ExeFs>", modDir)); + types.Append('E'); + } + else + { + var romfs = new DirectoryInfo(Path.Combine(modDir.FullName, RomfsDir)); + var exefs = new DirectoryInfo(Path.Combine(modDir.FullName, ExefsDir)); + if (romfs.Exists) + { + mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>(modDir.Name, romfs)); + types.Append('R'); + } + if (exefs.Exists) + { + mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>(modDir.Name, exefs)); + types.Append('E'); + } + } + + if (types.Length > 0) Logger.PrintInfo(LogClass.ModLoader, $"Found mod '{mod.Name}' [{types}]"); + } + } + + public static void QueryContentsDir(ModCache mods, DirectoryInfo contentsDir, ulong titleId) + { + if (!contentsDir.Exists) return; + + Logger.PrintInfo(LogClass.ModLoader, $"Searching mods for Title {titleId:X16}"); + + var titleDir = FindTitleDir(contentsDir, $"{titleId:x16}"); + + if (titleDir != null) + { + QueryTitleDir(mods, titleDir); + } + } + + public static void CollectMods(ModCache mods, PatchCache patches, ulong? titleId, params string[] searchDirPaths) + { + static bool IsPatchesDir(string name) => StrEquals(AmsNsoPatchDir, name) || + StrEquals(AmsNroPatchDir, name) || + StrEquals(AmsKipPatchDir, name); + + static bool TryQuery(ModCache mods, PatchCache patches, ulong? titleId, DirectoryInfo dir, DirectoryInfo searchDir) + { + if (StrEquals(AmsContentsDir, dir.Name)) + { + if (titleId.HasValue) + { + QueryContentsDir(mods, dir, (ulong)titleId); + + return true; + } + } + else if (IsPatchesDir(dir.Name)) + { + QueryPatchDirs(patches, dir, searchDir); + + return true; + } + + return false; + } + + foreach (var path in searchDirPaths) + { + var dir = new DirectoryInfo(path); + if (!dir.Exists) + { + Logger.PrintWarning(LogClass.ModLoader, $"Mod Search Dir '{dir.FullName}' doesn't exist"); + continue; + } + + if (!TryQuery(mods, patches, titleId, dir, dir)) + { + foreach (var subdir in dir.EnumerateDirectories()) + { + TryQuery(mods, patches, titleId, subdir, dir); + } + } + + patches.SearchedDirs.Add(dir.FullName); + } + } + + public void CollectMods(ulong titleId, params string[] searchDirPaths) + { + if (!AppMods.TryGetValue(titleId, out ModCache mods)) + { + mods = new ModCache(); + AppMods[titleId] = mods; + } + + CollectMods(mods, Patches, titleId, searchDirPaths); + } + + internal IStorage ApplyRomFsMods(ulong titleId, IStorage baseStorage) + { + if (!AppMods.TryGetValue(titleId, out ModCache mods) || mods.RomfsDirs.Count + mods.RomfsContainers.Count == 0) + { + return baseStorage; + } + + var fileSet = new HashSet<string>(); + var builder = new RomFsBuilder(); + int count = 0; + + Logger.PrintInfo(LogClass.ModLoader, $"Applying RomFS mods for Title {titleId:X16}"); + + // Prioritize loose files first + foreach (var mod in mods.RomfsDirs) + { + using (IFileSystem fs = new LocalFileSystem(mod.Path.FullName)) + { + AddFiles(fs, mod.Name, fileSet, builder); + } + count++; + } + + // Then files inside images + foreach (var mod in mods.RomfsContainers) + { + Logger.PrintInfo(LogClass.ModLoader, $"Found 'romfs.bin' for Title {titleId:X16}"); + using (IFileSystem fs = new RomFsFileSystem(mod.Path.OpenRead().AsStorage())) + { + AddFiles(fs, mod.Name, fileSet, builder); + } + count++; + } + + if (fileSet.Count == 0) + { + Logger.PrintInfo(LogClass.ModLoader, "No files found. Using base RomFS"); + + return baseStorage; + } + + Logger.PrintInfo(LogClass.ModLoader, $"Replaced {fileSet.Count} file(s) over {count} mod(s). Processing base storage..."); + + // And finally, the base romfs + var baseRom = new RomFsFileSystem(baseStorage); + foreach (var entry in baseRom.EnumerateEntries() + .Where(f => f.Type == DirectoryEntryType.File && !fileSet.Contains(f.FullPath)) + .OrderBy(f => f.FullPath, StringComparer.Ordinal)) + { + baseRom.OpenFile(out IFile file, entry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure(); + builder.AddFile(entry.FullPath, file); + } + + Logger.PrintInfo(LogClass.ModLoader, "Building new RomFS..."); + IStorage newStorage = builder.Build(); + Logger.PrintInfo(LogClass.ModLoader, "Using modded RomFS"); + + return newStorage; + } + + private static void AddFiles(IFileSystem fs, string modName, HashSet<string> fileSet, RomFsBuilder builder) + { + foreach (var entry in fs.EnumerateEntries() + .Where(f => f.Type == DirectoryEntryType.File) + .OrderBy(f => f.FullPath, StringComparer.Ordinal)) + { + fs.OpenFile(out IFile file, entry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure(); + if (fileSet.Add(entry.FullPath)) + { + builder.AddFile(entry.FullPath, file); + } + else + { + Logger.PrintWarning(LogClass.ModLoader, $" Skipped duplicate file '{entry.FullPath}' from '{modName}'", "ApplyRomFsMods"); + } + } + } + + internal bool ReplaceExefsPartition(ulong titleId, ref IFileSystem exefs) + { + if (!AppMods.TryGetValue(titleId, out ModCache mods) || mods.ExefsContainers.Count == 0) + { + return false; + } + + if (mods.ExefsContainers.Count > 1) + { + Logger.PrintWarning(LogClass.ModLoader, "Multiple ExeFS partition replacements detected"); + } + + Logger.PrintInfo(LogClass.ModLoader, $"Using replacement ExeFS partition"); + + exefs = new PartitionFileSystem(mods.ExefsContainers[0].Path.OpenRead().AsStorage()); + + return true; + } + + internal bool ApplyExefsMods(ulong titleId, List<NsoExecutable> nsos) + { + if (!AppMods.TryGetValue(titleId, out ModCache mods) || mods.ExefsDirs.Count == 0) + { + return false; + } + + bool replaced = false; + + if (nsos.Count > 32) + { + throw new ArgumentOutOfRangeException("NSO Count is more than 32"); + } + + var exeMods = mods.ExefsDirs; + + BitVector32 stubs = new BitVector32(); + BitVector32 repls = new BitVector32(); + + foreach (var mod in exeMods) + { + for (int i = 0; i < nsos.Count; ++i) + { + var nso = nsos[i]; + var nsoName = nso.Name; + + FileInfo nsoFile = new FileInfo(Path.Combine(mod.Path.FullName, nsoName)); + if (nsoFile.Exists) + { + if (repls[1 << i]) + { + Logger.PrintWarning(LogClass.ModLoader, $"Multiple replacements to '{nsoName}'"); + continue; + } + + repls[1 << i] = true; + + nsos[i] = new NsoExecutable(nsoFile.OpenRead().AsStorage(), nsoName); + Logger.PrintInfo(LogClass.ModLoader, $"NSO '{nsoName}' replaced"); + + replaced = true; + + continue; + } + + stubs[1 << i] |= File.Exists(Path.Combine(mod.Path.FullName, nsoName + StubExtension)); + } + } + + for (int i = nsos.Count - 1; i >= 0; --i) + { + if (stubs[1 << i] && !repls[1 << i]) // Prioritizes replacements over stubs + { + Logger.PrintInfo(LogClass.ModLoader, $" NSO '{nsos[i].Name}' stubbed"); + nsos.RemoveAt(i); + replaced = true; + } + } + + return replaced; + } + + internal void ApplyNroPatches(NroExecutable nro) + { + var nroPatches = Patches.NroPatches; + + if (nroPatches.Count == 0) return; + + // NRO patches aren't offset relative to header unlike NSO + // according to Atmosphere's ro patcher module + ApplyProgramPatches(nroPatches, 0, nro); + } + + internal bool ApplyNsoPatches(ulong titleId, params IExecutable[] programs) + { + AppMods.TryGetValue(titleId, out ModCache mods); + var nsoMods = Patches.NsoPatches.Concat(mods.ExefsDirs); + + // NSO patches are created with offset 0 according to Atmosphere's patcher module + // But `Program` doesn't contain the header which is 0x100 bytes. So, we adjust for that here + return ApplyProgramPatches(nsoMods, 0x100, programs); + } + + private static bool ApplyProgramPatches(IEnumerable<Mod<DirectoryInfo>> mods, int protectedOffset, params IExecutable[] programs) + { + int count = 0; + + MemPatch[] patches = new MemPatch[programs.Length]; + + for (int i = 0; i < patches.Length; ++i) + { + patches[i] = new MemPatch(); + } + + var buildIds = programs.Select(p => p switch + { + NsoExecutable nso => BitConverter.ToString(nso.BuildId.Bytes.ToArray()).Replace("-", "").TrimEnd('0'), + NroExecutable nro => BitConverter.ToString(nro.Header.BuildId).Replace("-", "").TrimEnd('0'), + _ => string.Empty + }).ToList(); + + int GetIndex(string buildId) => buildIds.FindIndex(id => id == buildId); // O(n) but list is small + + // Collect patches + foreach (var mod in mods) + { + var patchDir = mod.Path; + foreach (var patchFile in patchDir.EnumerateFiles()) + { + if (StrEquals(".ips", patchFile.Extension)) // IPS|IPS32 + { + string filename = Path.GetFileNameWithoutExtension(patchFile.FullName).Split('.')[0]; + string buildId = filename.TrimEnd('0'); + + int index = GetIndex(buildId); + if (index == -1) + { + continue; + } + + Logger.PrintInfo(LogClass.ModLoader, $"Matching IPS patch '{patchFile.Name}' in '{mod.Name}' bid={buildId}"); + + using var fs = patchFile.OpenRead(); + using var reader = new BinaryReader(fs); + + var patcher = new IpsPatcher(reader); + patcher.AddPatches(patches[index]); + } + else if (StrEquals(".pchtxt", patchFile.Extension)) // IPSwitch + { + using var fs = patchFile.OpenRead(); + using var reader = new StreamReader(fs); + + var patcher = new IPSwitchPatcher(reader); + + int index = GetIndex(patcher.BuildId); + if (index == -1) + { + continue; + } + + Logger.PrintInfo(LogClass.ModLoader, $"Matching IPSwitch patch '{patchFile.Name}' in '{mod.Name}' bid={patcher.BuildId}"); + + patcher.AddPatches(patches[index]); + } + } + } + + // Apply patches + for (int i = 0; i < programs.Length; ++i) + { + count += patches[i].Patch(programs[i].Program, protectedOffset); + } + + return count > 0; + } + } +}
\ No newline at end of file diff --git a/Ryujinx.HLE/HOS/ProgramLoader.cs b/Ryujinx.HLE/HOS/ProgramLoader.cs index cf5b15ba..231830a3 100644 --- a/Ryujinx.HLE/HOS/ProgramLoader.cs +++ b/Ryujinx.HLE/HOS/ProgramLoader.cs @@ -179,7 +179,7 @@ namespace Ryujinx.HLE.HOS ProcessCreationInfo creationInfo = new ProcessCreationInfo( metaData.TitleName, - metaData.ProcessCategory, + metaData.Version, metaData.Aci0.TitleId, codeStart, codePagesCount, diff --git a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs index 3ff622b6..46374acc 100644 --- a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs @@ -1,4 +1,5 @@ -using Ryujinx.Common; +using LibHac.FsSystem; +using Ryujinx.Common; using Ryujinx.Cpu; using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Memory; @@ -163,33 +164,36 @@ namespace Ryujinx.HLE.HOS.Services.Ro stream.Position = 0; - NroExecutable executable = new NroExecutable(stream, nroAddress, bssAddress); + NroExecutable nro = new NroExecutable(stream.AsStorage(), nroAddress, bssAddress); - // check if everything is page align. - if ((executable.Text.Length & 0xFFF) != 0 || (executable.Ro.Length & 0xFFF) != 0 || - (executable.Data.Length & 0xFFF) != 0 || (executable.BssSize & 0xFFF) != 0) + // Check if everything is page align. + if ((nro.Text.Length & 0xFFF) != 0 || (nro.Ro.Length & 0xFFF) != 0 || + (nro.Data.Length & 0xFFF) != 0 || (nro.BssSize & 0xFFF) != 0) { return ResultCode.InvalidNro; } - // check if everything is contiguous. - if (executable.RoOffset != executable.TextOffset + executable.Text.Length || - executable.DataOffset != executable.RoOffset + executable.Ro.Length || - nroFileSize != executable.DataOffset + executable.Data.Length) + // Check if everything is contiguous. + if (nro.RoOffset != nro.TextOffset + nro.Text.Length || + nro.DataOffset != nro.RoOffset + nro.Ro.Length || + nroFileSize != nro.DataOffset + nro.Data.Length) { return ResultCode.InvalidNro; } - // finally check the bss size match. - if ((ulong)executable.BssSize != bssSize) + // Check the bss size match. + if ((ulong)nro.BssSize != bssSize) { return ResultCode.InvalidNro; } - int totalSize = executable.Text.Length + executable.Ro.Length + executable.Data.Length + executable.BssSize; + int totalSize = nro.Text.Length + nro.Ro.Length + nro.Data.Length + nro.BssSize; + + // Apply patches + context.Device.FileSystem.ModLoader.ApplyNroPatches(nro); res = new NroInfo( - executable, + nro, nroHash, nroAddress, nroSize, |