diff options
| author | Mary <me@thog.eu> | 2021-11-01 23:38:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 19:38:13 -0300 |
| commit | f41687f4c1948e9e111afd70e979e98ea5de52fa (patch) | |
| tree | e7e34e4f8a986c7165cb3eb2fb3e216329d1c04d /Ryujinx.HLE/HOS/Applets | |
| parent | e48530e9d9f0bbaeb8fa5978d1a66c99e6fecbac (diff) | |
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
Diffstat (limited to 'Ryujinx.HLE/HOS/Applets')
13 files changed, 67 insertions, 48 deletions
diff --git a/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs b/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs index aab7a86b..9f7eae70 100644 --- a/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs +++ b/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs @@ -1,10 +1,12 @@ -namespace Ryujinx.HLE.HOS.Applets.Browser +using Ryujinx.Common.Memory; + +namespace Ryujinx.HLE.HOS.Applets.Browser { - public unsafe struct WebCommonReturnValue + public struct WebCommonReturnValue { public WebExitReason ExitReason; public uint Padding; - public fixed byte LastUrl[0x1000]; + public ByteArray4096 LastUrl; public ulong LastUrlSize; } } 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<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 }
\ 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<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 }
\ 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<byte> _padding; public uint SelectedId; public uint Result; } diff --git a/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs b/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs index 931c5912..2763253b 100644 --- a/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs +++ b/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs @@ -1,13 +1,15 @@ -using System.Runtime.InteropServices; +using Ryujinx.Common.Memory; +using System; +using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Applets.Error { [StructLayout(LayoutKind.Sequential, Pack = 1)] - unsafe struct ApplicationErrorArg + struct ApplicationErrorArg { - public uint ErrorNumber; - public ulong LanguageCode; - public fixed byte MessageText[0x800]; - public fixed byte DetailsText[0x800]; + public uint ErrorNumber; + public ulong LanguageCode; + public ByteArray2048 MessageText; + public ByteArray2048 DetailsText; } }
\ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs b/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs index 84562176..1b009de7 100644 --- a/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs +++ b/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs @@ -34,8 +34,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error _horizon = horizon; } - public ResultCode Start(AppletSession normalSession, - AppletSession interactiveSession) + public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession) { _normalSession = normalSession; _commonArguments = IApplet.ReadStruct<CommonArguments>(_normalSession.Pop()); @@ -176,11 +175,9 @@ namespace Ryujinx.HLE.HOS.Applets.Error byte[] messageTextBuffer = new byte[0x800]; byte[] detailsTextBuffer = new byte[0x800]; - unsafe - { - Marshal.Copy((IntPtr)applicationErrorArg.MessageText, messageTextBuffer, 0, 0x800); - Marshal.Copy((IntPtr)applicationErrorArg.DetailsText, detailsTextBuffer, 0, 0x800); - } + + applicationErrorArg.MessageText.ToSpan().CopyTo(messageTextBuffer); + applicationErrorArg.DetailsText.ToSpan().CopyTo(detailsTextBuffer); string messageText = Encoding.ASCII.GetString(messageTextBuffer.TakeWhile(b => !b.Equals(0)).ToArray()); string detailsText = Encoding.ASCII.GetString(detailsTextBuffer.TakeWhile(b => !b.Equals(0)).ToArray()); diff --git a/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs b/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs index 7d77b83c..cec9f213 100644 --- a/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs +++ b/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs @@ -19,8 +19,7 @@ namespace Ryujinx.HLE.HOS.Applets _system = system; } - public ResultCode Start(AppletSession normalSession, - AppletSession interactiveSession) + public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession) { _normalSession = normalSession; _interactiveSession = interactiveSession; diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs index a3fd4ee4..523fa5de 100644 --- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs +++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs @@ -66,8 +66,7 @@ namespace Ryujinx.HLE.HOS.Applets _device = system.Device; } - public ResultCode Start(AppletSession normalSession, - AppletSession interactiveSession) + public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession) { lock (_lock) { diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCalc.cs b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCalc.cs index d6b2d05f..90df6fa3 100644 --- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCalc.cs +++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCalc.cs @@ -5,7 +5,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard /// <summary> /// A structure with configuration options of the software keyboard when starting a new input request in inline mode. /// </summary> - [StructLayout(LayoutKind.Sequential, Pack=1, CharSet = CharSet.Unicode)] + [StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Unicode)] struct SoftwareKeyboardCalc { public const int InputTextLength = SoftwareKeyboardCalcEx.InputTextLength; diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCalcEx.cs b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCalcEx.cs index fded8975..2d3d5dbe 100644 --- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCalcEx.cs +++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCalcEx.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard /// A structure with configuration options of the software keyboard when starting a new input request in inline mode. /// This is the extended version of the structure with extended appear options. /// </summary> - [StructLayout(LayoutKind.Sequential, Pack=1, CharSet = CharSet.Unicode)] + [StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Unicode)] struct SoftwareKeyboardCalcEx { /// <summary> diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRenderer.cs b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRenderer.cs index c16b861e..dfd10925 100644 --- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRenderer.cs +++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRenderer.cs @@ -1,12 +1,14 @@ using Ryujinx.HLE.Ui; using Ryujinx.Memory; using System; +using System.Buffers.Binary; using System.Diagnostics; using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; using System.Drawing.Text; using System.IO; +using System.Numerics; using System.Reflection; using System.Runtime.InteropServices; using System.Threading; @@ -652,7 +654,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard DrawString(graphics, ControllerToggleText, _labelsTextFont, _textNormalBrush, labelPosition); } - private unsafe bool TryCopyTo(IVirtualMemoryManager destination, ulong position) + private bool TryCopyTo(IVirtualMemoryManager destination, ulong position) { if (_surface == null) { @@ -666,23 +668,21 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard Debug.Assert(surfaceData.Stride * surfaceData.Height == _surfaceInfo.Size); // Convert the pixel format used in System.Drawing to the one required by a Switch Surface. - int dataLength = surfaceData.Stride * surfaceData.Height; - byte* dataPointer = (byte*)surfaceData.Scan0; - byte* dataEnd = dataPointer + dataLength; + int dataLength = surfaceData.Stride * surfaceData.Height; - for (; dataPointer < dataEnd; dataPointer += 4) + byte[] data = new byte[dataLength]; + Span<uint> dataConvert = MemoryMarshal.Cast<byte, uint>(data); + + Marshal.Copy(surfaceData.Scan0, data, 0, dataLength); + + for (int i = 0; i < dataConvert.Length; i++) { - *(uint*)dataPointer = (uint)( - (*(dataPointer + 0) << 16) | - (*(dataPointer + 1) << 8 ) | - (*(dataPointer + 2) << 0 ) | - (*(dataPointer + 3) << 24)); + dataConvert[i] = BitOperations.RotateRight(BinaryPrimitives.ReverseEndianness(dataConvert[i]), 8); } try { - Span<byte> dataSpan = new Span<byte>((void*)surfaceData.Scan0, dataLength); - destination.Write(position, dataSpan); + destination.Write(position, data); } finally { |
