From 675f3f6f816d4f315c2f319d6b323834dc252590 Mon Sep 17 00:00:00 2001
From: emmauss <emmausssss@gmail.com>
Date: Sun, 2 Sep 2018 01:04:20 +0300
Subject: [PATCH] Implement loading of profile image (#391)

* implement loading of profile image

* rename icon to profilepicture

* rename icon file
---
 ...ceForApplication.cs => IAccountService.cs} |   4 +-
 Ryujinx.HLE/HOS/Services/Acc/IProfile.cs      |  36 +++++++++++++++++-
 Ryujinx.HLE/HOS/Services/ServiceFactory.cs    |   5 ++-
 Ryujinx.HLE/Ryujinx.HLE.csproj                |   8 ++++
 Ryujinx.HLE/RyujinxProfileImage.jpg           | Bin 0 -> 5394 bytes
 5 files changed, 48 insertions(+), 5 deletions(-)
 rename Ryujinx.HLE/HOS/Services/Acc/{IAccountServiceForApplication.cs => IAccountService.cs} (97%)
 create mode 100644 Ryujinx.HLE/RyujinxProfileImage.jpg

diff --git a/Ryujinx.HLE/HOS/Services/Acc/IAccountServiceForApplication.cs b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
similarity index 97%
rename from Ryujinx.HLE/HOS/Services/Acc/IAccountServiceForApplication.cs
rename to Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
index 36dfd9efa..8fd7bfeaf 100644
--- a/Ryujinx.HLE/HOS/Services/Acc/IAccountServiceForApplication.cs
+++ b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
@@ -7,13 +7,13 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Acc
 {
-    class IAccountServiceForApplication : IpcService
+    class IAccountService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> m_Commands;
 
         public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
 
-        public IAccountServiceForApplication()
+        public IAccountService()
         {
             m_Commands = new Dictionary<int, ServiceProcessRequest>()
             {
diff --git a/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs b/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs
index 960cc49c0..316f16d08 100644
--- a/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs
+++ b/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs
@@ -3,7 +3,10 @@ using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.Utilities;
+using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
 using System.Text;
 
 namespace Ryujinx.HLE.HOS.Services.Acc
@@ -16,15 +19,21 @@ namespace Ryujinx.HLE.HOS.Services.Acc
 
         private UserProfile Profile;
 
+        private Stream ProfilePictureStream;
+
         public IProfile(UserProfile Profile)
         {
             m_Commands = new Dictionary<int, ServiceProcessRequest>()
             {
-                { 0, Get     },
-                { 1, GetBase }
+                { 0,  Get          },
+                { 1,  GetBase      },
+                { 10, GetImageSize },
+                { 11, LoadImage    },
             };
 
             this.Profile = Profile;
+
+            ProfilePictureStream = Assembly.GetCallingAssembly().GetManifestResourceStream("Ryujinx.HLE.RyujinxProfileImage.jpg");
         }
 
         public long Get(ServiceCtx Context)
@@ -54,5 +63,28 @@ namespace Ryujinx.HLE.HOS.Services.Acc
 
             return 0;
         }
+
+        private long LoadImage(ServiceCtx Context)
+        {
+            long BufferPosition = Context.Request.ReceiveBuff[0].Position;
+            long BufferLen      = Context.Request.ReceiveBuff[0].Size;
+
+            byte[] ProfilePictureData = new byte[BufferLen];
+
+            ProfilePictureStream.Read(ProfilePictureData, 0, ProfilePictureData.Length);
+
+            Context.Memory.WriteBytes(BufferPosition, ProfilePictureData);
+
+            Context.ResponseData.Write(ProfilePictureStream.Length);
+
+            return 0;
+        }
+
+        private long GetImageSize(ServiceCtx Context)
+        {
+            Context.ResponseData.Write(ProfilePictureStream.Length);
+
+            return 0;
+        }
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/ServiceFactory.cs b/Ryujinx.HLE/HOS/Services/ServiceFactory.cs
index babceb7db..5e65d1d10 100644
--- a/Ryujinx.HLE/HOS/Services/ServiceFactory.cs
+++ b/Ryujinx.HLE/HOS/Services/ServiceFactory.cs
@@ -31,7 +31,10 @@ namespace Ryujinx.HLE.HOS.Services
             switch (Name)
             {
                 case "acc:u0":
-                    return new IAccountServiceForApplication();
+                    return new IAccountService();
+
+                case "acc:u1":
+                    return new IAccountService();
 
                 case "aoc:u":
                     return new IAddOnContentManager();
diff --git a/Ryujinx.HLE/Ryujinx.HLE.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj
index f7fb84a58..fa4c254e2 100644
--- a/Ryujinx.HLE/Ryujinx.HLE.csproj
+++ b/Ryujinx.HLE/Ryujinx.HLE.csproj
@@ -13,6 +13,14 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="RyujinxProfileImage.jpg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="RyujinxProfileImage.jpg" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\ChocolArm64\ChocolArm64.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio\Ryujinx.Audio.csproj" />
diff --git a/Ryujinx.HLE/RyujinxProfileImage.jpg b/Ryujinx.HLE/RyujinxProfileImage.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fe9ec2a9590d2d53ef1dcffc8078f5bd04e7b00f
GIT binary patch
literal 5394
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

literal 0
HcmV?d00001