From 9e9a4bb3a78543f6ada98fa4b16509b11026a6d6 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 17:16:23 -0400
Subject: [PATCH 01/13] profile_manager: Remove unnecessary std::move in
AddToProfiles() and CreateNewUser()
Moving a const reference isn't possible, so this just results in a copy
(and given ProfileInfo is composed of trivial types and aggregates, a
move wouldn't really do anything).
---
src/core/hle/service/acc/profile_manager.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index 62c2121fa..fe9921fb6 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -25,7 +25,7 @@ boost::optional<size_t> ProfileManager::AddToProfiles(const ProfileInfo& user) {
if (user_count >= MAX_USERS) {
return boost::none;
}
- profiles[user_count] = std::move(user);
+ profiles[user_count] = user;
return user_count++;
}
@@ -67,7 +67,7 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array<u8, 0x20>& userna
return ERROR_USER_ALREADY_EXISTS;
}
ProfileInfo profile;
- profile.user_uuid = std::move(uuid);
+ profile.user_uuid = uuid;
profile.username = username;
profile.data = {};
profile.creation_time = 0x0;
From f13a66b963d4ecd53dda7866e947bc3230566d63 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 17:24:13 -0400
Subject: [PATCH 02/13] profile_manager: Move UUID generation function to the
cpp file
This avoids needing to dump the contents of <random> into other files
that include the profile manager header.
---
src/core/hle/service/acc/profile_manager.cpp | 10 ++++++++++
src/core/hle/service/acc/profile_manager.h | 12 ++----------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index fe9921fb6..9440dc555 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <random>
#include <boost/optional.hpp>
#include "core/hle/service/acc/profile_manager.h"
#include "core/settings.h"
@@ -12,6 +13,15 @@ constexpr ResultCode ERROR_TOO_MANY_USERS(ErrorModule::Account, -1);
constexpr ResultCode ERROR_USER_ALREADY_EXISTS(ErrorModule::Account, -2);
constexpr ResultCode ERROR_ARGUMENT_IS_NULL(ErrorModule::Account, 20);
+const UUID& UUID::Generate() {
+ std::random_device device;
+ std::mt19937 gen(device());
+ std::uniform_int_distribution<u64> distribution(1, std::numeric_limits<u64>::max());
+ uuid[0] = distribution(gen);
+ uuid[1] = distribution(gen);
+ return *this;
+}
+
ProfileManager::ProfileManager() {
// TODO(ogniK): Create the default user we have for now until loading/saving users is added
auto user_uuid = UUID{1, 0};
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index 314bccbf9..91f6f03a9 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -5,7 +5,7 @@
#pragma once
#include <array>
-#include <random>
+
#include "boost/optional.hpp"
#include "common/common_types.h"
#include "common/swap.h"
@@ -38,15 +38,7 @@ struct UUID {
}
// TODO(ogniK): Properly generate uuids based on RFC-4122
- const UUID& Generate() {
- std::random_device device;
- std::mt19937 gen(device());
- std::uniform_int_distribution<uint64_t> distribution(1,
- std::numeric_limits<uint64_t>::max());
- uuid[0] = distribution(gen);
- uuid[1] = distribution(gen);
- return *this;
- }
+ const UUID& Generate();
// Set the UUID to {0,0} to be considered an invalid user
void Invalidate() {
From 69dd37d874094a2ad632e5dbafaa16553703af73 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 17:27:48 -0400
Subject: [PATCH 03/13] profile_manager: Simplify UUID's two param constructor,
operator==, and operator bool
We can use the constructor initializer list and just compare the
contained u128's together instead of comparing each element
individually. Ditto for comparing against an invalid UUID.
---
src/core/hle/service/acc/profile_manager.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index 91f6f03a9..054dd864e 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -21,16 +21,14 @@ struct UUID {
u128 uuid = INVALID_UUID;
UUID() = default;
explicit UUID(const u128& id) : uuid{id} {}
- explicit UUID(const u64 lo, const u64 hi) {
- uuid[0] = lo;
- uuid[1] = hi;
- };
+ explicit UUID(const u64 lo, const u64 hi) : uuid{{lo, hi}} {}
+
explicit operator bool() const {
- return uuid[0] != INVALID_UUID[0] || uuid[1] != INVALID_UUID[1];
+ return uuid != INVALID_UUID;
}
bool operator==(const UUID& rhs) const {
- return std::tie(uuid[0], uuid[1]) == std::tie(rhs.uuid[0], rhs.uuid[1]);
+ return uuid == rhs.uuid;
}
bool operator!=(const UUID& rhs) const {
From dfdf4a46fed709426ffa51fd041cd3014d86cf8d Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 17:31:07 -0400
Subject: [PATCH 04/13] profile_manager: Remove unnecessary static
This can just be constexpr like the others
---
src/core/hle/service/acc/profile_manager.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index 054dd864e..d4a2f4116 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -14,7 +14,7 @@
namespace Service::Account {
constexpr size_t MAX_USERS = 8;
constexpr size_t MAX_DATA = 128;
-static const u128 INVALID_UUID = {0, 0};
+constexpr u128 INVALID_UUID{{0, 0}};
struct UUID {
// UUIDs which are 0 are considered invalid!
From 1277556c69a29a6479815b16e3e1707f7e53a422 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 17:32:23 -0400
Subject: [PATCH 05/13] profile_manager: Make array parameter to CreateNewUser
a const reference
This doesn't modify the passed in array, so this can be a const
reference.
---
src/core/hle/service/acc/profile_manager.cpp | 2 +-
src/core/hle/service/acc/profile_manager.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index 9440dc555..e1ab0e559 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -62,7 +62,7 @@ ResultCode ProfileManager::AddUser(ProfileInfo user) {
/// Create a new user on the system. If the uuid of the user already exists, the user is not
/// created.
-ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array<u8, 0x20>& username) {
+ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::array<u8, 0x20>& username) {
if (user_count == MAX_USERS) {
return ERROR_TOO_MANY_USERS;
}
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index d4a2f4116..49dc3a6e3 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -79,7 +79,7 @@ class ProfileManager {
public:
ProfileManager(); // TODO(ogniK): Load from system save
ResultCode AddUser(ProfileInfo user);
- ResultCode CreateNewUser(UUID uuid, std::array<u8, 0x20>& username);
+ ResultCode CreateNewUser(UUID uuid, const std::array<u8, 0x20>& username);
ResultCode CreateNewUser(UUID uuid, const std::string& username);
boost::optional<size_t> GetUserIndex(const UUID& uuid) const;
boost::optional<size_t> GetUserIndex(ProfileInfo user) const;
From f9a26d468c2388269eb63c3baf6c35762c594932 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 17:36:41 -0400
Subject: [PATCH 06/13] profile_manager: Take ProfileInfo by const reference
where applicable
ProfileInfo is quite a large struct in terms of data, and we don't need
to perform a copy in these instances, so we can just pass constant
references instead.
---
src/core/hle/service/acc/profile_manager.cpp | 8 ++++----
src/core/hle/service/acc/profile_manager.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index e1ab0e559..beba92f64 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -53,7 +53,7 @@ bool ProfileManager::RemoveProfileAtIndex(size_t index) {
}
/// Helper function to register a user to the system
-ResultCode ProfileManager::AddUser(ProfileInfo user) {
+ResultCode ProfileManager::AddUser(const ProfileInfo& user) {
if (AddToProfiles(user) == boost::none) {
return ERROR_TOO_MANY_USERS;
}
@@ -112,7 +112,7 @@ boost::optional<size_t> ProfileManager::GetUserIndex(const UUID& uuid) const {
}
/// Returns a users profile index based on their profile
-boost::optional<size_t> ProfileManager::GetUserIndex(ProfileInfo user) const {
+boost::optional<size_t> ProfileManager::GetUserIndex(const ProfileInfo& user) const {
return GetUserIndex(user.user_uuid);
}
@@ -135,7 +135,7 @@ bool ProfileManager::GetProfileBase(UUID uuid, ProfileBase& profile) const {
}
/// Returns the data structure used by the switch when GetProfileBase is called on acc:*
-bool ProfileManager::GetProfileBase(ProfileInfo user, ProfileBase& profile) const {
+bool ProfileManager::GetProfileBase(const ProfileInfo& user, ProfileBase& profile) const {
return GetProfileBase(user.user_uuid, profile);
}
@@ -221,7 +221,7 @@ bool ProfileManager::GetProfileBaseAndData(UUID uuid, ProfileBase& profile,
}
/// Return the users profile base and the unknown arbitary data.
-bool ProfileManager::GetProfileBaseAndData(ProfileInfo user, ProfileBase& profile,
+bool ProfileManager::GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile,
std::array<u8, MAX_DATA>& data) const {
return GetProfileBaseAndData(user.user_uuid, profile, data);
}
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index 49dc3a6e3..d38f67188 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -78,19 +78,19 @@ static_assert(sizeof(ProfileBase) == 0x38, "ProfileBase is an invalid size");
class ProfileManager {
public:
ProfileManager(); // TODO(ogniK): Load from system save
- ResultCode AddUser(ProfileInfo user);
+ ResultCode AddUser(const ProfileInfo& user);
ResultCode CreateNewUser(UUID uuid, const std::array<u8, 0x20>& username);
ResultCode CreateNewUser(UUID uuid, const std::string& username);
boost::optional<size_t> GetUserIndex(const UUID& uuid) const;
- boost::optional<size_t> GetUserIndex(ProfileInfo user) const;
+ boost::optional<size_t> GetUserIndex(const ProfileInfo& user) const;
bool GetProfileBase(boost::optional<size_t> index, ProfileBase& profile) const;
bool GetProfileBase(UUID uuid, ProfileBase& profile) const;
- bool GetProfileBase(ProfileInfo user, ProfileBase& profile) const;
+ bool GetProfileBase(const ProfileInfo& user, ProfileBase& profile) const;
bool GetProfileBaseAndData(boost::optional<size_t> index, ProfileBase& profile,
std::array<u8, MAX_DATA>& data) const;
bool GetProfileBaseAndData(UUID uuid, ProfileBase& profile,
std::array<u8, MAX_DATA>& data) const;
- bool GetProfileBaseAndData(ProfileInfo user, ProfileBase& profile,
+ bool GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile,
std::array<u8, MAX_DATA>& data) const;
size_t GetUserCount() const;
size_t GetOpenUserCount() const;
From 38cd4e9c6100cb21c5b8a621d1ee204d61b031ca Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 18:02:16 -0400
Subject: [PATCH 07/13] profile_manager: Use type aliases for username data,
profile data, and user arrays
Avoids the need to repeatedly specify the whole array type in multiple
places.
---
src/core/hle/service/acc/profile_manager.cpp | 18 +++++++--------
src/core/hle/service/acc/profile_manager.h | 23 +++++++++++---------
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index beba92f64..f34f5af97 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -62,7 +62,7 @@ ResultCode ProfileManager::AddUser(const ProfileInfo& user) {
/// Create a new user on the system. If the uuid of the user already exists, the user is not
/// created.
-ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::array<u8, 0x20>& username) {
+ResultCode ProfileManager::CreateNewUser(UUID uuid, const ProfileUsername& username) {
if (user_count == MAX_USERS) {
return ERROR_TOO_MANY_USERS;
}
@@ -89,7 +89,7 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::array<u8, 0x20>&
/// specifically by allowing an std::string for the username. This is required specifically since
/// we're loading a string straight from the config
ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::string& username) {
- std::array<u8, 0x20> username_output;
+ ProfileUsername username_output;
if (username.size() > username_output.size()) {
std::copy_n(username.begin(), username_output.size(), username_output.begin());
} else {
@@ -178,8 +178,8 @@ void ProfileManager::CloseUser(UUID uuid) {
}
/// Gets all valid user ids on the system
-std::array<UUID, MAX_USERS> ProfileManager::GetAllUsers() const {
- std::array<UUID, MAX_USERS> output;
+UserIDArray ProfileManager::GetAllUsers() const {
+ UserIDArray output;
std::transform(profiles.begin(), profiles.end(), output.begin(),
[](const ProfileInfo& p) { return p.user_uuid; });
return output;
@@ -187,8 +187,8 @@ std::array<UUID, MAX_USERS> ProfileManager::GetAllUsers() const {
/// Get all the open users on the system and zero out the rest of the data. This is specifically
/// needed for GetOpenUsers and we need to ensure the rest of the output buffer is zero'd out
-std::array<UUID, MAX_USERS> ProfileManager::GetOpenUsers() const {
- std::array<UUID, MAX_USERS> output;
+UserIDArray ProfileManager::GetOpenUsers() const {
+ UserIDArray output;
std::transform(profiles.begin(), profiles.end(), output.begin(), [](const ProfileInfo& p) {
if (p.is_open)
return p.user_uuid;
@@ -205,7 +205,7 @@ UUID ProfileManager::GetLastOpenedUser() const {
/// Return the users profile base and the unknown arbitary data.
bool ProfileManager::GetProfileBaseAndData(boost::optional<size_t> index, ProfileBase& profile,
- std::array<u8, MAX_DATA>& data) const {
+ ProfileData& data) const {
if (GetProfileBase(index, profile)) {
std::memcpy(data.data(), profiles[index.get()].data.data(), MAX_DATA);
return true;
@@ -215,14 +215,14 @@ bool ProfileManager::GetProfileBaseAndData(boost::optional<size_t> index, Profil
/// Return the users profile base and the unknown arbitary data.
bool ProfileManager::GetProfileBaseAndData(UUID uuid, ProfileBase& profile,
- std::array<u8, MAX_DATA>& data) const {
+ ProfileData& data) const {
auto idx = GetUserIndex(uuid);
return GetProfileBaseAndData(idx, profile, data);
}
/// Return the users profile base and the unknown arbitary data.
bool ProfileManager::GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile,
- std::array<u8, MAX_DATA>& data) const {
+ ProfileData& data) const {
return GetProfileBaseAndData(user.user_uuid, profile, data);
}
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index d38f67188..cb06e6fa6 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -48,20 +48,24 @@ struct UUID {
};
static_assert(sizeof(UUID) == 16, "UUID is an invalid size!");
+using ProfileUsername = std::array<u8, 0x20>;
+using ProfileData = std::array<u8, MAX_DATA>;
+using UserIDArray = std::array<UUID, MAX_USERS>;
+
/// This holds general information about a users profile. This is where we store all the information
/// based on a specific user
struct ProfileInfo {
UUID user_uuid;
- std::array<u8, 0x20> username;
+ ProfileUsername username;
u64 creation_time;
- std::array<u8, MAX_DATA> data; // TODO(ognik): Work out what this is
+ ProfileData data; // TODO(ognik): Work out what this is
bool is_open;
};
struct ProfileBase {
UUID user_uuid;
u64_le timestamp;
- std::array<u8, 0x20> username;
+ ProfileUsername username;
// Zero out all the fields to make the profile slot considered "Empty"
void Invalidate() {
@@ -79,7 +83,7 @@ class ProfileManager {
public:
ProfileManager(); // TODO(ogniK): Load from system save
ResultCode AddUser(const ProfileInfo& user);
- ResultCode CreateNewUser(UUID uuid, const std::array<u8, 0x20>& username);
+ ResultCode CreateNewUser(UUID uuid, const ProfileUsername& username);
ResultCode CreateNewUser(UUID uuid, const std::string& username);
boost::optional<size_t> GetUserIndex(const UUID& uuid) const;
boost::optional<size_t> GetUserIndex(const ProfileInfo& user) const;
@@ -87,18 +91,17 @@ public:
bool GetProfileBase(UUID uuid, ProfileBase& profile) const;
bool GetProfileBase(const ProfileInfo& user, ProfileBase& profile) const;
bool GetProfileBaseAndData(boost::optional<size_t> index, ProfileBase& profile,
- std::array<u8, MAX_DATA>& data) const;
- bool GetProfileBaseAndData(UUID uuid, ProfileBase& profile,
- std::array<u8, MAX_DATA>& data) const;
+ ProfileData& data) const;
+ bool GetProfileBaseAndData(UUID uuid, ProfileBase& profile, ProfileData& data) const;
bool GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile,
- std::array<u8, MAX_DATA>& data) const;
+ ProfileData& data) const;
size_t GetUserCount() const;
size_t GetOpenUserCount() const;
bool UserExists(UUID uuid) const;
void OpenUser(UUID uuid);
void CloseUser(UUID uuid);
- std::array<UUID, MAX_USERS> GetOpenUsers() const;
- std::array<UUID, MAX_USERS> GetAllUsers() const;
+ UserIDArray GetOpenUsers() const;
+ UserIDArray GetAllUsers() const;
UUID GetLastOpenedUser() const;
bool CanSystemRegisterUser() const;
From 9d8f19d7bf69dd9213c2ced378f8a5e26f3d4d6e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 18:49:52 -0400
Subject: [PATCH 08/13] profile_manager: Remove unnecessary memcpy in
GetProfileBaseAndData()
Given the source and destination types are the same std::array type, we
can simply use regular assignment to perform the same behavior.
---
src/core/hle/service/acc/profile_manager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index f34f5af97..e0b03d763 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -207,7 +207,7 @@ UUID ProfileManager::GetLastOpenedUser() const {
bool ProfileManager::GetProfileBaseAndData(boost::optional<size_t> index, ProfileBase& profile,
ProfileData& data) const {
if (GetProfileBase(index, profile)) {
- std::memcpy(data.data(), profiles[index.get()].data.data(), MAX_DATA);
+ data = profiles[index.get()].data;
return true;
}
return false;
From 350f6e0aa4fa598b9449d53263de7262aacc4070 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 18:53:32 -0400
Subject: [PATCH 09/13] profile_manager: Use INVALID_UUID in the initializer of
last_opened_user
Makes it a little bit more self-documenting.
---
src/core/hle/service/acc/profile_manager.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index cb06e6fa6..52967844d 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -111,7 +111,7 @@ private:
size_t user_count = 0;
boost::optional<size_t> AddToProfiles(const ProfileInfo& profile);
bool RemoveProfileAtIndex(size_t index);
- UUID last_opened_user{0, 0};
+ UUID last_opened_user{INVALID_UUID};
};
}; // namespace Service::Account
From 0fcdf379171ad1a0aea3e7e1828324a8255f867c Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 18:55:12 -0400
Subject: [PATCH 10/13] acc: Remove unused DEFAULT_USER_ID
This is no longer used, so it can be removed.
---
src/core/hle/service/acc/acc.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index 979f2f892..f2dd38a73 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -27,9 +27,6 @@ struct UserData {
};
static_assert(sizeof(UserData) == 0x80, "UserData structure has incorrect size");
-// TODO(ogniK): Generate a real user id based on username, md5(username) maybe?
-static UUID DEFAULT_USER_ID{1ull, 0ull};
-
class IProfile final : public ServiceFramework<IProfile> {
public:
explicit IProfile(UUID user_id, ProfileManager& profile_manager)
From f5b132676fe0903f4fa75bcebe189895d58a3ce1 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 18:56:00 -0400
Subject: [PATCH 11/13] acc: Correct IProfile's constructor initializer list
order
Arranges them in the order the members would be initialized
---
src/core/hle/service/acc/acc.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index f2dd38a73..2ae6ff62f 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -30,7 +30,7 @@ static_assert(sizeof(UserData) == 0x80, "UserData structure has incorrect size")
class IProfile final : public ServiceFramework<IProfile> {
public:
explicit IProfile(UUID user_id, ProfileManager& profile_manager)
- : ServiceFramework("IProfile"), user_id(user_id), profile_manager(profile_manager) {
+ : ServiceFramework("IProfile"), profile_manager(profile_manager), user_id(user_id) {
static const FunctionInfo functions[] = {
{0, &IProfile::Get, "Get"},
{1, &IProfile::GetBase, "GetBase"},
From eb88fedc5d7943c8335fcf25b388b3fd7b0020c5 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 18:57:08 -0400
Subject: [PATCH 12/13] acc: Simplify WriteBuffer call within LoadImage()
We have an overload of WriteBuffer that accepts containers that satisfy
the ContiguousContainer concept, which std::array does, so we only need
to pass in the array itself.
---
src/core/hle/service/acc/acc.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index 2ae6ff62f..274d54653 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -76,8 +76,8 @@ private:
LOG_WARNING(Service_ACC, "(STUBBED) called");
// smallest jpeg https://github.com/mathiasbynens/small/blob/master/jpeg.jpg
// TODO(mailwl): load actual profile image from disk, width 256px, max size 0x20000
- const u32 jpeg_size = 107;
- static const std::array<u8, jpeg_size> jpeg{
+ constexpr u32 jpeg_size = 107;
+ static constexpr std::array<u8, jpeg_size> jpeg{
0xff, 0xd8, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03,
0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04,
0x08, 0x06, 0x06, 0x05, 0x06, 0x09, 0x08, 0x0a, 0x0a, 0x09, 0x08, 0x09, 0x09, 0x0a,
@@ -87,7 +87,7 @@ private:
0xff, 0xcc, 0x00, 0x06, 0x00, 0x10, 0x10, 0x05, 0xff, 0xda, 0x00, 0x08, 0x01, 0x01,
0x00, 0x00, 0x3f, 0x00, 0xd2, 0xcf, 0x20, 0xff, 0xd9,
};
- ctx.WriteBuffer(jpeg.data(), jpeg_size);
+ ctx.WriteBuffer(jpeg);
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
rb.Push<u32>(jpeg_size);
From 609cb04f3fef48d20990d8702ee7eed331190876 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 20 Aug 2018 19:00:58 -0400
Subject: [PATCH 13/13] acc: Replace profile_manager include with a forward
declaration
This is only used in a shared_ptr, so we can forward declare it.
---
src/core/hle/service/acc/acc.cpp | 4 +++-
src/core/hle/service/acc/acc.h | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index 274d54653..1502dbf55 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -13,7 +13,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"
+#include "core/hle/service/acc/profile_manager.h"
namespace Service::Account {
// TODO: RE this structure
@@ -202,6 +202,8 @@ Module::Interface::Interface(std::shared_ptr<Module> module,
: ServiceFramework(name), module(std::move(module)),
profile_manager(std::move(profile_manager)) {}
+Module::Interface::~Interface() = default;
+
void InstallInterfaces(SM::ServiceManager& service_manager) {
auto module = std::make_shared<Module>();
auto profile_manager = std::make_shared<ProfileManager>();
diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.h
index d7c6d2415..c7ed74351 100644
--- a/src/core/hle/service/acc/acc.h
+++ b/src/core/hle/service/acc/acc.h
@@ -4,17 +4,19 @@
#pragma once
-#include "core/hle/service/acc/profile_manager.h"
#include "core/hle/service/service.h"
namespace Service::Account {
+class ProfileManager;
+
class Module final {
public:
class Interface : public ServiceFramework<Interface> {
public:
explicit Interface(std::shared_ptr<Module> module,
std::shared_ptr<ProfileManager> profile_manager, const char* name);
+ ~Interface() override;
void GetUserCount(Kernel::HLERequestContext& ctx);
void GetUserExistence(Kernel::HLERequestContext& ctx);