Source cleaning. wxMotif/OS2 adjustements.

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

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 9675244428bee40ee2609bc9e21f60b3b7ab560f..92d972002cef9d3ff9ca77dd0375d1f0cc46b740 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -7,10 +7,6 @@
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -34,6 +30,7 @@
 #include "wx/buffer.h"
 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"
 #include "wx/buffer.h"
 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"

+#include "wx/link.h"

 #include "zlib.h"
 
 // value for the 'version needed to extract' field (20 means 2.0)
 #include "zlib.h"
 
 // value for the 'version needed to extract' field (20 means 2.0)


@@ -81,12 +78,7 @@ 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;
-}
+wxFORCE_LINK_THIS_MODULE(zipstrm)

 
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////


@@ -172,7 +164,8 @@ 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;
 


@@ -485,7 +478,7 @@ 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;
 
     char *m_data;
     size_t m_size;


@@ -505,7 +498,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;
     }


@@ -560,11 +553,13 @@ 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:
     wxZipEntry *GetEntry(wxFileOffset key) const;
     bool IsEmpty() const { return m_entries.empty(); }
 
 private:

+    typedef wx__OffsetZipEntryMap::key_type key_type;
+

     ~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
 
     int m_ref;
     ~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
 
     int m_ref;


@@ -573,7 +568,7 @@ private:
 
 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;
 }
     m_ref++;
     return this;
 }


@@ -581,7 +576,7 @@ wxZipWeakLinks *wxZipWeakLinks::AddEntry(wxZipEntry *entry, wxFileOffset key)
 wxZipEntry *wxZipWeakLinks::GetEntry(wxFileOffset key) const
 {
     wx__OffsetZipEntryMap::const_iterator it =
 wxZipEntry *wxZipWeakLinks::GetEntry(wxFileOffset key) const
 {
     wx__OffsetZipEntryMap::const_iterator it =

-        m_entries.find((wx__OffsetZipEntryMap::key_type)key);
+        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;
 }
 


@@ -902,7 +897,7 @@ size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
     const wxWX2MBbuf name_buf = conv.cWX2MB(unixName);
     const char *name = name_buf;
     if (!name) name = "";
     const wxWX2MBbuf name_buf = conv.cWX2MB(unixName);
     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 +905,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);


@@ -966,31 +963,31 @@ size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
     const wxWX2MBbuf name_buf = conv.cWX2MB(unixName);
     const char *name = name_buf;
     if (!name) name = "";
     const wxWX2MBbuf name_buf = conv.cWX2MB(unixName);
     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 char *comment = comment_buf;
     if (!comment) comment = "";
 
     const wxWX2MBbuf comment_buf = conv.cWX2MB(m_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)


@@ -1032,7 +1029,7 @@ size_t wxZipEntry::ReadDescriptor(wxInputStream& stream)
         {
             // it's an info-zip record as expected
             stream.Ungetch(buf + 4, sizeof(buf) - 4);
         {
             // it's an info-zip record as expected
             stream.Ungetch(buf + 4, sizeof(buf) - 4);

-            m_Crc = (wxUint32)m_CompressedSize;
+            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 +1049,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 +1072,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;


@@ -1182,25 +1186,21 @@ wxZipInputStream::wxZipInputStream(wxInputStream& stream,
                                    wxMBConv& conv /*=wxConvLocal*/)
   : wxArchiveInputStream(stream, conv)
 {
                                    wxMBConv& conv /*=wxConvLocal*/)
   : wxArchiveInputStream(stream, conv)
 {

-#if 1 //WXWIN_COMPATIBILITY_2_6
-    m_allowSeeking = false;
-#endif
-    m_ffile = NULL;

     Init();
 }
 
 #if 1 //WXWIN_COMPATIBILITY_2_6
 
     Init();
 }
 
 #if 1 //WXWIN_COMPATIBILITY_2_6
 

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

 //
 //

-wxZipInputStream::wxZipInputStream(const wxString& archive,
-                                   const wxString& file)
-  : wxArchiveInputStream(OpenFile(archive), wxConvLocal)
+void wxZipInputStream::Init(const wxString& file)

 {
     // no error messages
     wxLogNull nolog;
     Init();
     m_allowSeeking = true;
 {
     // no error messages
     wxLogNull nolog;
     Init();
     m_allowSeeking = true;

+    m_ffile = wx_static_cast(wxFFileInputStream*, m_parent_i_stream);

     wx__ZipEntryPtr entry;
 
     if (m_ffile->Ok()) {
     wx__ZipEntryPtr entry;
 
     if (m_ffile->Ok()) {


@@ -1217,8 +1217,7 @@ wxZipInputStream::wxZipInputStream(const wxString& archive,
 wxInputStream& wxZipInputStream::OpenFile(const wxString& archive)
 {
     wxLogNull nolog;
 wxInputStream& wxZipInputStream::OpenFile(const wxString& archive)
 {
     wxLogNull nolog;

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

 }
 
 #endif // WXWIN_COMPATIBILITY_2_6
 }
 
 #endif // WXWIN_COMPATIBILITY_2_6


@@ -1239,6 +1238,10 @@ 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
+    m_allowSeeking = false;
+#endif

 }
 
 wxZipInputStream::~wxZipInputStream()
 }
 
 wxZipInputStream::~wxZipInputStream()


@@ -1393,7 +1396,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;
 


@@ -1784,10 +1788,10 @@ 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
     {
     }
     else
     {


@@ -1798,17 +1802,17 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
             m_lasterror = wxSTREAM_READ_ERROR;
             return pos;
         }
             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;
         }


@@ -1825,7 +1829,7 @@ 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(wx__ZipEntryList)

 
 wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream,
                                      int level      /*=-1*/,
 
 wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream,
                                      int level      /*=-1*/,