Save Common implementation (#434)

* save common implementation

* remove zero userid check

* Renamed UserId to UInt128

* fix index in hex conversion

3 files changed, 14 insertions, 16 deletions

diff --git a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
index 8fd7bfea..347f2e20 100644
--- a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
+++ b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
@@ -1,6 +1,7 @@
 using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.HLE.Logging;
+using Ryujinx.HLE.Utilities;
 using System.Collections.Generic;
 
 using static Ryujinx.HLE.HOS.ErrorCode;
@@ -37,7 +38,7 @@ namespace Ryujinx.HLE.HOS.Services.Acc
 
         public long GetUserExistence(ServiceCtx Context)
         {
-            UserId Uuid = new UserId(
+            UInt128 Uuid = new UInt128(
                 Context.RequestData.ReadInt64(),
                 Context.RequestData.ReadInt64());
 
@@ -70,12 +71,8 @@ namespace Ryujinx.HLE.HOS.Services.Acc
                     break;
                 }
 
-                byte[] Uuid = Profile.Uuid.Bytes;
-
-                for (int Index = Uuid.Length - 1; Index >= 0; Index--)
-                {
-                    Context.Memory.WriteByte(OutputPosition + Offset++, Uuid[Index]);
-                }
+                Context.Memory.WriteInt64(OutputPosition, Profile.Uuid.High);
+                Context.Memory.WriteInt64(OutputPosition + 8, Profile.Uuid.Low);
             }
 
             return 0;
@@ -92,7 +89,7 @@ namespace Ryujinx.HLE.HOS.Services.Acc
 
         public long GetProfile(ServiceCtx Context)
         {
-            UserId Uuid = new UserId(
+            UInt128 Uuid = new UInt128(
                 Context.RequestData.ReadInt64(),
                 Context.RequestData.ReadInt64());
 
diff --git a/Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs b/Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs
index d476f5d0..ebbe5fca 100644
--- a/Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs
+++ b/Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs
@@ -1,6 +1,7 @@
 using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.HLE.Logging;
+using Ryujinx.HLE.Utilities;
 using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Friend
@@ -24,7 +25,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend
         // nn::friends::GetFriendListGetFriendListIds(nn::account::Uid, int Unknown0, nn::friends::detail::ipc::SizedFriendFilter, ulong Unknown1) -> int CounterIds,  array<nn::account::NetworkServiceAccountId>
         public long GetFriendList(ServiceCtx Context)
         {
-            UserId Uuid = new UserId(
+            UInt128 Uuid = new UInt128(
                 Context.RequestData.ReadInt64(),
                 Context.RequestData.ReadInt64());
 
@@ -45,7 +46,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend
             // There are no friends online, so we return 0 because the nn::account::NetworkServiceAccountId array is empty.
             Context.ResponseData.Write(0);
 
-            Context.Device.Log.PrintStub(LogClass.ServiceFriend, $"Stubbed. UserId: {Uuid.UserIdHex} - " +
+            Context.Device.Log.PrintStub(LogClass.ServiceFriend, $"Stubbed. UserId: {Uuid.ToString()} - " +
                                                                  $"Unknown0: {Unknown0} - " +
                                                                  $"PresenceStatus: {Filter.PresenceStatus} - " +
                                                                  $"IsFavoriteOnly: {Filter.IsFavoriteOnly} - " +
@@ -61,7 +62,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend
         // DeclareCloseOnlinePlaySession(nn::account::Uid)
         public long DeclareCloseOnlinePlaySession(ServiceCtx Context)
         {
-            UserId Uuid = new UserId(
+            UInt128 Uuid = new UInt128(
                 Context.RequestData.ReadInt64(),
                 Context.RequestData.ReadInt64());
 
@@ -70,7 +71,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend
                 Profile.OnlinePlayState = OpenCloseState.Closed;
             }
 
-            Context.Device.Log.PrintStub(LogClass.ServiceFriend, $"Stubbed. Uuid: {Uuid.UserIdHex} - " +
+            Context.Device.Log.PrintStub(LogClass.ServiceFriend, $"Stubbed. Uuid: {Uuid.ToString()} - " +
                                                                  $"OnlinePlayState: {Profile.OnlinePlayState}");
 
             return 0;
@@ -79,7 +80,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend
         // UpdateUserPresence(nn::account::Uid, ulong Unknown0) -> buffer<Unknown1, type: 0x19, size: 0xe0>
         public long UpdateUserPresence(ServiceCtx Context)
         {
-            UserId Uuid = new UserId(
+            UInt128 Uuid = new UInt128(
                 Context.RequestData.ReadInt64(),
                 Context.RequestData.ReadInt64());
 
@@ -90,7 +91,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend
 
             //Todo: Write the buffer content.
 
-            Context.Device.Log.PrintStub(LogClass.ServiceFriend, $"Stubbed. Uuid: {Uuid.UserIdHex} - " +
+            Context.Device.Log.PrintStub(LogClass.ServiceFriend, $"Stubbed. Uuid: {Uuid.ToString()} - " +
                                                                  $"Unknown0: {Unknown0}");
 
             return 0;
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
index 937ea6d6..daf5e0b2 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
@@ -1,6 +1,6 @@
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.Ipc;
-using Ryujinx.HLE.HOS.SystemState;
+using Ryujinx.HLE.Utilities;
 using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
@@ -78,7 +78,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
 
             long TitleId = Context.RequestData.ReadInt64();
 
-            UserId UserId = new UserId(
+            UInt128 UserId = new UInt128(
                 Context.RequestData.ReadInt64(), 
                 Context.RequestData.ReadInt64());