From cf6cd714884c41e9550757e364c2f4f5b04fc7f3 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Tue, 1 Dec 2020 20:23:43 -0300 Subject: IPC refactor part 2: Use ReplyAndReceive on HLE services and remove special handling from kernel (#1458) * IPC refactor part 2: Use ReplyAndReceive on HLE services and remove special handling from kernel * Fix for applet transfer memory + some nits * Keep handles if possible to avoid server handle table exhaustion * Fix IPC ZeroFill bug * am: Correctly implement CreateManagedDisplayLayer and implement CreateManagedDisplaySeparableLayer CreateManagedDisplaySeparableLayer is requires since 10.x+ when appletResourceUserId != 0 * Make it exit properly * Make ServiceNotImplementedException show the full message again * Allow yielding execution to avoid starving other threads * Only wait if active * Merge IVirtualMemoryManager and IAddressSpaceManager * Fix Ro loading data from the wrong process Co-authored-by: Thog --- Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs') diff --git a/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs index 44f406a0..e29a040f 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs @@ -33,7 +33,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs } [Command(8)] - // OpenFileSystemWithId(nn::fssrv::sf::FileSystemType filesystem_type, nn::ApplicationId tid, buffer, 0x19, 0x301> path) + // OpenFileSystemWithId(nn::fssrv::sf::FileSystemType filesystem_type, nn::ApplicationId tid, buffer, 0x19, 0x301> path) // -> object contentFs public ResultCode OpenFileSystemWithId(ServiceCtx context) { @@ -138,12 +138,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs // Workaround that by setting the application ID and owner ID if they're not already set if (attribute.ProgramId == ProgramId.InvalidId) { - attribute.ProgramId = new ProgramId(context.Process.TitleId); - } - - if (creationInfo.OwnerId == 0) - { - creationInfo.OwnerId = 0; + attribute.ProgramId = new ProgramId(context.Device.Application.TitleId); } Logger.Info?.Print(LogClass.ServiceFs, $"Creating save with title ID {attribute.ProgramId.Value:x16}"); @@ -215,12 +210,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs // Workaround that by setting the application ID and owner ID if they're not already set if (attribute.ProgramId == ProgramId.InvalidId) { - attribute.ProgramId = new ProgramId(context.Process.TitleId); - } - - if (creationInfo.OwnerId == 0) - { - creationInfo.OwnerId = 0; + attribute.ProgramId = new ProgramId(context.Device.Application.TitleId); } Result result = _baseFileSystemProxy.CreateSaveDataFileSystemWithHashSalt(ref attribute, ref creationInfo, ref metaCreateInfo, ref hashSalt); @@ -239,7 +229,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs // Workaround that by setting the application ID if it's not already set if (attribute.ProgramId == ProgramId.InvalidId) { - attribute.ProgramId = new ProgramId(context.Process.TitleId); + attribute.ProgramId = new ProgramId(context.Device.Application.TitleId); } Result result = _baseFileSystemProxy.OpenSaveDataFileSystem(out LibHac.Fs.Fsa.IFileSystem fileSystem, spaceId, ref attribute); @@ -280,7 +270,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs // Workaround that by setting the application ID if it's not already set if (attribute.ProgramId == ProgramId.InvalidId) { - attribute.ProgramId = new ProgramId(context.Process.TitleId); + attribute.ProgramId = new ProgramId(context.Device.Application.TitleId); } Result result = _baseFileSystemProxy.OpenReadOnlySaveDataFileSystem(out LibHac.Fs.Fsa.IFileSystem fileSystem, spaceId, ref attribute); @@ -328,7 +318,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs filter.SetSaveDataType(SaveDataType.Cache); filter.SetProgramId(new ProgramId(context.Process.TitleId)); - // FS would query the User and SdCache space IDs to find where the existing cache is (if any). + // FS would query the User and SdCache space IDs to find where the existing cache is (if any). // We always have the SD card inserted, so we can always use SdCache for now. Result result = _baseFileSystemProxy.OpenSaveDataInfoReaderBySaveDataSpaceId( out ReferenceCountedDisposable infoReader, SaveDataSpaceId.SdCache); -- cgit v1.2.3