Close ILibraryAppletAccessor handles on disposal (#2094)
This commit is contained in:
parent
dbce3455ad
commit
5ab5b0e709
1 changed files with 24 additions and 1 deletions
|
@ -1,14 +1,17 @@
|
||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.HLE.HOS.Applets;
|
using Ryujinx.HLE.HOS.Applets;
|
||||||
using Ryujinx.HLE.HOS.Ipc;
|
using Ryujinx.HLE.HOS.Ipc;
|
||||||
|
using Ryujinx.HLE.HOS.Kernel;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Common;
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Threading;
|
using Ryujinx.HLE.HOS.Kernel.Threading;
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.LibraryAppletCreator
|
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.LibraryAppletCreator
|
||||||
{
|
{
|
||||||
class ILibraryAppletAccessor : IpcService
|
class ILibraryAppletAccessor : IpcService, IDisposable
|
||||||
{
|
{
|
||||||
|
private KernelContext _kernelContext;
|
||||||
|
|
||||||
private IApplet _applet;
|
private IApplet _applet;
|
||||||
|
|
||||||
private AppletSession _normalSession;
|
private AppletSession _normalSession;
|
||||||
|
@ -24,6 +27,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
|
||||||
|
|
||||||
public ILibraryAppletAccessor(AppletId appletId, Horizon system)
|
public ILibraryAppletAccessor(AppletId appletId, Horizon system)
|
||||||
{
|
{
|
||||||
|
_kernelContext = system.KernelContext;
|
||||||
|
|
||||||
_stateChangedEvent = new KEvent(system.KernelContext);
|
_stateChangedEvent = new KEvent(system.KernelContext);
|
||||||
_normalOutDataEvent = new KEvent(system.KernelContext);
|
_normalOutDataEvent = new KEvent(system.KernelContext);
|
||||||
_interactiveOutDataEvent = new KEvent(system.KernelContext);
|
_interactiveOutDataEvent = new KEvent(system.KernelContext);
|
||||||
|
@ -223,5 +228,23 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
|
||||||
|
|
||||||
return ResultCode.Success;
|
return ResultCode.Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_stateChangedEventHandle != 0)
|
||||||
|
{
|
||||||
|
_kernelContext.Syscall.CloseHandle(_stateChangedEventHandle);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_normalOutDataEventHandle != 0)
|
||||||
|
{
|
||||||
|
_kernelContext.Syscall.CloseHandle(_normalOutDataEventHandle);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_interactiveOutDataEventHandle != 0)
|
||||||
|
{
|
||||||
|
_kernelContext.Syscall.CloseHandle(_interactiveOutDataEventHandle);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue