AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

open registry keys in read-only mode as we might not have the rights for full access to them (this is default for normal users under XP)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-04-28 10:42:41 +00:00
parent b7fafe6a1f
commit 5e6b515aba
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/mimetype.cpp
View File

@ -223,7 +223,7 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
strKey << wxT("\\shell\\") << verb; strKey << wxT("\\shell\\") << verb;
wxRegKey key(wxRegKey::HKCR, strKey + _T("\\command")); wxRegKey key(wxRegKey::HKCR, strKey + _T("\\command"));
wxString command; wxString command;
if ( key.Open() ) { if ( key.Open(wxRegKey::Read) ) {
// it's the default value of the key // it's the default value of the key
if ( key.QueryValue(wxEmptyString, command) ) { if ( key.QueryValue(wxEmptyString, command) ) {
bool foundFilename = CanonicalizeParams(command); bool foundFilename = CanonicalizeParams(command);
@ -233,7 +233,7 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
// (and not just launch it) // (and not just launch it)
strKey += _T("\\DDEExec"); strKey += _T("\\DDEExec");
wxRegKey keyDDE(wxRegKey::HKCR, strKey); wxRegKey keyDDE(wxRegKey::HKCR, strKey);
if ( keyDDE.Open() ) { if ( keyDDE.Open(wxRegKey::Read) ) {
wxString ddeCommand, ddeServer, ddeTopic; wxString ddeCommand, ddeServer, ddeTopic;
keyDDE.QueryValue(wxEmptyString, ddeCommand); keyDDE.QueryValue(wxEmptyString, ddeCommand);
ddeCommand.Replace(_T("%1"), _T("%s")); ddeCommand.Replace(_T("%1"), _T("%s"));
@ -323,7 +323,8 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
wxLogNull nolog; wxLogNull nolog;
wxRegKey key(wxRegKey::HKCR, m_ext); wxRegKey key(wxRegKey::HKCR, m_ext);
return key.Open() && key.QueryValue(wxT("Content Type"), *mimeType); return key.Open(wxRegKey::Read) &&
key.QueryValue(wxT("Content Type"), *mimeType);
} }
bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
@ -350,7 +351,7 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
wxLogNull nolog; wxLogNull nolog;
wxRegKey key(wxRegKey::HKCR, strIconKey); wxRegKey key(wxRegKey::HKCR, strIconKey);
if ( key.Open() ) { if ( key.Open(wxRegKey::Read) ) {
wxString strIcon; wxString strIcon;
// it's the default value of the key // it's the default value of the key
if ( key.QueryValue(wxEmptyString, strIcon) ) { if ( key.QueryValue(wxEmptyString, strIcon) ) {
@ -388,7 +389,7 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const
wxLogNull nolog; wxLogNull nolog;
wxRegKey key(wxRegKey::HKCR, m_strFileType); wxRegKey key(wxRegKey::HKCR, m_strFileType);
if ( key.Open() ) { if ( key.Open(wxRegKey::Read) ) {
// it's the default value of the key // it's the default value of the key
if ( key.QueryValue(wxEmptyString, *desc) ) { if ( key.QueryValue(wxEmptyString, *desc) ) {
return TRUE; return TRUE;
@ -425,7 +426,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
wxString strFileType; wxString strFileType;
wxRegKey key(wxRegKey::HKCR, str); wxRegKey key(wxRegKey::HKCR, str);
if ( key.Open() ) { if ( key.Open(wxRegKey::Read) ) {
// it's the default value of the key // it's the default value of the key
if ( key.QueryValue(wxEmptyString, strFileType) ) { if ( key.QueryValue(wxEmptyString, strFileType) ) {
// create the new wxFileType object // create the new wxFileType object
@ -474,7 +475,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
wxString ext; wxString ext;
wxRegKey key(wxRegKey::HKCR, strKey); wxRegKey key(wxRegKey::HKCR, strKey);
if ( key.Open() ) { if ( key.Open(wxRegKey::Read) ) {
if ( key.QueryValue(wxT("Extension"), ext) ) { if ( key.QueryValue(wxT("Extension"), ext) ) {
return GetFileTypeFromExtension(ext); return GetFileTypeFromExtension(ext);
} }