X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/916af76f40555e9d2548a1538e2a5563222ea373..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/common/fs_arc.cpp

diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index 357c2f7479..bd6c244f4b 100644
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fs_arc.cpp
+// Name:        src/common/fs_arc.cpp
 // Purpose:     wxArchive file system
 // Author:      Vaclav Slavik, Mike Wetherell
 // Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
@@ -17,12 +17,17 @@
 
 #include "wx/fs_arc.h"
 
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/archive.h"
+#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
+    #include "wx/zipstrm.h"
+#else
+    #include "wx/archive.h"
+#endif
+
 #include "wx/private/fileback.h"
 
 //---------------------------------------------------------------------------
@@ -119,7 +124,7 @@ wxArchiveFSCacheDataImpl::~wxArchiveFSCacheDataImpl()
 
 wxArchiveFSEntry *wxArchiveFSCacheDataImpl::AddToCache(wxArchiveEntry *entry)
 {
-    m_hash[entry->GetName()] = entry;
+    m_hash[entry->GetName(wxPATH_UNIX)] = entry;
     wxArchiveFSEntry *fse = new wxArchiveFSEntry;
     *m_endptr = fse;
     (*m_endptr)->entry = entry;
@@ -130,10 +135,8 @@ wxArchiveFSEntry *wxArchiveFSCacheDataImpl::AddToCache(wxArchiveEntry *entry)
 
 void wxArchiveFSCacheDataImpl::CloseStreams()
 {
-    delete m_archive;
-    m_archive = NULL;
-    delete m_stream;
-    m_stream = NULL;
+    wxDELETE(m_archive);
+    wxDELETE(m_stream);
 }
 
 wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name)
@@ -152,7 +155,7 @@ wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name)
     {
         AddToCache(entry);
 
-        if (entry->GetName() == name)
+        if (entry->GetName(wxPATH_UNIX) == name)
             return entry;
     }
 
@@ -355,7 +358,7 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
         right = rightPart.GetFullPath(wxPATH_UNIX);
     }
 
-    if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
+    if (!right.empty() && right.GetChar(0) == wxT('/')) right = right.Mid(1);
 
     if (!m_cache)
         m_cache = new wxArchiveFSCache;
@@ -390,20 +393,30 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
     }
 
     wxArchiveInputStream *s = factory->NewStream(leftStream);
+    if ( !s )
+        return NULL;
+
     s->OpenEntry(*entry);
 
-    if (s && s->IsOk())
-        return new wxFSFile(s,
-                            key + right,
-                            GetMimeTypeFromExt(location),
-                            GetAnchor(location)
+    if (!s->IsOk())
+    {
+        delete s;
+        return NULL;
+    }
+
+#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
+    if (factory->IsKindOf(CLASSINFO(wxZipClassFactory)))
+        ((wxZipInputStream*)s)->m_allowSeeking = true;
+#endif // WXWIN_COMPATIBILITY_2_6
+
+    return new wxFSFile(s,
+                        key + right,
+                        wxEmptyString,
+                        GetAnchor(location)
 #if wxUSE_DATETIME
-                            , entry->GetDateTime()
+                        , entry->GetDateTime()
 #endif // wxUSE_DATETIME
-                            );
-
-    delete s;
-    return NULL;
+                        );
 }
 
 wxString wxArchiveFSHandler::FindFirst(const wxString& spec, int flags)