diff options
| author | Thog <me@thog.eu> | 2020-02-02 04:24:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-02 14:24:17 +1100 |
| commit | ea14a955243705b5d5b22868c30c174e6524b4d3 (patch) | |
| tree | 038589c60aedc54e83b98954dbf0f8ce4813df52 /Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService | |
| parent | f373f870f769ef65c435aa307dc3fa1be6dc6fae (diff) | |
Fix inconsistencies with UserId (#906)
* Fix inconsistencies with UserId
The account user id isn't an UUID. This PR adds a new UserId type with
the correct value ordering to avoid mismatch with LibHac's Uid. This also fix
an hardcoded value of the UserId.
As the userid has been invalid for quite some time (and to avoid forcing
users to their recreate saves), the userid has been changed to "00000000000000010000000000000000".
Also implement a stub for IApplicationFunctions::GetSaveDataSize. (see
the sources for the reason)
Fix #626
* Address jd's & Ac_k's comments
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs index 4947a5ce..87f54bf3 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs @@ -1,4 +1,4 @@ -using Ryujinx.HLE.Utilities; +using Ryujinx.HLE.HOS.Services.Account.Acc; using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService [StructLayout(LayoutKind.Sequential, Pack = 0x8, Size = 0x200, CharSet = CharSet.Ansi)] struct Friend { - public UInt128 UserId; + public UserId UserId; public long NetworkUserId; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x21)] diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs index 5fe8bfd7..e7568a4a 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs @@ -1,4 +1,4 @@ -using Ryujinx.HLE.Utilities; +using Ryujinx.HLE.HOS.Services.Account.Acc; using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService [StructLayout(LayoutKind.Sequential, Pack = 0x8, CharSet = CharSet.Ansi)] struct UserPresence { - public UInt128 UserId; + public UserId UserId; public long LastTimeOnlineTimestamp; public PresenceStatus Status; |