mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-24 22:37:19 +02:00
Merge pull request #6742 from Morph1984/uuid
common: uuid: Return a lower-case hex string in Format
This commit is contained in:
commit
5acf020389
@ -18,7 +18,7 @@ UUID UUID::Generate() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string UUID::Format() const {
|
std::string UUID::Format() const {
|
||||||
return fmt::format("0x{:016X}{:016X}", uuid[1], uuid[0]);
|
return fmt::format("{:016x}{:016x}", uuid[1], uuid[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string UUID::FormatSwitch() const {
|
std::string UUID::FormatSwitch() const {
|
||||||
|
@ -292,7 +292,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
void Get(Kernel::HLERequestContext& ctx) {
|
void Get(Kernel::HLERequestContext& ctx) {
|
||||||
LOG_DEBUG(Service_ACC, "called user_id={}", user_id.Format());
|
LOG_DEBUG(Service_ACC, "called user_id=0x{}", user_id.Format());
|
||||||
ProfileBase profile_base{};
|
ProfileBase profile_base{};
|
||||||
ProfileData data{};
|
ProfileData data{};
|
||||||
if (profile_manager.GetProfileBaseAndData(user_id, profile_base, data)) {
|
if (profile_manager.GetProfileBaseAndData(user_id, profile_base, data)) {
|
||||||
@ -301,7 +301,7 @@ protected:
|
|||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushRaw(profile_base);
|
rb.PushRaw(profile_base);
|
||||||
} else {
|
} else {
|
||||||
LOG_ERROR(Service_ACC, "Failed to get profile base and data for user={}",
|
LOG_ERROR(Service_ACC, "Failed to get profile base and data for user=0x{}",
|
||||||
user_id.Format());
|
user_id.Format());
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(ResultUnknown); // TODO(ogniK): Get actual error code
|
rb.Push(ResultUnknown); // TODO(ogniK): Get actual error code
|
||||||
@ -309,14 +309,14 @@ protected:
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GetBase(Kernel::HLERequestContext& ctx) {
|
void GetBase(Kernel::HLERequestContext& ctx) {
|
||||||
LOG_DEBUG(Service_ACC, "called user_id={}", user_id.Format());
|
LOG_DEBUG(Service_ACC, "called user_id=0x{}", user_id.Format());
|
||||||
ProfileBase profile_base{};
|
ProfileBase profile_base{};
|
||||||
if (profile_manager.GetProfileBase(user_id, profile_base)) {
|
if (profile_manager.GetProfileBase(user_id, profile_base)) {
|
||||||
IPC::ResponseBuilder rb{ctx, 16};
|
IPC::ResponseBuilder rb{ctx, 16};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushRaw(profile_base);
|
rb.PushRaw(profile_base);
|
||||||
} else {
|
} else {
|
||||||
LOG_ERROR(Service_ACC, "Failed to get profile base for user={}", user_id.Format());
|
LOG_ERROR(Service_ACC, "Failed to get profile base for user=0x{}", user_id.Format());
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(ResultUnknown); // TODO(ogniK): Get actual error code
|
rb.Push(ResultUnknown); // TODO(ogniK): Get actual error code
|
||||||
}
|
}
|
||||||
@ -372,7 +372,7 @@ protected:
|
|||||||
|
|
||||||
const auto user_data = ctx.ReadBuffer();
|
const auto user_data = ctx.ReadBuffer();
|
||||||
|
|
||||||
LOG_DEBUG(Service_ACC, "called, username='{}', timestamp={:016X}, uuid={}",
|
LOG_DEBUG(Service_ACC, "called, username='{}', timestamp={:016X}, uuid=0x{}",
|
||||||
Common::StringFromFixedZeroTerminatedBuffer(
|
Common::StringFromFixedZeroTerminatedBuffer(
|
||||||
reinterpret_cast<const char*>(base.username.data()), base.username.size()),
|
reinterpret_cast<const char*>(base.username.data()), base.username.size()),
|
||||||
base.timestamp, base.user_uuid.Format());
|
base.timestamp, base.user_uuid.Format());
|
||||||
@ -405,7 +405,7 @@ protected:
|
|||||||
const auto user_data = ctx.ReadBuffer();
|
const auto user_data = ctx.ReadBuffer();
|
||||||
const auto image_data = ctx.ReadBuffer(1);
|
const auto image_data = ctx.ReadBuffer(1);
|
||||||
|
|
||||||
LOG_DEBUG(Service_ACC, "called, username='{}', timestamp={:016X}, uuid={}",
|
LOG_DEBUG(Service_ACC, "called, username='{}', timestamp={:016X}, uuid=0x{}",
|
||||||
Common::StringFromFixedZeroTerminatedBuffer(
|
Common::StringFromFixedZeroTerminatedBuffer(
|
||||||
reinterpret_cast<const char*>(base.username.data()), base.username.size()),
|
reinterpret_cast<const char*>(base.username.data()), base.username.size()),
|
||||||
base.timestamp, base.user_uuid.Format());
|
base.timestamp, base.user_uuid.Format());
|
||||||
@ -662,7 +662,7 @@ void Module::Interface::GetUserCount(Kernel::HLERequestContext& ctx) {
|
|||||||
void Module::Interface::GetUserExistence(Kernel::HLERequestContext& ctx) {
|
void Module::Interface::GetUserExistence(Kernel::HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
Common::UUID user_id = rp.PopRaw<Common::UUID>();
|
Common::UUID user_id = rp.PopRaw<Common::UUID>();
|
||||||
LOG_DEBUG(Service_ACC, "called user_id={}", user_id.Format());
|
LOG_DEBUG(Service_ACC, "called user_id=0x{}", user_id.Format());
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
@ -693,7 +693,7 @@ void Module::Interface::GetLastOpenedUser(Kernel::HLERequestContext& ctx) {
|
|||||||
void Module::Interface::GetProfile(Kernel::HLERequestContext& ctx) {
|
void Module::Interface::GetProfile(Kernel::HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
Common::UUID user_id = rp.PopRaw<Common::UUID>();
|
Common::UUID user_id = rp.PopRaw<Common::UUID>();
|
||||||
LOG_DEBUG(Service_ACC, "called user_id={}", user_id.Format());
|
LOG_DEBUG(Service_ACC, "called user_id=0x{}", user_id.Format());
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
@ -802,7 +802,7 @@ void Module::Interface::GetProfileEditor(Kernel::HLERequestContext& ctx) {
|
|||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
Common::UUID user_id = rp.PopRaw<Common::UUID>();
|
Common::UUID user_id = rp.PopRaw<Common::UUID>();
|
||||||
|
|
||||||
LOG_DEBUG(Service_ACC, "called, user_id={}", user_id.Format());
|
LOG_DEBUG(Service_ACC, "called, user_id=0x{}", user_id.Format());
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
@ -844,7 +844,7 @@ void Module::Interface::StoreSaveDataThumbnailApplication(Kernel::HLERequestCont
|
|||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
const auto uuid = rp.PopRaw<Common::UUID>();
|
const auto uuid = rp.PopRaw<Common::UUID>();
|
||||||
|
|
||||||
LOG_WARNING(Service_ACC, "(STUBBED) called, uuid={}", uuid.Format());
|
LOG_WARNING(Service_ACC, "(STUBBED) called, uuid=0x{}", uuid.Format());
|
||||||
|
|
||||||
// TODO(ogniK): Check if application ID is zero on acc initialize. As we don't have a reliable
|
// TODO(ogniK): Check if application ID is zero on acc initialize. As we don't have a reliable
|
||||||
// way of confirming things like the TID, we're going to assume a non zero value for the time
|
// way of confirming things like the TID, we're going to assume a non zero value for the time
|
||||||
@ -858,7 +858,7 @@ void Module::Interface::StoreSaveDataThumbnailSystem(Kernel::HLERequestContext&
|
|||||||
const auto uuid = rp.PopRaw<Common::UUID>();
|
const auto uuid = rp.PopRaw<Common::UUID>();
|
||||||
const auto tid = rp.Pop<u64_le>();
|
const auto tid = rp.Pop<u64_le>();
|
||||||
|
|
||||||
LOG_WARNING(Service_ACC, "(STUBBED) called, uuid={}, tid={:016X}", uuid.Format(), tid);
|
LOG_WARNING(Service_ACC, "(STUBBED) called, uuid=0x{}, tid={:016X}", uuid.Format(), tid);
|
||||||
StoreSaveDataThumbnail(ctx, uuid, tid);
|
StoreSaveDataThumbnail(ctx, uuid, tid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,7 +158,7 @@ private:
|
|||||||
const auto local_play = rp.Pop<bool>();
|
const auto local_play = rp.Pop<bool>();
|
||||||
const auto uuid = rp.PopRaw<Common::UUID>();
|
const auto uuid = rp.PopRaw<Common::UUID>();
|
||||||
|
|
||||||
LOG_WARNING(Service_Friend, "(STUBBED) called local_play={} uuid={}", local_play,
|
LOG_WARNING(Service_Friend, "(STUBBED) called, local_play={}, uuid=0x{}", local_play,
|
||||||
uuid.Format());
|
uuid.Format());
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@ -171,7 +171,7 @@ private:
|
|||||||
const auto uuid = rp.PopRaw<Common::UUID>();
|
const auto uuid = rp.PopRaw<Common::UUID>();
|
||||||
[[maybe_unused]] const auto filter = rp.PopRaw<SizedFriendFilter>();
|
[[maybe_unused]] const auto filter = rp.PopRaw<SizedFriendFilter>();
|
||||||
const auto pid = rp.Pop<u64>();
|
const auto pid = rp.Pop<u64>();
|
||||||
LOG_WARNING(Service_Friend, "(STUBBED) called, offset={}, uuid={}, pid={}", friend_offset,
|
LOG_WARNING(Service_Friend, "(STUBBED) called, offset={}, uuid=0x{}, pid={}", friend_offset,
|
||||||
uuid.Format(), pid);
|
uuid.Format(), pid);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
@ -289,7 +289,7 @@ void Module::Interface::CreateNotificationService(Kernel::HLERequestContext& ctx
|
|||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
auto uuid = rp.PopRaw<Common::UUID>();
|
auto uuid = rp.PopRaw<Common::UUID>();
|
||||||
|
|
||||||
LOG_DEBUG(Service_Friend, "called, uuid={}", uuid.Format());
|
LOG_DEBUG(Service_Friend, "called, uuid=0x{}", uuid.Format());
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
|
Loading…
Reference in New Issue
Block a user