X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d78b3d64143f165857922e1e695ba4164d61869f..acc0ebd7a871124d4d6b36069340227e6c584f38:/src/common/zstream.cpp

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index c917e493a4..5142f077b6 100644
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -20,17 +20,24 @@
   #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-
 #if wxUSE_ZLIB && wxUSE_STREAMS
 
 #include "wx/zstream.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
-#include "../zlib/zlib.h"
+
+// normally, the compiler options should contain -I../zlib, but it is
+// apparently not the case for all MSW makefiles and so, unless we use
+// configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
+// the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
+#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
+   #include "../zlib/zlib.h"
+#elif defined(__WXMAC__) && defined(__UNIX__)
+   #include <Kernel/net/zlib.h>
+#else
+   #include <zlib.h>
+#endif
 
 #define ZSTREAM_BUFFER_SIZE 1024
 
@@ -41,8 +48,6 @@
 wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   : wxFilterInputStream(stream)
 {
-  int err;
-
   // I need a private stream buffer.
   m_inflate = new z_stream_s;
 
@@ -50,7 +55,7 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   m_inflate->zfree = (free_func)0;
   m_inflate->opaque = (voidpf)0;
 
-  err = inflateInit(m_inflate);
+  int err = inflateInit(m_inflate);
   if (err != Z_OK) {
     inflateEnd(m_inflate);
     delete m_inflate;
@@ -68,6 +73,8 @@ wxZlibInputStream::~wxZlibInputStream()
 {
   inflateEnd(m_inflate);
   delete m_inflate;
+
+  delete [] m_z_buffer;
 }
 
 size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
@@ -80,26 +87,37 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
   while (m_inflate->avail_out > 0) {
     if (m_inflate->avail_in == 0) {
 
-      m_parent_i_stream->Read(m_z_buffer, m_z_size);
+      m_parent_i_stream->Read(m_z_buffer, wxMin(m_z_size, size));
       m_inflate->next_in = m_z_buffer;
       m_inflate->avail_in = m_parent_i_stream->LastRead();
 
-      if (m_parent_i_stream->LastError() != wxStream_NOERROR)
-        return (size - m_inflate->avail_in);
+      if (m_parent_i_stream->LastError() != wxStream_NOERROR &&
+          m_parent_i_stream->LastError() != wxStream_EOF)
+      { 
+        m_lasterror = m_parent_i_stream->LastError();
+        return 0; // failed to read anything
+      }
+
+      if ( m_inflate->avail_in == 0 )
+      {
+          // EOF
+          m_lasterror = wxStream_EOF;
+          break;
+      }
     }
     err = inflate(m_inflate, Z_FINISH);
     if (err == Z_STREAM_END)
-      return (size - m_inflate->avail_in);
+      return (size - m_inflate->avail_out);
   }
 
-  return size-m_inflate->avail_in;
+  return size-m_inflate->avail_out;
 }
 
 //////////////////////
 // wxZlibOutputStream
 //////////////////////
 
-wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
+wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, int level)
  : wxFilterOutputStream(stream)
 {
   int err;
@@ -110,7 +128,10 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
   m_deflate->zfree = (free_func)0;
   m_deflate->opaque = (voidpf)0;
 
-  err = deflateInit(m_deflate, Z_DEFAULT_COMPRESSION);
+  if (level == -1) level = Z_DEFAULT_COMPRESSION;
+  wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!"));
+
+  err = deflateInit(m_deflate, level);
   if (err != Z_OK) {
     deflateEnd(m_deflate);
     return;
@@ -133,11 +154,12 @@ wxZlibOutputStream::~wxZlibOutputStream()
   err = deflate(m_deflate, Z_FINISH);
   if (err != Z_STREAM_END) 
   {
-    wxLogDebug( _T("wxZlibOutputStream: an error occured while closing the stream.\n") );
+    wxLogDebug( wxT("wxZlibOutputStream: an error occured while closing the stream.\n") );
     return;
   }
 
   deflateEnd(m_deflate);
+  delete m_deflate;
 
   delete[] m_z_buffer;
 }
@@ -155,6 +177,19 @@ void wxZlibOutputStream::Sync()
     return;
   }
 
+  // Fixed by "Stefan Csomor" <csomor@advancedconcepts.ch>
+  while( m_deflate->avail_out == 0 )
+  {
+     m_parent_o_stream->Write(m_z_buffer, m_z_size );
+     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;
+     }
+  }
+  // End
+
   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;