From ca0d1f8205c3988d916033e2d950a421ddb995af Mon Sep 17 00:00:00 2001 From: Ac_K Date: Mon, 27 Jul 2020 01:04:08 +0200 Subject: [PATCH] ns/nim: Stub eShop related calls (#1420) * ns/nim: Stub eShop related calls As we aren't able to process purchase on the eShop throught the emulator, I have: - Stub IPurchaseEventManager::SetDefaultDeliveryTarget (with RE check). - Implement IPurchaseEventManager::GetPurchasedEventReadableHandle (with RE check). As we can't do any eShop async call throught the emulator, I have: - Stub IShopServiceAccessServerInterface::CreateServerInterface - Stub IShopServiceAccessServer::CreateAccessorInterface - Stub IShopServiceAccessor::IShopServiceAsync Close #1084 and #1322 * fix handle copy * Fix align * Fix readonly event --- Ryujinx.Common/Logging/LogClass.cs | 1 + .../Services/Nim/IShopServiceAccessServer.cs | 21 ++++++++ .../Nim/IShopServiceAccessServerInterface.cs | 16 ++++++- .../HOS/Services/Nim/IShopServiceAccessor.cs | 37 ++++++++++++++ .../HOS/Services/Nim/IShopServiceAsync.cs | 7 +++ .../HOS/Services/Ns/IAddOnContentManager.cs | 4 +- .../HOS/Services/Ns/IPurchaseEventManager.cs | 48 ++++++++++++++++++- 7 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs create mode 100644 Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessor.cs create mode 100644 Ryujinx.HLE/HOS/Services/Nim/IShopServiceAsync.cs diff --git a/Ryujinx.Common/Logging/LogClass.cs b/Ryujinx.Common/Logging/LogClass.cs index a35d01a54c..1ea69b05b0 100644 --- a/Ryujinx.Common/Logging/LogClass.cs +++ b/Ryujinx.Common/Logging/LogClass.cs @@ -37,6 +37,7 @@ namespace Ryujinx.Common.Logging ServiceMm, ServiceNfp, ServiceNifm, + ServiceNim, ServiceNs, ServiceNsd, ServiceNv, diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs new file mode 100644 index 0000000000..ad41328e1b --- /dev/null +++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs @@ -0,0 +1,21 @@ +using Ryujinx.Common.Logging; +using Ryujinx.HLE.HOS.Services.Nim.ShopServiceAccessServerInterface.ShopServiceAccessServer; + +namespace Ryujinx.HLE.HOS.Services.Nim.ShopServiceAccessServerInterface +{ + class IShopServiceAccessServer : IpcService + { + public IShopServiceAccessServer() { } + + [Command(0)] + // CreateAccessorInterface(u8) -> object + public ResultCode CreateAccessorInterface(ServiceCtx context) + { + MakeObject(context, new IShopServiceAccessor(context.Device.System)); + + Logger.PrintStub(LogClass.ServiceNim); + + return ResultCode.Success; + } + } +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServerInterface.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServerInterface.cs index 9be84393fc..b3438dd766 100644 --- a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServerInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServerInterface.cs @@ -1,8 +1,22 @@ -namespace Ryujinx.HLE.HOS.Services.Nim +using Ryujinx.Common.Logging; +using Ryujinx.HLE.HOS.Services.Nim.ShopServiceAccessServerInterface; + +namespace Ryujinx.HLE.HOS.Services.Nim { [Service("nim:eca")] // 5.0.0+ class IShopServiceAccessServerInterface : IpcService { public IShopServiceAccessServerInterface(ServiceCtx context) { } + + [Command(0)] + // CreateServerInterface(pid, handle, u64) -> object + public ResultCode CreateServerInterface(ServiceCtx context) + { + MakeObject(context, new IShopServiceAccessServer()); + + Logger.PrintStub(LogClass.ServiceNim); + + return ResultCode.Success; + } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessor.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessor.cs new file mode 100644 index 0000000000..6a9bdb0695 --- /dev/null +++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessor.cs @@ -0,0 +1,37 @@ +using Ryujinx.Common.Logging; +using Ryujinx.HLE.HOS.Ipc; +using Ryujinx.HLE.HOS.Kernel.Common; +using Ryujinx.HLE.HOS.Kernel.Threading; +using Ryujinx.HLE.HOS.Services.Nim.ShopServiceAccessServerInterface.ShopServiceAccessServer.ShopServiceAccessor; +using System; + +namespace Ryujinx.HLE.HOS.Services.Nim.ShopServiceAccessServerInterface.ShopServiceAccessServer +{ + class IShopServiceAccessor : IpcService + { + private readonly KEvent _event; + + public IShopServiceAccessor(Horizon system) + { + _event = new KEvent(system.KernelContext); + } + + [Command(0)] + // CreateAsyncInterface(u64) -> (handle, object) + public ResultCode CreateAsyncInterface(ServiceCtx context) + { + MakeObject(context, new IShopServiceAsync()); + + if (context.Process.HandleTable.GenerateHandle(_event.ReadableEvent, out int handle) != KernelResult.Success) + { + throw new InvalidOperationException("Out of handles!"); + } + + context.Response.HandleDesc = IpcHandleDesc.MakeCopy(handle); + + Logger.PrintStub(LogClass.ServiceNim); + + return ResultCode.Success; + } + } +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAsync.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAsync.cs new file mode 100644 index 0000000000..81d892c5d2 --- /dev/null +++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAsync.cs @@ -0,0 +1,7 @@ +namespace Ryujinx.HLE.HOS.Services.Nim.ShopServiceAccessServerInterface.ShopServiceAccessServer.ShopServiceAccessor +{ + class IShopServiceAsync : IpcService + { + public IShopServiceAsync() { } + } +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs b/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs index 20d95cbbbf..e6e42c41ba 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs @@ -165,7 +165,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns // CreateEcPurchasedEventManager() -> object public ResultCode CreateEcPurchasedEventManager(ServiceCtx context) { - MakeObject(context, new IPurchaseEventManager()); + MakeObject(context, new IPurchaseEventManager(context.Device.System)); Logger.PrintStub(LogClass.ServiceNs); @@ -178,7 +178,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns { // Very similar to CreateEcPurchasedEventManager but with some extra code - MakeObject(context, new IPurchaseEventManager()); + MakeObject(context, new IPurchaseEventManager(context.Device.System)); Logger.PrintStub(LogClass.ServiceNs); diff --git a/Ryujinx.HLE/HOS/Services/Ns/IPurchaseEventManager.cs b/Ryujinx.HLE/HOS/Services/Ns/IPurchaseEventManager.cs index 6a512b7b77..8bb05b04af 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/IPurchaseEventManager.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/IPurchaseEventManager.cs @@ -1,8 +1,52 @@ +using Ryujinx.Common; +using Ryujinx.Common.Logging; +using Ryujinx.HLE.HOS.Ipc; +using Ryujinx.HLE.HOS.Kernel.Common; +using Ryujinx.HLE.HOS.Kernel.Threading; +using System; + namespace Ryujinx.HLE.HOS.Services.Ns { class IPurchaseEventManager : IpcService { - // TODO: Implement this - // Size seems to be atleast 0x7a8 + private readonly KEvent _purchasedEvent; + + public IPurchaseEventManager(Horizon system) + { + _purchasedEvent = new KEvent(system.KernelContext); + } + + [Command(0)] + // SetDefaultDeliveryTarget(pid, buffer unknown) + public ResultCode SetDefaultDeliveryTarget(ServiceCtx context) + { + long inBufferPosition = context.Request.SendBuff[0].Position; + long inBufferSize = context.Request.SendBuff[0].Size; + byte[] buffer = new byte[inBufferSize]; + + context.Memory.Read((ulong)inBufferPosition, buffer); + + // NOTE: Service use the pid to call arp:r GetApplicationLaunchProperty and store it in internal field. + // Then it seems to use the buffer content and compare it with a stored linked instrusive list. + // Since we don't support purchase from eShop, we can stub it. + + Logger.PrintStub(LogClass.ServiceNs); + + return ResultCode.Success; + } + + [Command(2)] + // GetPurchasedEventReadableHandle() -> handle + public ResultCode GetPurchasedEventReadableHandle(ServiceCtx context) + { + if (context.Process.HandleTable.GenerateHandle(_purchasedEvent.ReadableEvent, out int handle) != KernelResult.Success) + { + throw new InvalidOperationException("Out of handles!"); + } + + context.Response.HandleDesc = IpcHandleDesc.MakeCopy(handle); + + return ResultCode.Success; + } } } \ No newline at end of file