X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb1a47897985cd1ae863626a65cf3d09f5239c75..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/mimetype.cpp diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp index 0649f09ed7..e10c79bd51 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -200,16 +200,47 @@ bool wxFileTypeImpl::EnsureExtKeyExists() // get the command to use // ---------------------------------------------------------------------------- +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 ) {