VERY experimental Nintendo Switch 2 emulator
C++
core: hle: service: acc: Fix ListOpenContextStoredUsers/StoreOpenContext.
bunnei6a447fd764a0
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cppindex bb838e2850..85a3f08023 100644--- a/src/core/hle/service/acc/acc.cpp+++ b/src/core/hle/service/acc/acc.cpp@@ -512,10 +512,11 @@ protected:class IManagerForApplication final : public ServiceFramework<IManagerForApplication> {public:- explicit IManagerForApplication(Core::System& system_, Common::UUID user_id_)+ explicit IManagerForApplication(Core::System& system_,+ const std::shared_ptr<ProfileManager>& profile_manager_): ServiceFramework{system_, "IManagerForApplication"},ensure_token_id{std::make_shared<EnsureTokenIdCacheAsyncInterface>(system)},- user_id{user_id_} {+ profile_manager{profile_manager_} {// clang-format offstatic const FunctionInfo functions[] = {{0, &IManagerForApplication::CheckAvailability, "CheckAvailability"},@@ -545,7 +546,7 @@ private:IPC::ResponseBuilder rb{ctx, 4};rb.Push(ResultSuccess);- rb.PushRaw<u64>(user_id.Hash());+ rb.PushRaw<u64>(profile_manager->GetLastOpenedUser().Hash());}void EnsureIdTokenCacheAsync(Kernel::HLERequestContext& ctx) {@@ -575,17 +576,20 @@ private:IPC::ResponseBuilder rb{ctx, 4};rb.Push(ResultSuccess);- rb.PushRaw<u64>(user_id.Hash());+ rb.PushRaw<u64>(profile_manager->GetLastOpenedUser().Hash());}void StoreOpenContext(Kernel::HLERequestContext& ctx) {- LOG_WARNING(Service_ACC, "(STUBBED) called");+ LOG_DEBUG(Service_ACC, "called");++ profile_manager->StoreOpenedUsers();+IPC::ResponseBuilder rb{ctx, 2};rb.Push(ResultSuccess);}std::shared_ptr<EnsureTokenIdCacheAsyncInterface> ensure_token_id{};- Common::UUID user_id{};+ std::shared_ptr<ProfileManager> profile_manager;};// 6.0.0+@@ -790,7 +794,7 @@ void Module::Interface::GetBaasAccountManagerForApplication(Kernel::HLERequestCoLOG_DEBUG(Service_ACC, "called");IPC::ResponseBuilder rb{ctx, 2, 0, 1};rb.Push(ResultSuccess);- rb.PushIpcInterface<IManagerForApplication>(system, profile_manager->GetLastOpenedUser());+ rb.PushIpcInterface<IManagerForApplication>(system, profile_manager);}void Module::Interface::IsUserAccountSwitchLocked(Kernel::HLERequestContext& ctx) {@@ -849,22 +853,10 @@ void Module::Interface::ListQualifiedUsers(Kernel::HLERequestContext& ctx) {rb.Push(ResultSuccess);}-void Module::Interface::LoadOpenContext(Kernel::HLERequestContext& ctx) {- LOG_WARNING(Service_ACC, "(STUBBED) called");-- // This is similar to GetBaasAccountManagerForApplication- // This command is used concurrently with ListOpenContextStoredUsers- // TODO: Find the differences between this and GetBaasAccountManagerForApplication- IPC::ResponseBuilder rb{ctx, 2, 0, 1};- rb.Push(ResultSuccess);- rb.PushIpcInterface<IManagerForApplication>(system, profile_manager->GetLastOpenedUser());-}-void Module::Interface::ListOpenContextStoredUsers(Kernel::HLERequestContext& ctx) {- LOG_WARNING(Service_ACC, "(STUBBED) called");+ LOG_DEBUG(Service_ACC, "called");- // TODO(ogniK): Handle open contexts- ctx.WriteBuffer(profile_manager->GetOpenUsers());+ ctx.WriteBuffer(profile_manager->GetStoredOpenedUsers());IPC::ResponseBuilder rb{ctx, 2};rb.Push(ResultSuccess);}diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.hindex 1621e7c0ac..9411b0b92d 100644--- a/src/core/hle/service/acc/acc.h+++ b/src/core/hle/service/acc/acc.h@@ -35,7 +35,6 @@ public:void InitializeApplicationInfoV2(Kernel::HLERequestContext& ctx);void GetProfileEditor(Kernel::HLERequestContext& ctx);void ListQualifiedUsers(Kernel::HLERequestContext& ctx);- void LoadOpenContext(Kernel::HLERequestContext& ctx);void ListOpenContextStoredUsers(Kernel::HLERequestContext& ctx);void StoreSaveDataThumbnailApplication(Kernel::HLERequestContext& ctx);void StoreSaveDataThumbnailSystem(Kernel::HLERequestContext& ctx);diff --git a/src/core/hle/service/acc/acc_u0.cpp b/src/core/hle/service/acc/acc_u0.cppindex 65023b8c22..54844bfe7d 100644--- a/src/core/hle/service/acc/acc_u0.cpp+++ b/src/core/hle/service/acc/acc_u0.cpp@@ -28,7 +28,7 @@ ACC_U0::ACC_U0(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>{110, &ACC_U0::StoreSaveDataThumbnailApplication, "StoreSaveDataThumbnail"},{111, nullptr, "ClearSaveDataThumbnail"},{120, nullptr, "CreateGuestLoginRequest"},- {130, &ACC_U0::LoadOpenContext, "LoadOpenContext"}, // 5.0.0++ {130, nullptr, "LoadOpenContext"}, // 5.0.0+{131, &ACC_U0::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"}, // 6.0.0+{140, &ACC_U0::InitializeApplicationInfoRestricted, "InitializeApplicationInfoRestricted"}, // 6.0.0+{141, &ACC_U0::ListQualifiedUsers, "ListQualifiedUsers"}, // 6.0.0+diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cppindex a58da4d5f5..481e0d1410 100644--- a/src/core/hle/service/acc/profile_manager.cpp+++ b/src/core/hle/service/acc/profile_manager.cpp@@ -261,6 +261,31 @@ UUID ProfileManager::GetLastOpenedUser() const {return last_opened_user;}+/// Gets the list of stored opened users.+UserIDArray ProfileManager::GetStoredOpenedUsers() const {+ UserIDArray output{};+ std::ranges::transform(stored_opened_profiles, output.begin(), [](const ProfileInfo& p) {+ if (p.is_open)+ return p.user_uuid;+ return Common::InvalidUUID;+ });+ std::stable_partition(output.begin(), output.end(),+ [](const UUID& uuid) { return uuid.IsValid(); });+ return output;+}++/// Captures the opened users, which can be queried across process launches with+/// ListOpenContextStoredUsers.+void ProfileManager::StoreOpenedUsers() {+ size_t profile_index{};+ stored_opened_profiles = {};+ std::for_each(profiles.begin(), profiles.end(), [&](const auto& profile) {+ if (profile.is_open) {+ stored_opened_profiles[profile_index++] = profile;+ }+ });+}+/// Return the users profile base and the unknown arbitary data.bool ProfileManager::GetProfileBaseAndData(std::optional<std::size_t> index, ProfileBase& profile,UserData& data) const {diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.hindex 135f7d0d59..993a5a57af 100644--- a/src/core/hle/service/acc/profile_manager.h+++ b/src/core/hle/service/acc/profile_manager.h@@ -86,6 +86,8 @@ public:UserIDArray GetOpenUsers() const;UserIDArray GetAllUsers() const;Common::UUID GetLastOpenedUser() const;+ UserIDArray GetStoredOpenedUsers() const;+ void StoreOpenedUsers();bool CanSystemRegisterUser() const;@@ -101,6 +103,7 @@ private:bool RemoveProfileAtIndex(std::size_t index);std::array<ProfileInfo, MAX_USERS> profiles{};+ std::array<ProfileInfo, MAX_USERS> stored_opened_profiles{};std::size_t user_count{};Common::UUID last_opened_user{};};