From aa932a6df1764b7c600ae0ba4e0c7a0ba802f312 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Thu, 23 Dec 2021 09:55:50 -0700 Subject: Update to LibHac v0.14.3 (#2925) * Update to LibHac v0.14.3 * Fix loading NCAs that don't have a data partition --- .../IDeliveryCacheDirectoryService.cs | 29 ++++++++++---------- .../ServiceCreator/IDeliveryCacheFileService.cs | 31 +++++++++++----------- .../ServiceCreator/IDeliveryCacheStorageService.cs | 23 +++++++++------- 3 files changed, 45 insertions(+), 38 deletions(-) (limited to 'Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator') diff --git a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheDirectoryService.cs b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheDirectoryService.cs index 36df6117..34176b4e 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheDirectoryService.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheDirectoryService.cs @@ -1,5 +1,6 @@ using LibHac; using LibHac.Bcat; +using LibHac.Common; using Ryujinx.Common; using System.Runtime.InteropServices; @@ -7,11 +8,19 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator { class IDeliveryCacheDirectoryService : DisposableIpcService { - private LibHac.Bcat.Impl.Ipc.IDeliveryCacheDirectoryService _base; + private SharedRef _base; - public IDeliveryCacheDirectoryService(LibHac.Bcat.Impl.Ipc.IDeliveryCacheDirectoryService baseService) + public IDeliveryCacheDirectoryService(ref SharedRef baseService) { - _base = baseService; + _base = SharedRef.CreateMove(ref baseService); + } + + protected override void Dispose(bool isDisposing) + { + if (isDisposing) + { + _base.Destroy(); + } } [CommandHipc(0)] @@ -20,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator { DirectoryName directoryName = context.RequestData.ReadStruct(); - Result result = _base.Open(ref directoryName); + Result result = _base.Get.Open(ref directoryName); return (ResultCode)result.Value; } @@ -34,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator byte[] data = new byte[size]; - Result result = _base.Read(out int entriesRead, MemoryMarshal.Cast(data)); + Result result = _base.Get.Read(out int entriesRead, MemoryMarshal.Cast(data)); context.Memory.Write(position, data); @@ -47,19 +56,11 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator // GetCount() -> u32 public ResultCode GetCount(ServiceCtx context) { - Result result = _base.GetCount(out int count); + Result result = _base.Get.GetCount(out int count); context.ResponseData.Write(count); return (ResultCode)result.Value; } - - protected override void Dispose(bool isDisposing) - { - if (isDisposing) - { - _base?.Dispose(); - } - } } } diff --git a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheFileService.cs b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheFileService.cs index eada19c2..b7b03447 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheFileService.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheFileService.cs @@ -1,16 +1,25 @@ using LibHac; using LibHac.Bcat; +using LibHac.Common; using Ryujinx.Common; namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator { class IDeliveryCacheFileService : DisposableIpcService { - private LibHac.Bcat.Impl.Ipc.IDeliveryCacheFileService _base; + private SharedRef _base; - public IDeliveryCacheFileService(LibHac.Bcat.Impl.Ipc.IDeliveryCacheFileService baseService) + public IDeliveryCacheFileService(ref SharedRef baseService) { - _base = baseService; + _base = SharedRef.CreateMove(ref baseService); + } + + protected override void Dispose(bool isDisposing) + { + if (isDisposing) + { + _base.Destroy(); + } } [CommandHipc(0)] @@ -20,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator DirectoryName directoryName = context.RequestData.ReadStruct(); FileName fileName = context.RequestData.ReadStruct(); - Result result = _base.Open(ref directoryName, ref fileName); + Result result = _base.Get.Open(ref directoryName, ref fileName); return (ResultCode)result.Value; } @@ -36,7 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator byte[] data = new byte[size]; - Result result = _base.Read(out long bytesRead, offset, data); + Result result = _base.Get.Read(out long bytesRead, offset, data); context.Memory.Write(position, data); @@ -49,7 +58,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator // GetSize() -> u64 public ResultCode GetSize(ServiceCtx context) { - Result result = _base.GetSize(out long size); + Result result = _base.Get.GetSize(out long size); context.ResponseData.Write(size); @@ -60,19 +69,11 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator // GetDigest() -> nn::bcat::Digest public ResultCode GetDigest(ServiceCtx context) { - Result result = _base.GetDigest(out Digest digest); + Result result = _base.Get.GetDigest(out Digest digest); context.ResponseData.WriteStruct(digest); return (ResultCode)result.Value; } - - protected override void Dispose(bool isDisposing) - { - if (isDisposing) - { - _base?.Dispose(); - } - } } } diff --git a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheStorageService.cs b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheStorageService.cs index 8fd6a3a8..edb4b03a 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheStorageService.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheStorageService.cs @@ -1,27 +1,30 @@ using LibHac; using LibHac.Bcat; +using LibHac.Common; using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator { class IDeliveryCacheStorageService : DisposableIpcService { - private LibHac.Bcat.Impl.Ipc.IDeliveryCacheStorageService _base; + private SharedRef _base; - public IDeliveryCacheStorageService(ServiceCtx context, LibHac.Bcat.Impl.Ipc.IDeliveryCacheStorageService baseService) + public IDeliveryCacheStorageService(ServiceCtx context, ref SharedRef baseService) { - _base = baseService; + _base = SharedRef.CreateMove(ref baseService); } [CommandHipc(0)] // CreateFileService() -> object public ResultCode CreateFileService(ServiceCtx context) { - Result result = _base.CreateFileService(out LibHac.Bcat.Impl.Ipc.IDeliveryCacheFileService service); + using var service = new SharedRef(); + + Result result = _base.Get.CreateFileService(ref service.Ref()); if (result.IsSuccess()) { - MakeObject(context, new IDeliveryCacheFileService(service)); + MakeObject(context, new IDeliveryCacheFileService(ref service.Ref())); } return (ResultCode)result.Value; @@ -31,11 +34,13 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator // CreateDirectoryService() -> object public ResultCode CreateDirectoryService(ServiceCtx context) { - Result result = _base.CreateDirectoryService(out LibHac.Bcat.Impl.Ipc.IDeliveryCacheDirectoryService service); + using var service = new SharedRef(); + + Result result = _base.Get.CreateDirectoryService(ref service.Ref()); if (result.IsSuccess()) { - MakeObject(context, new IDeliveryCacheDirectoryService(service)); + MakeObject(context, new IDeliveryCacheDirectoryService(ref service.Ref())); } return (ResultCode)result.Value; @@ -50,7 +55,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator byte[] data = new byte[size]; - Result result = _base.EnumerateDeliveryCacheDirectory(out int count, MemoryMarshal.Cast(data)); + Result result = _base.Get.EnumerateDeliveryCacheDirectory(out int count, MemoryMarshal.Cast(data)); context.Memory.Write(position, data); @@ -63,7 +68,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator { if (isDisposing) { - _base?.Dispose(); + _base.Destroy(); } } } -- cgit v1.2.3