From 268ee291a18ab37b5924701a95b9d60b2d170c22 Mon Sep 17 00:00:00 2001 From: darktux Date: Fri, 5 Apr 2024 01:58:30 +0200 Subject: [PATCH] Fixed minor issues from previous PR related to buffers and a typo in npns --- src/core/hle/service/friend/friend.cpp | 11 +++++------ src/core/hle/service/npns/npns.cpp | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index 2258223c87..cc5d1ef051 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -143,9 +143,9 @@ private: u64 friend_request_reception; char friend_code[0x20]; u64 friend_code_next_issuable_time; - u8 unk_x48[0x7C8]; + u8 unk_x48[0x7B8]; }; - static_assert(sizeof(FriendsUserSetting) == 0x810, "FriendsUserSetting is an invalid size"); + static_assert(sizeof(FriendsUserSetting) == 0x800, "FriendsUserSetting is an invalid size"); void GetCompletionEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Friend, "called"); @@ -250,9 +250,6 @@ private: LOG_DEBUG(Service_Friend, "(STUBBED) called"); - u8 buf[0xe0]; - ctx.WriteBuffer(buf); - IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } @@ -260,9 +257,11 @@ private: void GetUserPresenceView(HLERequestContext& ctx) { LOG_DEBUG(Service_Friend, "(STUBBED) called"); + u8 buf[0xe0]{}; + ctx.WriteBuffer(buf); + IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.Push(0); } void GetPlayHistoryStatistics(HLERequestContext& ctx) { diff --git a/src/core/hle/service/npns/npns.cpp b/src/core/hle/service/npns/npns.cpp index e54827efef..ff8c901889 100644 --- a/src/core/hle/service/npns/npns.cpp +++ b/src/core/hle/service/npns/npns.cpp @@ -24,7 +24,7 @@ public: {4, nullptr, "ReceiveRaw"}, {5, C<&INpnsSystem::GetReceiveEvent>, "GetReceiveEvent"}, {6, nullptr, "ListenUndelivered"}, - {7, nullptr, "GetStateChangeEVent"}, + {7, nullptr, "GetStateChangeEvent"}, {11, nullptr, "SubscribeTopic"}, {12, nullptr, "UnsubscribeTopic"}, {13, nullptr, "QueryIsTopicExist"},