diff options
| author | 2021-07-27 09:31:11 -0400 | |
|---|---|---|
| committer | 2021-07-30 02:15:53 -0400 | |
| commit | 6ca8ed9e582358c36f245253c7fc5fe51bb4e5e7 (patch) | |
| tree | 4ef04101941e75ceb1b6628a3b58ab4005ecb43b | |
| parent | service: ns, set: Add PT_BR (Brazilian Portuguese) (diff) | |
| download | yuzu-6ca8ed9e582358c36f245253c7fc5fe51bb4e5e7.tar.gz yuzu-6ca8ed9e582358c36f245253c7fc5fe51bb4e5e7.tar.xz yuzu-6ca8ed9e582358c36f245253c7fc5fe51bb4e5e7.zip | |
service: set: Correct 4.0.0 max_entries to 0x40 (64) instead of 17
| -rw-r--r-- | src/core/hle/service/set/set.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp index aca7f5632..f2e2e8306 100644 --- a/src/core/hle/service/set/set.cpp +++ b/src/core/hle/service/set/set.cpp | |||
| @@ -72,8 +72,8 @@ constexpr std::array<std::pair<LanguageCode, KeyboardLayout>, 18> language_to_la | |||
| 72 | {LanguageCode::PT_BR, KeyboardLayout::Portuguese}, | 72 | {LanguageCode::PT_BR, KeyboardLayout::Portuguese}, |
| 73 | }}; | 73 | }}; |
| 74 | 74 | ||
| 75 | constexpr std::size_t pre4_0_0_max_entries = 15; | 75 | constexpr std::size_t PRE_4_0_0_MAX_ENTRIES = 0xF; |
| 76 | constexpr std::size_t post4_0_0_max_entries = 17; | 76 | constexpr std::size_t POST_4_0_0_MAX_ENTRIES = 0x40; |
| 77 | 77 | ||
| 78 | constexpr ResultCode ERR_INVALID_LANGUAGE{ErrorModule::Settings, 625}; | 78 | constexpr ResultCode ERR_INVALID_LANGUAGE{ErrorModule::Settings, 625}; |
| 79 | 79 | ||
| @@ -83,9 +83,9 @@ void PushResponseLanguageCode(Kernel::HLERequestContext& ctx, std::size_t num_la | |||
| 83 | rb.Push(static_cast<u32>(num_language_codes)); | 83 | rb.Push(static_cast<u32>(num_language_codes)); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | void GetAvailableLanguageCodesImpl(Kernel::HLERequestContext& ctx, std::size_t max_size) { | 86 | void GetAvailableLanguageCodesImpl(Kernel::HLERequestContext& ctx, std::size_t max_entries) { |
| 87 | const std::size_t requested_amount = ctx.GetWriteBufferSize() / sizeof(LanguageCode); | 87 | const std::size_t requested_amount = ctx.GetWriteBufferSize() / sizeof(LanguageCode); |
| 88 | const std::size_t copy_amount = std::min(requested_amount, max_size); | 88 | const std::size_t copy_amount = std::min(requested_amount, max_entries); |
| 89 | const std::size_t copy_size = copy_amount * sizeof(LanguageCode); | 89 | const std::size_t copy_size = copy_amount * sizeof(LanguageCode); |
| 90 | 90 | ||
| 91 | ctx.WriteBuffer(available_language_codes.data(), copy_size); | 91 | ctx.WriteBuffer(available_language_codes.data(), copy_size); |
| @@ -120,7 +120,7 @@ LanguageCode GetLanguageCodeFromIndex(std::size_t index) { | |||
| 120 | void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) { | 120 | void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) { |
| 121 | LOG_DEBUG(Service_SET, "called"); | 121 | LOG_DEBUG(Service_SET, "called"); |
| 122 | 122 | ||
| 123 | GetAvailableLanguageCodesImpl(ctx, pre4_0_0_max_entries); | 123 | GetAvailableLanguageCodesImpl(ctx, PRE_4_0_0_MAX_ENTRIES); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | void SET::MakeLanguageCode(Kernel::HLERequestContext& ctx) { | 126 | void SET::MakeLanguageCode(Kernel::HLERequestContext& ctx) { |
| @@ -142,19 +142,19 @@ void SET::MakeLanguageCode(Kernel::HLERequestContext& ctx) { | |||
| 142 | void SET::GetAvailableLanguageCodes2(Kernel::HLERequestContext& ctx) { | 142 | void SET::GetAvailableLanguageCodes2(Kernel::HLERequestContext& ctx) { |
| 143 | LOG_DEBUG(Service_SET, "called"); | 143 | LOG_DEBUG(Service_SET, "called"); |
| 144 | 144 | ||
| 145 | GetAvailableLanguageCodesImpl(ctx, post4_0_0_max_entries); | 145 | GetAvailableLanguageCodesImpl(ctx, POST_4_0_0_MAX_ENTRIES); |
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | void SET::GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx) { | 148 | void SET::GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx) { |
| 149 | LOG_DEBUG(Service_SET, "called"); | 149 | LOG_DEBUG(Service_SET, "called"); |
| 150 | 150 | ||
| 151 | PushResponseLanguageCode(ctx, pre4_0_0_max_entries); | 151 | PushResponseLanguageCode(ctx, PRE_4_0_0_MAX_ENTRIES); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | void SET::GetAvailableLanguageCodeCount2(Kernel::HLERequestContext& ctx) { | 154 | void SET::GetAvailableLanguageCodeCount2(Kernel::HLERequestContext& ctx) { |
| 155 | LOG_DEBUG(Service_SET, "called"); | 155 | LOG_DEBUG(Service_SET, "called"); |
| 156 | 156 | ||
| 157 | PushResponseLanguageCode(ctx, post4_0_0_max_entries); | 157 | PushResponseLanguageCode(ctx, POST_4_0_0_MAX_ENTRIES); |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | void SET::GetQuestFlag(Kernel::HLERequestContext& ctx) { | 160 | void SET::GetQuestFlag(Kernel::HLERequestContext& ctx) { |