diff --git a/src/Ryujinx.HLE/HOS/HorizonFsClient.cs b/src/Ryujinx.HLE/HOS/HorizonFsClient.cs index 56bc3bec3..cffd89413 100644 --- a/src/Ryujinx.HLE/HOS/HorizonFsClient.cs +++ b/src/Ryujinx.HLE/HOS/HorizonFsClient.cs @@ -33,7 +33,7 @@ namespace Ryujinx.HLE.HOS public Result GetFileSize(out long size, FileHandle handle) { - return _fsClient.GetFileSize(out size, (LibHac.Fs.FileHandle)handle.Value).ToHorizonResult(); + return _fsClient.GetFileSize(out size, (LibHac.Fs.FileHandle)handle.Value).Horizon; } public Result MountSystemData(string mountName, ulong dataId) @@ -58,7 +58,7 @@ namespace Ryujinx.HLE.HOS using IFileSystem ncaFileSystem = nca.OpenFileSystem(NcaSectionType.Data, _system.FsIntegrityCheckLevel); using UniqueRef ncaFsRef = new(ncaFileSystem); - Result result = _fsClient.Register(mountName.ToU8Span(), ref ncaFsRef.Ref).ToHorizonResult(); + Result result = _fsClient.Register(mountName.ToU8Span(), ref ncaFsRef.Ref).Horizon; if (result.IsFailure) { ncaStorage.Dispose(); @@ -74,14 +74,14 @@ namespace Ryujinx.HLE.HOS { ncaStorage?.Dispose(); - return ex.ResultValue.ToHorizonResult(); + return ex.ResultValue.Horizon; } } } // TODO: Return correct result here, this is likely wrong. - return LibHac.Fs.ResultFs.TargetNotFound.Handle().ToHorizonResult(); + return LibHac.Fs.ResultFs.TargetNotFound.Handle().Horizon; } public Result OpenFile(out FileHandle handle, string path, OpenMode openMode) @@ -89,7 +89,7 @@ namespace Ryujinx.HLE.HOS LibHac.Result result = _fsClient.OpenFile(out LibHac.Fs.FileHandle libhacHandle, path.ToU8Span(), (LibHac.Fs.OpenMode)openMode); handle = new(libhacHandle); - return result.ToHorizonResult(); + return result.Horizon; } public Result QueryMountSystemDataCacheSize(out long size, ulong dataId) @@ -103,7 +103,7 @@ namespace Ryujinx.HLE.HOS public Result ReadFile(FileHandle handle, long offset, Span destination) { - return _fsClient.ReadFile((LibHac.Fs.FileHandle)handle.Value, offset, destination).ToHorizonResult(); + return _fsClient.ReadFile((LibHac.Fs.FileHandle)handle.Value, offset, destination).Horizon; } public void Unmount(string mountName) diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator.cs index 35967d274..0ccc35fc8 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator.cs @@ -52,7 +52,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc service = null; } - return resultCode.ToHorizonResult(); + return resultCode.Horizon; } [CmifCommand(2)] @@ -71,7 +71,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc service = null; } - return resultCode.ToHorizonResult(); + return resultCode.Horizon; } public void Dispose() diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs index 1559c833c..132453f05 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs @@ -22,19 +22,19 @@ namespace Ryujinx.Horizon.Bcat.Ipc [CmifCommand(0)] public Result Open(DirectoryName directoryName) { - return _libHacService.Get.Open(ref directoryName).ToHorizonResult(); + return _libHacService.Get.Open(ref directoryName).Horizon; } [CmifCommand(1)] public Result Read(out int entriesRead, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span entriesBuffer) { - return _libHacService.Get.Read(out entriesRead, entriesBuffer).ToHorizonResult(); + return _libHacService.Get.Read(out entriesRead, entriesBuffer).Horizon; } [CmifCommand(2)] public Result GetCount(out int count) { - return _libHacService.Get.GetCount(out count).ToHorizonResult(); + return _libHacService.Get.GetCount(out count).Horizon; } public void Dispose() diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs index bd5c418d9..cb6cc3159 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs @@ -22,25 +22,25 @@ namespace Ryujinx.Horizon.Bcat.Ipc [CmifCommand(0)] public Result Open(DirectoryName directoryName, FileName fileName) { - return _libHacService.Get.Open(ref directoryName, ref fileName).ToHorizonResult(); + return _libHacService.Get.Open(ref directoryName, ref fileName).Horizon; } [CmifCommand(1)] public Result Read(long offset, out long bytesRead, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span data) { - return _libHacService.Get.Read(out bytesRead, offset, data).ToHorizonResult(); + return _libHacService.Get.Read(out bytesRead, offset, data).Horizon; } [CmifCommand(2)] public Result GetSize(out long size) { - return _libHacService.Get.GetSize(out size).ToHorizonResult(); + return _libHacService.Get.GetSize(out size).Horizon; } [CmifCommand(3)] public Result GetDigest(out Digest digest) { - return _libHacService.Get.GetDigest(out digest).ToHorizonResult(); + return _libHacService.Get.GetDigest(out digest).Horizon; } public void Dispose() diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheStorageService.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheStorageService.cs index 356156fc1..b70d074d0 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheStorageService.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheStorageService.cs @@ -35,7 +35,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc service = null; } - return resultCode.ToHorizonResult(); + return resultCode.Horizon; } [CmifCommand(1)] @@ -54,13 +54,13 @@ namespace Ryujinx.Horizon.Bcat.Ipc service = null; } - return resultCode.ToHorizonResult(); + return resultCode.Horizon; } [CmifCommand(10)] public Result EnumerateDeliveryCacheDirectory(out int count, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span directoryNames) { - return _libHacService.Get.EnumerateDeliveryCacheDirectory(out count, directoryNames).ToHorizonResult(); + return _libHacService.Get.EnumerateDeliveryCacheDirectory(out count, directoryNames).Horizon; } public void Dispose() diff --git a/src/Ryujinx.Horizon/LibHacResultExtensions.cs b/src/Ryujinx.Horizon/LibHacResultExtensions.cs index 2abed197d..92c384141 100644 --- a/src/Ryujinx.Horizon/LibHacResultExtensions.cs +++ b/src/Ryujinx.Horizon/LibHacResultExtensions.cs @@ -4,9 +4,9 @@ namespace Ryujinx.Horizon { public static class LibHacResultExtensions { - public static Result ToHorizonResult(this LibHac.Result result) + extension(LibHac.Result libHacResult) { - return new Result((int)result.Module, (int)result.Description); + public Result Horizon => new((int)libHacResult.Module, (int)libHacResult.Description); } } }