X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00375592f92f68c4ca3f44d8e839bcfd47adc4e1..cb0791531fff2f3673e28d68be67a0ee5398a036:/src/common/fs_zip.cpp

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 458db30ee3..d2210718ce 100644
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -19,7 +19,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM && wxUSE_ZLIB
 
 #ifndef WXPRECOMP
     #include "wx/intl.h"
@@ -151,7 +151,13 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
 
     m_ZipFile = left;
     wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
-    m_Archive = new wxZipInputStream(*new wxFFileInputStream(nativename));
+
+    wxFFileInputStream *fs = new wxFFileInputStream(nativename);
+    if (fs->Ok())
+        m_Archive = new wxZipInputStream(*fs);
+    else
+        delete fs;
+
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 
@@ -160,7 +166,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
         if (m_AllowDirs)
         {
             delete m_DirsFound;
-            m_DirsFound = new wxLongToLongHashMap();
+            m_DirsFound = new wxZipFilenameHashMap();
         }
         return DoFind();
     }
@@ -199,12 +205,9 @@ wxString wxZipFSHandler::DoFind()
             dir = namestr.BeforeLast(wxT('/'));
             while (!dir.IsEmpty())
             {
-                long key = 0;
-                for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i];
-                wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
-                if (it == m_DirsFound->end())
+                if( m_DirsFound->find(dir) == m_DirsFound->end() )
                 {
-                    (*m_DirsFound)[key] = 1;
+                    (*m_DirsFound)[dir] = 1;
                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     if (!filename.IsEmpty() && m_BaseDir == dir &&