don't crash when streaming out a wxString into an std::ostream, just set the failbit...

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 6e8ba3b6fdcb008893f5a3e14ed0f8f43e03433e..f13ab26c5d4511d29d33af931c4616c281b77c8c 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -20,7 +20,6 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

-    #include "wx/hashmap.h"

     #include "wx/wxcrtvararg.h"
     #if wxUSE_GUI
         #include "wx/image.h"
     #include "wx/wxcrtvararg.h"
     #if wxUSE_GUI
         #include "wx/image.h"


@@ -29,10 +28,11 @@
 
 #include "wx/mstream.h"
 
 
 #include "wx/mstream.h"
 

-class MemFSHashObj
+// represents a file entry in wxMemoryFS
+class wxMemoryFSFile

 {
 public:
 {
 public:

-    MemFSHashObj(const void *data, size_t len, const wxString& mime)
+    wxMemoryFSFile(const void *data, size_t len, const wxString& mime)

     {
         m_Data = new char[len];
         memcpy(m_Data, data, len);
     {
         m_Data = new char[len];
         memcpy(m_Data, data, len);


@@ -41,7 +41,7 @@ public:
         InitTime();
     }
 
         InitTime();
     }
 

-    MemFSHashObj(const wxMemoryOutputStream& stream, const wxString& mime)
+    wxMemoryFSFile(const wxMemoryOutputStream& stream, const wxString& mime)

     {
         m_Len = stream.GetSize();
         m_Data = new char[m_Len];
     {
         m_Len = stream.GetSize();
         m_Data = new char[m_Len];


@@ -50,7 +50,7 @@ public:
         InitTime();
     }
 
         InitTime();
     }
 

-    virtual ~MemFSHashObj()
+    virtual ~wxMemoryFSFile()

     {
         delete[] m_Data;
     }
     {
         delete[] m_Data;
     }


@@ -62,8 +62,6 @@ public:
     wxDateTime m_Time;
 #endif // wxUSE_DATETIME
 
     wxDateTime m_Time;
 #endif // wxUSE_DATETIME
 

-DECLARE_NO_COPY_CLASS(MemFSHashObj)
-

 private:
     void InitTime()
     {
 private:
     void InitTime()
     {


@@ -71,9 +69,9 @@ private:
         m_Time = wxDateTime::Now();
 #endif // wxUSE_DATETIME
     }
         m_Time = wxDateTime::Now();
 #endif // wxUSE_DATETIME
     }

-};

 
 

-WX_DECLARE_STRING_HASH_MAP(MemFSHashObj *, wxMemoryFSHash);
+    DECLARE_NO_COPY_CLASS(wxMemoryFSFile)
+};

 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE
 


@@ -83,7 +81,7 @@ WX_DECLARE_STRING_HASH_MAP(MemFSHashObj *, wxMemoryFSHash);
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 
 

-wxMemoryFSHash *wxMemoryFSHandlerBase::m_Hash = NULL;
+wxMemoryFSHash wxMemoryFSHandlerBase::m_Hash;

 
 
 wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler()
 
 
 wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler()


@@ -95,13 +93,7 @@ wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase()
     // as only one copy of FS handler is supposed to exist, we may silently
     // delete static data here. (There is no way how to remove FS handler from
     // wxFileSystem other than releasing _all_ handlers.)
     // as only one copy of FS handler is supposed to exist, we may silently
     // delete static data here. (There is no way how to remove FS handler from
     // wxFileSystem other than releasing _all_ handlers.)

-
-    if (m_Hash)
-    {
-        WX_CLEAR_HASH_MAP(wxMemoryFSHash, *m_Hash);
-        delete m_Hash;
-        m_Hash = NULL;
-    }
+    WX_CLEAR_HASH_MAP(wxMemoryFSHash, m_Hash);

 }
 
 bool wxMemoryFSHandlerBase::CanOpen(const wxString& location)
 }
 
 bool wxMemoryFSHandlerBase::CanOpen(const wxString& location)


@@ -112,14 +104,11 @@ bool wxMemoryFSHandlerBase::CanOpen(const wxString& location)
 wxFSFile * wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs),
                                            const wxString& location)
 {
 wxFSFile * wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs),
                                            const wxString& location)
 {

-    if ( !m_Hash )
-        return NULL;
-
-    wxMemoryFSHash::const_iterator i = m_Hash->find(GetRightLocation(location));
-    if ( i == m_Hash->end() )
+    wxMemoryFSHash::const_iterator i = m_Hash.find(GetRightLocation(location));
+    if ( i == m_Hash.end() )

         return NULL;
 
         return NULL;
 

-    const MemFSHashObj * const obj = i->second;
+    const wxMemoryFSFile * const obj = i->second;

 
     return new wxFSFile
                (
 
     return new wxFSFile
                (


@@ -133,27 +122,52 @@ wxFSFile * wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs),
                );
 }
 
                );
 }
 

-wxString wxMemoryFSHandlerBase::FindFirst(const wxString& WXUNUSED(spec),
-                                          int WXUNUSED(flags))
+wxString wxMemoryFSHandlerBase::FindFirst(const wxString& spec, int flags)

 {
 {

-    wxFAIL_MSG(wxT("wxMemoryFSHandlerBase::FindFirst not implemented"));
+    if ( (flags & wxDIR) && !(flags & wxFILE) )
+    {
+        // we only store files, not directories, so we don't risk finding
+        // anything
+        return wxString();
+    }

 
 

-    return wxEmptyString;
+    if ( spec.find_first_of("?*") == wxString::npos )
+    {
+        // simple case: there are no wildcard characters so we can return
+        // either 0 or 1 results and we can find the potential match quickly
+        return m_Hash.count(spec) ? spec : wxString();
+    }
+    //else: deal with wildcards in FindNext()
+
+    m_findArgument = spec;
+    m_findIter = m_Hash.begin();
+
+    return FindNext();

 }
 
 wxString wxMemoryFSHandlerBase::FindNext()
 {
 }
 
 wxString wxMemoryFSHandlerBase::FindNext()
 {

-    wxFAIL_MSG(wxT("wxMemoryFSHandlerBase::FindNext not implemented"));
+    // m_findArgument is used to indicate that search is in progress, we reset
+    // it to empty string after iterating over all elements
+    while ( !m_findArgument.empty() )
+    {
+        // advance m_findIter before checking the value at the current position
+        // as we need to do it anyhow, whether it matches or not
+        const wxMemoryFSHash::const_iterator current = m_findIter;

 
 

-    return wxEmptyString;
+        if ( ++m_findIter == m_Hash.end() )
+            m_findArgument.clear();
+
+        if ( current->first.Matches(m_findArgument) )
+            return current->first;
+    }
+
+    return wxString();

 }
 
 }
 

-bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
+bool wxMemoryFSHandlerBase::CheckDoesntExist(const wxString& filename)

 {
 {

-    if ( !m_Hash )
-        m_Hash = new wxMemoryFSHash;
-
-    if ( m_Hash->count(filename) )
+    if ( m_Hash.count(filename) )

     {
         wxLogError(_("Memory VFS already contains file '%s'!"), filename);
         return false;
     {
         wxLogError(_("Memory VFS already contains file '%s'!"), filename);
         return false;


@@ -179,10 +193,10 @@ void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
                                                 const void *binarydata, size_t size,
                                                 const wxString& mimetype)
 {
                                                 const void *binarydata, size_t size,
                                                 const wxString& mimetype)
 {

-    if ( !CheckHash(filename) )
+    if ( !CheckDoesntExist(filename) )

         return;
 
         return;
 

-    (*m_Hash)[filename] = new MemFSHashObj(binarydata, size, mimetype);
+    m_Hash[filename] = new wxMemoryFSFile(binarydata, size, mimetype);

 }
 
 /*static*/
 }
 
 /*static*/


@@ -204,19 +218,17 @@ void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
 
 /*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename)
 {
 
 /*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename)
 {

-    if ( m_Hash )
+    wxMemoryFSHash::iterator i = m_Hash.find(filename);
+    if ( i == m_Hash.end() )

     {
     {

-        wxMemoryFSHash::iterator i = m_Hash->find(filename);
-        if ( i != m_Hash->end() )
-        {
-            delete i->second;
-            m_Hash->erase(i);
-        }
+        wxLogError(_("Trying to remove file '%s' from memory VFS, "
+                     "but it is not loaded!"),
+                   filename);
+        return;

     }
 
     }
 

-    wxLogError(_("Trying to remove file '%s' from memory VFS, "
-                 "but it is not loaded!"),
-               filename);
+    delete i->second;
+    m_Hash.erase(i);

 }
 
 #endif // wxUSE_BASE
 }
 
 #endif // wxUSE_BASE


@@ -229,17 +241,17 @@ wxMemoryFSHandler::AddFile(const wxString& filename,
                            const wxImage& image,
                            wxBitmapType type)
 {
                            const wxImage& image,
                            wxBitmapType type)
 {

-    if ( !CheckHash(filename) )
+    if ( !CheckDoesntExist(filename) )

         return;
 
     wxMemoryOutputStream mems;
     if ( image.Ok() && image.SaveFile(mems, type) )
     {
         return;
 
     wxMemoryOutputStream mems;
     if ( image.Ok() && image.SaveFile(mems, type) )
     {

-        (*m_Hash)[filename] = new MemFSHashObj
-                                  (
+        m_Hash[filename] = new wxMemoryFSFile
+                               (

                                     mems,
                                     wxImage::FindHandler(type)->GetMimeType()
                                     mems,
                                     wxImage::FindHandler(type)->GetMimeType()

-                                  );
+                               );

     }
     else
     {
     }
     else
     {