fix wxTimeSpan::Format() for negative spans with 0 hour component (#10055)

[wxWidgets.git] / src / common / zipstrm.cpp

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 76028b1ce55cc37e352dc4e87c11a1762729900e..6a6ea742c07f3897a111b5ad2e72afbc6ad459de 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        zipstrm.cpp
+// Name:        src/common/zipstrm.cpp

 // Purpose:     Streams for Zip files
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Purpose:     Streams for Zip files
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$


@@ -7,31 +7,27 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "zipstrm.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_ZIPSTREAM
+
+#include "wx/zipstrm.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"
+    #include "wx/hashmap.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
-
-#include "wx/zipstrm.h"
-#include "wx/log.h"
-#include "wx/intl.h"

 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"

-#include "wx/utils.h"
-#include "wx/buffer.h"

 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"
 #include "zlib.h"
 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"
 #include "zlib.h"


@@ -81,13 +77,6 @@ enum {
 IMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry)
 IMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory)
 
 IMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry)
 IMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory)
 

-//FORCE_LINK_ME(zipstrm)
-int _wx_link_dummy_func_zipstrm();
-int _wx_link_dummy_func_zipstrm()
-{
-    return 1;
-}
-

 
 /////////////////////////////////////////////////////////////////////////////
 // Helpers
 
 /////////////////////////////////////////////////////////////////////////////
 // Helpers


@@ -96,6 +85,9 @@ int _wx_link_dummy_func_zipstrm()
 //
 static wxString ReadString(wxInputStream& stream, wxUint16 len, wxMBConv& conv)
 {
 //
 static wxString ReadString(wxInputStream& stream, wxUint16 len, wxMBConv& conv)
 {

+    if (len == 0)
+        return wxEmptyString;
+

 #if wxUSE_UNICODE
     wxCharBuffer buf(len);
     stream.Read(buf.data(), len);
 #if wxUSE_UNICODE
     wxCharBuffer buf(len);
     stream.Read(buf.data(), len);


@@ -120,12 +112,20 @@ static inline wxUint32 CrackUint32(const char *m)
     return (n[3] << 24) | (n[2] << 16) | (n[1] << 8) | n[0];
 }
 
     return (n[3] << 24) | (n[2] << 16) | (n[1] << 8) | n[0];
 }
 

+// Decode a little endian wxUint16 number from a character array
+//
+static inline wxUint16 CrackUint16(const char *m)
+{
+    const unsigned char *n = (const unsigned char*)m;
+    return (n[1] << 8) | n[0];
+}
+

 // Temporarily lower the logging level in debug mode to avoid a warning
 // from SeekI about seeking on a stream with data written back to it.
 //
 static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
 {
 // Temporarily lower the logging level in debug mode to avoid a warning
 // from SeekI about seeking on a stream with data written back to it.
 //
 static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
 {

-#ifdef __WXDEBUG__
+#if defined(__WXDEBUG__) && wxUSE_LOG

     wxLogLevel level = wxLog::GetLogLevel();
     wxLog::SetLogLevel(wxLOG_Debug - 1);
     wxFileOffset result = stream.SeekI(pos);
     wxLogLevel level = wxLog::GetLogLevel();
     wxLog::SetLogLevel(wxLOG_Debug - 1);
     wxFileOffset result = stream.SeekI(pos);


@@ -137,6 +137,97 @@ static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
 }
 
 
 }
 
 

+/////////////////////////////////////////////////////////////////////////////
+// Class factory
+
+wxZipClassFactory g_wxZipClassFactory;
+
+wxZipClassFactory::wxZipClassFactory()
+{
+    if (this == &g_wxZipClassFactory)
+        PushFront();
+}
+
+const wxChar * const *
+wxZipClassFactory::GetProtocols(wxStreamProtocolType type) const
+{
+    static const wxChar *protocols[] = { _T("zip"), NULL };
+    static const wxChar *mimetypes[] = { _T("application/zip"), NULL };
+    static const wxChar *fileexts[]  = { _T(".zip"), _T(".htb"), NULL };
+    static const wxChar *empty[]     = { NULL };
+
+    switch (type) {
+        case wxSTREAM_PROTOCOL: return protocols;
+        case wxSTREAM_MIMETYPE: return mimetypes;
+        case wxSTREAM_FILEEXT:  return fileexts;
+        default:                return empty;
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Read a zip header
+
+class wxZipHeader
+{
+public:
+    wxZipHeader(wxInputStream& stream, size_t size);
+
+    inline wxUint8 Read8();
+    inline wxUint16 Read16();
+    inline wxUint32 Read32();
+
+    const char *GetData() const             { return m_data; }
+    size_t GetSize() const                  { return m_size; }
+    operator bool() const                   { return m_ok; }
+
+    size_t Seek(size_t pos)                 { m_pos = pos; return m_pos; }
+    size_t Skip(size_t size)                { m_pos += size; return m_pos; }
+
+    wxZipHeader& operator>>(wxUint8& n)     { n = Read8();  return *this; }
+    wxZipHeader& operator>>(wxUint16& n)    { n = Read16(); return *this; }
+    wxZipHeader& operator>>(wxUint32& n)    { n = Read32(); return *this; }
+
+private:
+    char m_data[64];
+    size_t m_size;
+    size_t m_pos;
+    bool m_ok;
+};
+
+wxZipHeader::wxZipHeader(wxInputStream& stream, size_t size)
+  : m_size(0),
+    m_pos(0),
+    m_ok(false)
+{
+    wxCHECK_RET(size <= sizeof(m_data), _T("buffer too small"));
+    m_size = stream.Read(m_data, size).LastRead();
+    m_ok = m_size == size;
+}
+
+inline wxUint8 wxZipHeader::Read8()
+{
+    wxASSERT(m_pos < m_size);
+    return m_data[m_pos++];
+}
+
+inline wxUint16 wxZipHeader::Read16()
+{
+    wxASSERT(m_pos + 2 <= m_size);
+    wxUint16 n = CrackUint16(m_data + m_pos);
+    m_pos += 2;
+    return n;
+}
+
+inline wxUint32 wxZipHeader::Read32()
+{
+    wxASSERT(m_pos + 4 <= m_size);
+    wxUint32 n = CrackUint32(m_data + m_pos);
+    m_pos += 4;
+    return n;
+}
+
+

 /////////////////////////////////////////////////////////////////////////////
 // Stored input stream
 // Trival decompressor for files which are 'stored' in the zip file.
 /////////////////////////////////////////////////////////////////////////////
 // Stored input stream
 // Trival decompressor for files which are 'stored' in the zip file.


@@ -172,14 +263,13 @@ wxStoredInputStream::wxStoredInputStream(wxInputStream& stream)
 
 size_t wxStoredInputStream::OnSysRead(void *buffer, size_t size)
 {
 
 size_t wxStoredInputStream::OnSysRead(void *buffer, size_t size)
 {

-    size_t count = wxMin(size, (size_t)(m_len - m_pos));
+    size_t count = wx_truncate_cast(size_t,
+                wxMin(size + wxFileOffset(0), m_len - m_pos + size_t(0)));

     count = m_parent_i_stream->Read(buffer, count).LastRead();
     m_pos += count;
 
     count = m_parent_i_stream->Read(buffer, count).LastRead();
     m_pos += count;
 

-    if (m_pos == m_len)
-        m_lasterror = wxSTREAM_EOF;
-    else if (!*m_parent_i_stream)
-        m_lasterror = wxSTREAM_READ_ERROR;
+    if (count < size)
+        m_lasterror = m_pos == m_len ? wxSTREAM_EOF : wxSTREAM_READ_ERROR;

 
     return count;
 }
 
     return count;
 }


@@ -302,7 +392,8 @@ wxInputStream& wxTeeInputStream::Read(void *buffer, size_t size)
 size_t wxTeeInputStream::OnSysRead(void *buffer, size_t size)
 {
     size_t count = m_parent_i_stream->Read(buffer, size).LastRead();
 size_t wxTeeInputStream::OnSysRead(void *buffer, size_t size)
 {
     size_t count = m_parent_i_stream->Read(buffer, size).LastRead();

-    m_lasterror = m_parent_i_stream->GetLastError();
+    if (count < size)
+        m_lasterror = m_parent_i_stream->GetLastError();

     return count;
 }
 
     return count;
 }
 


@@ -316,6 +407,7 @@ size_t wxTeeInputStream::GetData(char *buffer, size_t size)
             wxFAIL; // we've already returned data that's now being ungot
             m_end = len;
         }
             wxFAIL; // we've already returned data that's now being ungot
             m_end = len;
         }

+        m_parent_i_stream->Reset();

         m_parent_i_stream->Ungetch(m_wback, m_wbacksize);
         free(m_wback);
         m_wback = NULL;
         m_parent_i_stream->Ungetch(m_wback, m_wbacksize);
         free(m_wback);
         m_wback = NULL;


@@ -485,12 +577,14 @@ public:
     wxZipMemory *Unique(size_t size);
 
 private:
     wxZipMemory *Unique(size_t size);
 
 private:

-    ~wxZipMemory() { delete m_data; }
+    ~wxZipMemory() { delete [] m_data; }

 
     char *m_data;
     size_t m_size;
     size_t m_capacity;
     int m_ref;
 
     char *m_data;
     size_t m_size;
     size_t m_capacity;
     int m_ref;

+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipMemory)

 };
 
 wxZipMemory *wxZipMemory::Unique(size_t size)
 };
 
 wxZipMemory *wxZipMemory::Unique(size_t size)


@@ -505,7 +599,7 @@ wxZipMemory *wxZipMemory::Unique(size_t size)
     }
 
     if (zm->m_capacity < size) {
     }
 
     if (zm->m_capacity < size) {

-        delete zm->m_data;
+        delete [] zm->m_data;

         zm->m_data = new char[size];
         zm->m_capacity = size;
     }
         zm->m_data = new char[size];
         zm->m_capacity = size;
     }


@@ -546,7 +640,7 @@ static void Unique(wxZipMemory*& zm, size_t size)
 // Collection of weak references to entries
 
 WX_DECLARE_HASH_MAP(long, wxZipEntry*, wxIntegerHash,
 // Collection of weak references to entries
 
 WX_DECLARE_HASH_MAP(long, wxZipEntry*, wxIntegerHash,

-                    wxIntegerEqual, wx__OffsetZipEntryMap);
+                    wxIntegerEqual, wxOffsetZipEntryMap_);

 
 class wxZipWeakLinks
 {
 
 class wxZipWeakLinks
 {


@@ -560,28 +654,32 @@ public:
 
     wxZipWeakLinks *AddEntry(wxZipEntry *entry, wxFileOffset key);
     void RemoveEntry(wxFileOffset key)
 
     wxZipWeakLinks *AddEntry(wxZipEntry *entry, wxFileOffset key);
     void RemoveEntry(wxFileOffset key)

-        { m_entries.erase((wx__OffsetZipEntryMap::key_type)key); }
+        { m_entries.erase(wx_truncate_cast(key_type, key)); }

     wxZipEntry *GetEntry(wxFileOffset key) const;
     bool IsEmpty() const { return m_entries.empty(); }
 
 private:
     ~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
 
     wxZipEntry *GetEntry(wxFileOffset key) const;
     bool IsEmpty() const { return m_entries.empty(); }
 
 private:
     ~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
 

+    typedef wxOffsetZipEntryMap_::key_type key_type;
+

     int m_ref;
     int m_ref;

-    wx__OffsetZipEntryMap m_entries;
+    wxOffsetZipEntryMap_ m_entries;
+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipWeakLinks)

 };
 
 wxZipWeakLinks *wxZipWeakLinks::AddEntry(wxZipEntry *entry, wxFileOffset key)
 {
 };
 
 wxZipWeakLinks *wxZipWeakLinks::AddEntry(wxZipEntry *entry, wxFileOffset key)
 {

-    m_entries[(wx__OffsetZipEntryMap::key_type)key] = entry;
+    m_entries[wx_truncate_cast(key_type, key)] = entry;

     m_ref++;
     return this;
 }
 
 wxZipEntry *wxZipWeakLinks::GetEntry(wxFileOffset key) const
 {
     m_ref++;
     return this;
 }
 
 wxZipEntry *wxZipWeakLinks::GetEntry(wxFileOffset key) const
 {

-    wx__OffsetZipEntryMap::const_iterator it =
-        m_entries.find((wx__OffsetZipEntryMap::key_type)key);
+    wxOffsetZipEntryMap_::const_iterator it =
+        m_entries.find(wx_truncate_cast(key_type, key));

     return it != m_entries.end() ?  it->second : NULL;
 }
 
     return it != m_entries.end() ?  it->second : NULL;
 }
 


@@ -689,7 +787,7 @@ wxString wxZipEntry::GetName(wxPathFormat format /*=wxPATH_NATIVE*/) const
         case wxPATH_DOS:
         {
             wxString name(isDir ? m_Name + _T("\\") : m_Name);
         case wxPATH_DOS:
         {
             wxString name(isDir ? m_Name + _T("\\") : m_Name);

-            for (size_t i = name.length() - 1; i > 0; --i)
+            for (size_t i = 0; i < name.length(); i++)

                 if (name[i] == _T('/'))
                     name[i] = _T('\\');
             return name;
                 if (name[i] == _T('/'))
                     name[i] = _T('\\');
             return name;


@@ -870,7 +968,9 @@ size_t wxZipEntry::ReadLocal(wxInputStream& stream, wxMBConv& conv)
     wxUint16 nameLen, extraLen;
     wxUint32 compressedSize, size, crc;
 
     wxUint16 nameLen, extraLen;
     wxUint32 compressedSize, size, crc;
 

-    wxDataInputStream ds(stream);
+    wxZipHeader ds(stream, LOCAL_SIZE - 4);
+    if (!ds)
+        return 0;

 
     ds >> m_VersionNeeded >> m_Flags >> m_Method;
     SetDateTime(wxDateTime().SetFromDOS(ds.Read32()));
 
     ds >> m_VersionNeeded >> m_Flags >> m_Method;
     SetDateTime(wxDateTime().SetFromDOS(ds.Read32()));


@@ -886,11 +986,16 @@ size_t wxZipEntry::ReadLocal(wxInputStream& stream, wxMBConv& conv)
         m_Size = size;
 
     SetName(ReadString(stream, nameLen, conv), wxPATH_UNIX);
         m_Size = size;
 
     SetName(ReadString(stream, nameLen, conv), wxPATH_UNIX);

+    if (stream.LastRead() != nameLen + 0u)
+        return 0;

 
     if (extraLen || GetLocalExtraLen()) {
         Unique(m_LocalExtra, extraLen);
 
     if (extraLen || GetLocalExtraLen()) {
         Unique(m_LocalExtra, extraLen);

-        if (extraLen)
+        if (extraLen) {

             stream.Read(m_LocalExtra->GetData(), extraLen);
             stream.Read(m_LocalExtra->GetData(), extraLen);

+            if (stream.LastRead() != extraLen + 0u)
+                return 0;
+        }

     }
 
     return LOCAL_SIZE + nameLen + extraLen;
     }
 
     return LOCAL_SIZE + nameLen + extraLen;


@@ -899,10 +1004,10 @@ size_t wxZipEntry::ReadLocal(wxInputStream& stream, wxMBConv& conv)
 size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
 {
     wxString unixName = GetName(wxPATH_UNIX);
 size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
 {
     wxString unixName = GetName(wxPATH_UNIX);

-    const wxWX2MBbuf name_buf = conv.cWX2MB(unixName);
+    const wxWX2MBbuf name_buf = unixName.mb_str(conv);

     const char *name = name_buf;
     if (!name) name = "";
     const char *name = name_buf;
     if (!name) name = "";

-    wxUint16 nameLen = (wxUint16)strlen(name);
+    wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name));

 
     wxDataOutputStream ds(stream);
 
 
     wxDataOutputStream ds(stream);
 


@@ -910,11 +1015,13 @@ size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
     ds.Write32(GetDateTime().GetAsDOS());
 
     ds.Write32(m_Crc);
     ds.Write32(GetDateTime().GetAsDOS());
 
     ds.Write32(m_Crc);

-    ds.Write32(m_CompressedSize != wxInvalidOffset ? (wxUint32)m_CompressedSize : 0);
-    ds.Write32(m_Size != wxInvalidOffset ? (wxUint32)m_Size : 0);
+    ds.Write32(m_CompressedSize != wxInvalidOffset ?
+               wx_truncate_cast(wxUint32, m_CompressedSize) : 0);
+    ds.Write32(m_Size != wxInvalidOffset ?
+               wx_truncate_cast(wxUint32, m_Size) : 0);

 
     ds << nameLen;
 
     ds << nameLen;

-    wxUint16 extraLen = (wxUint16)GetLocalExtraLen();
+    wxUint16 extraLen = wx_truncate_cast(wxUint16, GetLocalExtraLen());

     ds.Write16(extraLen);
 
     stream.Write(name, nameLen);
     ds.Write16(extraLen);
 
     stream.Write(name, nameLen);


@@ -928,7 +1035,9 @@ size_t wxZipEntry::ReadCentral(wxInputStream& stream, wxMBConv& conv)
 {
     wxUint16 nameLen, extraLen, commentLen;
 
 {
     wxUint16 nameLen, extraLen, commentLen;
 

-    wxDataInputStream ds(stream);
+    wxZipHeader ds(stream, CENTRAL_SIZE - 4);
+    if (!ds)
+        return 0;

 
     ds >> m_VersionMadeBy >> m_SystemMadeBy;
 
 
     ds >> m_VersionMadeBy >> m_SystemMadeBy;
 


@@ -945,17 +1054,25 @@ size_t wxZipEntry::ReadCentral(wxInputStream& stream, wxMBConv& conv)
     SetOffset(ds.Read32());
 
     SetName(ReadString(stream, nameLen, conv), wxPATH_UNIX);
     SetOffset(ds.Read32());
 
     SetName(ReadString(stream, nameLen, conv), wxPATH_UNIX);

+    if (stream.LastRead() != nameLen + 0u)
+        return 0;

 
     if (extraLen || GetExtraLen()) {
         Unique(m_Extra, extraLen);
 
     if (extraLen || GetExtraLen()) {
         Unique(m_Extra, extraLen);

-        if (extraLen)
+        if (extraLen) {

             stream.Read(m_Extra->GetData(), extraLen);
             stream.Read(m_Extra->GetData(), extraLen);

+            if (stream.LastRead() != extraLen + 0u)
+                return 0;
+        }

     }
 
     }
 

-    if (commentLen)
+    if (commentLen) {

         m_Comment = ReadString(stream, commentLen, conv);
         m_Comment = ReadString(stream, commentLen, conv);

-    else
+        if (stream.LastRead() != commentLen + 0u)
+            return 0;
+    } else {

         m_Comment.clear();
         m_Comment.clear();

+    }

 
     return CENTRAL_SIZE + nameLen + extraLen + commentLen;
 }
 
     return CENTRAL_SIZE + nameLen + extraLen + commentLen;
 }


@@ -963,34 +1080,34 @@ size_t wxZipEntry::ReadCentral(wxInputStream& stream, wxMBConv& conv)
 size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
 {
     wxString unixName = GetName(wxPATH_UNIX);
 size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
 {
     wxString unixName = GetName(wxPATH_UNIX);

-    const wxWX2MBbuf name_buf = conv.cWX2MB(unixName);
+    const wxWX2MBbuf name_buf = unixName.mb_str(conv);

     const char *name = name_buf;
     if (!name) name = "";
     const char *name = name_buf;
     if (!name) name = "";

-    wxUint16 nameLen = (wxUint16)strlen(name);
+    wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name));

 
 

-    const wxWX2MBbuf comment_buf = conv.cWX2MB(m_Comment);
+    const wxWX2MBbuf comment_buf = m_Comment.mb_str(conv);

     const char *comment = comment_buf;
     if (!comment) comment = "";
     const char *comment = comment_buf;
     if (!comment) comment = "";

-    wxUint16 commentLen = (wxUint16)strlen(comment);
+    wxUint16 commentLen = wx_truncate_cast(wxUint16, strlen(comment));

 
 

-    wxUint16 extraLen = (wxUint16)GetExtraLen();
+    wxUint16 extraLen = wx_truncate_cast(wxUint16, GetExtraLen());

 
     wxDataOutputStream ds(stream);
 
     ds << CENTRAL_MAGIC << m_VersionMadeBy << m_SystemMadeBy;
 
 
     wxDataOutputStream ds(stream);
 
     ds << CENTRAL_MAGIC << m_VersionMadeBy << m_SystemMadeBy;
 

-    ds.Write16((wxUint16)GetVersionNeeded());
-    ds.Write16((wxUint16)GetFlags());
-    ds.Write16((wxUint16)GetMethod());
+    ds.Write16(wx_truncate_cast(wxUint16, GetVersionNeeded()));
+    ds.Write16(wx_truncate_cast(wxUint16, GetFlags()));
+    ds.Write16(wx_truncate_cast(wxUint16, GetMethod()));

     ds.Write32(GetDateTime().GetAsDOS());
     ds.Write32(GetCrc());
     ds.Write32(GetDateTime().GetAsDOS());
     ds.Write32(GetCrc());

-    ds.Write32((wxUint32)GetCompressedSize());
-    ds.Write32((wxUint32)GetSize());
+    ds.Write32(wx_truncate_cast(wxUint32, GetCompressedSize()));
+    ds.Write32(wx_truncate_cast(wxUint32, GetSize()));

     ds.Write16(nameLen);
     ds.Write16(extraLen);
 
     ds << commentLen << m_DiskStart << m_InternalAttributes
     ds.Write16(nameLen);
     ds.Write16(extraLen);
 
     ds << commentLen << m_DiskStart << m_InternalAttributes

-       << m_ExternalAttributes << (wxUint32)GetOffset();
+       << m_ExternalAttributes << wx_truncate_cast(wxUint32, GetOffset());

 
     stream.Write(name, nameLen);
     if (extraLen)
 
     stream.Write(name, nameLen);
     if (extraLen)


@@ -1007,7 +1124,9 @@ size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
 //
 size_t wxZipEntry::ReadDescriptor(wxInputStream& stream)
 {
 //
 size_t wxZipEntry::ReadDescriptor(wxInputStream& stream)
 {

-    wxDataInputStream ds(stream);
+    wxZipHeader ds(stream, SUMS_SIZE);
+    if (!ds)
+        return 0;

 
     m_Crc = ds.Read32();
     m_CompressedSize = ds.Read32();
 
     m_Crc = ds.Read32();
     m_CompressedSize = ds.Read32();


@@ -1016,23 +1135,24 @@ size_t wxZipEntry::ReadDescriptor(wxInputStream& stream)
     // if 1st value is the signature then this is probably an info-zip record
     if (m_Crc == SUMS_MAGIC)
     {
     // if 1st value is the signature then this is probably an info-zip record
     if (m_Crc == SUMS_MAGIC)
     {

-        char buf[8];
-        stream.Read(buf, sizeof(buf));
-        wxUint32 u1 = CrackUint32(buf);
-        wxUint32 u2 = CrackUint32(buf + 4);
+        wxZipHeader buf(stream, 8);
+        wxUint32 u1 = buf.GetSize() >= 4 ? buf.Read32() : (wxUint32)LOCAL_MAGIC;
+        wxUint32 u2 = buf.GetSize() == 8 ? buf.Read32() : 0;

 
         // look for the signature of the following record to decide which
         if ((u1 == LOCAL_MAGIC || u1 == CENTRAL_MAGIC) &&
             (u2 != LOCAL_MAGIC && u2 != CENTRAL_MAGIC))
         {
             // it's a pkzip style record after all!
 
         // look for the signature of the following record to decide which
         if ((u1 == LOCAL_MAGIC || u1 == CENTRAL_MAGIC) &&
             (u2 != LOCAL_MAGIC && u2 != CENTRAL_MAGIC))
         {
             // it's a pkzip style record after all!

-            stream.Ungetch(buf, sizeof(buf));
+            if (buf.GetSize() > 0)
+                stream.Ungetch(buf.GetData(), buf.GetSize());

         }
         else
         {
             // it's an info-zip record as expected
         }
         else
         {
             // it's an info-zip record as expected

-            stream.Ungetch(buf + 4, sizeof(buf) - 4);
-            m_Crc = (wxUint32)m_CompressedSize;
+            if (buf.GetSize() > 4)
+                stream.Ungetch(buf.GetData() + 4, buf.GetSize() - 4);
+            m_Crc = wx_truncate_cast(wxUint32, m_CompressedSize);

             m_CompressedSize = m_Size;
             m_Size = u1;
             return SUMS_SIZE + 4;
             m_CompressedSize = m_Size;
             m_Size = u1;
             return SUMS_SIZE + 4;


@@ -1052,8 +1172,8 @@ size_t wxZipEntry::WriteDescriptor(wxOutputStream& stream, wxUint32 crc,
     wxDataOutputStream ds(stream);
 
     ds.Write32(crc);
     wxDataOutputStream ds(stream);
 
     ds.Write32(crc);

-    ds.Write32((wxUint32)compressedSize);
-    ds.Write32((wxUint32)size);
+    ds.Write32(wx_truncate_cast(wxUint32, compressedSize));
+    ds.Write32(wx_truncate_cast(wxUint32, size));

 
     return SUMS_SIZE;
 }
 
     return SUMS_SIZE;
 }


@@ -1075,13 +1195,20 @@ public:
     wxFileOffset GetOffset() const              { return m_Offset; }
     wxString GetComment() const                 { return m_Comment; }
 
     wxFileOffset GetOffset() const              { return m_Offset; }
     wxString GetComment() const                 { return m_Comment; }
 

-    void SetDiskNumber(int num)                 { m_DiskNumber = (wxUint16)num; }
-    void SetStartDisk(int num)                  { m_StartDisk = (wxUint16)num; }
-    void SetEntriesHere(int num)                { m_EntriesHere = (wxUint16)num; }
-    void SetTotalEntries(int num)               { m_TotalEntries = (wxUint16)num; }
-    void SetSize(wxFileOffset size)             { m_Size = (wxUint32)size; }
-    void SetOffset(wxFileOffset offset)         { m_Offset = (wxUint32)offset; }
-    void SetComment(const wxString& comment)    { m_Comment = comment; }
+    void SetDiskNumber(int num)
+        { m_DiskNumber = wx_truncate_cast(wxUint16, num); }
+    void SetStartDisk(int num)
+        { m_StartDisk = wx_truncate_cast(wxUint16, num); }
+    void SetEntriesHere(int num)
+        { m_EntriesHere = wx_truncate_cast(wxUint16, num); }
+    void SetTotalEntries(int num)
+        { m_TotalEntries = wx_truncate_cast(wxUint16, num); }
+    void SetSize(wxFileOffset size)
+        { m_Size = wx_truncate_cast(wxUint32, size); }
+    void SetOffset(wxFileOffset offset)
+        { m_Offset = wx_truncate_cast(wxUint32, offset); }
+    void SetComment(const wxString& comment)
+        { m_Comment = comment; }

 
     bool Read(wxInputStream& stream, wxMBConv& conv);
     bool Write(wxOutputStream& stream, wxMBConv& conv) const;
 
     bool Read(wxInputStream& stream, wxMBConv& conv);
     bool Write(wxOutputStream& stream, wxMBConv& conv) const;


@@ -1108,7 +1235,7 @@ wxZipEndRec::wxZipEndRec()
 
 bool wxZipEndRec::Write(wxOutputStream& stream, wxMBConv& conv) const
 {
 
 bool wxZipEndRec::Write(wxOutputStream& stream, wxMBConv& conv) const
 {

-    const wxWX2MBbuf comment_buf = conv.cWX2MB(m_Comment);
+    const wxWX2MBbuf comment_buf = m_Comment.mb_str(conv);

     const char *comment = comment_buf;
     if (!comment) comment = "";
     wxUint16 commentLen = (wxUint16)strlen(comment);
     const char *comment = comment_buf;
     if (!comment) comment = "";
     wxUint16 commentLen = (wxUint16)strlen(comment);


@@ -1125,23 +1252,26 @@ bool wxZipEndRec::Write(wxOutputStream& stream, wxMBConv& conv) const
 
 bool wxZipEndRec::Read(wxInputStream& stream, wxMBConv& conv)
 {
 
 bool wxZipEndRec::Read(wxInputStream& stream, wxMBConv& conv)
 {

-    wxDataInputStream ds(stream);
+    wxZipHeader ds(stream, END_SIZE - 4);
+    if (!ds)
+        return false;
+

     wxUint16 commentLen;
 
     ds >> m_DiskNumber >> m_StartDisk >> m_EntriesHere
        >> m_TotalEntries >> m_Size >> m_Offset >> commentLen;
 
     wxUint16 commentLen;
 
     ds >> m_DiskNumber >> m_StartDisk >> m_EntriesHere
        >> m_TotalEntries >> m_Size >> m_Offset >> commentLen;
 

-    if (commentLen)
+    if (commentLen) {

         m_Comment = ReadString(stream, commentLen, conv);
         m_Comment = ReadString(stream, commentLen, conv);

+        if (stream.LastRead() != commentLen + 0u)
+            return false;
+    }

 
 

-    if (stream.IsOk())
-        if (m_DiskNumber == 0 && m_StartDisk == 0 &&
-                m_EntriesHere == m_TotalEntries)
-            return true;
-        else
-            wxLogError(_("unsupported zip archive"));
+    if (m_DiskNumber != 0 || m_StartDisk != 0 ||
+            m_EntriesHere != m_TotalEntries)
+        wxLogWarning(_("assuming this is a multi-part zip concatenated"));

 
 

-    return false;
+    return true;

 }
 
 
 }
 
 


@@ -1166,6 +1296,8 @@ private:
 
     int m_ref;
     wxZipOutputStream *m_stream;
 
     int m_ref;
     wxZipOutputStream *m_stream;

+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipStreamLink)

 };
 
 
 };
 
 


@@ -1173,8 +1305,8 @@ private:
 // Input stream
 
 // leave the default wxZipEntryPtr free for users
 // Input stream
 
 // leave the default wxZipEntryPtr free for users

-wxDECLARE_SCOPED_PTR(wxZipEntry, wx__ZipEntryPtr)
-wxDEFINE_SCOPED_PTR (wxZipEntry, wx__ZipEntryPtr)
+wxDECLARE_SCOPED_PTR(wxZipEntry, wxZipEntryPtr_)
+wxDEFINE_SCOPED_PTR (wxZipEntry, wxZipEntryPtr_)

 
 // constructor
 //
 
 // constructor
 //


@@ -1185,7 +1317,14 @@ wxZipInputStream::wxZipInputStream(wxInputStream& stream,
     Init();
 }
 
     Init();
 }
 

-#if 1 //WXWIN_COMPATIBILITY_2_6
+wxZipInputStream::wxZipInputStream(wxInputStream *stream,
+                                   wxMBConv& conv /*=wxConvLocal*/)
+  : wxArchiveInputStream(stream, conv)
+{
+    Init();
+}
+
+#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE

 
 // Part of the compatibility constructor, which has been made inline to
 // avoid a problem with it not being exported by mingw 3.2.3
 
 // Part of the compatibility constructor, which has been made inline to
 // avoid a problem with it not being exported by mingw 3.2.3


@@ -1196,10 +1335,11 @@ void wxZipInputStream::Init(const wxString& file)
     wxLogNull nolog;
     Init();
     m_allowSeeking = true;
     wxLogNull nolog;
     Init();
     m_allowSeeking = true;

-    m_ffile = wx_static_cast(wxFFileInputStream*, m_parent_i_stream);
-    wx__ZipEntryPtr entry;
+    wxFFileInputStream *ffile;
+    ffile = static_cast<wxFFileInputStream*>(m_parent_i_stream);
+    wxZipEntryPtr_ entry;

 
 

-    if (m_ffile->Ok()) {
+    if (ffile->Ok()) {

         do {
             entry.reset(GetNextEntry());
         }
         do {
             entry.reset(GetNextEntry());
         }


@@ -1210,13 +1350,13 @@ void wxZipInputStream::Init(const wxString& file)
         m_lasterror = wxSTREAM_READ_ERROR;
 }
 
         m_lasterror = wxSTREAM_READ_ERROR;
 }
 

-wxInputStream& wxZipInputStream::OpenFile(const wxString& archive)
+wxInputStream* wxZipInputStream::OpenFile(const wxString& archive)

 {
     wxLogNull nolog;
 {
     wxLogNull nolog;

-    return *new wxFFileInputStream(archive);
+    return new wxFFileInputStream(archive);

 }
 
 }
 

-#endif // WXWIN_COMPATIBILITY_2_6
+#endif // WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE

 
 void wxZipInputStream::Init()
 {
 
 void wxZipInputStream::Init()
 {


@@ -1234,8 +1374,7 @@ void wxZipInputStream::Init()
     m_signature = 0;
     m_TotalEntries = 0;
     m_lasterror = m_parent_i_stream->GetLastError();
     m_signature = 0;
     m_TotalEntries = 0;
     m_lasterror = m_parent_i_stream->GetLastError();

-    m_ffile = NULL;
-#if 1 //WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_6

     m_allowSeeking = false;
 #endif
 }
     m_allowSeeking = false;
 #endif
 }


@@ -1247,7 +1386,6 @@ wxZipInputStream::~wxZipInputStream()
     delete m_store;
     delete m_inflate;
     delete m_rawin;
     delete m_store;
     delete m_inflate;
     delete m_rawin;

-    delete m_ffile;

 
     m_weaklinks->Release(this);
 
 
     m_weaklinks->Release(this);
 


@@ -1309,9 +1447,7 @@ bool wxZipInputStream::LoadEndRecord()
         else {
             wxLogNull nolog;
             wxFileOffset pos = m_parent_i_stream->TellI();
         else {
             wxLogNull nolog;
             wxFileOffset pos = m_parent_i_stream->TellI();

-            // FIXME
-            //if (pos != wxInvalidOffset)
-            if (pos >= 0 && pos <= LONG_MAX)
+            if (pos != wxInvalidOffset)

                 m_offsetAdjustment = m_position = pos;
             return true;
         }
                 m_offsetAdjustment = m_position = pos;
             return true;
         }


@@ -1321,23 +1457,19 @@ bool wxZipInputStream::LoadEndRecord()
 
     // Read in the end record
     wxFileOffset endPos = m_parent_i_stream->TellI() - 4;
 
     // Read in the end record
     wxFileOffset endPos = m_parent_i_stream->TellI() - 4;

-    if (!endrec.Read(*m_parent_i_stream, GetConv())) {
-        if (!*m_parent_i_stream) {
-            m_lasterror = wxSTREAM_READ_ERROR;
-            return false;
-        }
-        // TODO: try this out
-        wxLogWarning(_("assuming this is a multi-part zip concatenated"));
-    }
+    if (!endrec.Read(*m_parent_i_stream, GetConv()))
+        return false;

 
     m_TotalEntries = endrec.GetTotalEntries();
     m_Comment = endrec.GetComment();
 
 
     m_TotalEntries = endrec.GetTotalEntries();
     m_Comment = endrec.GetComment();
 

+    wxUint32 magic = m_TotalEntries ? CENTRAL_MAGIC : END_MAGIC;
+

     // Now find the central-directory. we have the file offset of
     // the CD, so look there first.
     if (m_parent_i_stream->SeekI(endrec.GetOffset()) != wxInvalidOffset &&
     // Now find the central-directory. we have the file offset of
     // the CD, so look there first.
     if (m_parent_i_stream->SeekI(endrec.GetOffset()) != wxInvalidOffset &&

-            ReadSignature() == CENTRAL_MAGIC) {
-        m_signature = CENTRAL_MAGIC;
+            ReadSignature() == magic) {
+        m_signature = magic;

         m_position = endrec.GetOffset();
         m_offsetAdjustment = 0;
         return true;
         m_position = endrec.GetOffset();
         m_offsetAdjustment = 0;
         return true;


@@ -1347,8 +1479,8 @@ bool wxZipInputStream::LoadEndRecord()
     // to a self extractor, so take the CD size (also in endrec), subtract
     // it from the file offset of the end-central-directory and look there.
     if (m_parent_i_stream->SeekI(endPos - endrec.GetSize())
     // to a self extractor, so take the CD size (also in endrec), subtract
     // it from the file offset of the end-central-directory and look there.
     if (m_parent_i_stream->SeekI(endPos - endrec.GetSize())

-            != wxInvalidOffset && ReadSignature() == CENTRAL_MAGIC) {
-        m_signature = CENTRAL_MAGIC;
+            != wxInvalidOffset && ReadSignature() == magic) {
+        m_signature = magic;

         m_position = endPos - endrec.GetSize();
         m_offsetAdjustment = m_position - endrec.GetOffset();
         return true;
         m_position = endPos - endrec.GetSize();
         m_offsetAdjustment = m_position - endrec.GetOffset();
         return true;


@@ -1392,7 +1524,8 @@ bool wxZipInputStream::FindEndRecord()
     wxFileOffset minpos = wxMax(pos - 65535L, 0);
 
     while (pos > minpos) {
     wxFileOffset minpos = wxMax(pos - 65535L, 0);
 
     while (pos > minpos) {

-        size_t len = (size_t)(pos - wxMax(pos - (BUFSIZE - 3), minpos));
+        size_t len = wx_truncate_cast(size_t,
+                        pos - wxMax(pos - (BUFSIZE - 3), minpos));

         memcpy(buf.data() + len, buf, 3);
         pos -= len;
 
         memcpy(buf.data() + len, buf, 3);
         pos -= len;
 


@@ -1425,7 +1558,7 @@ wxZipEntry *wxZipInputStream::GetNextEntry()
     if (!IsOk())
         return NULL;
 
     if (!IsOk())
         return NULL;
 

-    wx__ZipEntryPtr entry(new wxZipEntry(m_entry));
+    wxZipEntryPtr_ entry(new wxZipEntry(m_entry));

     entry->m_backlink = m_weaklinks->AddEntry(entry.get(), entry->GetKey());
     return entry.release();
 }
     entry->m_backlink = m_weaklinks->AddEntry(entry.get(), entry->GetKey());
     return entry.release();
 }


@@ -1446,12 +1579,13 @@ wxStreamError wxZipInputStream::ReadCentral()
     if (QuietSeek(*m_parent_i_stream, m_position + 4) == wxInvalidOffset)
         return wxSTREAM_READ_ERROR;
 
     if (QuietSeek(*m_parent_i_stream, m_position + 4) == wxInvalidOffset)
         return wxSTREAM_READ_ERROR;
 

-    m_position += m_entry.ReadCentral(*m_parent_i_stream, GetConv());
-    if (m_parent_i_stream->GetLastError() == wxSTREAM_READ_ERROR) {
+    size_t size = m_entry.ReadCentral(*m_parent_i_stream, GetConv());
+    if (!size) {

         m_signature = 0;
         return wxSTREAM_READ_ERROR;
     }
 
         m_signature = 0;
         return wxSTREAM_READ_ERROR;
     }
 

+    m_position += size;

     m_signature = ReadSignature();
 
     if (m_offsetAdjustment)
     m_signature = ReadSignature();
 
     if (m_offsetAdjustment)


@@ -1480,9 +1614,10 @@ wxStreamError wxZipInputStream::ReadLocal(bool readEndRec /*=false*/)
         if (m_weaklinks->IsEmpty() && m_streamlink == NULL)
             return wxSTREAM_EOF;
 
         if (m_weaklinks->IsEmpty() && m_streamlink == NULL)
             return wxSTREAM_EOF;
 

-        m_position += m_entry.ReadCentral(*m_parent_i_stream, GetConv());
+        size_t size = m_entry.ReadCentral(*m_parent_i_stream, GetConv());
+        m_position += size;

         m_signature = 0;
         m_signature = 0;

-        if (m_parent_i_stream->GetLastError() == wxSTREAM_READ_ERROR)
+        if (!size)

             return wxSTREAM_READ_ERROR;
 
         wxZipEntry *entry = m_weaklinks->GetEntry(m_entry.GetOffset());
             return wxSTREAM_READ_ERROR;
 
         wxZipEntry *entry = m_weaklinks->GetEntry(m_entry.GetOffset());


@@ -1516,22 +1651,20 @@ wxStreamError wxZipInputStream::ReadLocal(bool readEndRec /*=false*/)
         return wxSTREAM_EOF;
     }
 
         return wxSTREAM_EOF;
     }
 

-    if (m_signature != LOCAL_MAGIC) {
-        wxLogError(_("error reading zip local header"));
-        return wxSTREAM_READ_ERROR;
-    }
-
-    m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv());
-    m_signature = 0;
-    m_entry.SetOffset(m_position);
-    m_entry.SetKey(m_position);
+    if (m_signature == LOCAL_MAGIC) {
+        m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv());
+        m_signature = 0;
+        m_entry.SetOffset(m_position);
+        m_entry.SetKey(m_position);

 
 

-    if (m_parent_i_stream->GetLastError() == wxSTREAM_READ_ERROR) {
-        return wxSTREAM_READ_ERROR;
-    } else {
-        m_TotalEntries++;
-        return wxSTREAM_NO_ERROR;
+        if (m_headerSize) {
+            m_TotalEntries++;
+            return wxSTREAM_NO_ERROR;
+        }

     }
     }

+
+    wxLogError(_("error reading zip local header"));
+    return wxSTREAM_READ_ERROR;

 }
 
 wxUint32 wxZipInputStream::ReadSignature()
 }
 
 wxUint32 wxZipInputStream::ReadSignature()


@@ -1556,7 +1689,8 @@ bool wxZipInputStream::DoOpen(wxZipEntry *entry, bool raw)
             return false;
     if (m_lasterror == wxSTREAM_READ_ERROR)
         return false;
             return false;
     if (m_lasterror == wxSTREAM_READ_ERROR)
         return false;

-    wxCHECK(!IsOpened(), false);
+    if (IsOpened())
+        CloseEntry();

 
     m_raw = raw;
 
 
     m_raw = raw;
 


@@ -1584,7 +1718,7 @@ bool wxZipInputStream::DoOpen(wxZipEntry *entry, bool raw)
 
     if (m_parentSeekable || AtHeader()) {
         m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv());
 
     if (m_parentSeekable || AtHeader()) {
         m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv());

-        if (m_parentSeekable) {
+        if (m_headerSize && m_parentSeekable) {

             wxZipEntry *ref = m_weaklinks->GetEntry(m_entry.GetKey());
             if (ref) {
                 Copy(ref->m_LocalExtra, m_entry.m_LocalExtra);
             wxZipEntry *ref = m_weaklinks->GetEntry(m_entry.GetKey());
             if (ref) {
                 Copy(ref->m_LocalExtra, m_entry.m_LocalExtra);


@@ -1598,7 +1732,8 @@ bool wxZipInputStream::DoOpen(wxZipEntry *entry, bool raw)
         }
     }
 
         }
     }
 

-    m_lasterror = m_parent_i_stream->GetLastError();
+    if (m_headerSize)
+        m_lasterror = wxSTREAM_NO_ERROR;

     return IsOk();
 }
 
     return IsOk();
 }
 


@@ -1717,7 +1852,8 @@ size_t wxZipInputStream::OnSysRead(void *buffer, size_t size)
     size_t count = m_decomp->Read(buffer, size).LastRead();
     if (!m_raw)
         m_crcAccumulator = crc32(m_crcAccumulator, (Byte*)buffer, count);
     size_t count = m_decomp->Read(buffer, size).LastRead();
     if (!m_raw)
         m_crcAccumulator = crc32(m_crcAccumulator, (Byte*)buffer, count);

-    m_lasterror = m_decomp->GetLastError();
+    if (count < size)
+        m_lasterror = m_decomp->GetLastError();

 
     if (Eof()) {
         if ((m_entry.GetFlags() & wxZIP_SUMS_FOLLOW) != 0) {
 
     if (Eof()) {
         if ((m_entry.GetFlags() & wxZIP_SUMS_FOLLOW) != 0) {


@@ -1735,23 +1871,21 @@ size_t wxZipInputStream::OnSysRead(void *buffer, size_t size)
         if (!m_raw) {
             m_lasterror = wxSTREAM_READ_ERROR;
 
         if (!m_raw) {
             m_lasterror = wxSTREAM_READ_ERROR;
 

-            if (m_parent_i_stream->IsOk()) {
-                if (m_entry.GetSize() != TellI())
-                    wxLogError(_("reading zip stream (entry %s): bad length"),
-                               m_entry.GetName().c_str());
-                else if (m_crcAccumulator != m_entry.GetCrc())
-                    wxLogError(_("reading zip stream (entry %s): bad crc"),
-                               m_entry.GetName().c_str());
-                else
-                    m_lasterror = wxSTREAM_EOF;
-            }
+            if (m_entry.GetSize() != TellI())
+                wxLogError(_("reading zip stream (entry %s): bad length"),
+                           m_entry.GetName().c_str());
+            else if (m_crcAccumulator != m_entry.GetCrc())
+                wxLogError(_("reading zip stream (entry %s): bad crc"),
+                           m_entry.GetName().c_str());
+            else
+                m_lasterror = wxSTREAM_EOF;

         }
     }
 
     return count;
 }
 
         }
     }
 
     return count;
 }
 

-#if 1 //WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_6

 
 // Borrowed from VS's zip stream (c) 1999 Vaclav Slavik
 //
 
 // Borrowed from VS's zip stream (c) 1999 Vaclav Slavik
 //


@@ -1783,31 +1917,30 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
         default : nextpos = pos; break; /* just to fool compiler, never happens */
     }
 
         default : nextpos = pos; break; /* just to fool compiler, never happens */
     }
 

-    size_t toskip wxDUMMY_INITIALIZE(0);
+    wxFileOffset toskip wxDUMMY_INITIALIZE(0);

     if ( nextpos >= pos )
     {
     if ( nextpos >= pos )
     {

-        toskip = (size_t)(nextpos - pos);
+        toskip = nextpos - pos;

     }
     else
     {
         wxZipEntry current(m_entry);
     }
     else
     {
         wxZipEntry current(m_entry);

-        CloseEntry();

         if (!OpenEntry(current))
         {
             m_lasterror = wxSTREAM_READ_ERROR;
             return pos;
         }
         if (!OpenEntry(current))
         {
             m_lasterror = wxSTREAM_READ_ERROR;
             return pos;
         }

-        toskip = (size_t)nextpos;
+        toskip = nextpos;

     }
 
     if ( toskip > 0 )
     {
     }
 
     if ( toskip > 0 )
     {

-        const size_t BUFSIZE = 4096;
+        const int BUFSIZE = 4096;

         size_t sz;
         char buffer[BUFSIZE];
         while ( toskip > 0 )
         {
         size_t sz;
         char buffer[BUFSIZE];
         while ( toskip > 0 )
         {

-            sz = wxMin(toskip, BUFSIZE);
+            sz = wx_truncate_cast(size_t, wxMin(toskip, BUFSIZE));

             Read(buffer, sz);
             toskip -= sz;
         }
             Read(buffer, sz);
             toskip -= sz;
         }


@@ -1824,32 +1957,46 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
 // Output stream
 
 #include "wx/listimpl.cpp"
 // Output stream
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wx__ZipEntryList);
+WX_DEFINE_LIST(wxZipEntryList_)

 
 wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream,
                                      int level      /*=-1*/,
                                      wxMBConv& conv /*=wxConvLocal*/)
 
 wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream,
                                      int level      /*=-1*/,
                                      wxMBConv& conv /*=wxConvLocal*/)

-  : wxArchiveOutputStream(stream, conv),
-    m_store(new wxStoredOutputStream(stream)),
-    m_deflate(NULL),
-    m_backlink(NULL),
-    m_initialData(new char[OUTPUT_LATENCY]),
-    m_initialSize(0),
-    m_pending(NULL),
-    m_raw(false),
-    m_headerOffset(0),
-    m_headerSize(0),
-    m_entrySize(0),
-    m_comp(NULL),
-    m_level(level),
-    m_offsetAdjustment(wxInvalidOffset)
+  : wxArchiveOutputStream(stream, conv)
+{
+    Init(level);
+}
+
+wxZipOutputStream::wxZipOutputStream(wxOutputStream *stream,
+                                     int level      /*=-1*/,
+                                     wxMBConv& conv /*=wxConvLocal*/)
+  : wxArchiveOutputStream(stream, conv)

 {
 {

+    Init(level);
+}
+
+void wxZipOutputStream::Init(int level)
+{
+    m_store = new wxStoredOutputStream(*m_parent_o_stream);
+    m_deflate = NULL;
+    m_backlink = NULL;
+    m_initialData = new char[OUTPUT_LATENCY];
+    m_initialSize = 0;
+    m_pending = NULL;
+    m_raw = false;
+    m_headerOffset = 0;
+    m_headerSize = 0;
+    m_entrySize = 0;
+    m_comp = NULL;
+    m_level = level;
+    m_offsetAdjustment = wxInvalidOffset;
+    m_endrecWritten = false;

 }
 
 wxZipOutputStream::~wxZipOutputStream()
 {
     Close();
 }
 
 wxZipOutputStream::~wxZipOutputStream()
 {
     Close();

-    WX_CLEAR_LIST(wx__ZipEntryList, m_entries);
+    WX_CLEAR_LIST(wxZipEntryList_, m_entries);

     delete m_store;
     delete m_deflate;
     delete m_pending;
     delete m_store;
     delete m_deflate;
     delete m_pending;


@@ -1878,7 +2025,7 @@ bool wxZipOutputStream::PutNextDirEntry(
 bool wxZipOutputStream::CopyEntry(wxZipEntry *entry,
                                   wxZipInputStream& inputStream)
 {
 bool wxZipOutputStream::CopyEntry(wxZipEntry *entry,
                                   wxZipInputStream& inputStream)
 {

-    wx__ZipEntryPtr e(entry);
+    wxZipEntryPtr_ e(entry);

 
     return
         inputStream.DoOpen(e.get(), true) &&
 
     return
         inputStream.DoOpen(e.get(), true) &&


@@ -1904,7 +2051,7 @@ bool wxZipOutputStream::CopyEntry(wxArchiveEntry *entry,
         return false;
     }
 
         return false;
     }
 

-    return CopyEntry(zipEntry, wx_static_cast(wxZipInputStream&, stream));
+    return CopyEntry(zipEntry, static_cast<wxZipInputStream&>(stream));

 }
 
 bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream)
 }
 
 bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream)


@@ -1918,7 +2065,7 @@ bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream)
 
 bool wxZipOutputStream::CopyArchiveMetaData(wxArchiveInputStream& stream)
 {
 
 bool wxZipOutputStream::CopyArchiveMetaData(wxArchiveInputStream& stream)
 {

-    return CopyArchiveMetaData(wx_static_cast(wxZipInputStream&, stream));
+    return CopyArchiveMetaData(static_cast<wxZipInputStream&>(stream));

 }
 
 void wxZipOutputStream::SetLevel(int level)
 }
 
 void wxZipOutputStream::SetLevel(int level)


@@ -2048,7 +2195,7 @@ bool wxZipOutputStream::CloseCompressor(wxOutputStream *comp)
 void wxZipOutputStream::CreatePendingEntry(const void *buffer, size_t size)
 {
     wxASSERT(IsOk() && m_pending && !m_comp);
 void wxZipOutputStream::CreatePendingEntry(const void *buffer, size_t size)
 {
     wxASSERT(IsOk() && m_pending && !m_comp);

-    wx__ZipEntryPtr spPending(m_pending);
+    wxZipEntryPtr_ spPending(m_pending);

     m_pending = NULL;
 
     Buffer bufs[] = {
     m_pending = NULL;
 
     Buffer bufs[] = {


@@ -2089,7 +2236,7 @@ void wxZipOutputStream::CreatePendingEntry(const void *buffer, size_t size)
 void wxZipOutputStream::CreatePendingEntry()
 {
     wxASSERT(IsOk() && m_pending && !m_comp);
 void wxZipOutputStream::CreatePendingEntry()
 {
     wxASSERT(IsOk() && m_pending && !m_comp);

-    wx__ZipEntryPtr spPending(m_pending);
+    wxZipEntryPtr_ spPending(m_pending);

     m_pending = NULL;
     m_lasterror = wxSTREAM_WRITE_ERROR;
 
     m_pending = NULL;
     m_lasterror = wxSTREAM_WRITE_ERROR;
 


@@ -2143,8 +2290,12 @@ bool wxZipOutputStream::Close()
 {
     CloseEntry();
 
 {
     CloseEntry();
 

-    if (m_lasterror == wxSTREAM_WRITE_ERROR || m_entries.size() == 0)
+    if (m_lasterror == wxSTREAM_WRITE_ERROR
+        || (m_entries.size() == 0 && m_endrecWritten))
+    {
+        wxFilterOutputStream::Close();

         return false;
         return false;

+    }

 
     wxZipEndRec endrec;
 
 
     wxZipEndRec endrec;
 


@@ -2153,7 +2304,7 @@ bool wxZipOutputStream::Close()
     endrec.SetOffset(m_headerOffset);
     endrec.SetComment(m_Comment);
 
     endrec.SetOffset(m_headerOffset);
     endrec.SetComment(m_Comment);
 

-    wx__ZipEntryList::iterator it;
+    wxZipEntryList_::iterator it;

     wxFileOffset size = 0;
 
     for (it = m_entries.begin(); it != m_entries.end(); ++it) {
     wxFileOffset size = 0;
 
     for (it = m_entries.begin(); it != m_entries.end(); ++it) {


@@ -2166,7 +2317,9 @@ bool wxZipOutputStream::Close()
     endrec.Write(*m_parent_o_stream, GetConv());
 
     m_lasterror = m_parent_o_stream->GetLastError();
     endrec.Write(*m_parent_o_stream, GetConv());
 
     m_lasterror = m_parent_o_stream->GetLastError();

-    if (!IsOk())
+    m_endrecWritten = true;
+    
+    if (!wxFilterOutputStream::Close() || !IsOk())

         return false;
     m_lasterror = wxSTREAM_EOF;
     return true;
         return false;
     m_lasterror = wxSTREAM_EOF;
     return true;


@@ -2275,4 +2428,4 @@ size_t wxZipOutputStream::OnSysWrite(const void *buffer, size_t size)
     return m_comp->LastWrite();
 }
 
     return m_comp->LastWrite();
 }
 

-#endif // wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+#endif // wxUSE_ZIPSTREAM