X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e36105bda4d8cded94715c0e5da5ffd04cce360..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/mimetype.cpp diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp index 71334a8134..e10c79bd51 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/mimetype.cpp +// Name: src/msw/mimetype.cpp // Purpose: classes and functions to manage MIME types // Author: Vadim Zeitlin // Modified by: @@ -9,32 +9,31 @@ // Licence: wxWindows licence (part of wxExtra library) ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mimetype.h" -#endif - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_MIMETYPE +#include "wx/msw/mimetype.h" + #ifndef WX_PRECOMP + #include "wx/dynarray.h" #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/crt.h" #if wxUSE_GUI #include "wx/icon.h" #include "wx/msgdlg.h" #endif #endif //WX_PRECOMP -#include "wx/log.h" #include "wx/file.h" #include "wx/iconloc.h" -#include "wx/intl.h" -#include "wx/dynarray.h" #include "wx/confbase.h" #ifdef __WXMSW__ @@ -42,13 +41,11 @@ #include "wx/msw/private.h" #endif // OS -#include "wx/msw/mimetype.h" - // other standard headers #include // in case we're compiling in non-GUI mode -class WXDLLEXPORT wxIcon; +class WXDLLIMPEXP_FWD_CORE wxIcon; // These classes use Windows registry to retrieve the required information. // @@ -203,16 +200,47 @@ bool wxFileTypeImpl::EnsureExtKeyExists() // get the command to use // ---------------------------------------------------------------------------- -wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const +static wxString wxFileTypeImplGetCurVer(const wxString& progId) +{ + wxRegKey key(wxRegKey::HKCR, progId + wxT("\\CurVer")); + if (key.Exists()) + { + wxString value; + if (key.QueryValue(wxEmptyString, value)) + return value; + } + return progId; +} + +wxString wxFileTypeImpl::GetCommand(const wxString& verb) const { // suppress possible error messages wxLogNull nolog; wxString strKey; - if ( wxRegKey(wxRegKey::HKCR, m_ext + _T("\\shell")).Exists() ) + { + wxRegKey explorerKey(wxRegKey::HKCU, wxT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\") + m_ext); + if (explorerKey.Exists()) + { + if (explorerKey.Open(wxRegKey::Read)) + { + if (explorerKey.QueryValue(wxT("Progid"), strKey)) + { + strKey = wxFileTypeImplGetCurVer(strKey); + } + } + } + } + + if (!strKey && wxRegKey(wxRegKey::HKCR, m_ext + _T("\\shell")).Exists()) strKey = m_ext; - if ( wxRegKey(wxRegKey::HKCR, m_strFileType + _T("\\shell")).Exists() ) - strKey = m_strFileType; + + if ( !strKey && !m_strFileType.empty()) + { + wxString fileType = wxFileTypeImplGetCurVer(m_strFileType); + if (wxRegKey(wxRegKey::HKCR, fileType + _T("\\shell")).Exists()) + strKey = fileType; + } if ( !strKey ) { @@ -513,7 +541,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) _T("Associate() needs extension") ); bool ok; - int iExtCount = 0 ; + size_t iExtCount = 0; wxString filetype; wxString extWithDot; @@ -551,56 +579,57 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) key.SetValue(wxEmptyString, filetype); } + } + else + { + // key already exists, maybe we want to change it ?? + if (!filetypeOrig.empty()) + { + filetype = filetypeOrig; + key.SetValue(wxEmptyString, filetype); } else { - // key already exists, maybe we want to change it ?? - if (!filetypeOrig.empty()) - { - filetype = filetypeOrig; - key.SetValue(wxEmptyString, filetype); - } - else - { - key.QueryValue(wxEmptyString, filetype); - } + key.QueryValue(wxEmptyString, filetype); } - // now set a mimetypeif we have it, but ignore it if none - const wxString& mimetype = ftInfo.GetMimeType(); - if ( !mimetype.empty() ) + } + + // now set a mimetypeif we have it, but ignore it if none + const wxString& mimetype = ftInfo.GetMimeType(); + if ( !mimetype.empty() ) + { + // set the MIME type + ok = key.SetValue(_T("Content Type"), mimetype); + + if ( ok ) { - // set the MIME type - ok = key.SetValue(_T("Content Type"), mimetype); + // create the MIME key + wxString strKey = MIME_DATABASE_KEY; + strKey << mimetype; + wxRegKey keyMIME(wxRegKey::HKCR, strKey); + ok = keyMIME.Create(); if ( ok ) { - // create the MIME key - wxString strKey = MIME_DATABASE_KEY; - strKey << mimetype; - wxRegKey keyMIME(wxRegKey::HKCR, strKey); - ok = keyMIME.Create(); - - if ( ok ) - { - // and provide a back link to the extension - keyMIME.SetValue(_T("Extension"), extWithDot); - } + // and provide a back link to the extension + keyMIME.SetValue(_T("Extension"), extWithDot); } } + } // now make other extensions have the same filetype for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ ) - { - ext = ftInfo.GetExtensions()[iExtCount]; - if ( ext[0u] != _T('.') ) - extWithDot = _T('.'); - extWithDot += ext; + { + ext = ftInfo.GetExtensions()[iExtCount]; + if ( ext[0u] != _T('.') ) + extWithDot = _T('.'); + extWithDot += ext; - wxRegKey key(wxRegKey::HKCR, extWithDot); - if ( !key.Exists() ) key.Create(); - key.SetValue(wxEmptyString, filetype); + wxRegKey key(wxRegKey::HKCR, extWithDot); + if ( !key.Exists() ) key.Create(); + key.SetValue(wxEmptyString, filetype); // now set any mimetypes we may have, but ignore it if none const wxString& mimetype = ftInfo.GetMimeType(); @@ -609,22 +638,21 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) // set the MIME type ok = key.SetValue(_T("Content Type"), mimetype); - if ( ok ) - { + if ( ok ) + { // create the MIME key wxString strKey = MIME_DATABASE_KEY; strKey << mimetype; wxRegKey keyMIME(wxRegKey::HKCR, strKey); ok = keyMIME.Create(); - if ( ok ) - { + if ( ok ) + { // and provide a back link to the extension keyMIME.SetValue(_T("Extension"), extWithDot); + } + } } - } - } - } // end of for loop; all extensions now point to HKCR\.ext\Default @@ -637,13 +665,14 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) if (ft) { - if (! ftInfo.GetOpenCommand ().empty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open" ) ); - if (! ftInfo.GetPrintCommand().empty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) ); - // chris: I don't like the ->m_impl-> here FIX this ?? - if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ; - if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() ); + if (! ftInfo.GetOpenCommand ().empty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open" ) ); + if (! ftInfo.GetPrintCommand().empty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) ); + // chris: I don't like the ->m_impl-> here FIX this ?? + if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ; + if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() ); + + } - } return ft; } @@ -761,7 +790,7 @@ bool wxFileTypeImpl::Unassociate() result = false; if ( !RemoveMimeType() ) result = false; - if ( !RemoveDescription() ) + if ( !RemoveDescription() ) result = false; /* @@ -787,7 +816,6 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb) wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false, _T("RemoveCommand() needs an extension and a verb") ); - wxString sKey = m_strFileType; wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb)); // if the key already doesn't exist, it's a success