Override Marshal.SizeOf in Helpers and use it instead of System's.

This commit is contained in:
2019-03-01 07:35:22 +00:00
parent 0ec558da55
commit e14c19279a
116 changed files with 1138 additions and 1182 deletions

View File

@@ -33,12 +33,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Exceptions;
using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.Console;
using DiscImageChef.Helpers;
using SharpCompress.Compressors;
using SharpCompress.Compressors.Deflate;
@@ -53,9 +53,9 @@ namespace DiscImageChef.DiscImages
if(stream.Length < 512) return false;
byte[] qHdrB = new byte[Marshal.SizeOf(qHdr)];
stream.Read(qHdrB, 0, Marshal.SizeOf(qHdr));
qHdr = Helpers.Marshal.ByteArrayToStructureBigEndian<QCow2Header>(qHdrB);
byte[] qHdrB = new byte[Marshal.SizeOf<QCow2Header>()];
stream.Read(qHdrB, 0, Marshal.SizeOf<QCow2Header>());
qHdr = Marshal.ByteArrayToStructureBigEndian<QCow2Header>(qHdrB);
DicConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", qHdr.magic);
DicConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", qHdr.version);