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

hle: Make Ryujinx.HLE project entirely safe (#2789)

Browse source 
* Remove a bit of unsafety around

* Regenerate StructArrayHelpers with a max element value of 256

* hle: remove unsafe marker from all struct that had it

* hle: make SoftwareKeyboardRenderer.TryCopyTo safe

* hle: remove unsafety in NpadDevice and remove AllowUnsafeBlocks from csproj

* Revert "Regenerate StructArrayHelpers with a max element value of 256"

This reverts commit f32a6e5be094f50571970eb1116b65c080781d05.

* Introduce ByteArray of various size and use that instead of ArrayXXX to avoid stackoverflow in .NET runtime type resolution

* Use ByteArray more

* Add some missing spaces on Pack = 1 for various structs

* Fix broken logic for TryCopyTo

* Address gdkchan's comment

* Address gdkchan's comment
This commit is contained in:
Mary 2021-11-01 23:38:13 +01:00 • committed by GitHub
parent e48530e9d9
commit f41687f4c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 175 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
View file

@ -24,8 +24,7 @@ namespace Ryujinx.HLE.HOS.Applets
_system = system;
}
unsafe public ResultCode Start(AppletSession normalSession,
AppletSession interactiveSession)
public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
{
_normalSession = normalSession;

2
Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs
View file

@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Applets
{
#pragma warning disable CS0649
[StructLayout(LayoutKind.Sequential, Pack=1)]
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct ControllerSupportArgHeader
{
public sbyte PlayerCountMin;

18
Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs
View file

@ -1,16 +1,26 @@
using Ryujinx.Common.Memory;
using System;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Applets
{
#pragma warning disable CS0649
// (8.0.0+ version)
[StructLayout(LayoutKind.Sequential, Pack=1)]
unsafe struct ControllerSupportArgV7
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct ControllerSupportArgV7
{
public ControllerSupportArgHeader Header;
public fixed uint IdentificationColor[8];
public Array8<uint> IdentificationColor;
public byte EnableExplainText;
public fixed byte ExplainText[8 * 0x81];
public ExplainTextStruct ExplainText;
[StructLayout(LayoutKind.Sequential, Size = 8 * 0x81)]
public struct ExplainTextStruct
{
private byte element;
public Span<byte> ToSpan() => MemoryMarshal.CreateSpan(ref element, 8 * 0x81);
}
}
#pragma warning restore CS0649
}

18
Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs
View file

@ -1,16 +1,26 @@
using Ryujinx.Common.Memory;
using System;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Applets
{
#pragma warning disable CS0649
// (1.0.0+ version)
[StructLayout(LayoutKind.Sequential, Pack=1)]
unsafe struct ControllerSupportArgVPre7
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct ControllerSupportArgVPre7
{
public ControllerSupportArgHeader Header;
public fixed uint IdentificationColor[4];
public Array4<uint> IdentificationColor;
public byte EnableExplainText;
public fixed byte ExplainText[4 * 0x81];
public ExplainTextStruct ExplainText;
[StructLayout(LayoutKind.Sequential, Size = 4 * 0x81)]
public struct ExplainTextStruct
{
private byte element;
public Span<byte> ToSpan() => MemoryMarshal.CreateSpan(ref element, 4 * 0x81);
}
}
#pragma warning restore CS0649
}

7
Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs
View file

@ -1,13 +1,14 @@
using Ryujinx.Common.Memory;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Applets
{
#pragma warning disable CS0649
[StructLayout(LayoutKind.Sequential, Pack=1)]
unsafe struct ControllerSupportResultInfo
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct ControllerSupportResultInfo
{
public sbyte PlayerCount;
fixed byte _padding[3];
private Array3<byte> _padding;
public uint SelectedId;
public uint Result;
}