X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/baeed2892d4f876add61aa04fe34364a7df31f7f..fd2daa68f4e2d0f66f466be4dcee7bad9ed4be1a:/src/msw/regconf.cpp diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp index 635bdf355d..22743d41a0 100644 --- a/src/msw/regconf.cpp +++ b/src/msw/regconf.cpp @@ -35,6 +35,7 @@ #include #endif //WX_PRECOMP +#include #include #include #include @@ -69,6 +70,8 @@ bool TryGetValue(const wxRegKey& key, const wxString& str, long *plVal) // ---------------------------------------------------------------------------- // ctor/dtor // ---------------------------------------------------------------------------- + +#if 0 wxRegConfig::wxRegConfig(const wxString& strRoot) : m_keyLocalRoot(wxRegKey::HKCU, SOFTWARE_KEY + strRoot), m_keyLocal(m_keyLocalRoot, ""), @@ -78,8 +81,62 @@ wxRegConfig::wxRegConfig(const wxString& strRoot) // Create() will Open() if key already exists m_keyLocalRoot.Create(); + // as it's the same key, Open() shouldn't fail (i.e. no need for Create()) + m_keyLocal.Open(); + + wxLogNull nolog; + m_keyGlobalRoot.Open(); +} +#endif + +// TODO: vendor name is ignored, because we can't yet do the test for optional vendor +// name in the constructor body. We need a wxRegKey::Set that takes the same +// args as the constructor. Then we'll set m_keyLocalRoot etc. in the constructor body. + +wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName, + const wxString& strLocal, const wxString& strGlobal, long style) + : wxConfigBase(appName, vendorName, strLocal, strGlobal, style), + + m_keyLocalRoot(wxRegKey::HKCU, SOFTWARE_KEY + appName), + m_keyLocal(m_keyLocalRoot, ""), + m_keyGlobalRoot(wxRegKey::HKLM, SOFTWARE_KEY + appName), + m_keyGlobal(m_keyGlobalRoot, "") +{ + // TODO: really, we should check and supply an app name if one isn't supplied. + // Unfortunately I don't know how to initialise the member wxRegKey + // variables from within the constructor body. -- JACS + // Vadim - we just need an implementation of wxRegKey::Set, + // and then we can uncomment this and remove the constructor lines above. +/* + wxString strRoot(appName); + if (appName.IsEmpty() && wxTheApp) + { + strRoot = wxTheApp->GetAppName(); + } + wxASSERT( !strRoot.IsEmpty() ); + + if (!vendorName.IsEmpty()) + { + strRoot += "\\"; + strRoot += vendorName; + } + + m_keyLocalRoot.Set(wxRegKey::HKCU, SOFTWARE_KEY + strRoot), + m_keyLocal.Set(m_keyLocalRoot, ""), + + m_keyGlobalRoot.Set(wxRegKey::HKLM, SOFTWARE_KEY + strRoot), + m_keyGlobal.Set(m_keyGlobalRoot, "") +*/ + + // Create() will Open() if key already exists + m_keyLocalRoot.Create(); + + // as it's the same key, Open() shouldn't fail (i.e. no need for Create()) + m_keyLocal.Open(); + wxLogNull nolog; m_keyGlobalRoot.Open(); + } wxRegConfig::~wxRegConfig() @@ -94,10 +151,9 @@ void wxRegConfig::SetPath(const wxString& strPath) { wxArrayString aParts; - if ( strPath.IsEmpty() ) - return; - - if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) { + // because GetPath() returns "" when we're at root, we must understand + // empty string as "/" + if ( strPath.IsEmpty() || (strPath[0] == wxCONFIG_PATH_SEPARATOR) ) { // absolute path wxSplitPath(aParts, strPath); } @@ -111,7 +167,7 @@ void wxRegConfig::SetPath(const wxString& strPath) // recombine path parts in one variable wxString strRegPath; m_strPath.Empty(); - for ( uint n = 0; n < aParts.Count(); n++ ) { + for ( size_t n = 0; n < aParts.Count(); n++ ) { strRegPath << '\\' << aParts[n]; m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n]; } @@ -198,9 +254,9 @@ bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex) const return bOk; } -uint wxRegConfig::GetNumberOfEntries(bool bRecursive) const +size_t wxRegConfig::GetNumberOfEntries(bool bRecursive) const { - uint nEntries = 0; + size_t nEntries = 0; // dummy vars wxString str; @@ -215,9 +271,9 @@ uint wxRegConfig::GetNumberOfEntries(bool bRecursive) const return nEntries; } -uint wxRegConfig::GetNumberOfGroups(bool bRecursive) const +size_t wxRegConfig::GetNumberOfGroups(bool bRecursive) const { - uint nGroups = 0; + size_t nGroups = 0; // dummy vars wxString str; @@ -250,11 +306,47 @@ bool wxRegConfig::HasEntry(const wxString& strName) const // reading/writing // ---------------------------------------------------------------------------- -bool wxRegConfig::Read(wxString *pStr, - const char *szKey, - const char *szDefault) const +bool wxRegConfig::Read(const wxString& key, wxString *pStr) const +{ + wxConfigPathChanger path(this, key); + + bool bQueryGlobal = TRUE; + + // if immutable key exists in global key we must check that it's not + // overriden by the local key with the same name + if ( IsImmutable(path.Name()) ) { + if ( TryGetValue(m_keyGlobal, path.Name(), *pStr) ) { + if ( m_keyLocal.HasValue(path.Name()) ) { + wxLogWarning("User value for immutable key '%s' ignored.", + path.Name().c_str()); + } + *pStr = wxConfigBase::ExpandEnvVars(*pStr); + return TRUE; + } + else { + // don't waste time - it's not there anyhow + bQueryGlobal = FALSE; + } + } + + // first try local key + if ( TryGetValue(m_keyLocal, path.Name(), *pStr) || + (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), *pStr)) ) { + // nothing to do + + // TODO: do we return TRUE? Not in original implementation, + // but I don't see why not. -- JACS + *pStr = wxConfigBase::ExpandEnvVars(*pStr); + return TRUE; + } + + return FALSE; +} + +bool wxRegConfig::Read(const wxString& key, wxString *pStr, + const wxString& szDefault) const { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); bool bQueryGlobal = TRUE; @@ -278,20 +370,26 @@ bool wxRegConfig::Read(wxString *pStr, // first try local key if ( TryGetValue(m_keyLocal, path.Name(), *pStr) || (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), *pStr)) ) { + *pStr = wxConfigBase::ExpandEnvVars(*pStr); return TRUE; } + else { + if ( IsRecordingDefaults() ) { + ((wxRegConfig*)this)->Write(key, szDefault); + } - if(IsRecordingDefaults()) - Write(szKey,szDefault); + // default value + *pStr = szDefault; + } + + *pStr = wxConfigBase::ExpandEnvVars(*pStr); - // default value - *pStr = szDefault; return FALSE; } -bool wxRegConfig::Read(long *plResult, const char *szKey, long lDefault) const +bool wxRegConfig::Read(const wxString& key, long *plResult) const { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); bool bQueryGlobal = TRUE; @@ -317,15 +415,12 @@ bool wxRegConfig::Read(long *plResult, const char *szKey, long lDefault) const (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), plResult)) ) { return TRUE; } - - // default - *plResult = lDefault; return FALSE; } -bool wxRegConfig::Write(const char *szKey, const char *szValue) +bool wxRegConfig::Write(const wxString& key, const wxString& szValue) { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); if ( IsImmutable(path.Name()) ) { wxLogError("Can't change immutable entry '%s'.", path.Name().c_str()); @@ -335,9 +430,9 @@ bool wxRegConfig::Write(const char *szKey, const char *szValue) return m_keyLocal.SetValue(path.Name(), szValue); } -bool wxRegConfig::Write(const char *szKey, long lValue) +bool wxRegConfig::Write(const wxString& key, long lValue) { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); if ( IsImmutable(path.Name()) ) { wxLogError("Can't change immutable entry '%s'.", path.Name().c_str()); @@ -350,9 +445,9 @@ bool wxRegConfig::Write(const char *szKey, long lValue) // ---------------------------------------------------------------------------- // deleting // ---------------------------------------------------------------------------- -bool wxRegConfig::DeleteEntry(const char *szValue, bool bGroupIfEmptyAlso) +bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso) { - PathChanger path(this, szValue); + wxConfigPathChanger path(this, value); if ( !m_keyLocal.DeleteValue(path.Name()) ) return FALSE; @@ -366,9 +461,9 @@ bool wxRegConfig::DeleteEntry(const char *szValue, bool bGroupIfEmptyAlso) return TRUE; } -bool wxRegConfig::DeleteGroup(const char *szKey) +bool wxRegConfig::DeleteGroup(const wxString& key) { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); return m_keyLocal.DeleteKey(path.Name()); }