From f41687f4c1948e9e111afd70e979e98ea5de52fa Mon Sep 17 00:00:00 2001 From: Mary Date: Mon, 1 Nov 2021 23:38:13 +0100 Subject: hle: Make Ryujinx.HLE project entirely safe (#2789) * 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 --- Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs | 3 +-- .../Applets/Controller/ControllerSupportArgHeader.cs | 2 +- .../HOS/Applets/Controller/ControllerSupportArgV7.cs | 18 ++++++++++++++---- .../Applets/Controller/ControllerSupportArgVPre7.cs | 18 ++++++++++++++---- .../Applets/Controller/ControllerSupportResultInfo.cs | 7 ++++--- 5 files changed, 34 insertions(+), 14 deletions(-) (limited to 'Ryujinx.HLE/HOS/Applets/Controller') diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs index 0597cf9b..1e8e26df 100644 --- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs +++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs @@ -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; diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs index 8eaf1d44..141994a8 100644 --- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs +++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs @@ -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; diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs index a01e7c04..efb95ea5 100644 --- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs +++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs @@ -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 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 ToSpan() => MemoryMarshal.CreateSpan(ref element, 8 * 0x81); + } } #pragma warning restore CS0649 } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs index 6d46aea5..ec977009 100644 --- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs +++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs @@ -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 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 ToSpan() => MemoryMarshal.CreateSpan(ref element, 4 * 0x81); + } } #pragma warning restore CS0649 } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs index c213e592..689a54de 100644 --- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs +++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs @@ -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 _padding; public uint SelectedId; public uint Result; } -- cgit v1.2.3