Recursive parsing of streams implemented

Not giving any output as of yet though. Please, use STABLE-0-0-0 branch
if you want to see pictures. I will merge this one there only after
regression test calls me "good boy".

2 files changed, 21 insertions, 30 deletions

diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 5966fa5..04d3e13 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -111,7 +111,7 @@ bool libvisio::VSDXParser::parseDocument(WPXInputStream *input)
 {
   try
   {
-    handleStreams(input, 4);
+    handleStreams(input, 4, 0);
     return true;
   }
   catch (...)
@@ -120,19 +120,18 @@ bool libvisio::VSDXParser::parseDocument(WPXInputStream *input)
   }
 }
 
-void libvisio::VSDXParser::handleStreams(WPXInputStream *input, unsigned shift)
+void libvisio::VSDXParser::handleStreams(WPXInputStream *input, unsigned shift, unsigned level)
 {
-  std::vector<libvisio::Pointer> PtrList;
-  Pointer ptr;
-
-  // Parse out pointers to other streams from trailer
+  // Parse out pointers to streams
   input->seek(shift, WPX_SEEK_SET);
   unsigned offset = readU32(input);
   input->seek(offset+shift, WPX_SEEK_SET);
   unsigned pointerCount = readU32(input);
   input->seek(4, WPX_SEEK_CUR);
+  std::vector<libvisio::Pointer> PtrList;
   for (unsigned i = 0; i < pointerCount; i++)
   {
+    Pointer ptr;
     ptr.Type = readU32(input);
     input->seek(4, WPX_SEEK_CUR); // Skip dword
     ptr.Offset = readU32(input);
@@ -144,44 +143,36 @@ void libvisio::VSDXParser::handleStreams(WPXInputStream *input, unsigned shift)
       PtrList.push_back(ptr);
   }
   for (unsigned j = 0; j < PtrList.size(); j++)
-  {
-    VSD_DEBUG_MSG(("VSDXParser::parseDocument: ptr.Type 0x%.8x, ptr.Offset 0x%.8x, ptr.Length 0x%.8x, ptr.Format 0x%.4x\n",
-                   ptr.Type, ptr.Offset, ptr.Length, ptr.Format));
-
-    ptr = PtrList[j];
-    handleStream(ptr);
-  }
+    handleStream(PtrList[j], level+1);
 }
 
 
-void libvisio::VSDXParser::handleStream(const Pointer &ptr)
+void libvisio::VSDXParser::handleStream(const Pointer &ptr, unsigned level)
 {
   bool compressed = ((ptr.Format & 2) == 2);
   m_input->seek(ptr.Offset, WPX_SEEK_SET);
   VSDInternalStream tmpInput(m_input, ptr.Length, compressed);
   unsigned shift = compressed ? 4 : 0;
+
+  VSD_DEBUG_MSG(("VSDXParser::handleStream: level %i, ptr.Type 0x%.8x, ptr.Offset 0x%.8x, ptr.Length 0x%.8x, ptr.Format 0x%.4x\n",
+                 level, ptr.Type, ptr.Offset, ptr.Length, ptr.Format));
+
   switch (ptr.Type)
   {
-  case VSD_PAGE:           // shouldn't happen
-  case VSD_FONT_LIST:      // ver6 stream contains chunk 0x18 (FontList) and chunks 0x19 (Font)
-    handleChunks(&tmpInput);
-    break;
-  case VSD_PAGES:
-  case VSD_FONTFACES:      // ver11 stream contains streams 0xd7 (FontFace)
-    handlePages(&tmpInput, shift);
-    break;
   case VSD_COLORS:
     readColours(&tmpInput);
-    break;
+    return;
   case VSD_STYLES:
     handleStyles(&tmpInput);
-    break;
-  case VSD_STENCILS:
-    handleStencils(&tmpInput, shift);
-    break;
+    return;
   default:
     break;
   }
+
+  if ((ptr.Format >> 4) == 0xd)
+    handleChunks(&tmpInput);
+  else if ((ptr.Format >> 4) == 0x5)
+    handleStreams(&tmpInput, shift, level+1);
 }
 
 void libvisio::VSDXParser::handleChunks(WPXInputStream *input)
@@ -365,7 +356,7 @@ void libvisio::VSDXParser::handlePages(WPXInputStream *input, unsigned shift)
       m_collector->endPage();
       break;
     case VSD_PAGES:             // shouldn't happen
-      handlePages(&tmpInput, shift);
+      handleStreams(&tmpInput, shift, 0);
       break;
     case VSD_COLORS:            // shouldn't happen
       readColours(&tmpInput);
diff --git a/src/lib/VSDXParser.h b/src/lib/VSDXParser.h
index 1194a97..8daf2bc 100644
--- a/src/lib/VSDXParser.h
+++ b/src/lib/VSDXParser.h
@@ -120,8 +120,8 @@ protected:
   bool parseDocument(WPXInputStream *input);
 
   // Stream handlers
-  void handleStreams(WPXInputStream *input, unsigned shift=0);
-  void handleStream(const Pointer &ptr);
+  void handleStreams(WPXInputStream *input, unsigned shift, unsigned level);
+  void handleStream(const Pointer &ptr, unsigned level);
   void handleChunks(WPXInputStream *input);
 
   void handlePages(WPXInputStream *input, unsigned shift);