Merge 6b0840d2ad into cd203e98f2

.gitignore

@@ -158,3 +158,6 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
+
+# VS Launch Settings
+launchSettings.json

Ryujinx.HLE/OsHle/Services/Acc/IAccountServiceForApplication.cs

@@ -27,7 +27,7 @@ namespace Ryujinx.HLE.OsHle.Services.Acc
 
         public long GetUserCount(ServiceCtx Context)
         {
-            Context.ResponseData.Write(0);
+            Context.ResponseData.Write(1);
 
             Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed.");
 
@@ -45,6 +45,11 @@ namespace Ryujinx.HLE.OsHle.Services.Acc
 
         public long ListAllUsers(ServiceCtx Context)
         {
+            long Position = Context.Request.RecvListBuff[0].Position;
+
+            Context.Memory.WriteInt64(Position,     1L);
+            Context.Memory.WriteInt64(Position + 8, 0L);
+
             Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed.");
 
             return 0;
@@ -52,6 +57,11 @@ namespace Ryujinx.HLE.OsHle.Services.Acc
 
         public long ListOpenUsers(ServiceCtx Context)
         {
+            long Position = Context.Request.RecvListBuff[0].Position;
+
+            Context.Memory.WriteInt64(Position,     1L);
+            Context.Memory.WriteInt64(Position + 8, 0L);
+
             Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed.");
 
             return 0;

Ryujinx.HLE/OsHle/Services/Acc/IManagerForApplication.cs

@@ -30,7 +30,7 @@ namespace Ryujinx.HLE.OsHle.Services.Acc
         {
             Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed.");
 
-            Context.ResponseData.Write(0xcafeL);
+            Context.ResponseData.Write(1L);
 
             return 0;
         }

Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs

@@ -1,5 +1,6 @@
 using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.OsHle.Ipc;
+using System;
 using System.Collections.Generic;
 
 namespace Ryujinx.HLE.OsHle.Services.Acc
@@ -22,15 +23,40 @@ namespace Ryujinx.HLE.OsHle.Services.Acc
         {
             Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed.");
 
+            //UserID
+            Context.ResponseData.Write(1L);
+
+            //Padding?
+            Context.ResponseData.Write(0);
+            Context.ResponseData.Write(0);
+
+            //Timestamp
             Context.ResponseData.Write(0L);
-            Context.ResponseData.Write(0L);
+
-            Context.ResponseData.Write(0L);
+            //Username
-            Context.ResponseData.Write(0L);
+            Context.ResponseData.Write(GetUsernameBytes("Ryujinx"));
-            Context.ResponseData.Write(0L);
-            Context.ResponseData.Write(0L);
-            Context.ResponseData.Write(0L);
 
             return 0;
         }
+
+        private byte[] GetUsernameBytes(string Username)
+        {
+            char[] CharArr = Username.ToCharArray();
+            byte[] ByteArr = new byte[0x20];
+
+            for (int Index = 0; Index < ByteArr.Length; Index++)
+            {
+                if (Index > CharArr.Length - 1)
+                {
+                    ByteArr[Index] = 0x0;
+                }
+                else
+                {
+                    ByteArr[Index] = Convert.ToByte(CharArr[Index]);
+                }
+            }
+
+            return ByteArr;
+        }
     }
 }

Ryujinx.HLE/OsHle/Services/Friend/IFriendService.cs

@@ -1,3 +1,4 @@
+using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.OsHle.Ipc;
 using System.Collections.Generic;
 
@@ -13,8 +14,23 @@ namespace Ryujinx.HLE.OsHle.Services.Friend
         {
             m_Commands = new Dictionary<int, ServiceProcessRequest>()
             {
-                //...
+                { 10601, DeclareCloseOnlinePlaySession },
+                { 10610, UpdateUserPresence            }
             };
         }
+
+        public long DeclareCloseOnlinePlaySession(ServiceCtx Context)
+        {
+            Context.Ns.Log.PrintStub(LogClass.ServiceFriend, "Stubbed.");
+
+            return 0;
+        }
+
+        public long UpdateUserPresence(ServiceCtx Context)
+        {
+            Context.Ns.Log.PrintStub(LogClass.ServiceFriend, "Stubbed.");
+
+            return 0;
+        }
     }
 }