mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle more errors in IFileSystem

Browse source
This commit is contained in:
Alex Barney 2019-05-23 09:13:52 -05:00
commit 07aeead5b9
1 changed files with 65 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

96
Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs
View file

@ -3,7 +3,7 @@ using Ryujinx.HLE.HOS.Ipc;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using Ryujinx.Common.Logging;
using static Ryujinx.HLE.HOS.ErrorCode; using static Ryujinx.HLE.HOS.ErrorCode;
using static Ryujinx.HLE.Utilities.StringUtils; using static Ryujinx.HLE.Utilities.StringUtils;
@ -72,10 +72,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
_provider.CreateFile(name, size, (CreateFileOptions)mode); _provider.CreateFile(name, size, (CreateFileOptions)mode);
} }
catch (IOException) catch (DirectoryNotFoundException)
{ {
// todo Figure out result codes return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
return MakeError(ErrorModule.Fs, 0); }
catch (UnauthorizedAccessException)
{
Logger.PrintError(LogClass.ServiceFs, $"Unable to access {name}");
throw;
} }
return 0; return 0;
@ -100,10 +105,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
_provider.DeleteFile(name); _provider.DeleteFile(name);
} }
catch (IOException) catch (FileNotFoundException)
{ {
// todo Figure out result codes return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
return MakeError(ErrorModule.Fs, 0); }
catch (UnauthorizedAccessException)
{
Logger.PrintError(LogClass.ServiceFs, $"Unable to access {name}");
throw;
} }
return 0; return 0;
@ -133,10 +143,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
_provider.CreateDirectory(name); _provider.CreateDirectory(name);
} }
catch (IOException) catch (DirectoryNotFoundException)
{ {
// todo Figure out result codes return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
return MakeError(ErrorModule.Fs, 0); }
catch (UnauthorizedAccessException)
{
Logger.PrintError(LogClass.ServiceFs, $"Unable to access {name}");
throw;
} }
return 0; return 0;
@ -161,10 +176,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
_provider.DeleteDirectory(name); _provider.DeleteDirectory(name);
} }
catch (IOException) catch (DirectoryNotFoundException)
{ {
// todo Figure out result codes return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
return MakeError(ErrorModule.Fs, 0); }
catch (UnauthorizedAccessException)
{
Logger.PrintError(LogClass.ServiceFs, $"Unable to access {name}");
throw;
} }
return 0; return 0;
@ -189,10 +209,11 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
_provider.DeleteDirectoryRecursively(name); _provider.DeleteDirectoryRecursively(name);
} }
catch (IOException) catch (UnauthorizedAccessException)
{ {
// todo Figure out result codes Logger.PrintError(LogClass.ServiceFs, $"Unable to access {name}");
return MakeError(ErrorModule.Fs, 0);
throw;
} }
return 0; return 0;
@ -223,10 +244,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
_provider.RenameFile(oldName, newName); _provider.RenameFile(oldName, newName);
} }
catch (IOException) catch (FileNotFoundException)
{ {
// todo Figure out result codes return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
return MakeError(ErrorModule.Fs, 0); }
catch (UnauthorizedAccessException)
{
Logger.PrintError(LogClass.ServiceFs, $"Unable to access {oldName} or {newName}");
throw;
} }
return 0; return 0;
@ -257,10 +283,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
_provider.RenameFile(oldName, newName); _provider.RenameFile(oldName, newName);
} }
catch (IOException) catch (DirectoryNotFoundException)
{ {
// todo Figure out result codes return MakeError(ErrorModule.Fs, FsErr.PathDoesNotExist);
return MakeError(ErrorModule.Fs, 0); }
catch (UnauthorizedAccessException)
{
Logger.PrintError(LogClass.ServiceFs, $"Unable to access {oldName} or {newName}");
throw;
} }
return 0; return 0;
@ -312,10 +343,11 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
fileInterface = new IFile(file, name); fileInterface = new IFile(file, name);
} }
catch (Exception) catch (UnauthorizedAccessException)
{ {
// todo Figure out result codes Logger.PrintError(LogClass.ServiceFs, $"Unable to access {name}");
return MakeError(ErrorModule.Fs, 0);
throw;
} }
fileInterface.Disposed += RemoveFileInUse; fileInterface.Disposed += RemoveFileInUse;
@ -355,10 +387,11 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
dirInterface = new IDirectory(dir); dirInterface = new IDirectory(dir);
} }
catch (Exception) catch (UnauthorizedAccessException)
{ {
// todo Figure out result codes Logger.PrintError(LogClass.ServiceFs, $"Unable to access {name}");
return MakeError(ErrorModule.Fs, 0);
throw;
} }
dirInterface.Disposed += RemoveDirectoryInUse; dirInterface.Disposed += RemoveDirectoryInUse;
@ -420,10 +453,11 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
_provider.CleanDirectoryRecursively(name); _provider.CleanDirectoryRecursively(name);
} }
catch (IOException) catch (UnauthorizedAccessException)
{ {
// todo Figure out result codes Logger.PrintError(LogClass.ServiceFs, $"Unable to access {name}");
return MakeError(ErrorModule.Fs, 0);
throw;
} }
return 0; return 0;