From 50226692bd398f24a2e724d241559bbea59b7acb Mon Sep 17 00:00:00 2001 From: Ac_K Date: Tue, 10 Sep 2019 06:19:07 +0200 Subject: [PATCH] Fix helper --- Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs | 2 +- .../HOS/Services/Arp/ApplicationLaunchProperty.cs | 15 ++++++++++++++- .../Arp/ApplicationLaunchPropertyHelper.cs | 11 ----------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs index ac7081699e..5513678739 100644 --- a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs +++ b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs @@ -173,7 +173,7 @@ namespace Ryujinx.HLE.HOS.Services.Acc /* if (nn::arp::detail::IReader::GetApplicationLaunchProperty() == 0xCC9D) // InvalidProcessId { - _applicationLaunchProperty = ApplicationLaunchPropertyHelper.GetDefault(); + _applicationLaunchProperty = ApplicationLaunchProperty.GetDefault(); return ResultCode.InvalidArgument; } diff --git a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs index 16ffea0b84..d21e66032d 100644 --- a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs +++ b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs @@ -1,4 +1,6 @@ -namespace Ryujinx.HLE.HOS.Services.Arp +using Ryujinx.HLE.FileSystem; + +namespace Ryujinx.HLE.HOS.Services.Arp { class ApplicationLaunchProperty { @@ -7,5 +9,16 @@ public byte BaseGameStorageId; public byte UpdateGameStorageId; public short Padding; + + public static ApplicationLaunchProperty GetDefault() + { + return new ApplicationLaunchProperty + { + TitleId = 0x00, + Version = 0x00, + BaseGameStorageId = (byte)StorageId.NandSystem, + UpdateGameStorageId = (byte)StorageId.None + }; + } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchPropertyHelper.cs b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchPropertyHelper.cs index 0268ed4b4d..248385c2bb 100644 --- a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchPropertyHelper.cs +++ b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchPropertyHelper.cs @@ -7,17 +7,6 @@ namespace Ryujinx.HLE.HOS.Services.Arp { static class ApplicationLaunchPropertyHelper { - public static ApplicationLaunchProperty GetDefault() - { - return new ApplicationLaunchProperty - { - TitleId = 0x00, - Version = 0x00, - BaseGameStorageId = (byte)StorageId.NandSystem, - UpdateGameStorageId = (byte)StorageId.None - }; - } - public static ApplicationLaunchProperty GetByPid(ServiceCtx context) { // TODO: Handle ApplicationLaunchProperty as array when pid will be supported and return the right item.