diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2020-12-01 20:23:43 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 00:23:43 +0100 |
| commit | cf6cd714884c41e9550757e364c2f4f5b04fc7f3 (patch) | |
| tree | bea748b4d1a350e5b8075d63ec9d39d49693829d /Ryujinx.HLE/HOS/Services/Ns | |
| parent | 461c24092ae6e148d896c18aa3e86220c89981f8 (diff) | |
IPC refactor part 2: Use ReplyAndReceive on HLE services and remove special handling from kernel (#1458)
* IPC refactor part 2: Use ReplyAndReceive on HLE services and remove special handling from kernel
* Fix for applet transfer memory + some nits
* Keep handles if possible to avoid server handle table exhaustion
* Fix IPC ZeroFill bug
* am: Correctly implement CreateManagedDisplayLayer and implement CreateManagedDisplaySeparableLayer
CreateManagedDisplaySeparableLayer is requires since 10.x+ when appletResourceUserId != 0
* Make it exit properly
* Make ServiceNotImplementedException show the full message again
* Allow yielding execution to avoid starving other threads
* Only wait if active
* Merge IVirtualMemoryManager and IAddressSpaceManager
* Fix Ro loading data from the wrong process
Co-authored-by: Thog <me@thog.eu>
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Ns')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs b/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs index e9f27cb5..debcd57e 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs @@ -9,7 +9,9 @@ namespace Ryujinx.HLE.HOS.Services.Ns [Service("aoc:u")] class IAddOnContentManager : IpcService { - KEvent _addOnContentListChangedEvent; + private readonly KEvent _addOnContentListChangedEvent; + + private int _addOnContentListChangedEventHandle; public IAddOnContentManager(ServiceCtx context) { @@ -22,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns { long pid = context.Process.Pid; - // Official code checks ApplicationControlProperty.RuntimeAddOnContentInstall + // Official code checks ApplicationControlProperty.RuntimeAddOnContentInstall // if true calls ns:am ListAvailableAddOnContent again to get updated count byte runtimeAddOnContentInstall = context.Device.Application.ControlData.Value.RuntimeAddOnContentInstall; @@ -135,12 +137,15 @@ namespace Ryujinx.HLE.HOS.Services.Ns { // Official code seems to make an internal call to ns:am Cmd 84 GetDynamicCommitEvent() - if (context.Process.HandleTable.GenerateHandle(_addOnContentListChangedEvent.ReadableEvent, out int handle) != KernelResult.Success) + if (_addOnContentListChangedEventHandle == 0) { - throw new InvalidOperationException("Out of handles!"); + if (context.Process.HandleTable.GenerateHandle(_addOnContentListChangedEvent.ReadableEvent, out _addOnContentListChangedEventHandle) != KernelResult.Success) + { + throw new InvalidOperationException("Out of handles!"); + } } - context.Response.HandleDesc = IpcHandleDesc.MakeCopy(handle); + context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_addOnContentListChangedEventHandle); Logger.Stub?.PrintStub(LogClass.ServiceNs); @@ -148,7 +153,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns } - [Command(9)] // [10.0.0+] + [Command(9)] // [10.0.0+] // GetAddOnContentLostErrorCode() -> u64 public ResultCode GetAddOnContentLostErrorCode(ServiceCtx context) { |