Add loading of bitmap width and height

Author: Kaioru

src/Duey.Provider.WZ/Files/Deferred/WZPropertyCanvas.cs

@@ -0,0 +1,35 @@
+using System.IO.MemoryMappedFiles;
+using Duey.Abstractions;
+using Duey.Abstractions.Types;
+using Duey.Provider.WZ.Codecs;
+using Duey.Provider.WZ.Crypto;
+
+namespace Duey.Provider.WZ.Files.Deferred;
+
+public class WZPropertyCanvas : WZPropertyDeferred<DataBitmap>
+{
+    public WZPropertyCanvas(
+        MemoryMappedFile view,
+        XORCipher cipher, 
+        int start, 
+        int offset, 
+        string name, 
+        IDataNode? parent = null
+    ) : base(view, cipher, start, offset, name, parent)
+    {
+    }
+    
+    protected override DataBitmap Resolve(WZReader reader)
+    {
+        var width = reader.ReadCompressedInt();
+        var height = reader.ReadCompressedInt();
+        var format = reader.ReadCompressedInt();
+        var scale = reader.ReadByte();
+
+        reader.BaseStream.Position += 4;
+
+        var length = reader.ReadInt32();
+
+        return new DataBitmap((ushort)width, (ushort)height, new byte[] {});
+    }
+}

src/Duey.Provider.WZ/Files/WZPropertyDeferred.cs

@@ -0,0 +1,33 @@
+using System.IO.MemoryMappedFiles;
+using Duey.Abstractions;
+using Duey.Provider.WZ.Codecs;
+using Duey.Provider.WZ.Crypto;
+
+namespace Duey.Provider.WZ.Files;
+
+public abstract class WZPropertyDeferred<T> : WZPropertyFile, IDataProperty<T>
+{
+    public WZPropertyDeferred(
+        MemoryMappedFile view, 
+        XORCipher cipher, 
+        int start, 
+        int offset,
+        string name, 
+        IDataNode? parent = null
+    ) : base(view, cipher, start, offset, name, parent)
+    {
+    }
+    
+    public T Resolve()
+    {
+        do _ = Children.ToList();
+        while (!_startDeferred.HasValue);
+        
+        using var stream = _view.CreateViewStream(_offset, 0, MemoryMappedFileAccess.Read);
+        using var reader = new WZReader(stream, _cipher, _startDeferred.Value);
+
+        return Resolve(reader);
+    }
+
+    protected abstract T Resolve(WZReader reader);
+}

src/Duey.Provider.WZ/Files/WZPropertyFile.cs

@@ -3,16 +3,19 @@
 using Duey.Abstractions.Types;
 using Duey.Provider.WZ.Codecs;
 using Duey.Provider.WZ.Crypto;
+using Duey.Provider.WZ.Files.Deferred;
 using Duey.Provider.WZ.Types;
 
 namespace Duey.Provider.WZ.Files;
 
 public class WZPropertyFile : AbstractWZNode, IDataNode
 {
-    private readonly MemoryMappedFile _view;
-    private readonly XORCipher _cipher;
-    private readonly int _start;
-    private readonly int _offset;
+    protected readonly MemoryMappedFile _view;
+    protected readonly XORCipher _cipher;
+    protected readonly int _start;
+    protected readonly int _offset;
+    
+    protected int? _startDeferred;
 
     public WZPropertyFile(MemoryMappedFile view, XORCipher cipher, int start, int offset, string name, IDataNode? parent = null)
     {
@@ -35,7 +38,8 @@ public override IEnumerable<IDataNode> Children
             using var reader = new WZReader(stream, _cipher, _start);
 
             reader.ReadBoolean();
-            reader.ReadByte();
+            if (reader.ReadBoolean())
+                reader.BaseStream.Position += 2;
 
             var count = reader.ReadCompressedInt();
 
@@ -92,6 +96,9 @@ public override IEnumerable<IDataNode> Children
                             case "Property":
                                 yield return new WZPropertyFile(_view, _cipher, (int)reader.BaseStream.Position, _offset, name, this);
                                 break;
+                            case "Canvas":
+                                yield return new WZPropertyCanvas(_view, _cipher, (int)reader.BaseStream.Position, _offset, name, this);
+                                break;
                             case "Shape2D#Vector2D":
                                 yield return new WZPropertyData<DataVector>(name, this, new DataVector(
                                     reader.ReadCompressedInt(), 
@@ -107,6 +114,8 @@ public override IEnumerable<IDataNode> Children
                         throw new ArgumentOutOfRangeException();
                 }
             }
+
+            _startDeferred = (int)reader.BaseStream.Position;
         }
     }
 }