Implement ContentManager and related services (#438)
* Implement contentmanager and related services * small changes * read system firmware version from nand * add pfs support, write directoryentry info for romfs files * add file check in fsp-srv:8 * add support for open fs of internal files * fix filename when accessing pfs * use switch style paths for contentpath * close nca after verifying type * removed publishing profiles, align directory entry * fix style * lots of style fixes * yasf(yet another style fix) * yasf(yet another style fix) plus symbols * enforce path check on every fs access * change enum type to default * fix typo
This commit is contained in:
emmauss
gdkchan
parent
e603b7afbc
commit
fe8fbb6fb9
38 changed files with 2179 additions and 173 deletions
|
|
@ -1,7 +1,14 @@
|
|||
using LibHac;
|
||||
using Ryujinx.HLE.FileSystem;
|
||||
using Ryujinx.HLE.HOS.Ipc;
|
||||
using Ryujinx.HLE.Utilities;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
using static Ryujinx.HLE.FileSystem.VirtualFileSystem;
|
||||
using static Ryujinx.HLE.HOS.ErrorCode;
|
||||
using static Ryujinx.HLE.Utilities.StringUtils;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Services.FspSrv
|
||||
{
|
||||
|
|
@ -15,28 +22,104 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|||
{
|
||||
m_Commands = new Dictionary<int, ServiceProcessRequest>()
|
||||
{
|
||||
{ 1, SetCurrentProcess },
|
||||
{ 1, Initialize },
|
||||
{ 8, OpenFileSystemWithId },
|
||||
{ 11, OpenBisFileSystem },
|
||||
{ 18, OpenSdCardFileSystem },
|
||||
{ 51, OpenSaveDataFileSystem },
|
||||
{ 52, OpenSaveDataFileSystemBySystemSaveDataId },
|
||||
{ 200, OpenDataStorageByCurrentProcess },
|
||||
{ 202, OpenDataStorageByDataId },
|
||||
{ 203, OpenPatchDataStorageByCurrentProcess },
|
||||
{ 1005, GetGlobalAccessLogMode }
|
||||
};
|
||||
}
|
||||
|
||||
public long SetCurrentProcess(ServiceCtx Context)
|
||||
// Initialize(u64, pid)
|
||||
public long Initialize(ServiceCtx Context)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
// OpenFileSystemWithId(nn::fssrv::sf::FileSystemType filesystem_type, nn::ApplicationId tid, buffer<bytes<0x301>, 0x19, 0x301> path)
|
||||
// -> object<nn::fssrv::sf::IFileSystem> contentFs
|
||||
public long OpenFileSystemWithId(ServiceCtx Context)
|
||||
{
|
||||
FileSystemType FileSystemType = (FileSystemType)Context.RequestData.ReadInt32();
|
||||
long TitleId = Context.RequestData.ReadInt64();
|
||||
string SwitchPath = ReadUtf8String(Context);
|
||||
string FullPath = Context.Device.FileSystem.SwitchPathToSystemPath(SwitchPath);
|
||||
|
||||
if (!File.Exists(FullPath))
|
||||
{
|
||||
if (FullPath.Contains("."))
|
||||
{
|
||||
return OpenFileSystemFromInternalFile(Context, FullPath);
|
||||
}
|
||||
|
||||
return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
|
||||
}
|
||||
|
||||
FileStream FileStream = new FileStream(FullPath, FileMode.Open, FileAccess.Read);
|
||||
string Extension = Path.GetExtension(FullPath);
|
||||
|
||||
if (Extension == ".nca")
|
||||
{
|
||||
return OpenNcaFs(Context, FullPath, FileStream);
|
||||
}
|
||||
else if (Extension == ".nsp")
|
||||
{
|
||||
return OpenNsp(Context, FullPath);
|
||||
}
|
||||
|
||||
return MakeError(ErrorModule.Fs, FsErr.InvalidInput);
|
||||
}
|
||||
|
||||
// OpenBisFileSystem(nn::fssrv::sf::Partition partitionID, buffer<bytes<0x301>, 0x19, 0x301>) -> object<nn::fssrv::sf::IFileSystem> Bis
|
||||
public long OpenBisFileSystem(ServiceCtx Context)
|
||||
{
|
||||
int BisPartitionId = Context.RequestData.ReadInt32();
|
||||
string PartitionString = ReadUtf8String(Context);
|
||||
string BisPartitonPath = string.Empty;
|
||||
|
||||
switch (BisPartitionId)
|
||||
{
|
||||
case 29:
|
||||
BisPartitonPath = SafeNandPath;
|
||||
break;
|
||||
case 30:
|
||||
case 31:
|
||||
BisPartitonPath = SystemNandPath;
|
||||
break;
|
||||
case 32:
|
||||
BisPartitonPath = UserNandPath;
|
||||
break;
|
||||
default:
|
||||
return MakeError(ErrorModule.Fs, FsErr.InvalidInput);
|
||||
}
|
||||
|
||||
string FullPath = Context.Device.FileSystem.GetFullPartitionPath(BisPartitonPath);
|
||||
|
||||
FileSystemProvider FileSystemProvider = new FileSystemProvider(FullPath, Context.Device.FileSystem.GetBasePath());
|
||||
|
||||
MakeObject(Context, new IFileSystem(FullPath, FileSystemProvider));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// OpenSdCardFileSystem() -> object<nn::fssrv::sf::IFileSystem>
|
||||
public long OpenSdCardFileSystem(ServiceCtx Context)
|
||||
{
|
||||
MakeObject(Context, new IFileSystem(Context.Device.FileSystem.GetSdCardPath()));
|
||||
string SdCardPath = Context.Device.FileSystem.GetSdCardPath();
|
||||
|
||||
FileSystemProvider FileSystemProvider = new FileSystemProvider(SdCardPath, Context.Device.FileSystem.GetBasePath());
|
||||
|
||||
MakeObject(Context, new IFileSystem(SdCardPath, FileSystemProvider));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// OpenSaveDataFileSystem(u8 save_data_space_id, nn::fssrv::sf::SaveStruct saveStruct) -> object<nn::fssrv::sf::IFileSystem> saveDataFs
|
||||
public long OpenSaveDataFileSystem(ServiceCtx Context)
|
||||
{
|
||||
LoadSaveDataFileSystem(Context);
|
||||
|
|
@ -44,6 +127,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|||
return 0;
|
||||
}
|
||||
|
||||
// OpenSaveDataFileSystemBySystemSaveDataId(u8 save_data_space_id, nn::fssrv::sf::SaveStruct saveStruct) -> object<nn::fssrv::sf::IFileSystem> systemSaveDataFs
|
||||
public long OpenSaveDataFileSystemBySystemSaveDataId(ServiceCtx Context)
|
||||
{
|
||||
LoadSaveDataFileSystem(Context);
|
||||
|
|
@ -51,6 +135,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|||
return 0;
|
||||
}
|
||||
|
||||
// OpenDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage> dataStorage
|
||||
public long OpenDataStorageByCurrentProcess(ServiceCtx Context)
|
||||
{
|
||||
MakeObject(Context, new IStorage(Context.Device.FileSystem.RomFs));
|
||||
|
|
@ -58,6 +143,63 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|||
return 0;
|
||||
}
|
||||
|
||||
// OpenDataStorageByDataId(u8 storageId, nn::ApplicationId tid) -> object<nn::fssrv::sf::IStorage> dataStorage
|
||||
public long OpenDataStorageByDataId(ServiceCtx Context)
|
||||
{
|
||||
StorageId StorageId = (StorageId)Context.RequestData.ReadByte();
|
||||
byte[] Padding = Context.RequestData.ReadBytes(7);
|
||||
long TitleId = Context.RequestData.ReadInt64();
|
||||
|
||||
StorageId InstalledStorage =
|
||||
Context.Device.System.ContentManager.GetInstalledStorage(TitleId, ContentType.Data, StorageId);
|
||||
|
||||
if (InstalledStorage == StorageId.None)
|
||||
{
|
||||
InstalledStorage =
|
||||
Context.Device.System.ContentManager.GetInstalledStorage(TitleId, ContentType.AocData, StorageId);
|
||||
}
|
||||
|
||||
if (InstalledStorage != StorageId.None)
|
||||
{
|
||||
string ContentPath = Context.Device.System.ContentManager.GetInstalledContentPath(TitleId, StorageId, ContentType.AocData);
|
||||
|
||||
if (string.IsNullOrWhiteSpace(ContentPath))
|
||||
{
|
||||
ContentPath = Context.Device.System.ContentManager.GetInstalledContentPath(TitleId, StorageId, ContentType.AocData);
|
||||
}
|
||||
|
||||
string InstallPath = Context.Device.FileSystem.SwitchPathToSystemPath(ContentPath);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(InstallPath))
|
||||
{
|
||||
string NcaPath = InstallPath;
|
||||
|
||||
if (File.Exists(NcaPath))
|
||||
{
|
||||
FileStream NcaStream = new FileStream(NcaPath, FileMode.Open, FileAccess.Read);
|
||||
Nca Nca = new Nca(Context.Device.System.KeySet, NcaStream, false);
|
||||
NcaSection RomfsSection = Nca.Sections.FirstOrDefault(x => x?.Type == SectionType.Romfs);
|
||||
Stream RomfsStream = Nca.OpenSection(RomfsSection.SectionNum, false, Context.Device.System.FsIntegrityCheckLevel);
|
||||
|
||||
MakeObject(Context, new IStorage(RomfsStream));
|
||||
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new FileNotFoundException($"No Nca found in Path `{NcaPath}`.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new DirectoryNotFoundException($"Path for title id {TitleId:x16} on Storage {StorageId} was not found in Path {InstallPath}.");
|
||||
}
|
||||
}
|
||||
|
||||
throw new FileNotFoundException($"System archive with titleid {TitleId:x16} was not found on Storage {StorageId}. Found in {InstalledStorage}.");
|
||||
}
|
||||
|
||||
// OpenPatchDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage>
|
||||
public long OpenPatchDataStorageByCurrentProcess(ServiceCtx Context)
|
||||
{
|
||||
MakeObject(Context, new IStorage(Context.Device.FileSystem.RomFs));
|
||||
|
|
@ -65,6 +207,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|||
return 0;
|
||||
}
|
||||
|
||||
// GetGlobalAccessLogMode() -> u32 logMode
|
||||
public long GetGlobalAccessLogMode(ServiceCtx Context)
|
||||
{
|
||||
Context.ResponseData.Write(0);
|
||||
|
|
@ -82,13 +225,102 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|||
Context.RequestData.ReadInt64(),
|
||||
Context.RequestData.ReadInt64());
|
||||
|
||||
long SaveId = Context.RequestData.ReadInt64();
|
||||
long SaveId = Context.RequestData.ReadInt64();
|
||||
SaveDataType SaveDataType = (SaveDataType)Context.RequestData.ReadByte();
|
||||
SaveInfo SaveInfo = new SaveInfo(TitleId, SaveId, SaveDataType, UserId, SaveSpaceId);
|
||||
string SavePath = Context.Device.FileSystem.GetGameSavePath(SaveInfo, Context);
|
||||
FileSystemProvider FileSystemProvider = new FileSystemProvider(SavePath, Context.Device.FileSystem.GetBasePath());
|
||||
|
||||
SaveDataType SaveDataType = (SaveDataType)Context.RequestData.ReadByte();
|
||||
MakeObject(Context, new IFileSystem(SavePath, FileSystemProvider));
|
||||
}
|
||||
|
||||
SaveInfo SaveInfo = new SaveInfo(TitleId, SaveId, SaveDataType, UserId, SaveSpaceId);
|
||||
private long OpenNsp(ServiceCtx Context, string PfsPath)
|
||||
{
|
||||
FileStream PfsFile = new FileStream(PfsPath, FileMode.Open, FileAccess.Read);
|
||||
Pfs Nsp = new Pfs(PfsFile);
|
||||
PfsFileEntry TicketFile = Nsp.Files.FirstOrDefault(x => x.Name.EndsWith(".tik"));
|
||||
|
||||
MakeObject(Context, new IFileSystem(Context.Device.FileSystem.GetGameSavePath(SaveInfo, Context)));
|
||||
if (TicketFile != null)
|
||||
{
|
||||
Ticket Ticket = new Ticket(Nsp.OpenFile(TicketFile));
|
||||
|
||||
Context.Device.System.KeySet.TitleKeys[Ticket.RightsId] =
|
||||
Ticket.GetTitleKey(Context.Device.System.KeySet);
|
||||
}
|
||||
|
||||
IFileSystem NspFileSystem = new IFileSystem(PfsPath, new PFsProvider(Nsp));
|
||||
|
||||
MakeObject(Context, NspFileSystem);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private long OpenNcaFs(ServiceCtx Context,string NcaPath, Stream NcaStream)
|
||||
{
|
||||
Nca Nca = new Nca(Context.Device.System.KeySet, NcaStream, false);
|
||||
|
||||
NcaSection RomfsSection = Nca.Sections.FirstOrDefault(x => x?.Type == SectionType.Romfs);
|
||||
NcaSection PfsSection = Nca.Sections.FirstOrDefault(x => x?.Type == SectionType.Pfs0);
|
||||
|
||||
if (RomfsSection != null)
|
||||
{
|
||||
Stream RomfsStream = Nca.OpenSection(RomfsSection.SectionNum, false, Context.Device.System.FsIntegrityCheckLevel);
|
||||
IFileSystem NcaFileSystem = new IFileSystem(NcaPath, new RomFsProvider(RomfsStream));
|
||||
|
||||
MakeObject(Context, NcaFileSystem);
|
||||
}
|
||||
else if(PfsSection !=null)
|
||||
{
|
||||
Stream PfsStream = Nca.OpenSection(PfsSection.SectionNum, false, Context.Device.System.FsIntegrityCheckLevel);
|
||||
Pfs Pfs = new Pfs(PfsStream);
|
||||
IFileSystem NcaFileSystem = new IFileSystem(NcaPath, new PFsProvider(Pfs));
|
||||
|
||||
MakeObject(Context, NcaFileSystem);
|
||||
}
|
||||
else
|
||||
{
|
||||
return MakeError(ErrorModule.Fs, FsErr.PartitionNotFound);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private long OpenFileSystemFromInternalFile(ServiceCtx Context, string FullPath)
|
||||
{
|
||||
DirectoryInfo ArchivePath = new DirectoryInfo(FullPath).Parent;
|
||||
|
||||
while (string.IsNullOrWhiteSpace(ArchivePath.Extension))
|
||||
{
|
||||
ArchivePath = ArchivePath.Parent;
|
||||
}
|
||||
|
||||
if (ArchivePath.Extension == ".nsp" && File.Exists(ArchivePath.FullName))
|
||||
{
|
||||
FileStream PfsFile = new FileStream(
|
||||
ArchivePath.FullName.TrimEnd(Path.DirectorySeparatorChar),
|
||||
FileMode.Open,
|
||||
FileAccess.Read);
|
||||
|
||||
Pfs Nsp = new Pfs(PfsFile);
|
||||
PfsFileEntry TicketFile = Nsp.Files.FirstOrDefault(x => x.Name.EndsWith(".tik"));
|
||||
|
||||
if (TicketFile != null)
|
||||
{
|
||||
Ticket Ticket = new Ticket(Nsp.OpenFile(TicketFile));
|
||||
|
||||
Context.Device.System.KeySet.TitleKeys[Ticket.RightsId] =
|
||||
Ticket.GetTitleKey(Context.Device.System.KeySet);
|
||||
}
|
||||
|
||||
string Filename = FullPath.Replace(ArchivePath.FullName, string.Empty).TrimStart('\\');
|
||||
|
||||
if (Nsp.FileExists(Filename))
|
||||
{
|
||||
return OpenNcaFs(Context, FullPath, Nsp.OpenFile(Filename));
|
||||
}
|
||||
}
|
||||
|
||||
return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue