initial

Author: HeroponRikiBestest

SabreTools.Serialization/Readers/MicrosoftCabinet.cs

@@ -204,12 +204,6 @@ private static CFDATA ParseDataBlock(Stream data, byte dataReservedSize)
             dataBlock.CompressedSize = data.ReadUInt16LittleEndian();
             dataBlock.UncompressedSize = data.ReadUInt16LittleEndian();
 
-            if (dataReservedSize > 0)
-                dataBlock.ReservedData = data.ReadBytes(dataReservedSize);
-
-            if (dataBlock.CompressedSize > 0)
-                dataBlock.CompressedData = data.ReadBytes(dataBlock.CompressedSize);
-
             return dataBlock;
         }
 

SabreTools.Serialization/Wrappers/MicrosoftCabinet.Extraction.cs

@@ -198,6 +198,32 @@ public bool Extract(string outputDirectory, bool includeDebug)
             }
         }
 
+        public void GetData(CFFOLDER folder)
+        {
+            if (folder.CabStartOffset > 0)
+            {
+                uint offset = folder.CabStartOffset;
+
+                for (int i = 0; i < folder.DataCount; i++)
+                {
+                    offset += 8;
+
+                    if (Header.DataReservedSize > 0)
+                    {
+                        folder.DataBlocks[i].ReservedData = ReadRangeFromSource(offset, Header.DataReservedSize);
+                        offset += Header.DataReservedSize;
+                    }
+
+                    if (folder.DataBlocks[i].CompressedSize > 0)
+                    {
+                        folder.DataBlocks[i].CompressedData = ReadRangeFromSource(offset, folder.DataBlocks[i].CompressedSize);
+                        offset += folder.DataBlocks[i].CompressedSize;
+                    }
+                }
+            }
+        }
+
+        
         /// <summary>
         /// Extract the contents of a single folder
         /// </summary>

SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs

@@ -315,6 +315,8 @@ private static CompressionType GetCompressionType(CFFOLDER folder)
             if (folder?.DataBlocks == null || folder.DataBlocks.Length == 0)
                 return null;
 
+            GetData(folder);
+
             // Get all files for the folder
             var files = GetFiles(folderIndex);
             if (files.Length == 0)