Added ability to change username & language code in the settings ui. Added IProfile::Get and SET::GetLanguageCode for libnx tests (#851)

src/core/hle/service/acc/acc.cpp

@@ -10,6 +10,7 @@
 #include "core/hle/service/acc/acc_su.h"
 #include "core/hle/service/acc/acc_u0.h"
 #include "core/hle/service/acc/acc_u1.h"
+#include "core/settings.h"
 
 namespace Service::Account {
 
@@ -31,13 +32,14 @@ struct ProfileBase {
 };
 static_assert(sizeof(ProfileBase) == 0x38, "ProfileBase structure has incorrect size");
 
+// TODO(ogniK): Generate a real user id based on username, md5(username) maybe?
 static constexpr u128 DEFAULT_USER_ID{1ull, 0ull};
 
 class IProfile final : public ServiceFramework<IProfile> {
 public:
     explicit IProfile(u128 user_id) : ServiceFramework("IProfile"), user_id(user_id) {
         static const FunctionInfo functions[] = {
-            {0, nullptr, "Get"},
+            {0, &IProfile::Get, "Get"},
             {1, &IProfile::GetBase, "GetBase"},
             {10, nullptr, "GetImageSize"},
             {11, nullptr, "LoadImage"},
@@ -46,14 +48,36 @@ public:
     }
 
 private:
+    void Get(Kernel::HLERequestContext& ctx) {
+        LOG_WARNING(Service_ACC, "(STUBBED) called");
+        ProfileBase profile_base{};
+        profile_base.user_id = user_id;
+        if (Settings::values.username.size() > profile_base.username.size()) {
+            std::copy_n(Settings::values.username.begin(), profile_base.username.size(),
+                        profile_base.username.begin());
+        } else {
+            std::copy(Settings::values.username.begin(), Settings::values.username.end(),
+                      profile_base.username.begin());
+        }
+
+        IPC::ResponseBuilder rb{ctx, 16};
+        rb.Push(RESULT_SUCCESS);
+        rb.PushRaw(profile_base);
+    }
+
     void GetBase(Kernel::HLERequestContext& ctx) {
         LOG_WARNING(Service_ACC, "(STUBBED) called");
 
         // TODO(Subv): Retrieve this information from somewhere.
         ProfileBase profile_base{};
         profile_base.user_id = user_id;
-        profile_base.username = {'y', 'u', 'z', 'u'};
-
+        if (Settings::values.username.size() > profile_base.username.size()) {
+            std::copy_n(Settings::values.username.begin(), profile_base.username.size(),
+                        profile_base.username.begin());
+        } else {
+            std::copy(Settings::values.username.begin(), Settings::values.username.end(),
+                      profile_base.username.begin());
+        }
         IPC::ResponseBuilder rb{ctx, 16};
         rb.Push(RESULT_SUCCESS);
         rb.PushRaw(profile_base);

src/core/hle/service/am/am.cpp

@@ -652,7 +652,8 @@ void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) {
     // TODO(bunnei): This should be configurable
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(RESULT_SUCCESS);
-    rb.Push(static_cast<u64>(Service::Set::LanguageCode::EN_US));
+    rb.Push(
+        static_cast<u64>(Service::Set::GetLanguageCodeFromIndex(Settings::values.language_index)));
     LOG_DEBUG(Service_AM, "called");
 }
 

src/core/hle/service/set/set.cpp

@@ -8,6 +8,7 @@
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/client_session.h"
 #include "core/hle/service/set/set.h"
+#include "core/settings.h"
 
 namespace Service::Set {
 
@@ -31,6 +32,10 @@ constexpr std::array<LanguageCode, 17> available_language_codes = {{
     LanguageCode::ZH_HANT,
 }};
 
+LanguageCode GetLanguageCodeFromIndex(size_t index) {
+    return available_language_codes.at(index);
+}
+
 void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) {
     ctx.WriteBuffer(available_language_codes);
 
@@ -49,9 +54,17 @@ void SET::GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx) {
     LOG_DEBUG(Service_SET, "called");
 }
 
+void SET::GetLanguageCode(Kernel::HLERequestContext& ctx) {
+    IPC::ResponseBuilder rb{ctx, 4};
+    rb.Push(RESULT_SUCCESS);
+    rb.Push(static_cast<u64>(available_language_codes[Settings::values.language_index]));
+
+    LOG_DEBUG(Service_SET, "called {}", Settings::values.language_index);
+}
+
 SET::SET() : ServiceFramework("set") {
     static const FunctionInfo functions[] = {
-        {0, nullptr, "GetLanguageCode"},
+        {0, &SET::GetLanguageCode, "GetLanguageCode"},
         {1, &SET::GetAvailableLanguageCodes, "GetAvailableLanguageCodes"},
         {2, nullptr, "MakeLanguageCode"},
         {3, &SET::GetAvailableLanguageCodeCount, "GetAvailableLanguageCodeCount"},

src/core/hle/service/set/set.h

@@ -28,6 +28,7 @@ enum class LanguageCode : u64 {
     ZH_HANS = 0x00736E61482D687A,
     ZH_HANT = 0x00746E61482D687A,
 };
+LanguageCode GetLanguageCodeFromIndex(size_t idx);
 
 class SET final : public ServiceFramework<SET> {
 public:
@@ -35,6 +36,7 @@ public:
     ~SET() = default;
 
 private:
+    void GetLanguageCode(Kernel::HLERequestContext& ctx);
     void GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx);
     void GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx);
 };

src/core/settings.h

@@ -112,6 +112,8 @@ static const std::array<const char*, NumAnalogs> mapping = {{
 struct Values {
     // System
     bool use_docked_mode;
+    std::string username;
+    int language_index;
 
     // Controls
     std::array<std::string, NativeButton::NumButtons> buttons;