X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7ce8392e0fa752d121000b7732c8f4ac3e3088d..54c7aaca2355973dd33359210b280b4d79d54593:/src/msw/mimetype.cpp diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp index 699c76c856..c5d5039212 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -20,14 +20,17 @@ #pragma hdrstop #endif +#if wxUSE_MIMETYPE + // Doesn't compile in WIN16 mode #ifndef __WIN16__ #ifndef WX_PRECOMP - #include "wx/string.h" - #if wxUSE_GUI - #include "wx/icon.h" - #endif + #include "wx/string.h" + #if wxUSE_GUI + #include "wx/icon.h" + #include "wx/msgdlg.h" + #endif #endif //WX_PRECOMP #include "wx/log.h" @@ -38,7 +41,7 @@ #ifdef __WXMSW__ #include "wx/msw/registry.h" - #include "windows.h" + #include "wx/msw/private.h" #endif // OS #include "wx/msw/mimetype.h" @@ -143,6 +146,8 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs, commands->Add(command); } + count++; + ok = rkey.GetNextKey(verb, dummy); } @@ -169,122 +174,10 @@ bool wxFileTypeImpl::EnsureExtKeyExists() return TRUE; } -bool wxFileTypeImpl::SetCommand(const wxString& cmd, - const wxString& verb, - bool overwriteprompt) -{ - wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE, - _T("SetCommand() needs an extension and a verb") ); - - if ( !EnsureExtKeyExists() ) - return FALSE; - - wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb)); - - if ( rkey.Exists() && overwriteprompt ) - { -#if wxUSE_GUI - wxString old; - rkey.QueryValue(wxT(""), old); - if ( wxMessageBox - ( - wxString::Format( - _("Do you want to overwrite the command used to %s " - "files with extension \"%s\" (current value is '%s', " - "new value is '%s')?"), - verb.c_str(), - m_ext.c_str(), - old.c_str(), - cmd.c_str()), - _("Confirm registry update"), - wxYES_NO | wxICON_QUESTION - ) != wxYES ) -#endif // wxUSE_GUI - { - // cancelled by user - return FALSE; - } - } - - // TODO: - // 1. translate '%s' to '%1' instead of always adding it - // 2. create DDEExec value if needed (undo GetCommand) - return rkey.Create() && rkey.SetValue(_T(""), cmd + _T(" \"%1\"") ); -} - -bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig) -{ - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") ); - - if ( !EnsureExtKeyExists() ) - return FALSE; - - // VZ: is this really useful? (FIXME) - wxString mimeType; - if ( !mimeTypeOrig ) - { - // make up a default value for it - wxString cmd; - wxSplitPath(GetCommand(_T("open")), NULL, &cmd, NULL); - mimeType << _T("application/x-") << cmd; - } - else - { - mimeType = mimeTypeOrig; - } - - wxRegKey rkey(wxRegKey::HKCR, m_ext); - return rkey.Create() && rkey.SetValue(_T("Content Type"), mimeType); -} - -bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index) -{ - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") ); - wxCHECK_MSG( wxFileExists(cmd), FALSE, _T("Icon file not found.") ); - - if ( !EnsureExtKeyExists() ) - return FALSE; - - wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); - - return rkey.Create() && - rkey.SetValue(_T(""), - wxString::Format(_T("%s,%d"), cmd.c_str(), index)); -} - // ---------------------------------------------------------------------------- -// remove file association +// get the command to use // ---------------------------------------------------------------------------- -bool wxFileTypeImpl::RemoveCommand(const wxString& verb) -{ - wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), 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 - return !rkey.Exists() || rkey.DeleteSelf(); -} - -bool wxFileTypeImpl::RemoveMimeType() -{ - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") ); - - wxRegKey rkey(wxRegKey::HKCR, m_ext); - return !rkey.Exists() || rkey.DeleteSelf(); -} - -bool wxFileTypeImpl::RemoveDefaultIcon() -{ - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, - _T("RemoveDefaultIcon() needs extension") ); - - wxRegKey rkey (wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); - return !rkey.Exists() || rkey.DeleteSelf(); -} - wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const { // suppress possible error messages @@ -374,13 +267,7 @@ wxFileTypeImpl::GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const { - wxString cmd; - if ( m_info ) { - cmd = m_info->GetOpenCommand(); - } - else { - cmd = GetCommand(wxT("open")); - } + wxString cmd = GetCommand(wxT("open")); *openCmd = wxFileType::ExpandCommand(cmd, params); @@ -392,28 +279,21 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const { - wxString cmd; - if ( m_info ) { - cmd = m_info->GetPrintCommand(); - } - else { - cmd = GetCommand(wxT("print")); - } + wxString cmd = GetCommand(wxT("print")); *printCmd = wxFileType::ExpandCommand(cmd, params); return !printCmd->IsEmpty(); } +// ---------------------------------------------------------------------------- +// getting other stuff +// ---------------------------------------------------------------------------- + // TODO this function is half implemented bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) { - if ( m_info ) { - extensions = m_info->GetExtensions(); - - return TRUE; - } - else if ( m_ext.IsEmpty() ) { + if ( m_ext.IsEmpty() ) { // the only way to get the list of extensions from the file type is to // scan through all extensions in the registry - too slow... return FALSE; @@ -429,13 +309,6 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const { - if ( m_info ) { - // we already have it - *mimeType = m_info->GetMimeType(); - - return TRUE; - } - // suppress possible error messages wxLogNull nolog; wxRegKey key(wxRegKey::HKCR, m_ext); @@ -463,11 +336,6 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon, int *iconIndex) const { #if wxUSE_GUI - if ( m_info ) { - // we don't have icons in the fallback resources - return FALSE; - } - wxString strIconKey; strIconKey << m_strFileType << wxT("\\DefaultIcon"); @@ -493,7 +361,8 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon, } wxString strExpPath = wxExpandEnvVars(strFullPath); - int nIndex = wxAtoi(strIndex) - 1 ; //bug here we need C based counting!! + // here we need C based counting! + int nIndex = wxAtoi(strIndex); HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex); switch ( (int)hIcon ) { @@ -505,6 +374,8 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon, default: icon->SetHICON((WXHICON)hIcon); + wxSize size = wxGetHiconSize(hIcon); + icon->SetSize(size); if ( iconIndex ) *iconIndex = nIndex; if ( iconFile ) @@ -522,13 +393,6 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon, bool wxFileTypeImpl::GetDescription(wxString *desc) const { - if ( m_info ) { - // we already have it - *desc = m_info->GetDescription(); - - return TRUE; - } - // suppress possible error messages wxLogNull nolog; wxRegKey key(wxRegKey::HKCR, m_strFileType); @@ -584,19 +448,6 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) } } - // check the fallbacks - // TODO linear search is potentially slow, perhaps we should use a sorted - // array? - size_t count = m_fallbacks.GetCount(); - for ( size_t n = 0; n < count; n++ ) { - if ( m_fallbacks[n].GetExtensions().Index(ext) != wxNOT_FOUND ) { - wxFileType *fileType = new wxFileType; - fileType->m_impl->Init(m_fallbacks[n]); - - return fileType; - } - } - if ( !knownExtension ) { // unknown extension @@ -606,6 +457,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) return CreateFileType(wxEmptyString, ext); } +/* wxFileType * wxMimeTypesManagerImpl::GetOrAllocateFileTypeFromExtension(const wxString& ext) { @@ -617,7 +469,7 @@ wxMimeTypesManagerImpl::GetOrAllocateFileTypeFromExtension(const wxString& ext) return fileType; } - +*/ // MIME type -> extension -> file type wxFileType * @@ -637,20 +489,6 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType) } } - // check the fallbacks - // TODO linear search is potentially slow, perhaps we should use a sorted - // array? - size_t count = m_fallbacks.GetCount(); - for ( size_t n = 0; n < count; n++ ) { - if ( wxMimeTypesManager::IsOfType(mimeType, - m_fallbacks[n].GetMimeType()) ) { - wxFileType *fileType = new wxFileType; - fileType->m_impl->Init(m_fallbacks[n]); - - return fileType; - } - } - // unknown MIME type return NULL; } @@ -677,32 +515,41 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes) // create a new association // ---------------------------------------------------------------------------- -wxFileType *wxMimeTypesManager::Associate(const wxString& ext, - const wxString& mimetype, - const wxString& filetypeOrig, - const wxString& WXUNUSED(desc)) +wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) { - wxCHECK_MSG( !ext.empty(), NULL, _T("Associate() needs extension") ); + wxCHECK_MSG( !ftInfo.GetExtensions().IsEmpty(), NULL, + _T("Associate() needs extension") ); + bool ok = FALSE ; + int iExtCount = 0 ; + wxString filetype; wxString extWithDot; + + wxString ext = ftInfo.GetExtensions()[iExtCount]; + + wxCHECK_MSG( !ext.empty(), NULL, + _T("Associate() needs non empty extension") ); + if ( ext[0u] != _T('.') ) extWithDot = _T('.'); extWithDot += ext; + // start by setting the HKCR\\.ext entries + // default is filetype; content type is mimetype + const wxString& filetypeOrig = ftInfo.GetShortDesc(); + wxRegKey key(wxRegKey::HKCR, extWithDot); - wxFileType *ft = NULL; if ( !key.Exists() ) { - wxString filetype; - // create the mapping from the extension to the filetype - bool ok = key.Create(); + ok = key.Create(); if ( ok ) { + if ( filetypeOrig.empty() ) { // make it up from the extension - filetype << extWithDot.c_str() + 1 << _T("_auto_file"); + filetype << extWithDot.c_str() + 1 << _T("_file"); } else { @@ -712,8 +559,23 @@ wxFileType *wxMimeTypesManager::Associate(const wxString& ext, ok = key.SetValue(_T(""), filetype); } - - if ( ok && !mimetype.empty() ) + } + else + { + // key already exists, maybe we want to change it ?? + if (!filetypeOrig.empty()) + { + filetype = filetypeOrig; + ok = key.SetValue(_T(""), filetype); + } + else + { + ok = key.QueryValue(_T(""), filetype); + } + } + // 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); @@ -734,32 +596,240 @@ wxFileType *wxMimeTypesManager::Associate(const wxString& ext, } } + + // 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; + + wxRegKey key(wxRegKey::HKCR, extWithDot); + if ( !key.Exists() ) ok = key.Create(); + ok = key.SetValue(_T(""), filetype); + + // now set any mimetypes we may have, 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 ) { - // create the filetype key itself (it will be empty for now, but - // SetCommand(), SetDefaultIcon() &c will use it later) - wxRegKey keyFT(wxRegKey::HKCR, filetype); - ok = keyFT.Create(); - } + // create the MIME key + wxString strKey = MIME_DATABASE_KEY; + strKey << mimetype; + wxRegKey keyMIME(wxRegKey::HKCR, strKey); + ok = keyMIME.Create(); if ( ok ) { - // ok, we've created everything correctly - ft = m_impl->CreateFileType(filetype, extWithDot); + // and provide a back link to the extension + ok = keyMIME.SetValue(_T("Extension"), extWithDot); } - else + } + } + + + } // end of for loop; all extensions now point to HKCR\.ext\Default + + // create the filetype key itself (it will be empty for now, but + // SetCommand(), SetDefaultIcon() &c will use it later) + wxRegKey keyFT(wxRegKey::HKCR, filetype); + ok = keyFT.Create(); + + wxFileType *ft = NULL; + ft = CreateFileType(filetype, extWithDot); + + if (ft) + { + if (! ftInfo.GetOpenCommand ().IsEmpty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open" ) ); + if (! ftInfo.GetPrintCommand().IsEmpty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) ); + // chris: I don't like the ->m_impl-> here FIX this ?? + if (! ftInfo.GetDescription ().IsEmpty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ; + if (! ftInfo.GetIconFile().IsEmpty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() ); + + } + return ft; +} + +bool wxFileTypeImpl::SetCommand(const wxString& cmd, + const wxString& verb, + bool WXUNUSED(overwriteprompt)) +{ + wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE, + _T("SetCommand() needs an extension and a verb") ); + + if ( !EnsureExtKeyExists() ) + return FALSE; + + wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb)); +#if 0 + if ( rkey.Exists() && overwriteprompt ) + { +#if wxUSE_GUI + wxString old; + rkey.QueryValue(wxT(""), old); + if ( wxMessageBox + ( + wxString::Format( + _("Do you want to overwrite the command used to %s " + "files with extension \"%s\" ?\nCurrent value is \n%s, " + "\nNew value is \n%s %1"), // bug here FIX need %1 ?? + verb.c_str(), + m_ext.c_str(), + old.c_str(), + cmd.c_str()), + _("Confirm registry update"), + wxYES_NO | wxICON_QUESTION + ) != wxYES ) +#endif // wxUSE_GUI { - // one of the registry operations failed - wxLogError(_("Failed to register extension '%s'."), ext.c_str()); + // cancelled by user + return FALSE; } } - else // key already exists +#endif + // TODO: + // 1. translate '%s' to '%1' instead of always adding it + // 2. create DDEExec value if needed (undo GetCommand) + return rkey.Create() && rkey.SetValue(_T(""), cmd + _T(" \"%1\"") ); +} + +/* // no longer used +bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig) +{ + wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") ); + + if ( !EnsureExtKeyExists() ) + return FALSE; + + // VZ: is this really useful? (FIXME) + wxString mimeType; + if ( !mimeTypeOrig ) { - // FIXME we probably should return an existing file type then? + // make up a default value for it + wxString cmd; + wxSplitPath(GetCommand(_T("open")), NULL, &cmd, NULL); + mimeType << _T("application/x-") << cmd; + } + else + { + mimeType = mimeTypeOrig; } - return ft; + wxRegKey rkey(wxRegKey::HKCR, m_ext); + return rkey.Create() && rkey.SetValue(_T("Content Type"), mimeType); +} +*/ + +bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index) +{ + wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetDefaultIcon() needs extension") ); + wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") ); +// the next line fails on a SMBshare, I think because it is case mangled +// wxCHECK_MSG( !wxFileExists(cmd), FALSE, _T("Icon file not found.") ); + + if ( !EnsureExtKeyExists() ) + return FALSE; + + wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); + + return rkey.Create() && + rkey.SetValue(_T(""), + wxString::Format(_T("%s,%d"), cmd.c_str(), index)); +} + +bool wxFileTypeImpl::SetDescription (const wxString& desc) +{ + wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") ); + wxCHECK_MSG( !desc.IsEmpty(), FALSE, _T("No file description supplied") ); + + if ( !EnsureExtKeyExists() ) + return FALSE; + + wxRegKey rkey(wxRegKey::HKCR, m_strFileType ); + + return rkey.Create() && + rkey.SetValue(_T(""), desc); +} + +// ---------------------------------------------------------------------------- +// remove file association +// ---------------------------------------------------------------------------- + +bool wxFileTypeImpl::Unassociate() +{ + bool result = TRUE; + if ( !RemoveOpenCommand() ) + result = FALSE; + if ( !RemoveDefaultIcon() ) + result = FALSE; + if ( !RemoveMimeType() ) + result = FALSE; + if ( !RemoveDescription() ) + result = FALSE; + +/* + //this might hold other keys, eg some have CSLID keys + if ( result ) + { + // delete the root key + wxRegKey key(wxRegKey::HKCR, m_ext); + if ( key.Exists() ) + result = key.DeleteSelf(); + } +*/ + return result; +} + +bool wxFileTypeImpl::RemoveOpenCommand() +{ + return RemoveCommand(_T("open")); +} + +bool wxFileTypeImpl::RemoveCommand(const wxString& verb) +{ + wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), 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 + return !rkey.Exists() || rkey.DeleteSelf(); +} + +bool wxFileTypeImpl::RemoveMimeType() +{ + wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") ); + + wxRegKey rkey(wxRegKey::HKCR, m_ext); + return !rkey.Exists() || rkey.DeleteSelf(); +} + +bool wxFileTypeImpl::RemoveDefaultIcon() +{ + wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, + _T("RemoveDefaultIcon() needs extension") ); + + wxRegKey rkey (wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); + return !rkey.Exists() || rkey.DeleteSelf(); +} + +bool wxFileTypeImpl::RemoveDescription() +{ + wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, + _T("RemoveDescription() needs extension") ); + + wxRegKey rkey (wxRegKey::HKCR, m_strFileType ); + return !rkey.Exists() || rkey.DeleteSelf(); } #endif // __WIN16__ + +#endif // wxUSE_MIMETYPE