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

Use new marshaller in QEMU Enhanced Disk image.

Browse Source
This commit is contained in:
Natalia Portillo
2019-03-15 23:00:12 +00:00
parent ffcb0da697
commit 7a3df6113b
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.DiscImages/QED/Identify.cs
View File

@@ -45,9 +45,9 @@ namespace DiscImageChef.DiscImages
if(stream.Length < 512) return false; if(stream.Length < 512) return false;
byte[] qHdrB = new byte[64]; byte[] qHdrB = new byte[68];
stream.Read(qHdrB, 0, 64); stream.Read(qHdrB, 0, 68);
qHdr = Marshal.ByteArrayToStructureLittleEndian<QedHeader>(qHdrB); qHdr = Marshal.SpanToStructureLittleEndian<QedHeader>(qHdrB);
return qHdr.magic == QED_MAGIC; return qHdr.magic == QED_MAGIC;
} }

15
DiscImageChef.DiscImages/QED/Read.cs
View File

@@ -33,11 +33,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums; using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.Console; using DiscImageChef.Console;
using DiscImageChef.Helpers; using Marshal = DiscImageChef.Helpers.Marshal;
namespace DiscImageChef.DiscImages namespace DiscImageChef.DiscImages
{ {
@@ -50,9 +51,9 @@ namespace DiscImageChef.DiscImages
if(stream.Length < 512) return false; if(stream.Length < 512) return false;
byte[] qHdrB = new byte[64]; byte[] qHdrB = new byte[68];
stream.Read(qHdrB, 0, 64); stream.Read(qHdrB, 0, 68);
qHdr = Marshal.ByteArrayToStructureLittleEndian<QedHeader>(qHdrB); qHdr = Marshal.SpanToStructureLittleEndian<QedHeader>(qHdrB);
DicConsole.DebugWriteLine("QED plugin", "qHdr.magic = 0x{0:X8}", qHdr.magic); DicConsole.DebugWriteLine("QED plugin", "qHdr.magic = 0x{0:X8}", qHdr.magic);
DicConsole.DebugWriteLine("QED plugin", "qHdr.cluster_size = {0}", qHdr.cluster_size); DicConsole.DebugWriteLine("QED plugin", "qHdr.cluster_size = {0}", qHdr.cluster_size);
@@ -99,9 +100,8 @@ namespace DiscImageChef.DiscImages
byte[] l1TableB = new byte[tableSize * 8]; byte[] l1TableB = new byte[tableSize * 8];
stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin); stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
stream.Read(l1TableB, 0, (int)tableSize * 8); stream.Read(l1TableB, 0, (int)tableSize * 8);
l1Table = new ulong[tableSize];
DicConsole.DebugWriteLine("QED plugin", "Reading L1 table"); DicConsole.DebugWriteLine("QED plugin", "Reading L1 table");
for(long i = 0; i < l1Table.LongLength; i++) l1Table[i] = BitConverter.ToUInt64(l1TableB, (int)(i * 8)); l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
l1Mask = 0; l1Mask = 0;
int c = 0; int c = 0;
@@ -175,12 +175,11 @@ namespace DiscImageChef.DiscImages
if(!l2TableCache.TryGetValue(l1Off, out ulong[] l2Table)) if(!l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
{ {
l2Table = new ulong[tableSize];
imageStream.Seek((long)l1Table[l1Off], SeekOrigin.Begin); imageStream.Seek((long)l1Table[l1Off], SeekOrigin.Begin);
byte[] l2TableB = new byte[tableSize * 8]; byte[] l2TableB = new byte[tableSize * 8];
imageStream.Read(l2TableB, 0, (int)tableSize * 8); imageStream.Read(l2TableB, 0, (int)tableSize * 8);
DicConsole.DebugWriteLine("QED plugin", "Reading L2 table #{0}", l1Off); DicConsole.DebugWriteLine("QED plugin", "Reading L2 table #{0}", l1Off);
for(long i = 0; i < l2Table.LongLength; i++) l2Table[i] = BitConverter.ToUInt64(l2TableB, (int)(i * 8)); l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
if(l2TableCache.Count >= maxL2TableCache) l2TableCache.Clear(); if(l2TableCache.Count >= maxL2TableCache) l2TableCache.Clear();

13
DiscImageChef.DiscImages/QED/Write.cs
View File

@@ -34,11 +34,12 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums; using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Structs; using DiscImageChef.CommonTypes.Structs;
using DiscImageChef.Helpers;
using Schemas; using Schemas;
using Marshal = DiscImageChef.Helpers.Marshal;
namespace DiscImageChef.DiscImages namespace DiscImageChef.DiscImages
{ {
@@ -245,17 +246,15 @@ namespace DiscImageChef.DiscImages
return false; return false;
} }
byte[] hdr = new byte[Marshal.SizeOf<QedHeader>()]; byte[] hdr = new byte[Marshal.SizeOf<QedHeader>()];
IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<QedHeader>()); MemoryMarshal.Write(hdr, ref qHdr);
System.Runtime.InteropServices.Marshal.StructureToPtr(qHdr, hdrPtr, true);
System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
writingStream.Seek(0, SeekOrigin.Begin); writingStream.Seek(0, SeekOrigin.Begin);
writingStream.Write(hdr, 0, hdr.Length); writingStream.Write(hdr, 0, hdr.Length);
writingStream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin); writingStream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
for(long i = 0; i < l1Table.LongLength; i++) writingStream.Write(BitConverter.GetBytes(l1Table[i]), 0, 8); byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(l1Table).ToArray();
writingStream.Write(l1TableB, 0, l1TableB.Length);
writingStream.Flush(); writingStream.Flush();
writingStream.Close(); writingStream.Close();