X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11d395f9d74b35a0bcaf222de1d8f093b9dba2c4..8d1147f94291adcfa4d028d7122b3d39e5b553e1:/src/msw/mimetype.cpp diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp index a7242a7de4..0e27060a7e 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence (part of wxExtra library) ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "mimetype.h" #endif @@ -22,9 +22,6 @@ #if wxUSE_MIMETYPE -// Doesn't compile in WIN16 mode -#ifndef __WIN16__ - #ifndef WX_PRECOMP #include "wx/string.h" #if wxUSE_GUI @@ -195,11 +192,11 @@ bool wxFileTypeImpl::EnsureExtKeyExists() { wxLogError(_("Failed to create registry entry for '%s' files."), m_ext.c_str()); - return FALSE; + return false; } } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -226,7 +223,7 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const strKey << wxT("\\shell\\") << verb; wxRegKey key(wxRegKey::HKCR, strKey + _T("\\command")); wxString command; - if ( key.Open() ) { + if ( key.Open(wxRegKey::Read) ) { // it's the default value of the key if ( key.QueryValue(wxEmptyString, command) ) { bool foundFilename = CanonicalizeParams(command); @@ -236,7 +233,7 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const // (and not just launch it) strKey += _T("\\DDEExec"); wxRegKey keyDDE(wxRegKey::HKCR, strKey); - if ( keyDDE.Open() ) { + if ( keyDDE.Open(wxRegKey::Read) ) { wxString ddeCommand, ddeServer, ddeTopic; keyDDE.QueryValue(wxEmptyString, ddeCommand); ddeCommand.Replace(_T("%1"), _T("%s")); @@ -309,14 +306,14 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) 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; + return false; } else { extensions.Empty(); extensions.Add(m_ext); // it's a lie too, we don't return _all_ extensions... - return TRUE; + return true; } } @@ -326,7 +323,8 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const wxLogNull nolog; 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 @@ -335,12 +333,12 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const if ( !GetMimeType(&s) ) { - return FALSE; + return false; } mimeTypes.Clear(); mimeTypes.Add(s); - return TRUE; + return true; } @@ -353,7 +351,7 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const wxLogNull nolog; wxRegKey key(wxRegKey::HKCR, strIconKey); - if ( key.Open() ) { + if ( key.Open(wxRegKey::Read) ) { wxString strIcon; // it's the default value of the key if ( key.QueryValue(wxEmptyString, strIcon) ) { @@ -377,12 +375,12 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const iconLoc->SetIndex(wxAtoi(strIndex)); } - return TRUE; + return true; } } // no such file type or no value or incorrect icon entry - return FALSE; + return false; } bool wxFileTypeImpl::GetDescription(wxString *desc) const @@ -391,14 +389,14 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const wxLogNull nolog; wxRegKey key(wxRegKey::HKCR, m_strFileType); - if ( key.Open() ) { + if ( key.Open(wxRegKey::Read) ) { // it's the default value of the key if ( key.QueryValue(wxEmptyString, *desc) ) { - return TRUE; + return true; } } - return FALSE; + return false; } // helper function @@ -424,11 +422,11 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) // suppress possible error messages wxLogNull nolog; - bool knownExtension = FALSE; + bool knownExtension = false; wxString strFileType; wxRegKey key(wxRegKey::HKCR, str); - if ( key.Open() ) { + if ( key.Open(wxRegKey::Read) ) { // it's the default value of the key if ( key.QueryValue(wxEmptyString, strFileType) ) { // create the new wxFileType object @@ -438,7 +436,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) // this extension doesn't have a filetype, but it's known to the // system and may be has some other useful keys (open command or // content-type), so still return a file type object for it - knownExtension = TRUE; + knownExtension = true; } } @@ -477,7 +475,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType) wxString ext; wxRegKey key(wxRegKey::HKCR, strKey); - if ( key.Open() ) { + if ( key.Open(wxRegKey::Read) ) { if ( key.QueryValue(wxT("Extension"), ext) ) { return GetFileTypeFromExtension(ext); } @@ -514,7 +512,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) wxCHECK_MSG( !ftInfo.GetExtensions().IsEmpty(), NULL, _T("Associate() needs extension") ); - bool ok = FALSE ; + bool ok; int iExtCount = 0 ; wxString filetype; wxString extWithDot; @@ -551,7 +549,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) filetype = filetypeOrig; } - ok = key.SetValue(wxEmptyString, filetype); + key.SetValue(wxEmptyString, filetype); } } else @@ -560,11 +558,11 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) if (!filetypeOrig.empty()) { filetype = filetypeOrig; - ok = key.SetValue(wxEmptyString, filetype); + key.SetValue(wxEmptyString, filetype); } else { - ok = key.QueryValue(wxEmptyString, filetype); + key.QueryValue(wxEmptyString, filetype); } } // now set a mimetypeif we have it, but ignore it if none @@ -585,7 +583,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) if ( ok ) { // and provide a back link to the extension - ok = keyMIME.SetValue(_T("Extension"), extWithDot); + keyMIME.SetValue(_T("Extension"), extWithDot); } } } @@ -601,8 +599,8 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) extWithDot += ext; wxRegKey key(wxRegKey::HKCR, extWithDot); - if ( !key.Exists() ) ok = key.Create(); - ok = key.SetValue(wxEmptyString, filetype); + 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(); @@ -622,7 +620,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) if ( ok ) { // and provide a back link to the extension - ok = keyMIME.SetValue(_T("Extension"), extWithDot); + keyMIME.SetValue(_T("Extension"), extWithDot); } } } @@ -633,10 +631,9 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) // 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(); + keyFT.Create(); - wxFileType *ft = NULL; - ft = CreateFileType(filetype, extWithDot); + wxFileType *ft = CreateFileType(filetype, extWithDot); if (ft) { @@ -654,11 +651,11 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool WXUNUSED(overwriteprompt)) { - wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), false, _T("SetCommand() needs an extension and a verb") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb)); #if 0 @@ -683,7 +680,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, #endif // wxUSE_GUI { // cancelled by user - return FALSE; + return false; } } #endif @@ -696,10 +693,10 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, /* // no longer used bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig) { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") ); + wxCHECK_MSG( !m_ext.IsEmpty(), false, _T("SetMimeType() needs extension") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; // VZ: is this really useful? (FIXME) wxString mimeType; @@ -722,13 +719,13 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig) 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") ); + 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.") ); +// wxCHECK_MSG( !wxFileExists(cmd), false, _T("Icon file not found.") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); @@ -739,11 +736,11 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int 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") ); + 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; + return false; wxRegKey rkey(wxRegKey::HKCR, m_strFileType ); @@ -757,15 +754,15 @@ bool wxFileTypeImpl::SetDescription (const wxString& desc) bool wxFileTypeImpl::Unassociate() { - bool result = TRUE; + bool result = true; if ( !RemoveOpenCommand() ) - result = FALSE; + result = false; if ( !RemoveDefaultIcon() ) - result = FALSE; + result = false; if ( !RemoveMimeType() ) - result = FALSE; + result = false; if ( !RemoveDescription() ) - result = FALSE; + result = false; /* //this might hold other keys, eg some have CSLID keys @@ -787,7 +784,7 @@ bool wxFileTypeImpl::RemoveOpenCommand() bool wxFileTypeImpl::RemoveCommand(const wxString& verb) { - wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), false, _T("RemoveCommand() needs an extension and a verb") ); wxString sKey = m_strFileType; @@ -799,7 +796,7 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb) bool wxFileTypeImpl::RemoveMimeType() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") ); + wxCHECK_MSG( !m_ext.IsEmpty(), false, _T("RemoveMimeType() needs extension") ); wxRegKey rkey(wxRegKey::HKCR, m_ext); return !rkey.Exists() || rkey.DeleteSelf(); @@ -807,7 +804,7 @@ bool wxFileTypeImpl::RemoveMimeType() bool wxFileTypeImpl::RemoveDefaultIcon() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.IsEmpty(), false, _T("RemoveDefaultIcon() needs extension") ); wxRegKey rkey (wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); @@ -816,14 +813,11 @@ bool wxFileTypeImpl::RemoveDefaultIcon() bool wxFileTypeImpl::RemoveDescription() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, + 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