Remove the busy-wait loops in wxAMMediaBackend::Play as they didn't

[wxWidgets.git] / src / msw / regconf.cpp

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 07fcf8201b4224871c55944a7404c7880c487d19..4684ba918867d222c0e6ac1e1dcb943b18bae9fe 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -6,13 +6,9 @@
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "regconf.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -33,8 +29,6 @@
 
 #include "wx/config.h"
 
 
 #include "wx/config.h"
 

-#ifndef __WIN16__
-

 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"
 
 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"
 


@@ -43,7 +37,7 @@
 // ----------------------------------------------------------------------------
 
 // we put our data in HKLM\SOFTWARE_KEY\appname
 // ----------------------------------------------------------------------------
 
 // we put our data in HKLM\SOFTWARE_KEY\appname

-#define SOFTWARE_KEY    wxString("Software\\")
+#define SOFTWARE_KEY    wxString(wxT("Software\\"))

 
 // ----------------------------------------------------------------------------
 // global functions
 
 // ----------------------------------------------------------------------------
 // global functions


@@ -124,7 +118,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   m_keyLocal.ReserveMemoryForName(MEMORY_PREALLOC);
 
   m_keyLocalRoot.SetName(wxRegKey::HKCU, SOFTWARE_KEY + str);
   m_keyLocal.ReserveMemoryForName(MEMORY_PREALLOC);
 
   m_keyLocalRoot.SetName(wxRegKey::HKCU, SOFTWARE_KEY + str);

-  m_keyLocal.SetName(m_keyLocalRoot, _T(""));
+  m_keyLocal.SetName(m_keyLocalRoot, wxEmptyString);

 
   if ( bDoUseGlobal )
   {
 
   if ( bDoUseGlobal )
   {


@@ -134,7 +128,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
     m_keyGlobal.ReserveMemoryForName(MEMORY_PREALLOC);
 
     m_keyGlobalRoot.SetName(wxRegKey::HKLM, SOFTWARE_KEY + str);
     m_keyGlobal.ReserveMemoryForName(MEMORY_PREALLOC);
 
     m_keyGlobalRoot.SetName(wxRegKey::HKLM, SOFTWARE_KEY + str);

-    m_keyGlobal.SetName(m_keyGlobalRoot, _T(""));
+    m_keyGlobal.SetName(m_keyGlobalRoot, wxEmptyString);

   }
 
   // Create() will Open() if key already exists
   }
 
   // Create() will Open() if key already exists


@@ -148,16 +142,11 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   if ( bDoUseGlobal )
   {
     wxLogNull nolog;
   if ( bDoUseGlobal )
   {
     wxLogNull nolog;

-    m_keyGlobalRoot.Open();
-    m_keyGlobal.Open();
+    m_keyGlobalRoot.Open(wxRegKey::Read);
+    m_keyGlobal.Open(wxRegKey::Read);

   }
 }
 
   }
 }
 

-wxRegConfig::~wxRegConfig()
-{
-  // nothing to do - key will be closed in their dtors
-}
-

 // ----------------------------------------------------------------------------
 // path management
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // path management
 // ----------------------------------------------------------------------------


@@ -222,9 +211,9 @@ void wxRegConfig::SetPath(const wxString& strPath)
             strFullPath.reserve(2*m_strPath.length());
 
             strFullPath << m_strPath;
             strFullPath.reserve(2*m_strPath.length());
 
             strFullPath << m_strPath;

-            if ( strFullPath.Len() == 0 || 
+            if ( strFullPath.Len() == 0 ||

                  strFullPath.Last() != wxCONFIG_PATH_SEPARATOR )
                  strFullPath.Last() != wxCONFIG_PATH_SEPARATOR )

-                strFullPath << wxCONFIG_PATH_SEPARATOR; 
+                strFullPath << wxCONFIG_PATH_SEPARATOR;

             strFullPath << strPath;
         }
 
             strFullPath << strPath;
         }
 


@@ -245,7 +234,8 @@ void wxRegConfig::SetPath(const wxString& strPath)
         size_t len = strFullPath.length();
         const wxChar *end = src + len;
 
         size_t len = strFullPath.length();
         const wxChar *end = src + len;
 

-        wxChar *dst = m_strPath.GetWriteBuf(len);
+        wxStringBufferLength buf(m_strPath, len);
+        wxChar *dst = buf;

         wxChar *start = dst;
 
         for ( ; src < end; src++, dst++ )
         wxChar *start = dst;
 
         for ( ; src < end; src++, dst++ )


@@ -337,8 +327,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
         }
 
         *dst = _T('\0');
         }
 
         *dst = _T('\0');

-
-        m_strPath.UngetWriteBuf(dst - start);
+        buf.SetLength(dst - start);

     }
 
 #ifdef WX_DEBUG_SET_PATH
     }
 
 #ifdef WX_DEBUG_SET_PATH


@@ -350,21 +339,25 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
     // registry APIs want backslashes instead of slashes
     wxString strRegPath;
 
     // registry APIs want backslashes instead of slashes
     wxString strRegPath;

-    size_t len = m_strPath.length();
+    if ( !m_strPath.empty() )
+    {
+        size_t len = m_strPath.length();

 
 

-    const wxChar *src = m_strPath.c_str();
-    wxChar *dst = strRegPath.GetWriteBuf(len);
+        const wxChar *src = m_strPath.c_str();
+        wxStringBufferLength buf(strRegPath, len);
+        wxChar *dst = buf;

 
 

-    const wxChar *end = src + len;
-    for ( ; src < end; src++, dst++ )
-    {
-        if ( *src == wxCONFIG_PATH_SEPARATOR )
-            *dst = _T('\\');
-        else
-            *dst = *src;
-    }
+        const wxChar *end = src + len;
+        for ( ; src < end; src++, dst++ )
+        {
+            if ( *src == wxCONFIG_PATH_SEPARATOR )
+                *dst = _T('\\');
+            else
+                *dst = *src;
+        }

 
 

-    strRegPath.UngetWriteBuf(len);
+        buf.SetLength(len);
+    }

 
     // this is not needed any longer as we don't create keys unnecessarily any
     // more (now it is done on demand, i.e. only when they're going to contain
 
     // this is not needed any longer as we don't create keys unnecessarily any
     // more (now it is done on demand, i.e. only when they're going to contain


@@ -382,13 +375,14 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
     // change current key(s)
     m_keyLocal.SetName(m_keyLocalRoot, strRegPath);
 
     // change current key(s)
     m_keyLocal.SetName(m_keyLocalRoot, strRegPath);

-    m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);

 
 

-    // don't create it right now, wait until it is accessed
-    //m_keyLocal.Create();
+    if ( GetStyle() & wxCONFIG_USE_GLOBAL_FILE )
+    {
+      m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);

 
 

-    wxLogNull nolog;
-    m_keyGlobal.Open();
+      wxLogNull nolog;
+      m_keyGlobal.Open(wxRegKey::Read);
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -420,7 +414,7 @@ bool wxRegConfig::GetNextGroup(wxString& str, long& lIndex) const
     while ( m_keyGlobal.GetNextKey(str, lIndex) ) {
       if ( !m_keyLocal.Exists() || !LocalKey().HasSubKey(str) ) {
         // ok, found one - return it
     while ( m_keyGlobal.GetNextKey(str, lIndex) ) {
       if ( !m_keyLocal.Exists() || !LocalKey().HasSubKey(str) ) {
         // ok, found one - return it

-        return TRUE;
+        return true;

       }
     }
 
       }
     }
 


@@ -430,7 +424,7 @@ bool wxRegConfig::GetNextGroup(wxString& str, long& lIndex) const
 
   // if we don't have the key at all, don't try to enumerate anything under it
   if ( !m_keyLocal.Exists() )
 
   // if we don't have the key at all, don't try to enumerate anything under it
   if ( !m_keyLocal.Exists() )

-      return FALSE;
+      return false;

 
   // much easier with local entries: get the next one we find
   // (don't forget to clear our flag bit and set it again later)
 
   // much easier with local entries: get the next one we find
   // (don't forget to clear our flag bit and set it again later)


@@ -455,7 +449,7 @@ bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex) const
     while ( m_keyGlobal.GetNextValue(str, lIndex) ) {
       if ( !m_keyLocal.Exists() || !LocalKey().HasValue(str) ) {
         // ok, found one - return it
     while ( m_keyGlobal.GetNextValue(str, lIndex) ) {
       if ( !m_keyLocal.Exists() || !LocalKey().HasValue(str) ) {
         // ok, found one - return it

-        return TRUE;
+        return true;

       }
     }
 
       }
     }
 


@@ -465,7 +459,7 @@ bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex) const
 
   // if we don't have the key at all, don't try to enumerate anything under it
   if ( !m_keyLocal.Exists() )
 
   // if we don't have the key at all, don't try to enumerate anything under it
   if ( !m_keyLocal.Exists() )

-      return FALSE;
+      return false;

 
   // much easier with local entries: get the next one we find
   // (don't forget to clear our flag bit and set it again later)
 
   // much easier with local entries: get the next one we find
   // (don't forget to clear our flag bit and set it again later)


@@ -555,47 +549,13 @@ wxConfigBase::EntryType wxRegConfig::GetEntryType(const wxString& key) const
 // reading/writing
 // ----------------------------------------------------------------------------
 
 // reading/writing
 // ----------------------------------------------------------------------------
 

-bool wxRegConfig::Read(const wxString& key, wxString *pStr) const
+bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const

 {
 {

-  wxConfigPathChanger path(this, key);
+    wxCHECK_MSG( pStr, false, _T("wxRegConfig::Read(): NULL param") );

 
 

-  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.Exists() && LocalKey().HasValue(path.Name()) ) {
-        wxLogWarning(wxT("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 ( (m_keyLocal.Exists() && TryGetValue(LocalKey(), path.Name(), *pStr)) ||
-       (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), *pStr)) ) {
-    // nothing to do
-
-    *pStr = wxConfigBase::ExpandEnvVars(*pStr);
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-bool wxRegConfig::Read(const wxString& key, wxString *pStr,
-                       const wxString& szDefault) const
-{

   wxConfigPathChanger path(this, key);
 
   wxConfigPathChanger path(this, key);
 

-  bool bQueryGlobal = TRUE;
+  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 immutable key exists in global key we must check that it's not
   // overriden by the local key with the same name


@@ -606,39 +566,33 @@ bool wxRegConfig::Read(const wxString& key, wxString *pStr,
                    path.Name().c_str());
       }
 
                    path.Name().c_str());
       }
 

-      return TRUE;
+      return true;

     }
     else {
       // don't waste time - it's not there anyhow
     }
     else {
       // don't waste time - it's not there anyhow

-      bQueryGlobal = FALSE;
+      bQueryGlobal = false;

     }
   }
 
   // first try local key
   if ( (m_keyLocal.Exists() && TryGetValue(LocalKey(), path.Name(), *pStr)) ||
        (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), *pStr)) ) {
     }
   }
 
   // first try local key
   if ( (m_keyLocal.Exists() && TryGetValue(LocalKey(), path.Name(), *pStr)) ||
        (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), *pStr)) ) {

-    *pStr = wxConfigBase::ExpandEnvVars(*pStr);
-    return TRUE;
+    return true;

   }
   }

-  else {
-    if ( IsRecordingDefaults() ) {
-      ((wxRegConfig*)this)->Write(key, szDefault);
-    }
-
-    // default value
-    *pStr = szDefault;
-  }
-
-  *pStr = wxConfigBase::ExpandEnvVars(*pStr);

 
 

-  return FALSE;
+  return false;

 }
 
 }
 

-bool wxRegConfig::Read(const wxString& key, long *plResult) const
+// this exactly reproduces the string version above except for ExpandEnvVars(),
+// we really should avoid this code duplication somehow...
+
+bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const

 {
 {

+    wxCHECK_MSG( plResult, false, _T("wxRegConfig::Read(): NULL param") );
+

   wxConfigPathChanger path(this, key);
 
   wxConfigPathChanger path(this, key);
 

-  bool bQueryGlobal = TRUE;
+  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 immutable key exists in global key we must check that it's not
   // overriden by the local key with the same name


@@ -649,41 +603,42 @@ bool wxRegConfig::Read(const wxString& key, long *plResult) const
                      path.Name().c_str());
       }
 
                      path.Name().c_str());
       }
 

-      return TRUE;
+      return true;

     }
     else {
       // don't waste time - it's not there anyhow
     }
     else {
       // don't waste time - it's not there anyhow

-      bQueryGlobal = FALSE;
+      bQueryGlobal = false;

     }
   }
 
   // first try local key
   if ( (m_keyLocal.Exists() && TryGetValue(LocalKey(), path.Name(), plResult)) ||
        (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), plResult)) ) {
     }
   }
 
   // first try local key
   if ( (m_keyLocal.Exists() && TryGetValue(LocalKey(), path.Name(), plResult)) ||
        (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), plResult)) ) {

-    return TRUE;
+    return true;

   }
   }

-  return FALSE;
+
+  return false;

 }
 
 }
 

-bool wxRegConfig::Write(const wxString& key, const wxString& szValue)
+bool wxRegConfig::DoWriteString(const wxString& key, const wxString& szValue)

 {
   wxConfigPathChanger path(this, key);
 
   if ( IsImmutable(path.Name()) ) {
     wxLogError(wxT("Can't change immutable entry '%s'."), path.Name().c_str());
 {
   wxConfigPathChanger path(this, key);
 
   if ( IsImmutable(path.Name()) ) {
     wxLogError(wxT("Can't change immutable entry '%s'."), path.Name().c_str());

-    return FALSE;
+    return false;

   }
 
   return LocalKey().SetValue(path.Name(), szValue);
 }
 
   }
 
   return LocalKey().SetValue(path.Name(), szValue);
 }
 

-bool wxRegConfig::Write(const wxString& key, long lValue)
+bool wxRegConfig::DoWriteLong(const wxString& key, long lValue)

 {
   wxConfigPathChanger path(this, key);
 
   if ( IsImmutable(path.Name()) ) {
     wxLogError(wxT("Can't change immutable entry '%s'."), path.Name().c_str());
 {
   wxConfigPathChanger path(this, key);
 
   if ( IsImmutable(path.Name()) ) {
     wxLogError(wxT("Can't change immutable entry '%s'."), path.Name().c_str());

-    return FALSE;
+    return false;

   }
 
   return LocalKey().SetValue(path.Name(), lValue);
   }
 
   return LocalKey().SetValue(path.Name(), lValue);


@@ -697,11 +652,11 @@ bool wxRegConfig::RenameEntry(const wxString& oldName, const wxString& newName)
 {
     // check that the old entry exists...
     if ( !HasEntry(oldName) )
 {
     // check that the old entry exists...
     if ( !HasEntry(oldName) )

-        return FALSE;
+        return false;

 
     // and that the new one doesn't
     if ( HasEntry(newName) )
 
     // and that the new one doesn't
     if ( HasEntry(newName) )

-        return FALSE;
+        return false;

 
     return m_keyLocal.RenameValue(oldName, newName);
 }
 
     return m_keyLocal.RenameValue(oldName, newName);
 }


@@ -710,11 +665,11 @@ bool wxRegConfig::RenameGroup(const wxString& oldName, const wxString& newName)
 {
     // check that the old group exists...
     if ( !HasGroup(oldName) )
 {
     // check that the old group exists...
     if ( !HasGroup(oldName) )

-        return FALSE;
+        return false;

 
     // and that the new one doesn't
     if ( HasGroup(newName) )
 
     // and that the new one doesn't
     if ( HasGroup(newName) )

-        return FALSE;
+        return false;

 
     return wxRegKey(m_keyLocal, oldName).Rename(newName);
 }
 
     return wxRegKey(m_keyLocal, oldName).Rename(newName);
 }


@@ -722,29 +677,30 @@ bool wxRegConfig::RenameGroup(const wxString& oldName, const wxString& newName)
 // ----------------------------------------------------------------------------
 // deleting
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // deleting
 // ----------------------------------------------------------------------------

-bool wxRegConfig::DeleteEntry(const wxString& value, bool WXUNUSED(bGroupIfEmptyAlso))
+
+bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso)

 {
   wxConfigPathChanger path(this, value);
 
   if ( m_keyLocal.Exists() ) {
     if ( !m_keyLocal.DeleteValue(path.Name()) )
 {
   wxConfigPathChanger path(this, value);
 
   if ( m_keyLocal.Exists() ) {
     if ( !m_keyLocal.DeleteValue(path.Name()) )

-      return FALSE;
+      return false;

 
 

-    if ( m_keyLocal.IsEmpty() ) {
+    if ( bGroupIfEmptyAlso && m_keyLocal.IsEmpty() ) {

       wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);
       wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);

-      SetPath("..");  // changes m_keyLocal
+      SetPath(_T(".."));  // changes m_keyLocal

       return LocalKey().DeleteKey(strKey);
     }
   }
 
       return LocalKey().DeleteKey(strKey);
     }
   }
 

-  return TRUE;
+  return true;

 }
 
 bool wxRegConfig::DeleteGroup(const wxString& key)
 {
   wxConfigPathChanger path(this, key);
 
 }
 
 bool wxRegConfig::DeleteGroup(const wxString& key)
 {
   wxConfigPathChanger path(this, key);
 

-  return m_keyLocal.Exists() ? LocalKey().DeleteKey(path.Name()) : TRUE;
+  return m_keyLocal.Exists() ? LocalKey().DeleteKey(path.Name()) : true;

 }
 
 bool wxRegConfig::DeleteAll()
 }
 
 bool wxRegConfig::DeleteAll()


@@ -762,8 +718,5 @@ bool wxRegConfig::DeleteAll()
   return bOk;
 }
 
   return bOk;
 }
 

-#endif
-  // __WIN16__
-

 #endif
   // wxUSE_CONFIG
 #endif
   // wxUSE_CONFIG