diff options
| author | Ac_K <Acoustik666@gmail.com> | 2020-07-27 01:04:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 01:04:08 +0200 |
| commit | ca0d1f8205c3988d916033e2d950a421ddb995af (patch) | |
| tree | 84871d4501cba182a92be3e037c2fb3cae16d512 /Ryujinx.HLE/HOS/Services | |
| parent | d8515b603bff4712fe0e84113d7f7823a84c85eb (diff) | |
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
Diffstat (limited to 'Ryujinx.HLE/HOS/Services')
6 files changed, 128 insertions, 5 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs new file mode 100644 index 00000000..ad41328e --- /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<nn::ec::IShopServiceAccessor> + 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 9be84393..b3438dd7 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<unknown>, u64) -> object<nn::ec::IShopServiceAccessServer> + 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 00000000..6a9bdb06 --- /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<copy>, object<nn::ec::IShopServiceAsync>) + 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 00000000..81d892c5 --- /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 20d95cbb..e6e42c41 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<nn::ec::IPurchaseEventManager> 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 6a512b7b..8bb05b04 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<bytes, 5> 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<copy, event> + 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 |