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

Use File.Exits instead of relying ona try/catch and change system resource exception format a bit

Browse source
This commit is contained in:
Thog 2018-07-31 20:39:32 +02:00
parent df7a393584
commit 7287041050
No known key found for this signature in database
GPG key ID: 0CD291558FAFDBC6
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Ryujinx.HLE/Font/SharedFontManager.cs
View file

@ -50,19 +50,22 @@ namespace Ryujinx.HLE.Font
public byte[] GetData(string FontName)
{
string FontFilePath = Path.Combine(FontsPath, $"{FontName}.ttf");
try
if (File.Exists(FontFilePath))
{
return File.ReadAllBytes(FontFilePath);
} catch (FileNotFoundException e)
}
else
{
throw new SystemResourceNotFoundException($"Font \"{FontName}.ttf\" not found. Please provide it in {FontsPath}", e);
throw new SystemResourceNotFoundException($"Font \"{FontName}.ttf\" not found. Please provide it in \"{FontsPath}\".");
}
}
public void MapFont(SharedFontType FontType, AMemory Memory, long Position)
{
uint SharedMemoryAddressOffset = GetSharedMemoryAddressOffset(FontType);
// TODO: find what are the 8 bytes before the font
Memory.WriteBytes(Position + GetSharedMemoryAddressOffset(FontType), FontEmbeddedPaths[FontType]);
Memory.WriteUInt64(Position + SharedMemoryAddressOffset - 8, 0);
Memory.WriteBytes(Position + SharedMemoryAddressOffset, FontEmbeddedPaths[FontType]);
}
public void PropagateNewMapFont(SharedFontType Type)
@ -97,11 +100,11 @@ namespace Ryujinx.HLE.Font
(AMemory Memory, long Position, long Size) = ShMemPositions[ShMemPositions.Length - 1];
for (SharedFontType Type = SharedFontType.JapanUsEurope; (int)Type < LoadedFonts.Length; Type++)
for (int Type = 0; Type < LoadedFonts.Length; Type++)
{
if (LoadedFonts[(int)Type] == 1)
{
MapFont(Type, Memory, Position);
MapFont((SharedFontType)Type, Memory, Position);
}
}
}
@ -140,7 +143,7 @@ namespace Ryujinx.HLE.Font
public uint GetFontSize(SharedFontType FontType)
{
return Convert.ToUInt32(FontEmbeddedPaths[FontType].Length);
return (uint)FontEmbeddedPaths[FontType].Length;
}
public uint GetSharedMemoryAddressOffset(SharedFontType FontType)
@ -156,9 +159,6 @@ namespace Ryujinx.HLE.Font
return Pos;
}
public int Count()
{
return FontEmbeddedPaths.Count;
}
public int Count => FontEmbeddedPaths.Count;
}
}

6
Ryujinx.HLE/OsHle/Services/Pl/ISharedFontManager.cs
View file

@ -102,14 +102,14 @@ namespace Ryujinx.HLE.OsHle.Services.Pl
uint BufferPos = 0;
uint Loaded = 0;
for (SharedFontType Type = SharedFontType.JapanUsEurope; (int)Type < Context.Ns.Font.Count(); Type++)
for (int Type = 0; Type < Context.Ns.Font.Count; Type++)
{
BufferPos = AddFontToOrderOfPriorityList(Context, Type, BufferPos, out Loaded);
BufferPos = AddFontToOrderOfPriorityList(Context, (SharedFontType)Type, BufferPos, out Loaded);
LoadedCount += Loaded;
}
Context.ResponseData.Write(LoadedCount);
Context.ResponseData.Write(Context.Ns.Font.Count());
Context.ResponseData.Write(Context.Ns.Font.Count);
return 0;
}

4
Ryujinx.HLE/Resource/SystemResourceNotFoundException.cs
View file

@ -5,8 +5,8 @@ namespace Ryujinx.HLE.Resource
public class SystemResourceNotFoundException: Exception
{
public SystemResourceNotFoundException(string message, Exception inner)
: base(message, inner)
public SystemResourceNotFoundException(string message)
: base(message)
{
}