Support HomeBrew Loader (#577)
* Make it possibles to load hb-loader and hb-menu One issue remains with hb-menu homebrew icons because of SIMD issues (libjpeg-turbo related) and netloader doesn't work. * Implement GetApplicationControlData * Fix shared fonts for NSO/NRO * Add homebrew NRO romfs support This readd the NRO support by parsing the ASET header * Address comments about HomebrewRomFs * override Dispose in homebrew romfs stream * Use a struct for file timestamp * Simplify positional increments in GetApplicationControlData * Address comments * improve readability of the memory permission check in SetProcessMemoryPermission * Fix previous broken check * Add address space checks in SetProcessMemoryPermission
This commit is contained in:
Thomas Guillemard
jduncanator
parent
7e9f555574
commit
b126ea48c6
17 changed files with 633 additions and 17 deletions
11
Ryujinx.HLE/HOS/Services/FspSrv/FileTimestamp.cs
Normal file
11
Ryujinx.HLE/HOS/Services/FspSrv/FileTimestamp.cs
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
using System;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Services.FspSrv
|
||||
{
|
||||
struct FileTimestamp
|
||||
{
|
||||
public DateTime CreationDateTime;
|
||||
public DateTime ModifiedDateTime;
|
||||
public DateTime LastAccessDateTime;
|
||||
}
|
||||
}
|
||||
|
|
@ -38,8 +38,8 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|||
{ 10, Commit },
|
||||
{ 11, GetFreeSpaceSize },
|
||||
{ 12, GetTotalSpaceSize },
|
||||
{ 13, CleanDirectoryRecursively }
|
||||
//{ 14, GetFileTimeStampRaw }
|
||||
{ 13, CleanDirectoryRecursively },
|
||||
{ 14, GetFileTimeStampRaw }
|
||||
};
|
||||
|
||||
_openPaths = new HashSet<string>();
|
||||
|
|
@ -368,6 +368,34 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|||
return 0;
|
||||
}
|
||||
|
||||
// GetFileTimeStampRaw(buffer<bytes<0x301>, 0x19, 0x301> path) -> bytes<0x20> timestamp
|
||||
public long GetFileTimeStampRaw(ServiceCtx context)
|
||||
{
|
||||
string name = ReadUtf8String(context);
|
||||
|
||||
string path = _provider.GetFullPath(name);
|
||||
|
||||
if (_provider.FileExists(path) || _provider.DirectoryExists(path))
|
||||
{
|
||||
FileTimestamp timestamp = _provider.GetFileTimeStampRaw(path);
|
||||
|
||||
context.ResponseData.Write(new DateTimeOffset(timestamp.CreationDateTime).ToUnixTimeSeconds());
|
||||
context.ResponseData.Write(new DateTimeOffset(timestamp.ModifiedDateTime).ToUnixTimeSeconds());
|
||||
context.ResponseData.Write(new DateTimeOffset(timestamp.LastAccessDateTime).ToUnixTimeSeconds());
|
||||
|
||||
byte[] data = new byte[8];
|
||||
|
||||
// is valid?
|
||||
data[0] = 1;
|
||||
|
||||
context.ResponseData.Write(data);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
|
||||
}
|
||||
|
||||
private bool IsPathAlreadyInUse(string path)
|
||||
{
|
||||
lock (_openPaths)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
using Ryujinx.HLE.HOS.Ipc;
|
||||
using LibHac;
|
||||
using Ryujinx.Common.Logging;
|
||||
using Ryujinx.HLE.HOS.Ipc;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Services.Ns
|
||||
{
|
||||
|
|
@ -9,14 +13,211 @@ namespace Ryujinx.HLE.HOS.Services.Ns
|
|||
|
||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
|
||||
|
||||
private bool _isInitialized;
|
||||
|
||||
public IApplicationManagerInterface()
|
||||
{
|
||||
_commands = new Dictionary<int, ServiceProcessRequest>
|
||||
{
|
||||
|
||||
{ 400, GetApplicationControlData }
|
||||
};
|
||||
}
|
||||
|
||||
public long GetApplicationControlData(ServiceCtx context)
|
||||
{
|
||||
long position = context.Request.ReceiveBuff[0].Position;
|
||||
|
||||
Nacp nacp = context.Device.System.ControlData;
|
||||
|
||||
for (int i = 0; i < 0x10; i++)
|
||||
{
|
||||
NacpDescription description = nacp.Descriptions[i];
|
||||
|
||||
byte[] titleData = new byte[0x200];
|
||||
byte[] developerData = new byte[0x100];
|
||||
|
||||
if (description !=null && description.Title != null)
|
||||
{
|
||||
byte[] titleDescriptionData = Encoding.ASCII.GetBytes(description.Title);
|
||||
Buffer.BlockCopy(titleDescriptionData, 0, titleData, 0, titleDescriptionData.Length);
|
||||
|
||||
}
|
||||
|
||||
if (description != null && description.Developer != null)
|
||||
{
|
||||
byte[] developerDescriptionData = Encoding.ASCII.GetBytes(description.Developer);
|
||||
Buffer.BlockCopy(developerDescriptionData, 0, developerData, 0, developerDescriptionData.Length);
|
||||
}
|
||||
|
||||
context.Memory.WriteBytes(position, titleData);
|
||||
context.Memory.WriteBytes(position + 0x200, developerData);
|
||||
|
||||
position += i * 0x300;
|
||||
}
|
||||
|
||||
byte[] isbn = new byte[0x25];
|
||||
|
||||
if (nacp.Isbn != null)
|
||||
{
|
||||
byte[] isbnData = Encoding.ASCII.GetBytes(nacp.Isbn);
|
||||
Buffer.BlockCopy(isbnData, 0, isbn, 0, isbnData.Length);
|
||||
}
|
||||
|
||||
context.Memory.WriteBytes(position, isbn);
|
||||
position += isbn.Length;
|
||||
|
||||
context.Memory.WriteByte(position++, nacp.StartupUserAccount);
|
||||
context.Memory.WriteByte(position++, nacp.TouchScreenUsageMode);
|
||||
context.Memory.WriteByte(position++, nacp.AocRegistrationType);
|
||||
|
||||
context.Memory.WriteInt32(position, nacp.AttributeFlag);
|
||||
position += 4;
|
||||
|
||||
context.Memory.WriteUInt32(position, nacp.SupportedLanguageFlag);
|
||||
position += 4;
|
||||
|
||||
context.Memory.WriteUInt32(position, nacp.ParentalControlFlag);
|
||||
position += 4;
|
||||
|
||||
context.Memory.WriteByte(position++, nacp.Screenshot);
|
||||
context.Memory.WriteByte(position++, nacp.VideoCapture);
|
||||
context.Memory.WriteByte(position++, nacp.DataLossConfirmation);
|
||||
context.Memory.WriteByte(position++, nacp.PlayLogPolicy);
|
||||
|
||||
context.Memory.WriteUInt64(position, nacp.PresenceGroupId);
|
||||
position += 8;
|
||||
|
||||
for (int i = 0; i < nacp.RatingAge.Length; i++)
|
||||
{
|
||||
context.Memory.WriteSByte(position++, nacp.RatingAge[i]);
|
||||
}
|
||||
|
||||
byte[] displayVersion = new byte[0x10];
|
||||
|
||||
if (nacp.DisplayVersion != null)
|
||||
{
|
||||
byte[] displayVersionData = Encoding.ASCII.GetBytes(nacp.DisplayVersion);
|
||||
Buffer.BlockCopy(displayVersionData, 0, displayVersion, 0, displayVersionData.Length);
|
||||
}
|
||||
|
||||
context.Memory.WriteBytes(position, displayVersion);
|
||||
position += displayVersion.Length;
|
||||
|
||||
context.Memory.WriteUInt64(position, nacp.AddOnContentBaseId);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteUInt64(position, nacp.SaveDataOwnerId);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.UserAccountSaveDataSize);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.UserAccountSaveDataJournalSize);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.DeviceSaveDataSize);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.DeviceSaveDataJournalSize);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.BcatDeliveryCacheStorageSize);
|
||||
position += 8;
|
||||
|
||||
byte[] applicationErrorCodeCategory = new byte[0x8];
|
||||
|
||||
if (nacp.ApplicationErrorCodeCategory != null)
|
||||
{
|
||||
byte[] applicationErrorCodeCategoryData = Encoding.ASCII.GetBytes(nacp.ApplicationErrorCodeCategory);
|
||||
Buffer.BlockCopy(applicationErrorCodeCategoryData, 0, applicationErrorCodeCategoryData, 0, applicationErrorCodeCategoryData.Length);
|
||||
}
|
||||
|
||||
context.Memory.WriteBytes(position, applicationErrorCodeCategory);
|
||||
position += applicationErrorCodeCategory.Length;
|
||||
|
||||
for (int i = 0; i < nacp.LocalCommunicationId.Length; i++)
|
||||
{
|
||||
context.Memory.WriteUInt64(position, nacp.LocalCommunicationId[i]);
|
||||
position += 8;
|
||||
}
|
||||
|
||||
context.Memory.WriteByte(position++, nacp.LogoType);
|
||||
context.Memory.WriteByte(position++, nacp.LogoHandling);
|
||||
context.Memory.WriteByte(position++, nacp.RuntimeAddOnContentInstall);
|
||||
|
||||
byte[] reserved000 = new byte[0x3];
|
||||
context.Memory.WriteBytes(position, reserved000);
|
||||
position += reserved000.Length;
|
||||
|
||||
context.Memory.WriteByte(position++, nacp.CrashReport);
|
||||
context.Memory.WriteByte(position++, nacp.Hdcp);
|
||||
context.Memory.WriteUInt64(position, nacp.SeedForPseudoDeviceId);
|
||||
position += 8;
|
||||
|
||||
byte[] bcatPassphrase = new byte[65];
|
||||
if (nacp.BcatPassphrase != null)
|
||||
{
|
||||
byte[] bcatPassphraseData = Encoding.ASCII.GetBytes(nacp.BcatPassphrase);
|
||||
Buffer.BlockCopy(bcatPassphraseData, 0, bcatPassphrase, 0, bcatPassphraseData.Length);
|
||||
}
|
||||
|
||||
context.Memory.WriteBytes(position, bcatPassphrase);
|
||||
position += bcatPassphrase.Length;
|
||||
|
||||
context.Memory.WriteByte(position++, nacp.Reserved01);
|
||||
|
||||
byte[] reserved02 = new byte[0x6];
|
||||
context.Memory.WriteBytes(position, reserved02);
|
||||
position += reserved02.Length;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.UserAccountSaveDataSizeMax);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.UserAccountSaveDataJournalSizeMax);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.DeviceSaveDataSizeMax);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.DeviceSaveDataJournalSizeMax);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.TemporaryStorageSize);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.CacheStorageSize);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.CacheStorageJournalSize);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt64(position, nacp.CacheStorageDataAndJournalSizeMax);
|
||||
position += 8;
|
||||
|
||||
context.Memory.WriteInt16(position, nacp.CacheStorageIndex);
|
||||
position += 2;
|
||||
|
||||
byte[] reserved03 = new byte[0x6];
|
||||
context.Memory.WriteBytes(position, reserved03);
|
||||
position += reserved03.Length;
|
||||
|
||||
|
||||
for (int i = 0; i < 16; i++)
|
||||
{
|
||||
ulong value = 0;
|
||||
|
||||
if (nacp.PlayLogQueryableApplicationId.Count > i)
|
||||
{
|
||||
value = nacp.PlayLogQueryableApplicationId[i];
|
||||
}
|
||||
|
||||
context.Memory.WriteUInt64(position, value);
|
||||
position += 8;
|
||||
}
|
||||
|
||||
context.Memory.WriteByte(position++, nacp.PlayLogQueryCapability);
|
||||
context.Memory.WriteByte(position++, nacp.RepairFlag);
|
||||
context.Memory.WriteByte(position++, nacp.ProgramIndex);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,8 +13,15 @@ namespace Ryujinx.HLE.HOS.Services.Ns
|
|||
{
|
||||
_commands = new Dictionary<int, ServiceProcessRequest>
|
||||
{
|
||||
//...
|
||||
{ 7996, GetApplicationManagerInterface }
|
||||
};
|
||||
}
|
||||
|
||||
public long GetApplicationManagerInterface(ServiceCtx context)
|
||||
{
|
||||
MakeObject(context, new IApplicationManagerInterface());
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
34
Ryujinx.HLE/HOS/Services/Pm/IShellInterface.cs
Normal file
34
Ryujinx.HLE/HOS/Services/Pm/IShellInterface.cs
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
using Ryujinx.HLE.HOS.Ipc;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Services.Pm
|
||||
{
|
||||
class IShellInterface : IpcService
|
||||
{
|
||||
private Dictionary<int, ServiceProcessRequest> _commands;
|
||||
|
||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
|
||||
|
||||
public IShellInterface()
|
||||
{
|
||||
_commands = new Dictionary<int, ServiceProcessRequest>
|
||||
{
|
||||
{ 6, GetApplicationPid }
|
||||
};
|
||||
}
|
||||
|
||||
// GetApplicationPid() -> u64
|
||||
public long GetApplicationPid(ServiceCtx context)
|
||||
{
|
||||
// FIXME: This is wrong but needed to make hb loader works
|
||||
// TODO: Change this when we will have a way to process via a PM like interface.
|
||||
long pid = context.Process.Pid;
|
||||
|
||||
context.ResponseData.Write(pid);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -17,6 +17,7 @@ using Ryujinx.HLE.HOS.Services.Ns;
|
|||
using Ryujinx.HLE.HOS.Services.Nv;
|
||||
using Ryujinx.HLE.HOS.Services.Pctl;
|
||||
using Ryujinx.HLE.HOS.Services.Pl;
|
||||
using Ryujinx.HLE.HOS.Services.Pm;
|
||||
using Ryujinx.HLE.HOS.Services.Prepo;
|
||||
using Ryujinx.HLE.HOS.Services.Psm;
|
||||
using Ryujinx.HLE.HOS.Services.Set;
|
||||
|
|
@ -131,6 +132,7 @@ namespace Ryujinx.HLE.HOS.Services
|
|||
case "ns:am":
|
||||
return new IApplicationManagerInterface();
|
||||
|
||||
case "ns:am2":
|
||||
case "ns:ec":
|
||||
return new IServiceGetterInterface();
|
||||
|
||||
|
|
@ -161,6 +163,9 @@ namespace Ryujinx.HLE.HOS.Services
|
|||
case "pl:u":
|
||||
return new ISharedFontManager();
|
||||
|
||||
case "pm:shell":
|
||||
return new IShellInterface();
|
||||
|
||||
case "prepo:a":
|
||||
return new IPrepoService();
|
||||
|
||||
|
|
|
|||
|
|
@ -23,9 +23,10 @@ namespace Ryujinx.HLE.HOS.Services.Sm
|
|||
{
|
||||
_commands = new Dictionary<int, ServiceProcessRequest>
|
||||
{
|
||||
{ 0, Initialize },
|
||||
{ 1, GetService },
|
||||
{ 2, RegisterService }
|
||||
{ 0, Initialize },
|
||||
{ 1, GetService },
|
||||
{ 2, RegisterService },
|
||||
{ 3, UnregisterService }
|
||||
};
|
||||
|
||||
_registeredServices = new ConcurrentDictionary<string, KPort>();
|
||||
|
|
@ -128,6 +129,36 @@ namespace Ryujinx.HLE.HOS.Services.Sm
|
|||
return 0;
|
||||
}
|
||||
|
||||
public long UnregisterService(ServiceCtx context)
|
||||
{
|
||||
if (!_isInitialized)
|
||||
{
|
||||
return ErrorCode.MakeError(ErrorModule.Sm, SmErr.NotInitialized);
|
||||
}
|
||||
|
||||
long namePosition = context.RequestData.BaseStream.Position;
|
||||
|
||||
string name = ReadName(context);
|
||||
|
||||
context.RequestData.BaseStream.Seek(namePosition + 8, SeekOrigin.Begin);
|
||||
|
||||
bool isLight = (context.RequestData.ReadInt32() & 1) != 0;
|
||||
|
||||
int maxSessions = context.RequestData.ReadInt32();
|
||||
|
||||
if (name == string.Empty)
|
||||
{
|
||||
return ErrorCode.MakeError(ErrorModule.Sm, SmErr.InvalidName);
|
||||
}
|
||||
|
||||
if (!_registeredServices.TryRemove(name, out _))
|
||||
{
|
||||
return ErrorCode.MakeError(ErrorModule.Sm, SmErr.NotRegistered);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private static string ReadName(ServiceCtx context)
|
||||
{
|
||||
string name = string.Empty;
|
||||
|
|
|
|||
|
|
@ -5,5 +5,6 @@ namespace Ryujinx.HLE.HOS.Services.Sm
|
|||
public const int NotInitialized = 2;
|
||||
public const int AlreadyRegistered = 4;
|
||||
public const int InvalidName = 6;
|
||||
public const int NotRegistered = 7;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue