From f4e879a1e6ad810aa38c1c020467a2589441871b Mon Sep 17 00:00:00 2001 From: Mary-nyan Date: Thu, 24 Nov 2022 15:26:29 +0100 Subject: Reduce usage of Marshal.PtrToStructure and Marshal.StructureToPtr (#3805) * common: Make BinaryReaderExtensions Read & Write take unamanged types This allows us to not rely on Marshal.PtrToStructure and Marshal.StructureToPtr for those. * common: Make MemoryHelper Read & Write takes unamanged types * Update Marshal.SizeOf => Unsafe.SizeOf when appropriate and start moving software applet to unmanaged types --- Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZone.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Ryujinx.HLE/HOS/Services/Time/TimeZone') diff --git a/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZone.cs b/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZone.cs index 12f6e90d..f7477e97 100644 --- a/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZone.cs +++ b/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZone.cs @@ -5,6 +5,7 @@ using Ryujinx.HLE.Utilities; using System; using System.Buffers.Binary; using System.IO; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; @@ -890,14 +891,14 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone long streamLength = reader.BaseStream.Length; - if (streamLength < Marshal.SizeOf()) + if (streamLength < Unsafe.SizeOf()) { return false; } TzifHeader header = reader.ReadStruct(); - streamLength -= Marshal.SizeOf(); + streamLength -= Unsafe.SizeOf(); int ttisGMTCount = Detzcode32(header.TtisGMTCount); int ttisSTDCount = Detzcode32(header.TtisSTDCount); -- cgit v1.2.3