wxMessageBox off the main thread lost result code.

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index ae176a802dcc2089b92d490632d3f986605cd60a..281cdbbc8848b3f76f9b9e29e4339d2ef498a268 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/fs_mem.cpp
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Name:        src/common/fs_mem.cpp
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,58 +16,60 @@
 
 #include "wx/fs_mem.h"
 
 
 #include "wx/fs_mem.h"
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP

     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/log.h"

-    #include "wx/hash.h"
+    #include "wx/wxcrtvararg.h"

     #if wxUSE_GUI
     #if wxUSE_GUI

-        #include "wx/bitmap.h"

         #include "wx/image.h"
     #endif // wxUSE_GUI
 #endif
 
 #include "wx/mstream.h"
 
         #include "wx/image.h"
     #endif // wxUSE_GUI
 #endif
 
 #include "wx/mstream.h"
 

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

 {
 {

-    public:
-
-        MemFSHashObj(const void *data, size_t len)
-        {
-            m_Data = new char[len];
-            memcpy(m_Data, data, len);
-            m_Len = len;
-            InitTime();
-        }
-
-        MemFSHashObj(const wxMemoryOutputStream& stream)
-        {
-            m_Len = stream.GetSize();
-            m_Data = new char[m_Len];
-            stream.CopyTo(m_Data, m_Len);
-            InitTime();
-        }
-
-        ~MemFSHashObj()
-        {
-            delete[] m_Data;
-        }
-
-        char *m_Data;
-        size_t m_Len;
+public:
+    wxMemoryFSFile(const void *data, size_t len, const wxString& mime)
+    {
+        m_Data = new char[len];
+        memcpy(m_Data, data, len);
+        m_Len = len;
+        m_MimeType = mime;
+        InitTime();
+    }
+
+    wxMemoryFSFile(const wxMemoryOutputStream& stream, const wxString& mime)
+    {
+        m_Len = stream.GetSize();
+        m_Data = new char[m_Len];
+        stream.CopyTo(m_Data, m_Len);
+        m_MimeType = mime;
+        InitTime();
+    }
+
+    virtual ~wxMemoryFSFile()
+    {
+        delete[] m_Data;
+    }
+
+    char *m_Data;
+    size_t m_Len;
+    wxString m_MimeType;

 #if wxUSE_DATETIME
 #if wxUSE_DATETIME

-        wxDateTime m_Time;
+    wxDateTime m_Time;

 #endif // wxUSE_DATETIME
 
 #endif // wxUSE_DATETIME
 

-    DECLARE_NO_COPY_CLASS(MemFSHashObj)
-
-    private:
-        void InitTime()
-        {
+private:
+    void InitTime()
+    {

 #if wxUSE_DATETIME
 #if wxUSE_DATETIME

-            m_Time = wxDateTime::Now();
+        m_Time = wxDateTime::Now();

 #endif // wxUSE_DATETIME
 #endif // wxUSE_DATETIME

-        }
+    }
+
+    wxDECLARE_NO_COPY_CLASS(wxMemoryFSFile);

 };
 
 #if wxUSE_BASE
 };
 
 #if wxUSE_BASE


@@ -79,123 +80,158 @@ class MemFSHashObj : public wxObject
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 
 

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

 
 
 wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler()
 {
 }
 
 
 
 wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler()
 {
 }
 

-
-

 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.)
 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.)

-
-    if (m_Hash)
-    {
-        WX_CLEAR_HASH_TABLE(*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)
 {

-    wxString p = GetProtocol(location);
-    return (p == wxT("memory"));
+    return GetProtocol(location) == "memory";

 }
 
 }
 

-
-
-
-wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
+wxFSFile * wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs),
+                                           const wxString& location)

 {
 {

-    if (m_Hash)
-    {
-        MemFSHashObj *obj = (MemFSHashObj*) m_Hash -> Get(GetRightLocation(location));
-        if (obj == NULL)  return NULL;
-        else return new wxFSFile(new wxMemoryInputStream(obj -> m_Data, obj -> m_Len),
-                            location,
-                            GetMimeTypeFromExt(location),
-                            GetAnchor(location)
+    wxMemoryFSHash::const_iterator i = m_Hash.find(GetRightLocation(location));
+    if ( i == m_Hash.end() )
+        return NULL;
+
+    const wxMemoryFSFile * const obj = i->second;
+
+    return new wxFSFile
+               (
+                    new wxMemoryInputStream(obj->m_Data, obj->m_Len),
+                    location,
+                    obj->m_MimeType,
+                    GetAnchor(location)

 #if wxUSE_DATETIME
 #if wxUSE_DATETIME

-                            , obj -> m_Time
+                    , obj->m_Time

 #endif // wxUSE_DATETIME
 #endif // wxUSE_DATETIME

-                            );
-    }
-    else return NULL;
+               );

 }
 
 }
 

-
-
-wxString wxMemoryFSHandlerBase::FindFirst(const wxString& WXUNUSED(spec),
-                                      int WXUNUSED(flags))
+wxString wxMemoryFSHandlerBase::FindFirst(const wxString& url, 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;
-}
+    const wxString spec = GetRightLocation(url);
+    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) ? url : 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() )
+    {
+        // test for the match before (possibly) clearing m_findArgument below
+        const bool found = m_findIter->first.Matches(m_findArgument);

 
 

-    return wxEmptyString;
-}
+        // advance m_findIter first as we need to do it anyhow, whether it
+        // matches or not
+        const wxMemoryFSHash::const_iterator current = m_findIter;

 
 

+        if ( ++m_findIter == m_Hash.end() )
+            m_findArgument.clear();

 
 

-bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
-{
-    if (m_Hash == NULL)
-    {
-        m_Hash = new wxHashTable(wxKEY_STRING);
+        if ( found )
+            return "memory:" + current->first;

     }
 
     }
 

-    if (m_Hash -> Get(filename) != NULL)
+    return wxString();
+}
+
+bool wxMemoryFSHandlerBase::CheckDoesntExist(const wxString& filename)
+{
+    if ( m_Hash.count(filename) )

     {
     {

-        wxString s;
-        s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
-        wxLogError(s);
+        wxLogError(_("Memory VFS already contains file '%s'!"), filename);

         return false;
     }
         return false;
     }

-    else
-        return true;
+
+    return true;

 }
 
 
 }
 
 

-/*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata)
+/*static*/
+void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
+                                                const wxString& textdata,
+                                                const wxString& mimetype)

 {
 {

-    AddFile(filename, (const void*) textdata.mb_str(), textdata.length());
+    const wxCharBuffer buf(textdata.To8BitData());
+
+    AddFileWithMimeType(filename, buf.data(), buf.length(), mimetype);

 }
 
 
 }
 
 

-/*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const void *binarydata, size_t size)
+/*static*/
+void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
+                                                const void *binarydata, size_t size,
+                                                const wxString& mimetype)

 {
 {

-    if (!CheckHash(filename)) return;
-    m_Hash -> Put(filename, new MemFSHashObj(binarydata, size));
+    if ( !CheckDoesntExist(filename) )
+        return;
+
+    m_Hash[filename] = new wxMemoryFSFile(binarydata, size, mimetype);
+}
+
+/*static*/
+void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
+                                    const wxString& textdata)
+{
+    AddFileWithMimeType(filename, textdata, wxEmptyString);
+}
+
+
+/*static*/
+void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
+                                    const void *binarydata, size_t size)
+{
+    AddFileWithMimeType(filename, binarydata, size, wxEmptyString);

 }
 
 
 
 /*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename)
 {
 }
 
 
 
 /*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename)
 {

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

     {
     {

-        wxString s;
-        s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
-        wxLogError(s);
+        wxLogError(_("Trying to remove file '%s' from memory VFS, "
+                     "but it is not loaded!"),
+                   filename);
+        return;

     }
 
     }
 

-    else
-        delete m_Hash -> Delete(filename);
+    delete i->second;
+    m_Hash.erase(i);

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


@@ -206,31 +242,33 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
 /*static*/ void
 wxMemoryFSHandler::AddFile(const wxString& filename,
                            const wxImage& image,
 /*static*/ void
 wxMemoryFSHandler::AddFile(const wxString& filename,
                            const wxImage& image,

-                           long type)
+                           wxBitmapType type)

 {
 {

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

 
     wxMemoryOutputStream mems;
 
     wxMemoryOutputStream mems;

-    if (image.Ok() && image.SaveFile(mems, (int)type))
-        m_Hash -> Put(filename, new MemFSHashObj(mems));
+    if ( image.IsOk() && image.SaveFile(mems, type) )
+    {
+        m_Hash[filename] = new wxMemoryFSFile
+                               (
+                                    mems,
+                                    wxImage::FindHandler(type)->GetMimeType()
+                               );
+    }

     else
     {
     else
     {

-        wxString s;
-        s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
-        wxPrintf(wxT("'%s'\n"), s.c_str());
-        wxLogError(s);
+        wxLogError(_("Failed to store image '%s' to memory VFS!"), filename);

     }
 }
 
 /*static*/ void
 wxMemoryFSHandler::AddFile(const wxString& filename,
                            const wxBitmap& bitmap,
     }
 }
 
 /*static*/ void
 wxMemoryFSHandler::AddFile(const wxString& filename,
                            const wxBitmap& bitmap,

-                           long type)
+                           wxBitmapType type)

 {
 {

-#if !defined(__WXMSW__) || wxUSE_WXDIB

     wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
     wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);

-#endif

 }
 
 #endif // wxUSE_IMAGE
 }
 
 #endif // wxUSE_IMAGE