more wxPostEvent MT fixes

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 612f0214676f42f217318df8754a7430a5df7d06..276e481c526aff0d6f009330f20772b28e9e3ebd 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -6,13 +6,13 @@
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

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

 // TODO:        - parsing of registry key names
 //              - support of other (than REG_SZ/REG_DWORD) registry types
 //              - add high level functions (RegisterOleServer, ...)
 ///////////////////////////////////////////////////////////////////////////////
 
 // TODO:        - parsing of registry key names
 //              - support of other (than REG_SZ/REG_DWORD) registry types
 //              - add high level functions (RegisterOleServer, ...)
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "registry.h"
 #endif
 
 #pragma implementation "registry.h"
 #endif
 


@@ -23,13 +23,10 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-// other wxWindows headers
+// other wxWidgets headers

 #include  "wx/string.h"
 #include  "wx/intl.h"
 #include  "wx/log.h"
 #include  "wx/string.h"
 #include  "wx/intl.h"
 #include  "wx/log.h"

-#include  "wx/config.h"    // for wxExpandEnvVars
-
-#ifndef __WIN16__

 
 // Windows headers
 /*
 
 // Windows headers
 /*


@@ -37,13 +34,19 @@
 #define   WIN32_LEAN_AND_MEAN
 */
 
 #define   WIN32_LEAN_AND_MEAN
 */
 

-#include  <windows.h>
+#include  "wx/msw/wrapwin.h"
+
+#ifdef __WXWINCE__
+#include "wx/msw/private.h"
+#include <winbase.h>
+#include <winreg.h>
+#endif

 
 // other std headers
 #include  <stdlib.h>      // for _MAX_PATH
 
 #ifndef _MAX_PATH
 
 // other std headers
 #include  <stdlib.h>      // for _MAX_PATH
 
 #ifndef _MAX_PATH

-       #define _MAX_PATH 512
+    #define _MAX_PATH 512

 #endif
 
 // our header
 #endif
 
 // our header


@@ -52,6 +55,7 @@
 
 // some registry functions don't like signed chars
 typedef unsigned char *RegString;
 
 // some registry functions don't like signed chars
 typedef unsigned char *RegString;

+typedef BYTE* RegBinary;

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -72,10 +76,12 @@ aStdKeys[] =
   { HKEY_CURRENT_USER,      wxT("HKEY_CURRENT_USER"),      wxT("HKCU") },
   { HKEY_LOCAL_MACHINE,     wxT("HKEY_LOCAL_MACHINE"),     wxT("HKLM") },
   { HKEY_USERS,             wxT("HKEY_USERS"),             wxT("HKU")  }, // short name?
   { HKEY_CURRENT_USER,      wxT("HKEY_CURRENT_USER"),      wxT("HKCU") },
   { HKEY_LOCAL_MACHINE,     wxT("HKEY_LOCAL_MACHINE"),     wxT("HKLM") },
   { HKEY_USERS,             wxT("HKEY_USERS"),             wxT("HKU")  }, // short name?

+#ifndef __WXWINCE__

   { HKEY_PERFORMANCE_DATA,  wxT("HKEY_PERFORMANCE_DATA"),  wxT("HKPD") },
   { HKEY_PERFORMANCE_DATA,  wxT("HKEY_PERFORMANCE_DATA"),  wxT("HKPD") },

-#if     WINVER >= 0x0400
+#endif
+#if WINVER >= 0x0400 && !defined(__WXWINCE__)

   { HKEY_CURRENT_CONFIG,    wxT("HKEY_CURRENT_CONFIG"),    wxT("HKCC") },
   { HKEY_CURRENT_CONFIG,    wxT("HKEY_CURRENT_CONFIG"),    wxT("HKCC") },

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__WXWINCE__)

   { HKEY_DYN_DATA,          wxT("HKEY_DYN_DATA"),          wxT("HKDD") }, // short name?
 #endif  //GNUWIN32
 #endif  //WINVER >= 4.0
   { HKEY_DYN_DATA,          wxT("HKEY_DYN_DATA"),          wxT("HKDD") }, // short name?
 #endif  //GNUWIN32
 #endif  //WINVER >= 4.0


@@ -87,17 +93,17 @@ aStdKeys[] =
 
 // useful for Windows programmers: makes somewhat more clear all these zeroes
 // being passed to Windows APIs
 
 // useful for Windows programmers: makes somewhat more clear all these zeroes
 // being passed to Windows APIs

-#define   RESERVED        (NULL)
+#define   RESERVED        (0)

 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------

-// @ const_cast<> is not yet supported by all compilers
+
+// const_cast<> is not yet supported by all compilers

 #define CONST_CAST    ((wxRegKey *)this)->
 
 #define CONST_CAST    ((wxRegKey *)this)->
 

-#if   !USE_MUTABLE
-  #define m_dwLastError   CONST_CAST m_dwLastError
-#endif
+// and neither is mutable which m_dwLastError should be
+#define m_dwLastError   CONST_CAST m_dwLastError

 
 // ----------------------------------------------------------------------------
 // non member functions
 
 // ----------------------------------------------------------------------------
 // non member functions


@@ -106,7 +112,7 @@ aStdKeys[] =
 // removes the trailing backslash from the string if it has one
 static inline void RemoveTrailingSeparator(wxString& str);
 
 // removes the trailing backslash from the string if it has one
 static inline void RemoveTrailingSeparator(wxString& str);
 

-// returns TRUE if given registry key exists
+// returns true if given registry key exists

 static bool KeyExists(WXHKEY hRootKey, const wxChar *szKey);
 
 // combines value and key name (uses static buffer!)
 static bool KeyExists(WXHKEY hRootKey, const wxChar *szKey);
 
 // combines value and key name (uses static buffer!)


@@ -128,7 +134,7 @@ const size_t wxRegKey::nStdKeys = WXSIZEOF(aStdKeys);
 const wxChar *wxRegKey::GetStdKeyName(size_t key)
 {
   // return empty string if key is invalid
 const wxChar *wxRegKey::GetStdKeyName(size_t key)
 {
   // return empty string if key is invalid

-  wxCHECK_MSG( key < nStdKeys, wxT(""), wxT("invalid key in wxRegKey::GetStdKeyName") );
+  wxCHECK_MSG( key < nStdKeys, wxEmptyString, wxT("invalid key in wxRegKey::GetStdKeyName") );

 
   return aStdKeys[key].szName;
 }
 
   return aStdKeys[key].szName;
 }


@@ -136,7 +142,7 @@ const wxChar *wxRegKey::GetStdKeyName(size_t key)
 const wxChar *wxRegKey::GetStdKeyShortName(size_t key)
 {
   // return empty string if key is invalid
 const wxChar *wxRegKey::GetStdKeyShortName(size_t key)
 {
   // return empty string if key is invalid

-  wxCHECK( key < nStdKeys, wxT("") );
+  wxCHECK( key < nStdKeys, wxEmptyString );

 
   return aStdKeys[key].szShortName;
 }
 
   return aStdKeys[key].szShortName;
 }


@@ -187,16 +193,16 @@ wxRegKey::StdKey wxRegKey::GetStdKeyFromHkey(WXHKEY hkey)
 
 wxRegKey::wxRegKey()
 {
 
 wxRegKey::wxRegKey()
 {

-  m_hKey = 0;

   m_hRootKey = (WXHKEY) aStdKeys[HKCR].hkey;
   m_hRootKey = (WXHKEY) aStdKeys[HKCR].hkey;

-  m_dwLastError = 0;
+
+  Init();

 }
 
 wxRegKey::wxRegKey(const wxString& strKey) : m_strKey(strKey)
 {
   m_hRootKey  = (WXHKEY) aStdKeys[ExtractKeyName(m_strKey)].hkey;
 }
 
 wxRegKey::wxRegKey(const wxString& strKey) : m_strKey(strKey)
 {
   m_hRootKey  = (WXHKEY) aStdKeys[ExtractKeyName(m_strKey)].hkey;

-  m_hKey      = (WXHKEY) NULL;
-  m_dwLastError = 0;
+
+  Init();

 }
 
 // parent is a predefined (and preopened) key
 }
 
 // parent is a predefined (and preopened) key


@@ -204,8 +210,8 @@ wxRegKey::wxRegKey(StdKey keyParent, const wxString& strKey) : m_strKey(strKey)
 {
   RemoveTrailingSeparator(m_strKey);
   m_hRootKey  = (WXHKEY) aStdKeys[keyParent].hkey;
 {
   RemoveTrailingSeparator(m_strKey);
   m_hRootKey  = (WXHKEY) aStdKeys[keyParent].hkey;

-  m_hKey      = (WXHKEY) NULL;
-  m_dwLastError = 0;
+
+  Init();

 }
 
 // parent is a normal regkey
 }
 
 // parent is a normal regkey


@@ -222,8 +228,8 @@ wxRegKey::wxRegKey(const wxRegKey& keyParent, const wxString& strKey)
   RemoveTrailingSeparator(m_strKey);
 
   m_hRootKey  = keyParent.m_hRootKey;
   RemoveTrailingSeparator(m_strKey);
 
   m_hRootKey  = keyParent.m_hRootKey;

-  m_hKey      = (WXHKEY) NULL;
-  m_dwLastError = 0;
+
+  Init();

 }
 
 // dtor closes the key releasing system resource
 }
 
 // dtor closes the key releasing system resource


@@ -261,7 +267,14 @@ void wxRegKey::SetName(const wxRegKey& keyParent, const wxString& strKey)
   Close();
 
   // combine our name with parent's to get the full name
   Close();
 
   // combine our name with parent's to get the full name

-  m_strKey = keyParent.m_strKey;
+
+  // NB: this method is called by wxRegConfig::SetPath() which is a performance
+  //     critical function and so it preallocates space for our m_strKey to
+  //     gain some speed - this is why we only use += here and not = which
+  //     would just free the prealloc'd buffer and would have to realloc it the
+  //     next line!
+  m_strKey.clear();
+  m_strKey += keyParent.m_strKey;

   if ( !strKey.IsEmpty() && strKey[0] != REG_SEPARATOR )
     m_strKey += REG_SEPARATOR;
   m_strKey += strKey;
   if ( !strKey.IsEmpty() && strKey[0] != REG_SEPARATOR )
     m_strKey += REG_SEPARATOR;
   m_strKey += strKey;


@@ -283,21 +296,21 @@ void wxRegKey::SetHkey(WXHKEY hKey)
 // info about the key
 // ----------------------------------------------------------------------------
 
 // info about the key
 // ----------------------------------------------------------------------------
 

-// returns TRUE if the key exists
+// returns true if the key exists

 bool wxRegKey::Exists() const
 {
   // opened key has to exist, try to open it if not done yet
 bool wxRegKey::Exists() const
 {
   // opened key has to exist, try to open it if not done yet

-  return IsOpened() ? TRUE : KeyExists(m_hRootKey, m_strKey);
+  return IsOpened() ? true : KeyExists(m_hRootKey, m_strKey);

 }
 
 // returns the full name of the key (prefix is abbreviated if bShortPrefix)
 wxString wxRegKey::GetName(bool bShortPrefix) const
 {
 }
 
 // returns the full name of the key (prefix is abbreviated if bShortPrefix)
 wxString wxRegKey::GetName(bool bShortPrefix) const
 {

-  StdKey key = GetStdKeyFromHkey((StdKey) m_hRootKey);
+  StdKey key = GetStdKeyFromHkey((WXHKEY) m_hRootKey);

   wxString str = bShortPrefix ? aStdKeys[key].szShortName
                               : aStdKeys[key].szName;
   if ( !m_strKey.IsEmpty() )
   wxString str = bShortPrefix ? aStdKeys[key].szShortName
                               : aStdKeys[key].szName;
   if ( !m_strKey.IsEmpty() )

-    str << "\\" << m_strKey;
+    str << _T("\\") << m_strKey;

 
   return str;
 }
 
   return str;
 }


@@ -307,15 +320,16 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
                           size_t *pnValues,
                           size_t *pnMaxValueLen) const
 {
                           size_t *pnValues,
                           size_t *pnMaxValueLen) const
 {

-#if defined(__WIN32__) && !defined(__TWIN32__)
-

     // old gcc headers incorrectly prototype RegQueryInfoKey()
     // old gcc headers incorrectly prototype RegQueryInfoKey()

-#ifdef __GNUWIN32_OLD__
+#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)

     #define REG_PARAM   (size_t *)
 #else
     #define REG_PARAM   (LPDWORD)
 #endif
 
     #define REG_PARAM   (size_t *)
 #else
     #define REG_PARAM   (LPDWORD)
 #endif
 

+  // it might be unexpected to some that this function doesn't open the key
+  wxASSERT_MSG( IsOpened(), _T("key should be opened in GetKeyInfo") );
+

   m_dwLastError = ::RegQueryInfoKey
                   (
                     (HKEY) m_hKey,
   m_dwLastError = ::RegQueryInfoKey
                   (
                     (HKEY) m_hKey,


@@ -341,15 +355,10 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
   if ( m_dwLastError != ERROR_SUCCESS ) {
     wxLogSysError(m_dwLastError, _("Can't get info about registry key '%s'"),
                   GetName().c_str());
   if ( m_dwLastError != ERROR_SUCCESS ) {
     wxLogSysError(m_dwLastError, _("Can't get info about registry key '%s'"),
                   GetName().c_str());

-    return FALSE;
+    return false;

   }
   }

-  else
-    return TRUE;
-#else // Win16
-  wxFAIL_MSG("GetKeyInfo() not implemented");

 
 

-  return FALSE;
-#endif
+  return true;

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


@@ -357,47 +366,65 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
 // ----------------------------------------------------------------------------
 
 // opens key (it's not an error to call Open() on an already opened key)
 // ----------------------------------------------------------------------------
 
 // opens key (it's not an error to call Open() on an already opened key)

-bool wxRegKey::Open()
+bool wxRegKey::Open(AccessMode mode)

 {
 {

-  if ( IsOpened() )
-    return TRUE;
+    if ( IsOpened() )
+        return true;
+
+    HKEY tmpKey;
+    m_dwLastError = ::RegOpenKeyEx
+                    (
+                        (HKEY) m_hRootKey,
+                        m_strKey,
+                        RESERVED,
+                        mode == Read ? KEY_READ : KEY_ALL_ACCESS,
+                        &tmpKey
+                    );
+
+    if ( m_dwLastError != ERROR_SUCCESS )
+    {
+        wxLogSysError(m_dwLastError, _("Can't open registry key '%s'"),
+                      GetName().c_str());
+        return false;
+    }

 
 

-  HKEY tmpKey;
-  m_dwLastError = RegOpenKey((HKEY) m_hRootKey, m_strKey, &tmpKey);
-  if ( m_dwLastError != ERROR_SUCCESS ) {
-    wxLogSysError(m_dwLastError, _("Can't open registry key '%s'"),
-                  GetName().c_str());
-    return FALSE;
-  }
-  else
-  {

     m_hKey = (WXHKEY) tmpKey;
     m_hKey = (WXHKEY) tmpKey;

-    return TRUE;
-  }
+    return true;

 }
 
 // creates key, failing if it exists and !bOkIfExists
 bool wxRegKey::Create(bool bOkIfExists)
 {
   // check for existence only if asked (i.e. order is important!)
 }
 
 // creates key, failing if it exists and !bOkIfExists
 bool wxRegKey::Create(bool bOkIfExists)
 {
   // check for existence only if asked (i.e. order is important!)

-  if ( !bOkIfExists && Exists() ) {
-    return FALSE;
-  }
+  if ( !bOkIfExists && Exists() )
+    return false;

 
   if ( IsOpened() )
 
   if ( IsOpened() )

-    return TRUE;
+    return true;

 
   HKEY tmpKey;
 
   HKEY tmpKey;

+#ifdef __WXWINCE__
+  DWORD disposition;
+  m_dwLastError = RegCreateKeyEx((HKEY) m_hRootKey, m_strKey,
+      NULL, // reserved
+      NULL, // class string
+      0,
+      0,
+      NULL,
+      &tmpKey,
+      &disposition);
+#else

   m_dwLastError = RegCreateKey((HKEY) m_hRootKey, m_strKey, &tmpKey);
   m_dwLastError = RegCreateKey((HKEY) m_hRootKey, m_strKey, &tmpKey);

+#endif

   if ( m_dwLastError != ERROR_SUCCESS ) {
     wxLogSysError(m_dwLastError, _("Can't create registry key '%s'"),
                   GetName().c_str());
   if ( m_dwLastError != ERROR_SUCCESS ) {
     wxLogSysError(m_dwLastError, _("Can't create registry key '%s'"),
                   GetName().c_str());

-    return FALSE;
+    return false;

   }
   else
   {
     m_hKey = (WXHKEY) tmpKey;
   }
   else
   {
     m_hKey = (WXHKEY) tmpKey;

-    return TRUE;
+    return true;

   }
 }
 
   }
 }
 


@@ -406,38 +433,38 @@ bool wxRegKey::Close()
 {
   if ( IsOpened() ) {
     m_dwLastError = RegCloseKey((HKEY) m_hKey);
 {
   if ( IsOpened() ) {
     m_dwLastError = RegCloseKey((HKEY) m_hKey);

+    m_hKey = 0;
+

     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("Can't close registry key '%s'"),
                     GetName().c_str());
 
     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("Can't close registry key '%s'"),
                     GetName().c_str());
 

-      m_hKey = 0;
-      return FALSE;
-    }
-    else {
-      m_hKey = 0;
+      return false;

     }
   }
 
     }
   }
 

-  return TRUE;
+  return true;

 }
 
 bool wxRegKey::RenameValue(const wxChar *szValueOld, const wxChar *szValueNew)
 {
 }
 
 bool wxRegKey::RenameValue(const wxChar *szValueOld, const wxChar *szValueNew)
 {

-    bool ok = TRUE;
+    bool ok = true;

     if ( HasValue(szValueNew) ) {
         wxLogError(_("Registry value '%s' already exists."), szValueNew);
 
     if ( HasValue(szValueNew) ) {
         wxLogError(_("Registry value '%s' already exists."), szValueNew);
 

-        ok = FALSE;
+        ok = false;

     }
 
     }
 

-    if ( !ok || !CopyValue(szValueOld, *this, szValueNew) ) {
+    if ( !ok ||
+         !CopyValue(szValueOld, *this, szValueNew) ||
+         !DeleteValue(szValueOld) ) {

         wxLogError(_("Failed to rename registry value '%s' to '%s'."),
                    szValueOld, szValueNew);
 
         wxLogError(_("Failed to rename registry value '%s' to '%s'."),
                    szValueOld, szValueNew);
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxRegKey::CopyValue(const wxChar *szValue,
 }
 
 bool wxRegKey::CopyValue(const wxChar *szValue,


@@ -465,14 +492,19 @@ bool wxRegKey::CopyValue(const wxChar *szValue,
                        keyDst.SetValue(szValueNew, dwVal);
             }
 
                        keyDst.SetValue(szValueNew, dwVal);
             }
 

+#ifdef  __WIN32__
+        case Type_Binary:
+        {
+            wxMemoryBuffer buf;
+            return QueryValue(szValue,buf) &&
+                   keyDst.SetValue(szValueNew,buf);
+        }

         // these types are unsupported because I am not sure about how
         // exactly they should be copied and because they shouldn't
         // occur among the application keys (supposedly created with
         // this class)
         // these types are unsupported because I am not sure about how
         // exactly they should be copied and because they shouldn't
         // occur among the application keys (supposedly created with
         // this class)

-#ifdef  __WIN32__

         case Type_None:
         case Type_Expand_String:
         case Type_None:
         case Type_Expand_String:

-        case Type_Binary:

         case Type_Dword_big_endian:
         case Type_Link:
         case Type_Multi_String:
         case Type_Dword_big_endian:
         case Type_Link:
         case Type_Multi_String:


@@ -483,15 +515,70 @@ bool wxRegKey::CopyValue(const wxChar *szValue,
         default:
             wxLogError(_("Can't copy values of unsupported type %d."),
                        GetValueType(szValue));
         default:
             wxLogError(_("Can't copy values of unsupported type %d."),
                        GetValueType(szValue));

-            return FALSE;
+            return false;
+    }
+}
+
+bool wxRegKey::Rename(const wxChar *szNewName)
+{
+    wxCHECK_MSG( !m_strKey.IsEmpty(), false, _T("registry hives can't be renamed") );
+
+    if ( !Exists() ) {
+        wxLogError(_("Registry key '%s' does not exist, cannot rename it."),
+                   GetFullName(this));
+
+        return false;
+    }
+
+    // do we stay in the same hive?
+    bool inSameHive = !wxStrchr(szNewName, REG_SEPARATOR);
+
+    // construct the full new name of the key
+    wxRegKey keyDst;
+
+    if ( inSameHive ) {
+        // rename the key to the new name under the same parent
+        wxString strKey = m_strKey.BeforeLast(REG_SEPARATOR);
+        if ( !strKey.IsEmpty() ) {
+            // don't add '\\' in the start if strFullNewName is empty
+            strKey += REG_SEPARATOR;
+        }
+
+        strKey += szNewName;
+
+        keyDst.SetName(GetStdKeyFromHkey(m_hRootKey), strKey);
+    }
+    else {
+        // this is the full name already
+        keyDst.SetName(szNewName);
+    }
+
+    bool ok = keyDst.Create(false /* fail if alredy exists */);
+    if ( !ok ) {
+        wxLogError(_("Registry key '%s' already exists."),
+                   GetFullName(&keyDst));
+    }
+    else {
+        ok = Copy(keyDst) && DeleteSelf();

     }
     }

+
+    if ( !ok ) {
+        wxLogError(_("Failed to rename the registry key '%s' to '%s'."),
+                   GetFullName(this), GetFullName(&keyDst));
+    }
+    else {
+        m_hRootKey = keyDst.m_hRootKey;
+        m_strKey = keyDst.m_strKey;
+    }
+
+    return ok;

 }
 
 }
 

-bool wxRegKey::Copy(const wxString& strNewName)
+bool wxRegKey::Copy(const wxChar *szNewName)

 {
     // create the new key first
 {
     // create the new key first

-    wxRegKey keyDst(strNewName);
-    bool ok = keyDst.Create(FALSE /* fail if alredy exists */);
+    wxRegKey keyDst(szNewName);
+    bool ok = keyDst.Create(false /* fail if alredy exists */);

     if ( ok ) {
         ok = Copy(keyDst);
 
     if ( ok ) {
         ok = Copy(keyDst);
 


@@ -506,7 +593,7 @@ bool wxRegKey::Copy(const wxString& strNewName)
 
 bool wxRegKey::Copy(wxRegKey& keyDst)
 {
 
 bool wxRegKey::Copy(wxRegKey& keyDst)
 {

-    bool ok = TRUE;
+    bool ok = true;

 
     // copy all sub keys to the new location
     wxString strKey;
 
     // copy all sub keys to the new location
     wxString strKey;


@@ -516,10 +603,14 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
         wxRegKey key(*this, strKey);
         wxString keyName;
         keyName << GetFullName(&keyDst) << REG_SEPARATOR << strKey;
         wxRegKey key(*this, strKey);
         wxString keyName;
         keyName << GetFullName(&keyDst) << REG_SEPARATOR << strKey;

-        ok = key.Copy(keyName);
+        ok = key.Copy((const wxChar*) keyName);

 
         if ( ok )
             bCont = GetNextKey(strKey, lIndex);
 
         if ( ok )
             bCont = GetNextKey(strKey, lIndex);

+        else
+            wxLogError(_("Failed to copy the registry subkey '%s' to '%s'."),
+                   GetFullName(&key), keyName.c_str());
+

     }
 
     // copy all values
     }
 
     // copy all values


@@ -539,8 +630,8 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
     }
 
     if ( !ok ) {
     }
 
     if ( !ok ) {

-        wxLogError(_("Failed to copy the contents of registry key '%s' to "
-                     "'%s'."), GetFullName(this), GetFullName(&keyDst));
+        wxLogError(_("Failed to copy the contents of registry key '%s' to '%s'."),
+                   GetFullName(this), GetFullName(&keyDst));

     }
 
     return ok;
     }
 
     return ok;


@@ -555,20 +646,20 @@ bool wxRegKey::DeleteSelf()
     wxLogNull nolog;
     if ( !Open() ) {
       // it already doesn't exist - ok!
     wxLogNull nolog;
     if ( !Open() ) {
       // it already doesn't exist - ok!

-      return TRUE;
+      return true;

     }
   }
 
   // prevent a buggy program from erasing one of the root registry keys or an
   // immediate subkey (i.e. one which doesn't have '\\' inside) of any other
   // key except HKCR (HKCR has some "deleteable" subkeys)
     }
   }
 
   // prevent a buggy program from erasing one of the root registry keys or an
   // immediate subkey (i.e. one which doesn't have '\\' inside) of any other
   // key except HKCR (HKCR has some "deleteable" subkeys)

-  if ( m_strKey.IsEmpty() || (m_hRootKey != HKCR &&
-       m_strKey.Find(REG_SEPARATOR) == wxNOT_FOUND) ) {
-      wxLogError(_("Registry key '%s' is needed for normal system operation,\n"
-                   "deleting it will leave your system in unusable state:\n"
-                   "operation aborted."), GetFullName(this));
+  if ( m_strKey.IsEmpty() ||
+       ((m_hRootKey != (WXHKEY) aStdKeys[HKCR].hkey) &&
+        (m_strKey.Find(REG_SEPARATOR) == wxNOT_FOUND)) ) {
+      wxLogError(_("Registry key '%s' is needed for normal system operation,\ndeleting it will leave your system in unusable state:\noperation aborted."),
+                 GetFullName(this));

 
 

-      return FALSE;
+      return false;

   }
 
   // we can't delete keys while enumerating because it confuses GetNextKey, so
   }
 
   // we can't delete keys while enumerating because it confuses GetNextKey, so


@@ -588,26 +679,28 @@ bool wxRegKey::DeleteSelf()
   for ( size_t nKey = 0; nKey < nKeyCount; nKey++ ) {
     wxRegKey key(*this, astrSubkeys[nKey]);
     if ( !key.DeleteSelf() )
   for ( size_t nKey = 0; nKey < nKeyCount; nKey++ ) {
     wxRegKey key(*this, astrSubkeys[nKey]);
     if ( !key.DeleteSelf() )

-      return FALSE;
+      return false;

   }
 
   // now delete this key itself
   Close();
 
   m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey);
   }
 
   // now delete this key itself
   Close();
 
   m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey);

-  if ( m_dwLastError != ERROR_SUCCESS ) {
+  // deleting a key which doesn't exist is not considered an error
+  if ( m_dwLastError != ERROR_SUCCESS &&
+          m_dwLastError != ERROR_FILE_NOT_FOUND ) {

     wxLogSysError(m_dwLastError, _("Can't delete key '%s'"),
                   GetName().c_str());
     wxLogSysError(m_dwLastError, _("Can't delete key '%s'"),
                   GetName().c_str());

-    return FALSE;
+    return false;

   }
 
   }
 

-  return TRUE;
+  return true;

 }
 
 bool wxRegKey::DeleteKey(const wxChar *szKey)
 {
   if ( !Open() )
 }
 
 bool wxRegKey::DeleteKey(const wxChar *szKey)
 {
   if ( !Open() )

-    return FALSE;
+    return false;

 
   wxRegKey key(*this, szKey);
   return key.DeleteSelf();
 
   wxRegKey key(*this, szKey);
   return key.DeleteSelf();


@@ -616,55 +709,42 @@ bool wxRegKey::DeleteKey(const wxChar *szKey)
 bool wxRegKey::DeleteValue(const wxChar *szValue)
 {
   if ( !Open() )
 bool wxRegKey::DeleteValue(const wxChar *szValue)
 {
   if ( !Open() )

-    return FALSE;
+    return false;

 
 

-#if defined(__WIN32__) && !defined(__TWIN32__)

     m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST szValue);
     m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST szValue);

-    if ( m_dwLastError != ERROR_SUCCESS ) {
+
+    // deleting a value which doesn't exist is not considered an error
+    if ( (m_dwLastError != ERROR_SUCCESS) &&
+         (m_dwLastError != ERROR_FILE_NOT_FOUND) ) {

       wxLogSysError(m_dwLastError, _("Can't delete value '%s' from key '%s'"),
                     szValue, GetName().c_str());
       wxLogSysError(m_dwLastError, _("Can't delete value '%s' from key '%s'"),
                     szValue, GetName().c_str());

-      return FALSE;
+      return false;

     }
     }

-  #else   //WIN16
-    // named registry values don't exist in Win16 world
-    wxASSERT( IsEmpty(szValue) );

 
 

-    // just set the (default and unique) value of the key to ""
-    m_dwLastError = RegSetValue((HKEY) m_hKey, NULL, REG_SZ, "", RESERVED);
-    if ( m_dwLastError != ERROR_SUCCESS ) {
-      wxLogSysError(m_dwLastError, _("Can't delete value of key '%s'"),
-                    GetName().c_str());
-      return FALSE;
-    }
-  #endif  //WIN16/32
-
-  return TRUE;
+  return true;

 }
 
 // ----------------------------------------------------------------------------
 // access to values and subkeys
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // access to values and subkeys
 // ----------------------------------------------------------------------------
 

-// return TRUE if value exists
+// return true if value exists

 bool wxRegKey::HasValue(const wxChar *szValue) const
 {
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;
 
 bool wxRegKey::HasValue(const wxChar *szValue) const
 {
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;
 

-  #ifdef  __WIN32__
-    if ( CONST_CAST Open() ) {
-      return RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,
-                             NULL, NULL, NULL) == ERROR_SUCCESS;
-    }
-    else
-      return FALSE;
-  #else   // WIN16
-    // only unnamed value exists
-    return IsEmpty(szValue);
-  #endif  // WIN16/32
+    if ( !CONST_CAST Open(Read) )
+        return false;
+
+    LONG dwRet = ::RegQueryValueEx((HKEY) m_hKey,
+                                   WXSTRINGCAST szValue,
+                                   RESERVED,
+                                   NULL, NULL, NULL);
+    return dwRet == ERROR_SUCCESS;

 }
 
 }
 

-// returns TRUE if this key has any values
+// returns true if this key has any values

 bool wxRegKey::HasValues() const
 {
   // suppress possible messages from GetFirstValue()
 bool wxRegKey::HasValues() const
 {
   // suppress possible messages from GetFirstValue()


@@ -676,7 +756,7 @@ bool wxRegKey::HasValues() const
   return CONST_CAST GetFirstValue(str, l);
 }
 
   return CONST_CAST GetFirstValue(str, l);
 }
 

-// returns TRUE if this key has any subkeys
+// returns true if this key has any subkeys

 bool wxRegKey::HasSubkeys() const
 {
   // suppress possible messages from GetFirstKey()
 bool wxRegKey::HasSubkeys() const
 {
   // suppress possible messages from GetFirstKey()


@@ -688,22 +768,21 @@ bool wxRegKey::HasSubkeys() const
   return CONST_CAST GetFirstKey(str, l);
 }
 
   return CONST_CAST GetFirstKey(str, l);
 }
 

-// returns TRUE if given subkey exists
+// returns true if given subkey exists

 bool wxRegKey::HasSubKey(const wxChar *szKey) const
 {
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;
 
 bool wxRegKey::HasSubKey(const wxChar *szKey) const
 {
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;
 

-  if ( CONST_CAST Open() )
-    return KeyExists(m_hKey, szKey);
-  else
-    return FALSE;
+  if ( !CONST_CAST Open(Read) )
+    return false;
+
+  return KeyExists(m_hKey, szKey);

 }
 
 wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const
 {
 }
 
 wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const
 {

-  #ifdef  __WIN32__
-    if ( ! CONST_CAST Open() )
+    if ( ! CONST_CAST Open(Read) )

       return Type_None;
 
     DWORD dwType;
       return Type_None;
 
     DWORD dwType;


@@ -716,34 +795,26 @@ wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const
     }
 
     return (ValueType)dwType;
     }
 
     return (ValueType)dwType;

-  #else   //WIN16
-    return IsEmpty(szValue) ? Type_String : Type_None;
-  #endif  //WIN16/32

 }
 
 #ifdef  __WIN32__
 bool wxRegKey::SetValue(const wxChar *szValue, long lValue)
 {
 }
 
 #ifdef  __WIN32__
 bool wxRegKey::SetValue(const wxChar *szValue, long lValue)
 {

-#ifdef __TWIN32__
-  wxFAIL_MSG("RegSetValueEx not implemented by TWIN32");
-  return FALSE;
-#else

   if ( CONST_CAST Open() ) {
     m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_DWORD,
                                   (RegString)&lValue, sizeof(lValue));
     if ( m_dwLastError == ERROR_SUCCESS )
   if ( CONST_CAST Open() ) {
     m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_DWORD,
                                   (RegString)&lValue, sizeof(lValue));
     if ( m_dwLastError == ERROR_SUCCESS )

-      return TRUE;
+      return true;

   }
 
   wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),
                 GetFullName(this, szValue));
   }
 
   wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),
                 GetFullName(this, szValue));

-  return FALSE;
-#endif
+  return false;

 }
 
 bool wxRegKey::QueryValue(const wxChar *szValue, long *plValue) const
 {
 }
 
 bool wxRegKey::QueryValue(const wxChar *szValue, long *plValue) const
 {

-  if ( CONST_CAST Open() ) {
+  if ( CONST_CAST Open(Read) ) {

     DWORD dwType, dwSize = sizeof(DWORD);
     RegString pBuf = (RegString)plValue;
     m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,
     DWORD dwType, dwSize = sizeof(DWORD);
     RegString pBuf = (RegString)plValue;
     m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,


@@ -751,26 +822,83 @@ bool wxRegKey::QueryValue(const wxChar *szValue, long *plValue) const
     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("Can't read value of key '%s'"),
                     GetName().c_str());
     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("Can't read value of key '%s'"),
                     GetName().c_str());

-      return FALSE;
+      return false;

     }
     else {
       // check that we read the value of right type
       wxASSERT_MSG( IsNumericValue(szValue),
                     wxT("Type mismatch in wxRegKey::QueryValue().")  );
 
     }
     else {
       // check that we read the value of right type
       wxASSERT_MSG( IsNumericValue(szValue),
                     wxT("Type mismatch in wxRegKey::QueryValue().")  );
 

-      return TRUE;
+      return true;

     }
   }
   else
     }
   }
   else

-    return FALSE;
+    return false;

 }
 
 }
 

-#endif  //Win32
+bool wxRegKey::SetValue(const wxChar *szValue,const wxMemoryBuffer& buffer)
+{
+#ifdef __TWIN32__
+  wxFAIL_MSG("RegSetValueEx not implemented by TWIN32");
+  return false;
+#else
+  if ( CONST_CAST Open() ) {
+    m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_BINARY,
+                                  (RegBinary)buffer.GetData(),buffer.GetDataLen());
+    if ( m_dwLastError == ERROR_SUCCESS )
+      return true;
+  }
+
+  wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),
+                GetFullName(this, szValue));
+  return false;
+#endif
+}

 
 

-bool wxRegKey::QueryValue(const wxChar *szValue, wxString& strValue) const
+bool wxRegKey::QueryValue(const wxChar *szValue, wxMemoryBuffer& buffer) const

 {
   if ( CONST_CAST Open() ) {
 {
   if ( CONST_CAST Open() ) {

-    #ifdef  __WIN32__
+    // first get the type and size of the data
+    DWORD dwType, dwSize;
+    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,
+                                      &dwType, NULL, &dwSize);
+
+    if ( m_dwLastError == ERROR_SUCCESS ) {
+        if ( dwSize ) {
+            const RegBinary pBuf = (RegBinary)buffer.GetWriteBuf(dwSize);
+            m_dwLastError = RegQueryValueEx((HKEY) m_hKey,
+                                            WXSTRINGCAST szValue,
+                                            RESERVED,
+                                            &dwType,
+                                            pBuf,
+                                            &dwSize);
+            buffer.UngetWriteBuf(dwSize);
+        } else {
+            buffer.SetDataLen(0);
+        }
+    }
+
+
+    if ( m_dwLastError != ERROR_SUCCESS ) {
+      wxLogSysError(m_dwLastError, _("Can't read value of key '%s'"),
+                    GetName().c_str());
+      return false;
+    }
+    return true;
+  }
+  return false;
+}
+
+
+
+#endif  //Win32
+
+bool wxRegKey::QueryValue(const wxChar *szValue,
+                          wxString& strValue,
+                          bool raw) const
+{
+  if ( CONST_CAST Open(Read) ) {
+

       // first get the type and size of the data
       DWORD dwType, dwSize;
       m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,
       // first get the type and size of the data
       DWORD dwType, dwSize;
       m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,


@@ -782,14 +910,40 @@ bool wxRegKey::QueryValue(const wxChar *szValue, wxString& strValue) const
             strValue.Empty();
         }
         else {
             strValue.Empty();
         }
         else {

-            RegString pBuf = (RegString)strValue.GetWriteBuf(dwSize);

             m_dwLastError = RegQueryValueEx((HKEY) m_hKey,
                                             WXSTRINGCAST szValue,
                                             RESERVED,
                                             &dwType,
             m_dwLastError = RegQueryValueEx((HKEY) m_hKey,
                                             WXSTRINGCAST szValue,
                                             RESERVED,
                                             &dwType,

-                                            pBuf,
+                                            (RegString)(wxChar*)wxStringBuffer(strValue, dwSize),

                                             &dwSize);
                                             &dwSize);

-            strValue.UngetWriteBuf();
+
+            // expand the var expansions in the string unless disabled
+#ifndef __WXWINCE__
+            if ( (dwType == REG_EXPAND_SZ) && !raw )
+            {
+                DWORD dwExpSize = ::ExpandEnvironmentStrings(strValue, NULL, 0);
+                bool ok = dwExpSize != 0;
+                if ( ok )
+                {
+                    wxString strExpValue;
+                    ok = ::ExpandEnvironmentStrings
+                           (
+                            strValue,
+                            wxStringBuffer(strExpValue, dwExpSize),
+                            dwExpSize
+                           ) != 0;
+                    strValue = strExpValue;
+                }
+
+                if ( !ok )
+                {
+                    wxLogLastError(_T("ExpandEnvironmentStrings"));
+                }
+            }
+#else
+  wxUnusedVar(raw);
+#endif
+            // __WXWINCE__

         }
 
         if ( m_dwLastError == ERROR_SUCCESS ) {
         }
 
         if ( m_dwLastError == ERROR_SUCCESS ) {


@@ -797,50 +951,32 @@ bool wxRegKey::QueryValue(const wxChar *szValue, wxString& strValue) const
           wxASSERT_MSG( !IsNumericValue(szValue),
                         wxT("Type mismatch in wxRegKey::QueryValue().") );
 
           wxASSERT_MSG( !IsNumericValue(szValue),
                         wxT("Type mismatch in wxRegKey::QueryValue().") );
 

-          return TRUE;
+          return true;

         }
       }
         }
       }

-    #else   //WIN16
-      // named registry values don't exist in Win16
-      wxASSERT( IsEmpty(szValue) );
-
-      m_dwLastError = RegQueryValue((HKEY) m_hKey, 0, strValue.GetWriteBuf(256), &l);
-      strValue.UngetWriteBuf();
-      if ( m_dwLastError == ERROR_SUCCESS )
-        return TRUE;
-    #endif  //WIN16/32

   }
 
   wxLogSysError(m_dwLastError, _("Can't read value of '%s'"),
                 GetFullName(this, szValue));
   }
 
   wxLogSysError(m_dwLastError, _("Can't read value of '%s'"),
                 GetFullName(this, szValue));

-  return FALSE;
+  return false;

 }
 
 bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue)
 {
   if ( CONST_CAST Open() ) {
 }
 
 bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue)
 {
   if ( CONST_CAST Open() ) {

-#if defined( __WIN32__) && !defined(__TWIN32__)

       m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_SZ,
                                     (RegString)strValue.c_str(),
       m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_SZ,
                                     (RegString)strValue.c_str(),

-                                    strValue.Len() + 1);
-      if ( m_dwLastError == ERROR_SUCCESS )
-        return TRUE;
-    #else   //WIN16
-      // named registry values don't exist in Win16
-      wxASSERT( IsEmpty(szValue) );
-
-      m_dwLastError = RegSetValue((HKEY) m_hKey, NULL, REG_SZ, strValue, NULL);
+                                    (strValue.Len() + 1)*sizeof(wxChar));

       if ( m_dwLastError == ERROR_SUCCESS )
       if ( m_dwLastError == ERROR_SUCCESS )

-        return TRUE;
-    #endif  //WIN16/32
+        return true;

   }
 
   wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),
                 GetFullName(this, szValue));
   }
 
   wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),
                 GetFullName(this, szValue));

-  return FALSE;
+  return false;

 }
 
 }
 

-wxRegKey::operator wxString() const
+wxString wxRegKey::QueryDefaultValue() const

 {
   wxString str;
   QueryValue(NULL, str);
 {
   wxString str;
   QueryValue(NULL, str);


@@ -855,8 +991,8 @@ wxRegKey::operator wxString() const
 
 bool wxRegKey::GetFirstValue(wxString& strValueName, long& lIndex)
 {
 
 bool wxRegKey::GetFirstValue(wxString& strValueName, long& lIndex)
 {

-  if ( !Open() )
-    return FALSE;
+  if ( !Open(Read) )
+    return false;

 
   lIndex = 0;
   return GetNextValue(strValueName, lIndex);
 
   lIndex = 0;
   return GetNextValue(strValueName, lIndex);


@@ -868,9 +1004,8 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
 
   // are we already at the end of enumeration?
   if ( lIndex == -1 )
 
   // are we already at the end of enumeration?
   if ( lIndex == -1 )

-    return FALSE;
+    return false;

 
 

-#if defined( __WIN32__) && !defined(__TWIN32__)

     wxChar  szValueName[1024];                  // @@ use RegQueryInfoKey...
     DWORD dwValueLen = WXSIZEOF(szValueName);
 
     wxChar  szValueName[1024];                  // @@ use RegQueryInfoKey...
     DWORD dwValueLen = WXSIZEOF(szValueName);
 


@@ -891,25 +1026,18 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
                       GetName().c_str());
       }
 
                       GetName().c_str());
       }
 

-      return FALSE;
+      return false;

     }
 
     strValueName = szValueName;
     }
 
     strValueName = szValueName;

-  #else   //WIN16
-    // only one unnamed value
-    wxASSERT( lIndex == 0 );

 
 

-    lIndex = -1;
-    strValueName.Empty();
-  #endif
-
-  return TRUE;
+  return true;

 }
 
 bool wxRegKey::GetFirstKey(wxString& strKeyName, long& lIndex)
 {
 }
 
 bool wxRegKey::GetFirstKey(wxString& strKeyName, long& lIndex)
 {

-  if ( !Open() )
-    return FALSE;
+  if ( !Open(Read) )
+    return false;

 
   lIndex = 0;
   return GetNextKey(strKeyName, lIndex);
 
   lIndex = 0;
   return GetNextKey(strKeyName, lIndex);


@@ -921,10 +1049,17 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
 
   // are we already at the end of enumeration?
   if ( lIndex == -1 )
 
   // are we already at the end of enumeration?
   if ( lIndex == -1 )

-    return FALSE;
+    return false;

 
   wxChar szKeyName[_MAX_PATH + 1];
 
   wxChar szKeyName[_MAX_PATH + 1];

+
+#ifdef __WXWINCE__
+  DWORD sizeName = WXSIZEOF(szKeyName);
+  m_dwLastError = RegEnumKeyEx((HKEY) m_hKey, lIndex++, szKeyName, & sizeName,
+      0, NULL, NULL, NULL);
+#else

   m_dwLastError = RegEnumKey((HKEY) m_hKey, lIndex++, szKeyName, WXSIZEOF(szKeyName));
   m_dwLastError = RegEnumKey((HKEY) m_hKey, lIndex++, szKeyName, WXSIZEOF(szKeyName));

+#endif

 
   if ( m_dwLastError != ERROR_SUCCESS ) {
     if ( m_dwLastError == ERROR_NO_MORE_ITEMS ) {
 
   if ( m_dwLastError != ERROR_SUCCESS ) {
     if ( m_dwLastError == ERROR_NO_MORE_ITEMS ) {


@@ -936,40 +1071,54 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
                     GetName().c_str());
     }
 
                     GetName().c_str());
     }
 

-    return FALSE;
+    return false;

   }
 
   strKeyName = szKeyName;
   }
 
   strKeyName = szKeyName;

-  return TRUE;
+  return true;

 }
 
 }
 

-// returns TRUE if the value contains a number (else it's some string)
+// returns true if the value contains a number (else it's some string)

 bool wxRegKey::IsNumericValue(const wxChar *szValue) const
 bool wxRegKey::IsNumericValue(const wxChar *szValue) const

-  {
-      ValueType type = GetValueType(szValue);
-      switch ( type ) {
+{
+    ValueType type = GetValueType(szValue);
+    switch ( type ) {

         case Type_Dword:
         /* case Type_Dword_little_endian: == Type_Dword */
         case Type_Dword_big_endian:
         case Type_Dword:
         /* case Type_Dword_little_endian: == Type_Dword */
         case Type_Dword_big_endian:

-            return TRUE;
+            return true;

 
         default:
 
         default:

-            return FALSE;
-      }
-  }
+            return false;
+    }
+}

 
 // ============================================================================
 // implementation of global private functions
 // ============================================================================
 
 // ============================================================================
 // implementation of global private functions
 // ============================================================================

+

 bool KeyExists(WXHKEY hRootKey, const wxChar *szKey)
 {
 bool KeyExists(WXHKEY hRootKey, const wxChar *szKey)
 {

-  HKEY hkeyDummy;
-  if ( RegOpenKey( (HKEY) hRootKey, szKey, &hkeyDummy) == ERROR_SUCCESS ) {
-    RegCloseKey(hkeyDummy);
-    return TRUE;
-  }
-  else
-    return FALSE;
+    // don't close this key itself for the case of empty szKey!
+    if ( wxIsEmpty(szKey) )
+        return true;
+
+    HKEY hkeyDummy;
+    if ( ::RegOpenKeyEx
+         (
+            (HKEY)hRootKey,
+            szKey,
+            RESERVED,
+            KEY_READ,        // we might not have enough rights for rw access
+            &hkeyDummy
+         ) == ERROR_SUCCESS )
+    {
+        ::RegCloseKey(hkeyDummy);
+
+        return true;
+    }
+
+    return false;

 }
 
 const wxChar *GetFullName(const wxRegKey *pKey, const wxChar *szValue)
 }
 
 const wxChar *GetFullName(const wxRegKey *pKey, const wxChar *szValue)


@@ -988,6 +1137,3 @@ void RemoveTrailingSeparator(wxString& str)
     str.Truncate(str.Len() - 1);
 }
 
     str.Truncate(str.Len() - 1);
 }
 

-#endif
-  // __WIN16__
-