Catch HorizonResultException in IFileSystemProxy

Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs

@@ -3,6 +3,7 @@ using LibHac.Fs;
 using Ryujinx.HLE.HOS.Ipc;
 using System.Collections.Generic;
 
+using static Ryujinx.HLE.HOS.ErrorCode;
 using static Ryujinx.HLE.Utilities.StringUtils;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
@@ -174,8 +175,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
             {
                 DirectoryEntryType entryType = _fileSystem.GetEntryType(name);
 
+                if (entryType == DirectoryEntryType.Directory || entryType == DirectoryEntryType.File)
+                {
                     context.ResponseData.Write((int)entryType);
                 }
+                else
+                {
+                    return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
+                }
+            }
             catch (HorizonResultException ex)
             {
                 return ex.ResultValue.Value;

Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs

@@ -126,17 +126,13 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
         // OpenSaveDataFileSystem(u8 save_data_space_id, nn::fssrv::sf::SaveStruct saveStruct) -> object<nn::fssrv::sf::IFileSystem> saveDataFs
         public long OpenSaveDataFileSystem(ServiceCtx context)
         {
-            LoadSaveDataFileSystem(context);
+            return LoadSaveDataFileSystem(context);
-
-            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);
+            return LoadSaveDataFileSystem(context);
-
-            return 0;
         }
 
         // OpenDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage> dataStorage
@@ -177,12 +173,19 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
                     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 ex.ResultValue.Value;
+                        }
 
                         return 0;
                     }
@@ -229,7 +232,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
             return 0;
         }
 
-        public void LoadSaveDataFileSystem(ServiceCtx context)
+        public long LoadSaveDataFileSystem(ServiceCtx context)
         {
             SaveSpaceId saveSpaceId = (SaveSpaceId)context.RequestData.ReadInt64();
 
@@ -241,14 +244,26 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
             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 ex.ResultValue.Value;
+            }
+
+            return 0;
+        }
 
         private long OpenNsp(ServiceCtx context, string pfsPath)
+        {
+            try
             {
                 LocalStorage        storage = new LocalStorage(pfsPath, FileAccess.Read, FileMode.Open);
                 PartitionFileSystem nsp     = new PartitionFileSystem(storage);
@@ -258,11 +273,18 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
                 IFileSystem nspFileSystem = new IFileSystem(nsp);
 
                 MakeObject(context, nspFileSystem);
+            }
+            catch (HorizonResultException ex)
+            {
+                return ex.ResultValue.Value;
+            }
 
             return 0;
         }
 
         private long OpenNcaFs(ServiceCtx context, string ncaPath, LibHac.Fs.IStorage ncaStorage)
+        {
+            try
             {
                 Nca nca = new Nca(context.Device.System.KeySet, ncaStorage);
 
@@ -274,6 +296,11 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
                 LibHac.Fs.IFileSystem fileSystem = nca.OpenFileSystem(NcaSectionType.Data, context.Device.System.FsIntegrityCheckLevel);
 
                 MakeObject(context, new IFileSystem(fileSystem));
+            }
+            catch (HorizonResultException ex)
+            {
+                return ex.ResultValue.Value;
+            }
 
             return 0;
         }
@@ -294,6 +321,8 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
                     FileMode.Open,
                     FileAccess.Read);
 
+                try
+                {
                     PartitionFileSystem nsp = new PartitionFileSystem(pfsFile.AsStorage());
 
                     ImportTitleKeysFromNsp(nsp, context.Device.System.KeySet);
@@ -305,6 +334,11 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
                         return OpenNcaFs(context, fullPath, nsp.OpenFile(filename, OpenMode.Read).AsStorage());
                     }
                 }
+                catch (HorizonResultException ex)
+                {
+                    return ex.ResultValue.Value;
+                }
+            }
 
             return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
         }

Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -46,7 +46,7 @@
 
   <ItemGroup>
     <PackageReference Include="Concentus" Version="1.1.7" />
-    <PackageReference Include="LibHac" Version="0.4.2--more-results.21" />
+    <PackageReference Include="LibHac" Version="0.5.0" />
     <PackageReference Include="TimeZoneConverter.Posix" Version="2.1.0" />
   </ItemGroup>