X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c80cef4bf3c6bac25e412a253bcce4fa268620f..66f75561893ea7b4bf429d1882d9cc0407ba932d:/src/common/fs_arc.cpp diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp index a00e6accd7..7203354982 100644 --- a/src/common/fs_arc.cpp +++ b/src/common/fs_arc.cpp @@ -17,12 +17,12 @@ #include "wx/fs_arc.h" -#ifndef WXPRECOMP +#ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" #endif -#if WXWIN_COMPATIBILITY_2_6 +#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM #include "wx/zipstrm.h" #else #include "wx/archive.h" @@ -135,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) @@ -360,7 +358,7 @@ wxFSFile* wxArchiveFSHandler::OpenFile( right = rightPart.GetFullPath(wxPATH_UNIX); } - if (right.GetChar(0) == wxT('/')) right = right.Mid(1); + if (right.Length() && right.GetChar(0) == wxT('/')) right = right.Mid(1); if (!m_cache) m_cache = new wxArchiveFSCache; @@ -395,27 +393,30 @@ wxFSFile* wxArchiveFSHandler::OpenFile( } wxArchiveInputStream *s = factory->NewStream(leftStream); + if ( !s ) + return NULL; + s->OpenEntry(*entry); - if (s && s->IsOk()) + if (!s->IsOk()) { -#if WXWIN_COMPATIBILITY_2_6 - if (factory->IsKindOf(CLASSINFO(wxZipClassFactory))) - ((wxZipInputStream*)s)->m_allowSeeking = true; + 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, - GetMimeTypeFromExt(location), - GetAnchor(location) + 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)