aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Natalia Portillo
2019-03-01 07:35:22 +00:00
parent 0ec558da55
commit e14c19279a
116 changed files with 1138 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DiscImageChef.DiscImages/VDI/Identify.cs
View File

@@ -31,8 +31,8 @@
// ****************************************************************************/
using System.IO;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.Helpers;
namespace DiscImageChef.DiscImages
{
@@ -45,9 +45,9 @@ namespace DiscImageChef.DiscImages
if(stream.Length < 512) return false;
byte[] vHdrB = new byte[Marshal.SizeOf(vHdr)];
stream.Read(vHdrB, 0, Marshal.SizeOf(vHdr));
vHdr = Helpers.Marshal.ByteArrayToStructureLittleEndian<VdiHeader>(vHdrB);
byte[] vHdrB = new byte[Marshal.SizeOf<VdiHeader>()];
stream.Read(vHdrB, 0, Marshal.SizeOf<VdiHeader>());
vHdr = Marshal.ByteArrayToStructureLittleEndian<VdiHeader>(vHdrB);
return vHdr.magic == VDI_MAGIC;
}

8
DiscImageChef.DiscImages/VDI/Read.cs
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;
namespace DiscImageChef.DiscImages
{
@@ -51,9 +51,9 @@ namespace DiscImageChef.DiscImages
if(stream.Length < 512) return false;
byte[] vHdrB = new byte[Marshal.SizeOf(vHdr)];
stream.Read(vHdrB, 0, Marshal.SizeOf(vHdr));
vHdr = Helpers.Marshal.ByteArrayToStructureLittleEndian<VdiHeader>(vHdrB);
byte[] vHdrB = new byte[Marshal.SizeOf<VdiHeader>()];
stream.Read(vHdrB, 0, Marshal.SizeOf<VdiHeader>());
vHdr = Marshal.ByteArrayToStructureLittleEndian<VdiHeader>(vHdrB);
DicConsole.DebugWriteLine("VirtualBox plugin", "vHdr.creator = {0}", vHdr.creator);
DicConsole.DebugWriteLine("VirtualBox plugin", "vHdr.magic = {0}", vHdr.magic);

14
DiscImageChef.DiscImages/VDI/Write.cs
View File

@@ -34,10 +34,10 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Structs;
using DiscImageChef.Helpers;
using Schemas;
namespace DiscImageChef.DiscImages
@@ -88,7 +88,7 @@ namespace DiscImageChef.DiscImages
magic = VDI_MAGIC,
majorVersion = 1,
minorVersion = 1,
headerSize = Marshal.SizeOf(typeof(VdiHeader)) - 72,
headerSize = Marshal.SizeOf<VdiHeader>() - 72,
imageType = VdiImageType.Normal,
offsetBlocks = sectorSize,
offsetData = currentWritingPosition,
@@ -241,11 +241,11 @@ namespace DiscImageChef.DiscImages
}
}
byte[] hdr = new byte[Marshal.SizeOf(typeof(VdiHeader))];
IntPtr hdrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(VdiHeader)));
Marshal.StructureToPtr(vHdr, hdrPtr, true);
Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
Marshal.FreeHGlobal(hdrPtr);
byte[] hdr = new byte[Marshal.SizeOf<VdiHeader>()];
IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<VdiHeader>());
System.Runtime.InteropServices.Marshal.StructureToPtr(vHdr, hdrPtr, true);
System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
writingStream.Seek(0, SeekOrigin.Begin);
writingStream.Write(hdr, 0, hdr.Length);