Use wxCOMPtr throughout wxWebViewIE to simplify the code and reduce the chance of...

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

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 27d4b8d4295cc0f0fa1f018967f4053dd5aa5581..63ef69d6e6f9544d87bc02f5913919dbc2e6361a 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -34,9 +34,10 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/module.h"
+    #include "wx/crt.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/module.h"

 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/confbase.h"


@@ -45,10 +46,10 @@
 #include <ctype.h>
 
 // implementation classes:
 #include <ctype.h>
 
 // implementation classes:

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

     #include "wx/msw/mimetype.h"
     #include "wx/msw/mimetype.h"

-#elif defined(__WXMAC__)
-    #include "wx/mac/mimetype.h"
+#elif ( defined(__WXMAC__) )
+    #include "wx/osx/mimetype.h"

 #elif defined(__WXPM__) || defined (__EMX__)
     #include "wx/os2/mimetype.h"
     #undef __UNIX__
 #elif defined(__WXPM__) || defined (__EMX__)
     #include "wx/os2/mimetype.h"
     #undef __UNIX__


@@ -62,22 +63,65 @@
 // common classes
 // ============================================================================
 
 // common classes
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// wxMimeTypeCommands
+// ----------------------------------------------------------------------------
+
+void
+wxMimeTypeCommands::AddOrReplaceVerb(const wxString& verb, const wxString& cmd)
+{
+    int n = m_verbs.Index(verb, false /* ignore case */);
+    if ( n == wxNOT_FOUND )
+    {
+        m_verbs.Add(verb);
+        m_commands.Add(cmd);
+    }
+    else
+    {
+        m_commands[n] = cmd;
+    }
+}
+
+wxString
+wxMimeTypeCommands::GetCommandForVerb(const wxString& verb, size_t *idx) const
+{
+    wxString s;
+
+    int n = m_verbs.Index(verb);
+    if ( n != wxNOT_FOUND )
+    {
+        s = m_commands[(size_t)n];
+        if ( idx )
+            *idx = n;
+    }
+    else if ( idx )
+    {
+        // different from any valid index
+        *idx = (size_t)-1;
+    }
+
+    return s;
+}
+
+wxString wxMimeTypeCommands::GetVerbCmd(size_t n) const
+{
+    return m_verbs[n] + wxT('=') + m_commands[n];
+}
+

 // ----------------------------------------------------------------------------
 // wxFileTypeInfo
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxFileTypeInfo
 // ----------------------------------------------------------------------------
 

-wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
-                               const wxChar *openCmd,
-                               const wxChar *printCmd,
-                               const wxChar *desc,
-                               ...)
-              : m_mimeType(mimeType),
-                m_openCmd(openCmd),
-                m_printCmd(printCmd),
-                m_desc(desc)
+void wxFileTypeInfo::DoVarArgInit(const wxString& mimeType,
+                                  const wxString& openCmd,
+                                  const wxString& printCmd,
+                                  const wxString& desc,
+                                  va_list argptr)

 {
 {

-    va_list argptr;
-    va_start(argptr, desc);
+    m_mimeType = mimeType;
+    m_openCmd = openCmd;
+    m_printCmd = printCmd;
+    m_desc = desc;

 
     for ( ;; )
     {
 
     for ( ;; )
     {


@@ -87,7 +131,7 @@ wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
     #pragma warning(disable: 1684)
 #endif
 
     #pragma warning(disable: 1684)
 #endif
 

-        const wxChar *ext = va_arg(argptr, const wxChar *);
+        wxArgNormalizedString ext(WX_VA_ARG_STRING(argptr));

 
 #ifdef __INTELC__
     #pragma warning(pop)
 
 #ifdef __INTELC__
     #pragma warning(pop)


@@ -98,8 +142,20 @@ wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
             break;
         }
 
             break;
         }
 

-        m_exts.Add(ext);
+        m_exts.Add(ext.GetString());

     }
     }

+}
+
+void wxFileTypeInfo::VarArgInit(const wxString *mimeType,
+                                const wxString *openCmd,
+                                const wxString *printCmd,
+                                const wxString *desc,
+                                ...)
+{
+    va_list argptr;
+    va_start(argptr, desc);
+
+    DoVarArgInit(*mimeType, *openCmd, *printCmd, *desc, argptr);

 
     va_end(argptr);
 }
 
     va_end(argptr);
 }


@@ -136,22 +192,28 @@ wxString wxFileType::ExpandCommand(const wxString& command,
 {
     bool hasFilename = false;
 
 {
     bool hasFilename = false;
 

+    // We consider that only the file names with spaces in them need to be
+    // handled specially. This is not perfect, but this can be done easily
+    // under all platforms while handling the file names with quotes in them,
+    // for example, needs to be done differently.
+    const bool needToQuoteFilename = params.GetFileName().find_first_of(" \t")
+                                        != wxString::npos;
+

     wxString str;
     for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
         if ( *pc == wxT('%') ) {
             switch ( *++pc ) {
                 case wxT('s'):
     wxString str;
     for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
         if ( *pc == wxT('%') ) {
             switch ( *++pc ) {
                 case wxT('s'):

-                    // '%s' expands into file name (quoted because it might
-                    // contain spaces) - except if there are already quotes
-                    // there because otherwise some programs may get confused
-                    // by double double quotes
-#if 0
-                    if ( *(pc - 2) == wxT('"') )
-                        str << params.GetFileName();
-                    else
+                    // don't quote the file name if it's already quoted: notice
+                    // that we check for a quote following it and not preceding
+                    // it as at least under Windows we can have commands
+                    // containing "file://%s" (with quotes) in them so the
+                    // argument may be quoted even if there is no quote
+                    // directly before "%s" itself
+                    if ( needToQuoteFilename && pc[1] != '"' )

                         str << wxT('"') << params.GetFileName() << wxT('"');
                         str << wxT('"') << params.GetFileName() << wxT('"');

-#endif
-                    str << params.GetFileName();
+                    else
+                        str << params.GetFileName();

                     hasFilename = true;
                     break;
 
                     hasFilename = true;
                     break;
 


@@ -206,10 +268,16 @@ wxString wxFileType::ExpandCommand(const wxString& command,
     // test now carried out on reading file so test should never get here
     if ( !hasFilename && !str.empty()
 #ifdef __UNIX__
     // test now carried out on reading file so test should never get here
     if ( !hasFilename && !str.empty()
 #ifdef __UNIX__

-                      && !str.StartsWith(_T("test "))
+                      && !str.StartsWith(wxT("test "))

 #endif // Unix
 #endif // Unix

-       ) {
-        str << wxT(" < '") << params.GetFileName() << wxT('\'');
+       )
+    {
+        str << wxT(" < ");
+        if ( needToQuoteFilename )
+            str << '"';
+        str << params.GetFileName();
+        if ( needToQuoteFilename )
+            str << '"';

     }
 
     return str;
     }
 
     return str;


@@ -246,7 +314,7 @@ bool wxFileType::GetExtensions(wxArrayString& extensions)
 
 bool wxFileType::GetMimeType(wxString *mimeType) const
 {
 
 bool wxFileType::GetMimeType(wxString *mimeType) const
 {

-    wxCHECK_MSG( mimeType, false, _T("invalid parameter in GetMimeType") );
+    wxCHECK_MSG( mimeType, false, wxT("invalid parameter in GetMimeType") );

 
     if ( m_info )
     {
 
     if ( m_info )
     {


@@ -278,9 +346,9 @@ bool wxFileType::GetIcon(wxIconLocation *iconLoc) const
         if ( iconLoc )
         {
             iconLoc->SetFileName(m_info->GetIconFile());
         if ( iconLoc )
         {
             iconLoc->SetFileName(m_info->GetIconFile());

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

             iconLoc->SetIndex(m_info->GetIconIndex());
             iconLoc->SetIndex(m_info->GetIconIndex());

-#endif // __WXMSW__
+#endif // __WINDOWS__

         }
 
         return true;
         }
 
         return true;


@@ -310,7 +378,7 @@ wxFileType::GetIcon(wxIconLocation *iconloc,
 
 bool wxFileType::GetDescription(wxString *desc) const
 {
 
 bool wxFileType::GetDescription(wxString *desc) const
 {

-    wxCHECK_MSG( desc, false, _T("invalid parameter in GetDescription") );
+    wxCHECK_MSG( desc, false, wxT("invalid parameter in GetDescription") );

 
     if ( m_info )
     {
 
     if ( m_info )
     {


@@ -326,7 +394,7 @@ bool
 wxFileType::GetOpenCommand(wxString *openCmd,
                            const wxFileType::MessageParameters& params) const
 {
 wxFileType::GetOpenCommand(wxString *openCmd,
                            const wxFileType::MessageParameters& params) const
 {

-    wxCHECK_MSG( openCmd, false, _T("invalid parameter in GetOpenCommand") );
+    wxCHECK_MSG( openCmd, false, wxT("invalid parameter in GetOpenCommand") );

 
     if ( m_info )
     {
 
     if ( m_info )
     {


@@ -354,7 +422,7 @@ bool
 wxFileType::GetPrintCommand(wxString *printCmd,
                             const wxFileType::MessageParameters& params) const
 {
 wxFileType::GetPrintCommand(wxString *printCmd,
                             const wxFileType::MessageParameters& params) const
 {

-    wxCHECK_MSG( printCmd, false, _T("invalid parameter in GetPrintCommand") );
+    wxCHECK_MSG( printCmd, false, wxT("invalid parameter in GetPrintCommand") );

 
     if ( m_info )
     {
 
     if ( m_info )
     {


@@ -376,9 +444,9 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     if ( commands )
         commands->Clear();
 
     if ( commands )
         commands->Clear();
 

-#if defined (__WXMSW__)  || defined(__UNIX__)
+#if defined (__WINDOWS__)  || defined(__UNIX__)

     return m_impl->GetAllCommands(verbs, commands, params);
     return m_impl->GetAllCommands(verbs, commands, params);

-#else // !__WXMSW__ || Unix
+#else // !__WINDOWS__ || __UNIX__

     // we don't know how to retrieve all commands, so just try the 2 we know
     // about
     size_t count = 0;
     // we don't know how to retrieve all commands, so just try the 2 we know
     // about
     size_t count = 0;


@@ -386,7 +454,7 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     if ( GetOpenCommand(&cmd, params) )
     {
         if ( verbs )
     if ( GetOpenCommand(&cmd, params) )
     {
         if ( verbs )

-            verbs->Add(_T("Open"));
+            verbs->Add(wxT("Open"));

         if ( commands )
             commands->Add(cmd);
         count++;
         if ( commands )
             commands->Add(cmd);
         count++;


@@ -395,7 +463,7 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     if ( GetPrintCommand(&cmd, params) )
     {
         if ( verbs )
     if ( GetPrintCommand(&cmd, params) )
     {
         if ( verbs )

-            verbs->Add(_T("Print"));
+            verbs->Add(wxT("Print"));

         if ( commands )
             commands->Add(cmd);
 
         if ( commands )
             commands->Add(cmd);
 


@@ -403,17 +471,17 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     }
 
     return count;
     }
 
     return count;

-#endif // __WXMSW__/| __UNIX__
+#endif // __WINDOWS__/| __UNIX__

 }
 
 bool wxFileType::Unassociate()
 {
 }
 
 bool wxFileType::Unassociate()
 {

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

     return m_impl->Unassociate();
 #elif defined(__UNIX__)
     return m_impl->Unassociate(this);
 #else
     return m_impl->Unassociate();
 #elif defined(__UNIX__)
     return m_impl->Unassociate(this);
 #else

-    wxFAIL_MSG( _T("not implemented") ); // TODO
+    wxFAIL_MSG( wxT("not implemented") ); // TODO

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -422,13 +490,13 @@ bool wxFileType::SetCommand(const wxString& cmd,
                             const wxString& verb,
                             bool overwriteprompt)
 {
                             const wxString& verb,
                             bool overwriteprompt)
 {

-#if defined (__WXMSW__)  || defined(__UNIX__)
+#if defined (__WINDOWS__)  || defined(__UNIX__)

     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxUnusedVar(cmd);
     wxUnusedVar(verb);
     wxUnusedVar(overwriteprompt);
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxUnusedVar(cmd);
     wxUnusedVar(verb);
     wxUnusedVar(overwriteprompt);

-    wxFAIL_MSG(_T("not implemented"));
+    wxFAIL_MSG(wxT("not implemented"));

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -436,45 +504,44 @@ bool wxFileType::SetCommand(const wxString& cmd,
 bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
 {
     wxString sTmp = cmd;
 bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
 {
     wxString sTmp = cmd;

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     // VZ: should we do this?
     // chris elliott : only makes sense in MS windows
     if ( sTmp.empty() )
         GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
 #endif
     // VZ: should we do this?
     // chris elliott : only makes sense in MS windows
     if ( sTmp.empty() )
         GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
 #endif

-    wxCHECK_MSG( !sTmp.empty(), false, _T("need the icon file") );
+    wxCHECK_MSG( !sTmp.empty(), false, wxT("need the icon file") );

 
 

-#if defined (__WXMSW__) || defined(__UNIX__)
+#if defined (__WINDOWS__) || defined(__UNIX__)

     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxUnusedVar(index);
     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxUnusedVar(index);

-    wxFAIL_MSG(_T("not implemented"));
+    wxFAIL_MSG(wxT("not implemented"));

     return false;
 #endif
 }
 
     return false;
 #endif
 }
 

-//----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxMimeTypesManagerFactory
 // wxMimeTypesManagerFactory

-//----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
 
 /* static */
 
 wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
 
 /* static */

-void wxMimeTypesManagerFactory::SetFactory( wxMimeTypesManagerFactory *factory )
+void wxMimeTypesManagerFactory::Set(wxMimeTypesManagerFactory *factory)

 {
 {

-    if (wxMimeTypesManagerFactory::m_factory)
-        delete wxMimeTypesManagerFactory::m_factory;
+    delete m_factory;

 
 

-    wxMimeTypesManagerFactory::m_factory = factory;
+    m_factory = factory;

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

-wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::GetFactory()
+wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::Get()

 {
 {

-    if (!wxMimeTypesManagerFactory::m_factory)
-        wxMimeTypesManagerFactory::m_factory = new wxMimeTypesManagerFactory;
+    if ( !m_factory )
+        m_factory = new wxMimeTypesManagerFactory;

 
 

-    return wxMimeTypesManagerFactory::m_factory;
+    return m_factory;

 }
 
 wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
 }
 
 wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()


@@ -489,7 +556,7 @@ wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
 void wxMimeTypesManager::EnsureImpl()
 {
     if ( !m_impl )
 void wxMimeTypesManager::EnsureImpl()
 {
     if ( !m_impl )

-        m_impl = wxMimeTypesManagerFactory::GetFactory()->CreateMimeTypesManagerImpl();
+        m_impl = wxMimeTypesManagerFactory::Get()->CreateMimeTypesManagerImpl();

 }
 
 bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
 }
 
 bool wxMimeTypesManager::IsOfType(const wxString& mimeType,


@@ -528,6 +595,8 @@ wxMimeTypesManager::~wxMimeTypesManager()
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {

+    EnsureImpl();
+

 #if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
     return m_impl->Unassociate(ft);
 #else
 #if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
     return m_impl->Unassociate(ft);
 #else


@@ -541,11 +610,11 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
 {
     EnsureImpl();
 
 {
     EnsureImpl();
 

-#if defined(__WXMSW__) || defined(__UNIX__)
+#if defined(__WINDOWS__) || defined(__UNIX__)

     return m_impl->Associate(ftInfo);
 #else // other platforms
     wxUnusedVar(ftInfo);
     return m_impl->Associate(ftInfo);
 #else // other platforms
     wxUnusedVar(ftInfo);

-    wxFAIL_MSG( _T("not implemented") ); // TODO
+    wxFAIL_MSG( wxT("not implemented") ); // TODO

     return NULL;
 #endif // platforms
 }
     return NULL;
 #endif // platforms
 }


@@ -554,7 +623,18 @@ wxFileType *
 wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
 {
     EnsureImpl();
 wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
 {
     EnsureImpl();

-    wxFileType *ft = m_impl->GetFileTypeFromExtension(ext);
+
+    wxString::const_iterator i = ext.begin();
+    const wxString::const_iterator end = ext.end();
+    wxString extWithoutDot;
+    if ( i != end && *i == '.' )
+        extWithoutDot.assign(++i, ext.end());
+    else
+        extWithoutDot = ext;
+
+    wxCHECK_MSG( !ext.empty(), NULL, wxT("extension can't be empty") );
+
+    wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);

 
     if ( !ft ) {
         // check the fallbacks
 
     if ( !ft ) {
         // check the fallbacks


@@ -599,18 +679,6 @@ wxMimeTypesManager::GetFileTypeFromMimeType(const wxString& mimeType)
     return ft;
 }
 
     return ft;
 }
 

-bool wxMimeTypesManager::ReadMailcap(const wxString& filename, bool fallback)
-{
-    EnsureImpl();
-    return m_impl->ReadMailcap(filename, fallback);
-}
-
-bool wxMimeTypesManager::ReadMimeTypes(const wxString& filename)
-{
-    EnsureImpl();
-    return m_impl->ReadMimeTypes(filename);
-}
-

 void wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo *filetypes)
 {
     EnsureImpl();
 void wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo *filetypes)
 {
     EnsureImpl();


@@ -673,14 +741,15 @@ class wxMimeTypeCmnModule: public wxModule
 {
 public:
     wxMimeTypeCmnModule() : wxModule() { }
 {
 public:
     wxMimeTypeCmnModule() : wxModule() { }

+

     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {
     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {

-        // this avoids false memory leak allerts:
+        wxMimeTypesManagerFactory::Set(NULL);
+

         if ( gs_mimeTypesManager.m_impl != NULL )
         {
         if ( gs_mimeTypesManager.m_impl != NULL )
         {

-            delete gs_mimeTypesManager.m_impl;
-            gs_mimeTypesManager.m_impl = NULL;
+            wxDELETE(gs_mimeTypesManager.m_impl);

             gs_mimeTypesManager.m_fallbacks.Clear();
         }
     }
             gs_mimeTypesManager.m_fallbacks.Clear();
         }
     }