From ac1a379265d0c02a8bd4a146c205f21e2d00f3ab Mon Sep 17 00:00:00 2001 From: Thomas Guillemard Date: Sun, 14 Oct 2018 04:07:56 +0200 Subject: [PATCH] Fix some issues with UserId (#455) --- Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs | 4 ++-- Ryujinx.HLE/Utilities/UInt128.cs | 17 +---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs index 08c4c88cd..d866a8535 100644 --- a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs +++ b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs @@ -77,8 +77,8 @@ namespace Ryujinx.HLE.HOS.Services.Acc break; } - Context.Memory.WriteInt64(OutputPosition, Profile.Uuid.High); - Context.Memory.WriteInt64(OutputPosition + 8, Profile.Uuid.Low); + Context.Memory.WriteInt64(OutputPosition, Profile.Uuid.Low); + Context.Memory.WriteInt64(OutputPosition + 8, Profile.Uuid.High); } return 0; diff --git a/Ryujinx.HLE/Utilities/UInt128.cs b/Ryujinx.HLE/Utilities/UInt128.cs index 54c0c35fe..95b3d624d 100644 --- a/Ryujinx.HLE/Utilities/UInt128.cs +++ b/Ryujinx.HLE/Utilities/UInt128.cs @@ -14,21 +14,6 @@ namespace Ryujinx.HLE.Utilities { this.Low = Low; this.High = High; - - byte[] Bytes = new byte[16]; - - int Index = Bytes.Length; - - void WriteBytes(long Value) - { - for (int Byte = 0; Byte < 8; Byte++) - { - Bytes[--Index] = (byte)(Value >> Byte * 8); - } - } - - WriteBytes(Low); - WriteBytes(High); } public UInt128(string UInt128Hex) @@ -38,7 +23,7 @@ namespace Ryujinx.HLE.Utilities throw new ArgumentException("Invalid Hex value!", nameof(UInt128Hex)); } - Low = Convert.ToInt64(UInt128Hex.Substring(16),16); + Low = Convert.ToInt64(UInt128Hex.Substring(16), 16); High = Convert.ToInt64(UInt128Hex.Substring(0, 16), 16); }