diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2018-04-06 02:38:59 -0300 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2018-04-06 02:38:59 -0300 |
| commit | a7ecf6dd2dcbe4ff03118435d9d203bcc8500718 (patch) | |
| tree | 55fae777165563641029a1ece0e04eb0493f3465 | |
| parent | 081ede2a9a94c985831dad8f5782bb99ceb9e766 (diff) | |
Show service short name for unimplemented commands
| -rw-r--r-- | Ryujinx.Core/OsHle/Handles/KSession.cs | 7 | ||||
| -rw-r--r-- | Ryujinx.Core/OsHle/Services/IpcService.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.Core/OsHle/Services/Sm/IUserInterface.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Core/OsHle/Svc/SvcSystem.cs | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/Ryujinx.Core/OsHle/Handles/KSession.cs b/Ryujinx.Core/OsHle/Handles/KSession.cs index 86ce5ccc..de3f9efa 100644 --- a/Ryujinx.Core/OsHle/Handles/KSession.cs +++ b/Ryujinx.Core/OsHle/Handles/KSession.cs @@ -7,9 +7,12 @@ namespace Ryujinx.Core.OsHle.Handles { public IpcService Service { get; private set; } - public KSession(IpcService Service) + public string ServiceName { get; private set; } + + public KSession(IpcService Service, string ServiceName) { - this.Service = Service; + this.Service = Service; + this.ServiceName = ServiceName; } public void Dispose() diff --git a/Ryujinx.Core/OsHle/Services/IpcService.cs b/Ryujinx.Core/OsHle/Services/IpcService.cs index 69570bea..963c7022 100644 --- a/Ryujinx.Core/OsHle/Services/IpcService.cs +++ b/Ryujinx.Core/OsHle/Services/IpcService.cs @@ -104,7 +104,9 @@ namespace Ryujinx.Core.OsHle.Services } else { - throw new NotImplementedException($"{Service.GetType().Name}: {CommandId}"); + string DbgMessage = $"{Context.Session.ServiceName} {Service.GetType().Name}: {CommandId}"; + + throw new NotImplementedException(DbgMessage); } } @@ -118,7 +120,7 @@ namespace Ryujinx.Core.OsHle.Services } else { - KSession Session = new KSession(Obj); + KSession Session = new KSession(Obj, Context.Session.ServiceName); int Handle = Context.Process.HandleTable.OpenHandle(Session); diff --git a/Ryujinx.Core/OsHle/Services/Sm/IUserInterface.cs b/Ryujinx.Core/OsHle/Services/Sm/IUserInterface.cs index 6b695dda..f7c0f107 100644 --- a/Ryujinx.Core/OsHle/Services/Sm/IUserInterface.cs +++ b/Ryujinx.Core/OsHle/Services/Sm/IUserInterface.cs @@ -57,7 +57,7 @@ namespace Ryujinx.Core.OsHle.Services.Sm return 0; } - KSession Session = new KSession(ServiceFactory.MakeService(Name)); + KSession Session = new KSession(ServiceFactory.MakeService(Name), Name); int Handle = Context.Process.HandleTable.OpenHandle(Session); diff --git a/Ryujinx.Core/OsHle/Svc/SvcSystem.cs b/Ryujinx.Core/OsHle/Svc/SvcSystem.cs index c9e992d5..0b5c97e3 100644 --- a/Ryujinx.Core/OsHle/Svc/SvcSystem.cs +++ b/Ryujinx.Core/OsHle/Svc/SvcSystem.cs @@ -153,7 +153,7 @@ namespace Ryujinx.Core.OsHle.Svc //TODO: Validate that app has perms to access the service, and that the service //actually exists, return error codes otherwise. - KSession Session = new KSession(ServiceFactory.MakeService(Name)); + KSession Session = new KSession(ServiceFactory.MakeService(Name), Name); ulong Handle = (ulong)Process.HandleTable.OpenHandle(Session); |