edafce57be
* Added GUI to Ryujinx * Updated to use Glade Also added scrollbar and default dark theme * Added support for loading icon from .nro files and cleaned up the code a bit * Added General Settings Menu (read-only for now) and moved some functionality from MainMenu.cs to ApplicationLibrary.cs * Added custom GUI theme support and changed the defualt theme to one I just wrote * Added GTK to process path, fixed a bug and minor edits * some more edits and a bug fix * general settings menu is now fully functional. also fixed the bug where ryujinx crashes when it trys to load an invalid gamedir * big rewrite * aesthetic changes to General Settings menu * Added Control Settings one day done feature :P * minor changes * 1st wave of changes * 2nd wave of changes * 3rd wave of changes * Cleanup settings ui * minor edits * new about window added, still needs styling * added spin button for new option and tooltips to settings * Game icons and names are now shown in the games list * add nuget package which contains gtk dependencies * requested changes have been changed * put CreateGameWindow on a new thread and stopped destroying the main menu when a game loads * fixed bug that allowed a user to attempt to load multiple games at a time which causes a crash * Added LastPlayed and TimePlayed columns to the game list * Did some testing and fixed some bugs Im not happy with one of the fixes so i will do it properly an upcoming commit * did some more bug testing and fixed another 2 bugs * caught an exception when ryujinx tries to load non-homebrew as homebrew * Large changes Rewrote ApplicationLibrary.cs (added comments too) so any devs reading it wont get eye cancer, also its probably more efficient now. Added 2 new columns (Developer name and application version) to the game list and wrote the logic for it. Ryujinx now loads NRO's TitleName and TitleID from the NACP file instead of the default NPDM. I also killed a lot of bugs * Moved Files moved ApplicationLibrary.cs to Ryujinx.HLE as that is a better place for it. Moved contents of GUI folder to Ui folder and changed the namespaces of the gui files from Ryujinx to Ryujinx.Ui * Added 'Open Ryujinx Folder' button to the file menu and did some small fixes * New features * updated nuget package with missing dlls and changed emmauss' requested changes * fixed some minor issues * all requested changes marked as resolved have been changed * gdkchan's requested changes * fixed an issue with settings window getting chopped on small res * fixed 2 problems caused by rebase * changed the default theme * applied Thog's patch to fix issue on linux * fixed issue caused by rebase * added update check button that runs ryujinx-updater * reads version info from installer and displays it in about menu * changes completed * requested changes changed * fixed issue with default theme * fixed a bug and completed requested changes * added more tooltips and changed some text
347 lines
13 KiB
C#
347 lines
13 KiB
C#
using LibHac;
|
|
using LibHac.Fs;
|
|
using LibHac.Fs.NcaUtils;
|
|
using Ryujinx.Common;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.HLE.FileSystem;
|
|
using Ryujinx.HLE.Utilities;
|
|
using System.IO;
|
|
|
|
using static Ryujinx.HLE.FileSystem.VirtualFileSystem;
|
|
using static Ryujinx.HLE.Utilities.StringUtils;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.FspSrv
|
|
{
|
|
[Service("fsp-srv")]
|
|
class IFileSystemProxy : IpcService
|
|
{
|
|
public IFileSystemProxy(ServiceCtx context) { }
|
|
|
|
[Command(1)]
|
|
// Initialize(u64, pid)
|
|
public ResultCode Initialize(ServiceCtx context)
|
|
{
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(8)]
|
|
// OpenFileSystemWithId(nn::fssrv::sf::FileSystemType filesystem_type, nn::ApplicationId tid, buffer<bytes<0x301>, 0x19, 0x301> path)
|
|
// -> object<nn::fssrv::sf::IFileSystem> contentFs
|
|
public ResultCode 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 ResultCode.PathDoesNotExist;
|
|
}
|
|
|
|
FileStream fileStream = new FileStream(fullPath, FileMode.Open, FileAccess.Read);
|
|
string extension = Path.GetExtension(fullPath);
|
|
|
|
if (extension == ".nca")
|
|
{
|
|
return OpenNcaFs(context, fullPath, fileStream.AsStorage());
|
|
}
|
|
else if (extension == ".nsp")
|
|
{
|
|
return OpenNsp(context, fullPath);
|
|
}
|
|
|
|
return ResultCode.InvalidInput;
|
|
}
|
|
|
|
[Command(11)]
|
|
// OpenBisFileSystem(nn::fssrv::sf::Partition partitionID, buffer<bytes<0x301>, 0x19, 0x301>) -> object<nn::fssrv::sf::IFileSystem> Bis
|
|
public ResultCode OpenBisFileSystem(ServiceCtx context)
|
|
{
|
|
int bisPartitionId = context.RequestData.ReadInt32();
|
|
string partitionString = ReadUtf8String(context);
|
|
string bisPartitionPath = string.Empty;
|
|
|
|
switch (bisPartitionId)
|
|
{
|
|
case 29:
|
|
bisPartitionPath = SafeNandPath;
|
|
break;
|
|
case 30:
|
|
case 31:
|
|
bisPartitionPath = SystemNandPath;
|
|
break;
|
|
case 32:
|
|
bisPartitionPath = UserNandPath;
|
|
break;
|
|
default:
|
|
return ResultCode.InvalidInput;
|
|
}
|
|
|
|
string fullPath = context.Device.FileSystem.GetFullPartitionPath(bisPartitionPath);
|
|
|
|
LocalFileSystem fileSystem = new LocalFileSystem(fullPath);
|
|
|
|
MakeObject(context, new IFileSystem(fileSystem));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(18)]
|
|
// OpenSdCardFileSystem() -> object<nn::fssrv::sf::IFileSystem>
|
|
public ResultCode OpenSdCardFileSystem(ServiceCtx context)
|
|
{
|
|
string sdCardPath = context.Device.FileSystem.GetSdCardPath();
|
|
|
|
LocalFileSystem fileSystem = new LocalFileSystem(sdCardPath);
|
|
|
|
MakeObject(context, new IFileSystem(fileSystem));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(51)]
|
|
// OpenSaveDataFileSystem(u8 save_data_space_id, nn::fssrv::sf::SaveStruct saveStruct) -> object<nn::fssrv::sf::IFileSystem> saveDataFs
|
|
public ResultCode OpenSaveDataFileSystem(ServiceCtx context)
|
|
{
|
|
return LoadSaveDataFileSystem(context);
|
|
}
|
|
|
|
[Command(52)]
|
|
// OpenSaveDataFileSystemBySystemSaveDataId(u8 save_data_space_id, nn::fssrv::sf::SaveStruct saveStruct) -> object<nn::fssrv::sf::IFileSystem> systemSaveDataFs
|
|
public ResultCode OpenSaveDataFileSystemBySystemSaveDataId(ServiceCtx context)
|
|
{
|
|
return LoadSaveDataFileSystem(context);
|
|
}
|
|
|
|
[Command(200)]
|
|
// OpenDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage> dataStorage
|
|
public ResultCode OpenDataStorageByCurrentProcess(ServiceCtx context)
|
|
{
|
|
MakeObject(context, new IStorage(context.Device.FileSystem.RomFs.AsStorage()));
|
|
|
|
return 0;
|
|
}
|
|
|
|
[Command(202)]
|
|
// OpenDataStorageByDataId(u8 storageId, nn::ApplicationId tid) -> object<nn::fssrv::sf::IStorage> dataStorage
|
|
public ResultCode OpenDataStorageByDataId(ServiceCtx context)
|
|
{
|
|
StorageId storageId = (StorageId)context.RequestData.ReadByte();
|
|
byte[] padding = context.RequestData.ReadBytes(7);
|
|
long titleId = context.RequestData.ReadInt64();
|
|
|
|
ContentType contentType = ContentType.Data;
|
|
|
|
StorageId installedStorage =
|
|
context.Device.System.ContentManager.GetInstalledStorage(titleId, contentType, storageId);
|
|
|
|
if (installedStorage == StorageId.None)
|
|
{
|
|
contentType = ContentType.PublicData;
|
|
|
|
installedStorage =
|
|
context.Device.System.ContentManager.GetInstalledStorage(titleId, contentType, storageId);
|
|
}
|
|
|
|
if (installedStorage != StorageId.None)
|
|
{
|
|
string contentPath = context.Device.System.ContentManager.GetInstalledContentPath(titleId, storageId, contentType);
|
|
string installPath = context.Device.FileSystem.SwitchPathToSystemPath(contentPath);
|
|
|
|
if (!string.IsNullOrWhiteSpace(installPath))
|
|
{
|
|
string ncaPath = installPath;
|
|
|
|
if (File.Exists(ncaPath))
|
|
{
|
|
try
|
|
{
|
|
LibHac.Fs.IStorage ncaStorage = new LocalStorage(ncaPath, FileAccess.Read, FileMode.Open);
|
|
Nca nca = new Nca(context.Device.System.KeySet, ncaStorage);
|
|
LibHac.Fs.IStorage romfsStorage = nca.OpenStorage(NcaSectionType.Data, context.Device.System.FsIntegrityCheckLevel);
|
|
|
|
MakeObject(context, new IStorage(romfsStorage));
|
|
}
|
|
catch (HorizonResultException ex)
|
|
{
|
|
return (ResultCode)ex.ResultValue.Value;
|
|
}
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
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}.");
|
|
}
|
|
|
|
[Command(203)]
|
|
// OpenPatchDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage>
|
|
public ResultCode OpenPatchDataStorageByCurrentProcess(ServiceCtx context)
|
|
{
|
|
MakeObject(context, new IStorage(context.Device.FileSystem.RomFs.AsStorage()));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(1005)]
|
|
// GetGlobalAccessLogMode() -> u32 logMode
|
|
public ResultCode GetGlobalAccessLogMode(ServiceCtx context)
|
|
{
|
|
int mode = context.Device.System.GlobalAccessLogMode;
|
|
|
|
context.ResponseData.Write(mode);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(1006)]
|
|
// OutputAccessLogToSdCard(buffer<bytes, 5> log_text)
|
|
public ResultCode OutputAccessLogToSdCard(ServiceCtx context)
|
|
{
|
|
string message = ReadUtf8StringSend(context);
|
|
|
|
// FS ends each line with a newline. Remove it because Ryujinx logging adds its own newline
|
|
Logger.PrintAccessLog(LogClass.ServiceFs, message.TrimEnd('\n'));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode LoadSaveDataFileSystem(ServiceCtx context)
|
|
{
|
|
SaveSpaceId saveSpaceId = (SaveSpaceId)context.RequestData.ReadInt64();
|
|
|
|
ulong titleId = context.RequestData.ReadUInt64();
|
|
|
|
UInt128 userId = context.RequestData.ReadStruct<UInt128>();
|
|
|
|
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);
|
|
|
|
try
|
|
{
|
|
LocalFileSystem fileSystem = new LocalFileSystem(savePath);
|
|
DirectorySaveDataFileSystem saveFileSystem = new DirectorySaveDataFileSystem(fileSystem);
|
|
|
|
MakeObject(context, new IFileSystem(saveFileSystem));
|
|
}
|
|
catch (HorizonResultException ex)
|
|
{
|
|
return (ResultCode)ex.ResultValue.Value;
|
|
}
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
private ResultCode OpenNsp(ServiceCtx context, string pfsPath)
|
|
{
|
|
try
|
|
{
|
|
LocalStorage storage = new LocalStorage(pfsPath, FileAccess.Read, FileMode.Open);
|
|
PartitionFileSystem nsp = new PartitionFileSystem(storage);
|
|
|
|
ImportTitleKeysFromNsp(nsp, context.Device.System.KeySet);
|
|
|
|
IFileSystem nspFileSystem = new IFileSystem(nsp);
|
|
|
|
MakeObject(context, nspFileSystem);
|
|
}
|
|
catch (HorizonResultException ex)
|
|
{
|
|
return (ResultCode)ex.ResultValue.Value;
|
|
}
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
private ResultCode OpenNcaFs(ServiceCtx context, string ncaPath, LibHac.Fs.IStorage ncaStorage)
|
|
{
|
|
try
|
|
{
|
|
Nca nca = new Nca(context.Device.System.KeySet, ncaStorage);
|
|
|
|
if (!nca.SectionExists(NcaSectionType.Data))
|
|
{
|
|
return ResultCode.PartitionNotFound;
|
|
}
|
|
|
|
LibHac.Fs.IFileSystem fileSystem = nca.OpenFileSystem(NcaSectionType.Data, context.Device.System.FsIntegrityCheckLevel);
|
|
|
|
MakeObject(context, new IFileSystem(fileSystem));
|
|
}
|
|
catch (HorizonResultException ex)
|
|
{
|
|
return (ResultCode)ex.ResultValue.Value;
|
|
}
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
private ResultCode 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);
|
|
|
|
try
|
|
{
|
|
PartitionFileSystem nsp = new PartitionFileSystem(pfsFile.AsStorage());
|
|
|
|
ImportTitleKeysFromNsp(nsp, context.Device.System.KeySet);
|
|
|
|
string filename = fullPath.Replace(archivePath.FullName, string.Empty).TrimStart('\\');
|
|
|
|
if (nsp.FileExists(filename))
|
|
{
|
|
return OpenNcaFs(context, fullPath, nsp.OpenFile(filename, OpenMode.Read).AsStorage());
|
|
}
|
|
}
|
|
catch (HorizonResultException ex)
|
|
{
|
|
return (ResultCode)ex.ResultValue.Value;
|
|
}
|
|
}
|
|
|
|
return ResultCode.PathDoesNotExist;
|
|
}
|
|
|
|
private void ImportTitleKeysFromNsp(LibHac.Fs.IFileSystem nsp, Keyset keySet)
|
|
{
|
|
foreach (DirectoryEntry ticketEntry in nsp.EnumerateEntries("*.tik"))
|
|
{
|
|
Ticket ticket = new Ticket(nsp.OpenFile(ticketEntry.FullPath, OpenMode.Read).AsStream());
|
|
|
|
if (!keySet.TitleKeys.ContainsKey(ticket.RightsId))
|
|
{
|
|
keySet.TitleKeys.Add(ticket.RightsId, ticket.GetTitleKey(keySet));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} |