From 675f3f6f816d4f315c2f319d6b323834dc252590 Mon Sep 17 00:00:00 2001 From: emmauss 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 m_Commands; public override IReadOnlyDictionary Commands => m_Commands; - public IAccountServiceForApplication() + public IAccountService() { m_Commands = new Dictionary() { 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() { - { 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 @@ true + + + + + + + + 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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