From 4314a8f3e5b76bbf2143f701c06e9354de712027 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Mon, 19 Mar 2018 15:58:46 -0300 Subject: [WIP] Add support for events (#60) * Add support for events, move concept of domains to IpcService * Support waiting for KThread, remove some test code, other tweaks * Use move handle on NIFM since I can't test that now, it's better to leave it how it was --- Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs | 39 +++-------------------- 1 file changed, 5 insertions(+), 34 deletions(-) (limited to 'Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs') diff --git a/Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs b/Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs index 1156e035..2c809883 100644 --- a/Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs +++ b/Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs @@ -1,8 +1,8 @@ -using System; +using System.Collections.Generic; namespace Ryujinx.Core.OsHle.Handles { - class KProcessHandleTable : IDisposable + class KProcessHandleTable { private IdDictionary Handles; @@ -21,43 +21,14 @@ namespace Ryujinx.Core.OsHle.Handles return Handles.GetData(Handle); } - public bool ReplaceData(int Id, object Data) + public object CloseHandle(int Handle) { - return Handles.ReplaceData(Id, Data); - } - - public bool CloseHandle(int Handle) - { - object Data = Handles.GetData(Handle); - - if (Data is HTransferMem TMem) - { - TMem.Memory.Manager.Reprotect( - TMem.Position, - TMem.Size, - TMem.Perm); - } - return Handles.Delete(Handle); } - public void Dispose() - { - Dispose(true); - } - - protected virtual void Dispose(bool Disposing) + public ICollection Clear() { - if (Disposing) - { - foreach (object Obj in Handles) - { - if (Obj is IDisposable DisposableObj) - { - DisposableObj.Dispose(); - } - } - } + return Handles.Clear(); } } } \ No newline at end of file -- cgit v1.2.3