X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79c3e0e1aeebb64da2ac893e6ed7b27edca01a64..e29b83a455bead3dae44300f631d07aa9635d3e9:/src/common/zstream.cpp

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index de38cad39c..773776fe4c 100644
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -14,19 +14,21 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include <wx/stream.h>
-#include <wx/zstream.h>
-#include <wx/utils.h>
-#include "zlib.h"
+
+#include "wx/zstream.h"
+
+#ifdef wxUSE_ZLIB
+
+#include "wx/utils.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "../zlib/zlib.h"   // don't change this, Robert
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxZlibInputStream, wxFilterInputStream)
-IMPLEMENT_CLASS(wxZlibOutputStream, wxFilterOutputStream)
-#endif
+#define ZSTREAM_BUFFER_SIZE 1024
 
 //////////////////////
 // wxZlibInputStream
@@ -37,69 +39,58 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
 {
   int err;
 
-  m_inflate.zalloc = (alloc_func)0;
-  m_inflate.zfree = (free_func)0;
-  m_inflate.opaque = (voidpf)0;
+  // I need a private stream buffer.
+  m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
+  m_i_destroybuf = TRUE;
+  m_inflate = new z_stream_s;
+
+  m_inflate->zalloc = (alloc_func)0;
+  m_inflate->zfree = (free_func)0;
+  m_inflate->opaque = (voidpf)0;
 
-  err = inflateInit(&m_inflate);
+  err = inflateInit(m_inflate);
   if (err != Z_OK) {
-    inflateEnd(&m_inflate);
+    inflateEnd(m_inflate);
+    delete m_inflate;
     return;
   }
 
-  m_inflate.avail_in = 0;
+  m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
+  m_z_size = ZSTREAM_BUFFER_SIZE;
+
+  m_inflate->avail_in = 0;
+  m_inflate->next_in = NULL;
 }
 
 wxZlibInputStream::~wxZlibInputStream()
 {
-  inflateEnd(&m_inflate);
+  inflateEnd(m_inflate);
+  delete m_inflate;
 }
 
-wxInputStream& wxZlibInputStream::Read(void *buffer, size_t size)
+size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
 {
   int err;
 
-  m_inflate.next_out = (unsigned char *)buffer;
-  m_inflate.avail_out = size;
-  m_eof = FALSE;
-
-  while (m_inflate.avail_out > 0) {
-    if (m_inflate.avail_in == 0) {
-      wxFilterInputStream::Read(m_z_buffer, m_z_size);
-      m_inflate.next_in = m_z_buffer;
-      m_inflate.avail_in = wxFilterInputStream::LastRead();
-      if (wxFilterInputStream::Eof()) {
-        m_lastread = size - m_inflate.avail_out;
-        return *this;
-      }
-    }
-    err = inflate(&m_inflate, Z_FINISH);
-    if (err == Z_STREAM_END) {
-      m_lastread = size - m_inflate.avail_out;
-      m_eof = TRUE;
-      return *this;
-    }
-  }
+  m_inflate->next_out = (unsigned char *)buffer;
+  m_inflate->avail_out = size;
 
-  m_lastread = size;
-  return *this;
-}
+  while (m_inflate->avail_out > 0) {
+    if (m_inflate->avail_in == 0) {
 
-off_t wxZlibInputStream::SeekI(off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode))
-{
-  return 0;
-}
+      m_parent_i_stream->Read(m_z_buffer, m_z_size);
+      m_inflate->next_in = m_z_buffer;
+      m_inflate->avail_in = m_parent_i_stream->LastRead();
 
-off_t wxZlibInputStream::TellI() const
-{
-  return 0;
-}
+      if (m_parent_i_stream->LastError() != wxStream_NOERROR)
+        return (size - m_inflate->avail_in);
+    }
+    err = inflate(m_inflate, Z_FINISH);
+    if (err == Z_STREAM_END)
+      return (size - m_inflate->avail_in);
+  }
 
-bool wxZlibInputStream::Eof() const
-{
-  if (!m_eof)
-    return wxFilterInputStream::Eof();
-  return m_eof;
+  return size-m_inflate->avail_in;
 }
 
 //////////////////////
@@ -111,90 +102,90 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
 {
   int err;
 
-  m_deflate.zalloc = (alloc_func)0;
-  m_deflate.zfree = (free_func)0;
-  m_deflate.opaque = (voidpf)0;
+  m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
+  m_o_destroybuf = TRUE;
+  m_deflate = new z_stream_s;
 
-  err = deflateInit(&m_deflate, Z_DEFAULT_COMPRESSION);
+  m_deflate->zalloc = (alloc_func)0;
+  m_deflate->zfree = (free_func)0;
+  m_deflate->opaque = (voidpf)0;
+
+  err = deflateInit(m_deflate, Z_DEFAULT_COMPRESSION);
   if (err != Z_OK) {
-    deflateEnd(&m_deflate);
+    deflateEnd(m_deflate);
     return;
   }
-  m_deflate.avail_in = 0;
-  m_deflate.next_out = m_z_buffer;
-  m_deflate.avail_out = m_z_size;
+
+  m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
+  m_z_size = ZSTREAM_BUFFER_SIZE;
+
+  m_deflate->avail_in = 0;
+  m_deflate->next_out = m_z_buffer;
+  m_deflate->avail_out = m_z_size;
 }
 
 wxZlibOutputStream::~wxZlibOutputStream()
 {
   int err;
 
-  while (1) {
-    err = deflate(&m_deflate, Z_FINISH);
-    if (err == Z_STREAM_END)
-      break;
-    if (err < 0) {
-      wxDebugMsg("wxZlibOutputStream: error during final deflate");
-      break;
-    }
-    if (m_deflate.avail_out == 0) {
-      wxFilterOutputStream::Write(m_z_buffer, m_z_size);
-      if (wxFilterOutputStream::Bad()) {
-        wxDebugMsg("wxZlibOutputStream: error during final write");
-        break;
-      }
-      m_deflate.next_out = m_z_buffer;
-      m_deflate.avail_out = m_z_size;
-    }
+  Sync();
+
+  err = deflate(m_deflate, Z_FINISH);
+  if (err != Z_STREAM_END) 
+  {
+    wxLogDebug( "wxZlibOutputStream: an error occured while closing the stream.\n" );
+    return;
   }
-  wxFilterOutputStream::Write(m_z_buffer, m_z_size-m_deflate.avail_out);
 
-  deflateEnd(&m_deflate);
+  deflateEnd(m_deflate);
+
+  delete[] m_z_buffer;
 }
 
-wxOutputStream& wxZlibOutputStream::Write(const void *buffer, size_t size)
+void wxZlibOutputStream::Sync()
 {
   int err;
 
-  m_deflate.next_in = (unsigned char *)buffer;
-  m_deflate.avail_in = size;
-
-  m_bad = FALSE;
-  while (m_deflate.avail_in > 0) {
-    if (m_deflate.avail_out == 0) {
-      wxFilterOutputStream::Write(m_z_buffer, m_z_size);
-      if (wxFilterOutputStream::Bad()) {
-        m_lastwrite = size - m_deflate.avail_in;
-        return *this;
-      }
-            
-      m_deflate.next_out = m_z_buffer;
-      m_deflate.avail_out = m_z_size;
-    }
-    err = deflate(&m_deflate, Z_NO_FLUSH);
-    if (err < 0) {
-      m_bad = TRUE;
-      m_lastwrite = size - m_deflate.avail_in;
-      return *this;
-    }
+  m_parent_o_stream->Write(m_z_buffer, m_z_size-m_deflate->avail_out);
+  m_deflate->next_out  = m_z_buffer;
+  m_deflate->avail_out = m_z_size;
+
+  err = deflate(m_deflate, Z_FULL_FLUSH);
+  if (err != Z_OK) {
+    return;
   }
-  m_lastwrite = size;
-  return *this;
-}
 
-off_t wxZlibOutputStream::SeekO(off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode))
-{
-  return 0;
+  m_parent_o_stream->Write(m_z_buffer, m_z_size-m_deflate->avail_out);
+  m_deflate->next_out  = m_z_buffer;
+  m_deflate->avail_out = m_z_size;
 }
 
-off_t wxZlibOutputStream::TellO() const
+size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-  return 0;
-}
+  int err;
 
-bool wxZlibOutputStream::Bad() const
-{
-  if (!m_bad)
-    return wxFilterOutputStream::Bad();
-  return m_bad;
+  m_deflate->next_in = (unsigned char *)buffer;
+  m_deflate->avail_in = size;
+
+  while (m_deflate->avail_in > 0) {
+
+    if (m_deflate->avail_out == 0) {
+      m_parent_o_stream->Write(m_z_buffer, m_z_size);
+      if (m_parent_o_stream->LastError() != wxStream_NOERROR)
+        return (size - m_deflate->avail_in);
+
+      m_deflate->next_out = m_z_buffer;
+      m_deflate->avail_out = m_z_size;
+    }
+
+    err = deflate(m_deflate, Z_NO_FLUSH);
+    if (err != Z_OK)
+      return (size - m_deflate->avail_in);
+  }
+  return size;
 }
+
+#endif
+
+  // wxUSE_ZLIB
+