From 83f02f48f34363a367a1a68b778fec7bcaec5ad2 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Sat, 21 Oct 2023 10:59:22 -0400 Subject: [PATCH] Signatures --- .../Am/Ipc/Proxies/ApplicationProxy.cs | 1 - .../Am/Ipc/Proxies/LibraryAppletProxy.cs | 1 - .../Am/Ipc/Proxies/OverlayAppletProxy.cs | 1 - .../Am/Ipc/Proxies/SystemAppletProxy.cs | 1 - src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs | 16 ++++++++-------- .../IAllSystemAppletProxiesService.cs | 11 ++++++----- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs b/src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs index f81a7bbda..eae76592f 100644 --- a/src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs +++ b/src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs @@ -1,6 +1,5 @@ using Ryujinx.Horizon.Am.Ipc.Controllers; using Ryujinx.Horizon.Common; -using Ryujinx.Horizon.Sdk.Am; using Ryujinx.Horizon.Sdk.Am.Controllers; using Ryujinx.Horizon.Sdk.Am.Proxies; using Ryujinx.Horizon.Sdk.Sf; diff --git a/src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs b/src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs index 194802504..8bbdb8a39 100644 --- a/src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs +++ b/src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs @@ -1,6 +1,5 @@ using Ryujinx.Horizon.Am.Ipc.Controllers; using Ryujinx.Horizon.Common; -using Ryujinx.Horizon.Sdk.Am; using Ryujinx.Horizon.Sdk.Am.Controllers; using Ryujinx.Horizon.Sdk.Am.Proxies; using Ryujinx.Horizon.Sdk.Sf; diff --git a/src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs b/src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs index 5f823f6d8..b0d05c253 100644 --- a/src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs +++ b/src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs @@ -1,6 +1,5 @@ using Ryujinx.Horizon.Am.Ipc.Controllers; using Ryujinx.Horizon.Common; -using Ryujinx.Horizon.Sdk.Am; using Ryujinx.Horizon.Sdk.Am.Controllers; using Ryujinx.Horizon.Sdk.Am.Proxies; using Ryujinx.Horizon.Sdk.Sf; diff --git a/src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs b/src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs index fea51af96..1175402bd 100644 --- a/src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs +++ b/src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs @@ -1,6 +1,5 @@ using Ryujinx.Horizon.Am.Ipc.Controllers; using Ryujinx.Horizon.Common; -using Ryujinx.Horizon.Sdk.Am; using Ryujinx.Horizon.Sdk.Am.Controllers; using Ryujinx.Horizon.Sdk.Am.Proxies; using Ryujinx.Horizon.Sdk.Sf; diff --git a/src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs b/src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs index 3264d77da..e123a2a57 100644 --- a/src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs +++ b/src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs @@ -1,18 +1,18 @@ -using LibHac.Diag; using Ryujinx.Common.Logging; using Ryujinx.Horizon.Am.Ipc.Proxies; using Ryujinx.Horizon.Common; -using Ryujinx.Horizon.Sdk.Am; using Ryujinx.Horizon.Sdk.Am.Controllers; using Ryujinx.Horizon.Sdk.Am.Proxies; using Ryujinx.Horizon.Sdk.Sf; +using Ryujinx.Horizon.Sdk.Sf.Hipc; +using System; namespace Ryujinx.Horizon.Am.Ipc { partial class ProxiesService : IAllSystemAppletProxiesService { [CmifCommand(100)] - public Result OpenSystemAppletProxy(out ISystemAppletProxy systemAppletProxy, [ClientProcessId] ulong pid) + public Result OpenSystemAppletProxy(out ISystemAppletProxy systemAppletProxy, ulong unknown1, [CopyHandle] int unknown2, [ClientProcessId] ulong pid) { systemAppletProxy = new SystemAppletProxy(); @@ -20,15 +20,15 @@ namespace Ryujinx.Horizon.Am.Ipc } [CmifCommand(200)] - public Result OpenLibraryAppletProxyOld(out ILibraryAppletProxy libraryAppletProxy, [ClientProcessId] ulong pid) + public Result OpenLibraryAppletProxyOld(out ILibraryAppletProxy libraryAppletProxy, ulong unknown1, [CopyHandle] int unknown2, [ClientProcessId] ulong pid) { - OpenLibraryAppletProxy(out libraryAppletProxy, pid); + OpenLibraryAppletProxy(out libraryAppletProxy, unknown1, unknown2, new byte[0x80], pid); return Result.Success; } [CmifCommand(201)] - public Result OpenLibraryAppletProxy(out ILibraryAppletProxy libraryAppletProxy, [ClientProcessId] ulong pid) + public Result OpenLibraryAppletProxy(out ILibraryAppletProxy libraryAppletProxy, ulong unknown1, [CopyHandle] int unknown2, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias, 0x80)] ReadOnlySpan appletAttribute, [ClientProcessId] ulong pid) { libraryAppletProxy = new LibraryAppletProxy(); @@ -36,7 +36,7 @@ namespace Ryujinx.Horizon.Am.Ipc } [CmifCommand(300)] - public Result OpenOverlayAppletProxy(out IOverlayAppletProxy overlayAppletProxy, [ClientProcessId] ulong pid) + public Result OpenOverlayAppletProxy(out IOverlayAppletProxy overlayAppletProxy, ulong unknown1, [CopyHandle] int unknown2, [ClientProcessId] ulong pid) { overlayAppletProxy = new OverlayAppletProxy(); @@ -44,7 +44,7 @@ namespace Ryujinx.Horizon.Am.Ipc } [CmifCommand(350)] - public Result OpenSystemApplicationProxy(out IApplicationProxy applicationProxy, [ClientProcessId] ulong pid) + public Result OpenSystemApplicationProxy(out IApplicationProxy applicationProxy, ulong unknown1, [CopyHandle] int unknown2, [ClientProcessId] ulong pid) { applicationProxy = new ApplicationProxy(); diff --git a/src/Ryujinx.Horizon/Sdk/Am/Controllers/IAllSystemAppletProxiesService.cs b/src/Ryujinx.Horizon/Sdk/Am/Controllers/IAllSystemAppletProxiesService.cs index e9146dfce..b2eed94ce 100644 --- a/src/Ryujinx.Horizon/Sdk/Am/Controllers/IAllSystemAppletProxiesService.cs +++ b/src/Ryujinx.Horizon/Sdk/Am/Controllers/IAllSystemAppletProxiesService.cs @@ -1,15 +1,16 @@ using Ryujinx.Horizon.Common; using Ryujinx.Horizon.Sdk.Am.Proxies; +using System; namespace Ryujinx.Horizon.Sdk.Am.Controllers { public interface IAllSystemAppletProxiesService { - Result OpenSystemAppletProxy(out ISystemAppletProxy systemAppletProxy, ulong pid); - Result OpenLibraryAppletProxyOld(out ILibraryAppletProxy libraryAppletProxy, ulong pid); - Result OpenLibraryAppletProxy(out ILibraryAppletProxy libraryAppletProxy, ulong pid); - Result OpenOverlayAppletProxy(out IOverlayAppletProxy overlayAppletProxy, ulong pid); - Result OpenSystemApplicationProxy(out IApplicationProxy applicationProxy, ulong pid); + Result OpenSystemAppletProxy(out ISystemAppletProxy systemAppletProxy, ulong unknown1, int unknown2, ulong pid); + Result OpenLibraryAppletProxyOld(out ILibraryAppletProxy libraryAppletProxy, ulong unknown1, int unknown2, ulong pid); + Result OpenLibraryAppletProxy(out ILibraryAppletProxy libraryAppletProxy, ulong unknown1, int unknown2, ReadOnlySpan appletAttribute, ulong pid); + Result OpenOverlayAppletProxy(out IOverlayAppletProxy overlayAppletProxy, ulong unknown1, int unknown2, ulong pid); + Result OpenSystemApplicationProxy(out IApplicationProxy applicationProxy, ulong unknown1, int unknown2, ulong pid); Result CreateSelfLibraryAppletCreatorForDevelop(); Result GetSystemAppletControllerForDebug(); Result GetDebugFunctions();