emu-mirrors/ryujinx-fork
0
0
Fork 0
mirror of https://github.com/ryujinx-mirror/ryujinx.git synced 2024-12-23 13:25:46 +00:00
Code Activity

Update to LibHac 0.8.2 (#889)

Browse source 
* Update to LibHac 0.8.2

This brings support for temporary savedata, ignores case in key names when loading from a file, and prints the rights ID correctly when missing a title key.

* Auto-format IFileSystemProxy
This commit is contained in:
Alex Barney 2020-01-16 15:08:39 -07:00 committed by gdkchan
parent 892df335e6
commit c5f872c70a
3 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs
View file

@ -130,7 +130,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs
public ResultCode CreateSaveDataFileSystem(ServiceCtx context) public ResultCode CreateSaveDataFileSystem(ServiceCtx context)
{ {
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>(); SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
SaveDataCreateInfo createInfo = context.RequestData.ReadStruct<SaveDataCreateInfo>(); SaveDataCreationInfo creationInfo = context.RequestData.ReadStruct<SaveDataCreationInfo>();
SaveMetaCreateInfo metaCreateInfo = context.RequestData.ReadStruct<SaveMetaCreateInfo>(); SaveMetaCreateInfo metaCreateInfo = context.RequestData.ReadStruct<SaveMetaCreateInfo>();
// TODO: There's currently no program registry for FS to reference. // TODO: There's currently no program registry for FS to reference.
@ -140,14 +140,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs
attribute.TitleId = new TitleId(context.Process.TitleId); attribute.TitleId = new TitleId(context.Process.TitleId);
} }
if (createInfo.OwnerId == TitleId.Zero) if (creationInfo.OwnerId == TitleId.Zero)
{ {
createInfo.OwnerId = new TitleId(context.Process.TitleId); creationInfo.OwnerId = new TitleId(context.Process.TitleId);
} }
Logger.PrintInfo(LogClass.ServiceFs, $"Creating save with title ID {attribute.TitleId.Value:x16}"); Logger.PrintInfo(LogClass.ServiceFs, $"Creating save with title ID {attribute.TitleId.Value:x16}");
Result result = _baseFileSystemProxy.CreateSaveDataFileSystem(ref attribute, ref createInfo, ref metaCreateInfo); Result result = _baseFileSystemProxy.CreateSaveDataFileSystem(ref attribute, ref creationInfo, ref metaCreateInfo);
return (ResultCode)result.Value; return (ResultCode)result.Value;
} }
@ -156,9 +156,9 @@ namespace Ryujinx.HLE.HOS.Services.Fs
public ResultCode CreateSaveDataFileSystemBySystemSaveDataId(ServiceCtx context) public ResultCode CreateSaveDataFileSystemBySystemSaveDataId(ServiceCtx context)
{ {
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>(); SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
SaveDataCreateInfo createInfo = context.RequestData.ReadStruct<SaveDataCreateInfo>(); SaveDataCreationInfo creationInfo = context.RequestData.ReadStruct<SaveDataCreationInfo>();
Result result = _baseFileSystemProxy.CreateSaveDataFileSystemBySystemSaveDataId(ref attribute, ref createInfo); Result result = _baseFileSystemProxy.CreateSaveDataFileSystemBySystemSaveDataId(ref attribute, ref creationInfo);
return (ResultCode)result.Value; return (ResultCode)result.Value;
} }
@ -206,7 +206,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs
public ResultCode CreateSaveDataFileSystemWithHashSalt(ServiceCtx context) public ResultCode CreateSaveDataFileSystemWithHashSalt(ServiceCtx context)
{ {
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>(); SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
SaveDataCreateInfo createInfo = context.RequestData.ReadStruct<SaveDataCreateInfo>(); SaveDataCreationInfo creationInfo = context.RequestData.ReadStruct<SaveDataCreationInfo>();
SaveMetaCreateInfo metaCreateInfo = context.RequestData.ReadStruct<SaveMetaCreateInfo>(); SaveMetaCreateInfo metaCreateInfo = context.RequestData.ReadStruct<SaveMetaCreateInfo>();
HashSalt hashSalt = context.RequestData.ReadStruct<HashSalt>(); HashSalt hashSalt = context.RequestData.ReadStruct<HashSalt>();
@ -217,12 +217,12 @@ namespace Ryujinx.HLE.HOS.Services.Fs
attribute.TitleId = new TitleId(context.Process.TitleId); attribute.TitleId = new TitleId(context.Process.TitleId);
} }
if (createInfo.OwnerId == TitleId.Zero) if (creationInfo.OwnerId == TitleId.Zero)
{ {
createInfo.OwnerId = new TitleId(context.Process.TitleId); creationInfo.OwnerId = new TitleId(context.Process.TitleId);
} }
Result result = _baseFileSystemProxy.CreateSaveDataFileSystemWithHashSalt(ref attribute, ref createInfo, ref metaCreateInfo, ref hashSalt); Result result = _baseFileSystemProxy.CreateSaveDataFileSystemWithHashSalt(ref attribute, ref creationInfo, ref metaCreateInfo, ref hashSalt);
return (ResultCode)result.Value; return (ResultCode)result.Value;
} }

2
Ryujinx.HLE/Ryujinx.HLE.csproj
View file

@ -52,7 +52,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Concentus" Version="1.1.7" /> <PackageReference Include="Concentus" Version="1.1.7" />
<PackageReference Include="LibHac" Version="0.7.0" /> <PackageReference Include="LibHac" Version="0.8.2" />
<PackageReference Include="TimeZoneConverter.Posix" Version="2.1.0" /> <PackageReference Include="TimeZoneConverter.Posix" Version="2.1.0" />
</ItemGroup> </ItemGroup>

3
Ryujinx/Ui/SaveImporter.cs
View file

@ -3,7 +3,6 @@ using LibHac.Common;
using LibHac.Fs; using LibHac.Fs;
using LibHac.Fs.Shim; using LibHac.Fs.Shim;
using LibHac.FsSystem; using LibHac.FsSystem;
using LibHac.FsSystem.Save;
using LibHac.Ncm; using LibHac.Ncm;
using Ryujinx.HLE.Utilities; using Ryujinx.HLE.Utilities;
using System; using System;
@ -131,7 +130,7 @@ namespace Ryujinx.Ui
{ {
SaveDataAttribute attribute = new SaveDataAttribute SaveDataAttribute attribute = new SaveDataAttribute
{ {
Type = SaveDataType.SaveData, Type = SaveDataType.Account,
UserId = userId, UserId = userId,
TitleId = new TitleId(titleId) TitleId = new TitleId(titleId)
}; };