hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #1180 from tech4me/languagecode_fix 

set: Fixed GetAvailableLanguageCodes() to follow the max_entries
This commit is contained in:
bunnei 2018-08-27 15:41:38 -04:00 committed by GitHub
parent be2f1eabd7 d26a46feed
commit 43a2598e26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/core/hle/service/set/set.cpp
View File

@ -32,24 +32,59 @@ constexpr std::array<LanguageCode, 17> available_language_codes = {{
LanguageCode::ZH_HANT, LanguageCode::ZH_HANT,
}}; }};
constexpr size_t pre4_0_0_max_entries = 0xF;
constexpr size_t post4_0_0_max_entries = 0x40;
LanguageCode GetLanguageCodeFromIndex(size_t index) { LanguageCode GetLanguageCodeFromIndex(size_t index) {
return available_language_codes.at(index); return available_language_codes.at(index);
} }
void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) { template <size_t size>
ctx.WriteBuffer(available_language_codes); static std::array<LanguageCode, size> MakeLanguageCodeSubset() {
std::array<LanguageCode, size> arr;
std::copy_n(available_language_codes.begin(), size, arr.begin());
return arr;
}
static void PushResponseLanguageCode(Kernel::HLERequestContext& ctx, size_t max_size) {
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
if (available_language_codes.size() > max_size)
rb.Push(static_cast<u32>(max_size));
else
rb.Push(static_cast<u32>(available_language_codes.size())); rb.Push(static_cast<u32>(available_language_codes.size()));
}
void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) {
if (available_language_codes.size() > pre4_0_0_max_entries)
ctx.WriteBuffer(MakeLanguageCodeSubset<pre4_0_0_max_entries>());
else
ctx.WriteBuffer(available_language_codes);
PushResponseLanguageCode(ctx, pre4_0_0_max_entries);
LOG_DEBUG(Service_SET, "called");
}
void SET::GetAvailableLanguageCodes2(Kernel::HLERequestContext& ctx) {
if (available_language_codes.size() > post4_0_0_max_entries)
ctx.WriteBuffer(MakeLanguageCodeSubset<post4_0_0_max_entries>());
else
ctx.WriteBuffer(available_language_codes);
PushResponseLanguageCode(ctx, post4_0_0_max_entries);
LOG_DEBUG(Service_SET, "called"); LOG_DEBUG(Service_SET, "called");
} }
void SET::GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx) { void SET::GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 3}; PushResponseLanguageCode(ctx, pre4_0_0_max_entries);
rb.Push(RESULT_SUCCESS);
rb.Push(static_cast<u32>(available_language_codes.size())); LOG_DEBUG(Service_SET, "called");
}
void SET::GetAvailableLanguageCodeCount2(Kernel::HLERequestContext& ctx) {
PushResponseLanguageCode(ctx, post4_0_0_max_entries);
LOG_DEBUG(Service_SET, "called"); LOG_DEBUG(Service_SET, "called");
} }
@ -69,8 +104,8 @@ SET::SET() : ServiceFramework("set") {
{2, nullptr, "MakeLanguageCode"}, {2, nullptr, "MakeLanguageCode"},
{3, &SET::GetAvailableLanguageCodeCount, "GetAvailableLanguageCodeCount"}, {3, &SET::GetAvailableLanguageCodeCount, "GetAvailableLanguageCodeCount"},
{4, nullptr, "GetRegionCode"}, {4, nullptr, "GetRegionCode"},
{5, &SET::GetAvailableLanguageCodes, "GetAvailableLanguageCodes2"}, {5, &SET::GetAvailableLanguageCodes2, "GetAvailableLanguageCodes2"},
{6, &SET::GetAvailableLanguageCodeCount, "GetAvailableLanguageCodeCount2"}, {6, &SET::GetAvailableLanguageCodeCount2, "GetAvailableLanguageCodeCount2"},
{7, nullptr, "GetKeyCodeMap"}, {7, nullptr, "GetKeyCodeMap"},
{8, nullptr, "GetQuestFlag"}, {8, nullptr, "GetQuestFlag"},
}; };

2
src/core/hle/service/set/set.h
View File

@ -38,7 +38,9 @@ public:
private: private:
void GetLanguageCode(Kernel::HLERequestContext& ctx); void GetLanguageCode(Kernel::HLERequestContext& ctx);
void GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx); void GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx);
void GetAvailableLanguageCodes2(Kernel::HLERequestContext& ctx);
void GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx); void GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx);
void GetAvailableLanguageCodeCount2(Kernel::HLERequestContext& ctx);
}; };
} // namespace Service::Set } // namespace Service::Set