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/Prepo | |
| 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/Prepo')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs b/Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs index f5c8a873..e882032b 100644 --- a/Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs +++ b/Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs @@ -1,5 +1,7 @@ using MsgPack.Serialization; +using Ryujinx.Common; using Ryujinx.Common.Logging; +using Ryujinx.HLE.HOS.Services.Account.Acc; using Ryujinx.HLE.Utilities; using System.Collections.Generic; using System.IO; @@ -48,7 +50,7 @@ namespace Ryujinx.HLE.HOS.Services.Prepo private ResultCode ProcessReport(ServiceCtx context, bool withUserID) { - UInt128 userId = withUserID ? new UInt128(context.RequestData.ReadBytes(0x10)) : new UInt128(); + UserId userId = withUserID ? context.RequestData.ReadStruct<UserId>() : new UserId(); string gameRoom = StringUtils.ReadUtf8String(context); if (withUserID) @@ -79,7 +81,7 @@ namespace Ryujinx.HLE.HOS.Services.Prepo return ResultCode.Success; } - private string ReadReportBuffer(byte[] buffer, string room, UInt128 userId) + private string ReadReportBuffer(byte[] buffer, string room, UserId userId) { StringBuilder sb = new StringBuilder(); |
