VC++ compilation correction; doc file corrections

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 480206990e06e7cf456e908a3866cbac179d6861..5d44fc5a7320b06f66620dc1bb7f1b17900dd48a 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -12,13 +12,9 @@
 //              - add high level functions (RegisterOleServer, ...)
 ///////////////////////////////////////////////////////////////////////////////
 
 //              - add high level functions (RegisterOleServer, ...)
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
+#ifdef __GNUG__
+#pragma implementation "registry.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"


@@ -31,17 +27,23 @@
 #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

+/*

 #define   STRICT
 #define   WIN32_LEAN_AND_MEAN
 #define   STRICT
 #define   WIN32_LEAN_AND_MEAN

+*/
+

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

-#define _MAX_PATH 256
+       #define _MAX_PATH 512

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


@@ -75,7 +77,7 @@ aStdKeys[] =
   { HKEY_CURRENT_CONFIG,    "HKEY_CURRENT_CONFIG",    "HKCC" },
 #ifndef __GNUWIN32__
   { HKEY_DYN_DATA,          "HKEY_DYN_DATA",          "HKDD" }, // short name?
   { HKEY_CURRENT_CONFIG,    "HKEY_CURRENT_CONFIG",    "HKCC" },
 #ifndef __GNUWIN32__
   { HKEY_DYN_DATA,          "HKEY_DYN_DATA",          "HKDD" }, // short name?

-#endif  //_GNUWIN32__
+#endif  //GNUWIN32

 #endif  //WINVER >= 4.0
 #endif  //WIN32
 };
 #endif  //WINVER >= 4.0
 #endif  //WIN32
 };


@@ -83,6 +85,10 @@ aStdKeys[] =
 // the registry name separator (perhaps one day MS will change it to '/' ;-)
 #define   REG_SEPARATOR     '\\'
 
 // the registry name separator (perhaps one day MS will change it to '/' ;-)
 #define   REG_SEPARATOR     '\\'
 

+// useful for Windows programmers: makes somewhat more clear all these zeroes
+// being passed to Windows APIs
+#define   RESERVED        (NULL)
+

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


@@ -97,8 +103,11 @@ aStdKeys[] =
 // non member functions
 // ----------------------------------------------------------------------------
 
 // non member functions
 // ----------------------------------------------------------------------------
 

+// 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(HKEY hRootKey, const char *szKey);
+static bool KeyExists(WXHKEY hRootKey, const char *szKey);

 
 // combines value and key name (uses static buffer!)
 static const char *GetFullName(const wxRegKey *pKey, 
 
 // combines value and key name (uses static buffer!)
 static const char *GetFullName(const wxRegKey *pKey, 


@@ -116,18 +125,18 @@ const size_t wxRegKey::nStdKeys = WXSIZEOF(aStdKeys);
 
 // @@ should take a `StdKey key', but as it's often going to be used in loops
 //    it would require casts in user code.  
 
 // @@ should take a `StdKey key', but as it's often going to be used in loops
 //    it would require casts in user code.  

-const char *wxRegKey::GetStdKeyName(uint key)
+const char *wxRegKey::GetStdKeyName(size_t key)

 {
   // return empty string if key is invalid
 {
   // return empty string if key is invalid

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

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

-const char *wxRegKey::GetStdKeyShortName(uint key)
+const char *wxRegKey::GetStdKeyShortName(size_t key)

 {
   // return empty string if key is invalid
 {
   // return empty string if key is invalid

-  wxCHECK_RET( key < nStdKeys, "" );
+  wxCHECK( key < nStdKeys, "" );

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


@@ -136,8 +145,8 @@ wxRegKey::StdKey wxRegKey::ExtractKeyName(wxString& strKey)
 {
   wxString strRoot = strKey.Left(REG_SEPARATOR);
 
 {
   wxString strRoot = strKey.Left(REG_SEPARATOR);
 

-  HKEY hRootKey;
-  uint ui;
+  HKEY hRootKey = 0;
+  size_t ui;

   for ( ui = 0; ui < nStdKeys; ui++ ) {
     if ( strRoot.CmpNoCase(aStdKeys[ui].szName) == 0 || 
          strRoot.CmpNoCase(aStdKeys[ui].szShortName) == 0 ) {
   for ( ui = 0; ui < nStdKeys; ui++ ) {
     if ( strRoot.CmpNoCase(aStdKeys[ui].szName) == 0 || 
          strRoot.CmpNoCase(aStdKeys[ui].szShortName) == 0 ) {


@@ -160,10 +169,10 @@ wxRegKey::StdKey wxRegKey::ExtractKeyName(wxString& strKey)
   return (wxRegKey::StdKey)(int)hRootKey;
 }
 
   return (wxRegKey::StdKey)(int)hRootKey;
 }
 

-wxRegKey::StdKey wxRegKey::GetStdKeyFromHkey(HKEY hkey)
+wxRegKey::StdKey wxRegKey::GetStdKeyFromHkey(WXHKEY hkey)

 {
 {

-  for ( uint ui = 0; ui < nStdKeys; ui++ ) {
-    if ( aStdKeys[ui].hkey == hkey )
+  for ( size_t ui = 0; ui < nStdKeys; ui++ ) {
+    if ( (int) aStdKeys[ui].hkey == (int) hkey )

       return (StdKey)ui;
   }
   
       return (StdKey)ui;
   }
   


@@ -179,25 +188,23 @@ wxRegKey::StdKey wxRegKey::GetStdKeyFromHkey(HKEY hkey)
 wxRegKey::wxRegKey()
 {
   m_hKey = 0;
 wxRegKey::wxRegKey()
 {
   m_hKey = 0;

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

   m_dwLastError = 0;
 }
 
 wxRegKey::wxRegKey(const wxString& strKey) : m_strKey(strKey)
 {
   m_dwLastError = 0;
 }
 
 wxRegKey::wxRegKey(const wxString& strKey) : m_strKey(strKey)
 {

-  m_hRootKey  = aStdKeys[ExtractKeyName(m_strKey)].hkey;
-  m_hKey      = NULL;
+  m_hRootKey  = (WXHKEY) aStdKeys[ExtractKeyName(m_strKey)].hkey;
+  m_hKey      = (WXHKEY) NULL;

   m_dwLastError = 0;
 }
 
 // parent is a predefined (and preopened) key
 wxRegKey::wxRegKey(StdKey keyParent, const wxString& strKey) : m_strKey(strKey)
 {
   m_dwLastError = 0;
 }
 
 // parent is a predefined (and preopened) key
 wxRegKey::wxRegKey(StdKey keyParent, const wxString& strKey) : m_strKey(strKey)
 {

-  if ( !m_strKey.IsEmpty() && m_strKey.Last() == REG_SEPARATOR )
-    m_strKey.Truncate(m_strKey.Len() - 1);
-
-  m_hRootKey  = aStdKeys[keyParent].hkey;
-  m_hKey      = NULL;
+  RemoveTrailingSeparator(m_strKey);
+  m_hRootKey  = (WXHKEY) aStdKeys[keyParent].hkey;
+  m_hKey      = (WXHKEY) NULL;

   m_dwLastError = 0;
 }
 
   m_dwLastError = 0;
 }
 


@@ -206,15 +213,16 @@ wxRegKey::wxRegKey(const wxRegKey& keyParent, const wxString& strKey)
         : m_strKey(keyParent.m_strKey)
 {
   // combine our name with parent's to get the full name
         : m_strKey(keyParent.m_strKey)
 {
   // combine our name with parent's to get the full name

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

 
   m_strKey += strKey;
 
   m_strKey += strKey;

-  if ( !m_strKey.IsEmpty() && m_strKey.Last() == REG_SEPARATOR )
-    m_strKey.Truncate(m_strKey.Len() - 1);
+  RemoveTrailingSeparator(m_strKey);

 
   m_hRootKey  = keyParent.m_hRootKey;
 
   m_hRootKey  = keyParent.m_hRootKey;

-  m_hKey      = NULL;
+  m_hKey      = (WXHKEY) NULL;

   m_dwLastError = 0;
 }
 
   m_dwLastError = 0;
 }
 


@@ -224,6 +232,53 @@ wxRegKey::~wxRegKey()
   Close();
 }
 
   Close();
 }
 

+// ----------------------------------------------------------------------------
+// change the key name/hkey
+// ----------------------------------------------------------------------------
+
+// set the full key name
+void wxRegKey::SetName(const wxString& strKey)
+{
+  Close();
+
+  m_strKey = strKey;
+  m_hRootKey = (WXHKEY) aStdKeys[ExtractKeyName(m_strKey)].hkey;
+}
+
+// the name is relative to the parent key
+void wxRegKey::SetName(StdKey keyParent, const wxString& strKey)
+{
+  Close();
+
+  m_strKey = strKey;
+  RemoveTrailingSeparator(m_strKey);
+  m_hRootKey = (WXHKEY) aStdKeys[keyParent].hkey;
+}
+
+// the name is relative to the parent key
+void wxRegKey::SetName(const wxRegKey& keyParent, const wxString& strKey)
+{
+  Close();
+
+  // combine our name with parent's to get the full name
+  m_strKey = keyParent.m_strKey;
+  if ( !strKey.IsEmpty() && strKey[0] != REG_SEPARATOR )
+    m_strKey += REG_SEPARATOR;
+  m_strKey += strKey;
+
+  RemoveTrailingSeparator(m_strKey);
+
+  m_hRootKey = keyParent.m_hRootKey;
+}
+
+// hKey should be opened and will be closed in wxRegKey dtor
+void wxRegKey::SetHkey(WXHKEY hKey)
+{
+  Close();
+
+  m_hKey = hKey;
+}
+

 // ----------------------------------------------------------------------------
 // info about the key
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // info about the key
 // ----------------------------------------------------------------------------


@@ -238,7 +293,7 @@ bool wxRegKey::Exists() const
 // 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(m_hRootKey);
+  StdKey key = GetStdKeyFromHkey((StdKey) 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() )


@@ -247,6 +302,49 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
   return str;
 }
 
   return str;
 }
 

+#ifdef __GNUWIN32__
+bool wxRegKey::GetKeyInfo(size_t* pnSubKeys,
+                          size_t* pnMaxKeyLen,
+                          size_t* pnValues,
+                          size_t* pnMaxValueLen) const
+#else
+bool wxRegKey::GetKeyInfo(ulong *pnSubKeys,
+                          ulong *pnMaxKeyLen,
+                          ulong *pnValues,
+                          ulong *pnMaxValueLen) const
+#endif
+{
+#ifdef  __WIN32__
+  m_dwLastError = ::RegQueryInfoKey
+                  (
+                    (HKEY) m_hKey,
+                    NULL,           // class name
+                    NULL,           // (ptr to) size of class name buffer
+                    RESERVED,
+                    pnSubKeys,      // [out] number of subkeys
+                    pnMaxKeyLen,    // [out] max length of a subkey name
+                    NULL,           // longest subkey class name
+                    pnValues,       // [out] number of values
+                    pnMaxValueLen,  // [out] max length of a value name
+                    NULL,           // longest value data
+                    NULL,           // security descriptor
+                    NULL            // time of last modification
+                  );
+
+  if ( m_dwLastError != ERROR_SUCCESS ) {
+    wxLogSysError(m_dwLastError, _("can't get info about registry key '%s'"),
+                  GetName().c_str());
+    return FALSE;
+  }
+  else
+    return TRUE;
+#else // Win16
+  wxFAIL_MSG("GetKeyInfo() not implemented");
+
+  return FALSE;
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------


@@ -257,14 +355,18 @@ bool wxRegKey::Open()
   if ( IsOpened() )
     return TRUE;
 
   if ( IsOpened() )
     return TRUE;
 

-  m_dwLastError = RegOpenKey(m_hRootKey, m_strKey, &m_hKey);
+  HKEY tmpKey;
+  m_dwLastError = RegOpenKey((HKEY) m_hRootKey, m_strKey, &tmpKey);

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

-    wxLogSysError(m_dwLastError, "can't open registry key '%s'", 
+    wxLogSysError(m_dwLastError, _("can't open registry key '%s'"),

                   GetName().c_str());
     return FALSE;
   }
   else
                   GetName().c_str());
     return FALSE;
   }
   else

+  {
+    m_hKey = (WXHKEY) tmpKey;

     return TRUE;
     return TRUE;

+  }

 }
 
 // creates key, failing if it exists and !bOkIfExists
 }
 
 // creates key, failing if it exists and !bOkIfExists


@@ -278,37 +380,80 @@ bool wxRegKey::Create(bool bOkIfExists)
   if ( IsOpened() )
     return TRUE;
 
   if ( IsOpened() )
     return TRUE;
 

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

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

-    wxLogSysError(m_dwLastError, "can't create registry key '%s'", 
+    wxLogSysError(m_dwLastError, _("can't create registry key '%s'"),

                   GetName().c_str());
     return FALSE;
   }
   else
                   GetName().c_str());
     return FALSE;
   }
   else

+  {
+    m_hKey = (WXHKEY) tmpKey;

     return TRUE;
     return TRUE;

+  }
+}
+
+// close the key, it's not an error to call it when not opened
+bool wxRegKey::Close()
+{
+  if ( IsOpened() ) {
+    m_dwLastError = RegCloseKey((HKEY) m_hKey);
+    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 TRUE;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// delete keys/values
+// ----------------------------------------------------------------------------

 bool wxRegKey::DeleteSelf()
 {
 bool wxRegKey::DeleteSelf()
 {

-  if ( !Open() )
-    return FALSE;
+  {
+    wxLogNull nolog;
+    if ( !Open() ) {
+      // it already doesn't exist - ok!
+      return TRUE;
+    }
+  }
+
+  // we can't delete keys while enumerating because it confuses GetNextKey, so
+  // we first save the key names and then delete them all
+  wxArrayString astrSubkeys;

 
   wxString strKey;
   long lIndex;
   bool bCont = GetFirstKey(strKey, lIndex);
   while ( bCont ) {
 
   wxString strKey;
   long lIndex;
   bool bCont = GetFirstKey(strKey, lIndex);
   while ( bCont ) {

-    wxRegKey key(*this, strKey);
-    if ( !key.DeleteSelf() )
-      return FALSE;
+    astrSubkeys.Add(strKey);

 
     bCont = GetNextKey(strKey, lIndex);
   }
 
 
     bCont = GetNextKey(strKey, lIndex);
   }
 

+  size_t nKeyCount = astrSubkeys.Count();
+  for ( size_t nKey = 0; nKey < nKeyCount; nKey++ ) {
+    wxRegKey key(*this, astrSubkeys[nKey]);
+    if ( !key.DeleteSelf() )
+      return FALSE;
+  }
+
+  // now delete this key itself

   Close();
 
   Close();
 

-  m_dwLastError = RegDeleteKey(m_hRootKey, m_strKey);
+  m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey);

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

-    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;
   }
 


@@ -330,9 +475,9 @@ bool wxRegKey::DeleteValue(const char *szValue)
     return FALSE;
 
   #ifdef  __WIN32__
     return FALSE;
 
   #ifdef  __WIN32__

-    m_dwLastError = RegDeleteValue(m_hKey, szValue);
+    m_dwLastError = RegDeleteValue((HKEY) m_hKey, (char*) (const char*) szValue);

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

-      wxLogSysError(m_dwLastError, "can't delete value '%s' from key '%s'",
+      wxLogSysError(m_dwLastError, _("can't delete value '%s' from key '%s'"),

                     szValue, GetName().c_str());
       return FALSE;
     }
                     szValue, GetName().c_str());
       return FALSE;
     }


@@ -341,9 +486,9 @@ bool wxRegKey::DeleteValue(const char *szValue)
     wxASSERT( IsEmpty(szValue) );
 
     // just set the (default and unique) value of the key to ""
     wxASSERT( IsEmpty(szValue) );
 
     // just set the (default and unique) value of the key to ""

-    m_dwLastError = RegSetValue(m_hKey, NULL, REG_SZ, "", RESERVED);
+    m_dwLastError = RegSetValue((HKEY) m_hKey, NULL, REG_SZ, "", RESERVED);

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

-      wxLogSysError(m_dwLastError, "can't delete value of key '%s'", 
+      wxLogSysError(m_dwLastError, _("can't delete value of key '%s'"),

                     GetName().c_str());
       return FALSE;
     }
                     GetName().c_str());
       return FALSE;
     }


@@ -352,33 +497,35 @@ bool wxRegKey::DeleteValue(const char *szValue)
   return TRUE;
 }
 
   return TRUE;
 }
 

-// close the key, it's not an error to call it when not opened
-bool wxRegKey::Close()
-{
-  if ( IsOpened() ) {
-    m_dwLastError = RegCloseKey(m_hKey);
-    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 TRUE;
-}
-

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

+// return TRUE if value exists
+bool wxRegKey::HasValue(const char *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, (char*) (const char*) szValue, RESERVED,
+                             NULL, NULL, NULL) == ERROR_SUCCESS;
+    }
+    else
+      return FALSE;
+  #else   // WIN16
+    // only unnamed value exists
+    return IsEmpty(szValue);
+  #endif  // WIN16/32
+}
+

 // returns TRUE if this key has any subkeys
 bool wxRegKey::HasSubkeys() const
 {
 // returns TRUE if this key has any subkeys
 bool wxRegKey::HasSubkeys() const
 {

+  // suppress possible messages from GetFirstKey()
+  wxLogNull nolog;
+  

   // just call GetFirstKey with dummy parameters
   wxString str;
   long     l;
   // just call GetFirstKey with dummy parameters
   wxString str;
   long     l;


@@ -388,6 +535,9 @@ bool wxRegKey::HasSubkeys() const
 // returns TRUE if given subkey exists
 bool wxRegKey::HasSubKey(const char *szKey) const
 {
 // returns TRUE if given subkey exists
 bool wxRegKey::HasSubKey(const char *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
   if ( CONST_CAST Open() )
     return KeyExists(m_hKey, szKey);
   else


@@ -401,10 +551,10 @@ wxRegKey::ValueType wxRegKey::GetValueType(const char *szValue)
       return Type_None;
 
     DWORD dwType;
       return Type_None;
 
     DWORD dwType;

-    m_dwLastError = RegQueryValueEx(m_hKey, szValue, RESERVED,
+    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,

                                     &dwType, NULL, NULL);
     if ( m_dwLastError != ERROR_SUCCESS ) {
                                     &dwType, NULL, NULL);
     if ( m_dwLastError != ERROR_SUCCESS ) {

-      wxLogSysError(m_dwLastError, "can't read value of key '%s'", 
+      wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),

                     GetName().c_str());
       return Type_None;
     }
                     GetName().c_str());
       return Type_None;
     }


@@ -419,13 +569,13 @@ wxRegKey::ValueType wxRegKey::GetValueType(const char *szValue)
 bool wxRegKey::SetValue(const char *szValue, long lValue)
 {
   if ( CONST_CAST Open() ) {
 bool wxRegKey::SetValue(const char *szValue, long lValue)
 {
   if ( CONST_CAST Open() ) {

-    m_dwLastError = RegSetValueEx(m_hKey, szValue, RESERVED, REG_DWORD, 
+    m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_DWORD,

                                   (RegString)&lValue, sizeof(lValue));
     if ( m_dwLastError == ERROR_SUCCESS )
       return TRUE;
   }
 
                                   (RegString)&lValue, sizeof(lValue));
     if ( m_dwLastError == ERROR_SUCCESS )
       return TRUE;
   }
 

-  wxLogSysError(m_dwLastError, "can't set value of '%s'", 
+  wxLogSysError(m_dwLastError, _("can't set value of '%s'"),

                 GetFullName(this, szValue));
   return FALSE;
 }
                 GetFullName(this, szValue));
   return FALSE;
 }


@@ -435,10 +585,10 @@ bool wxRegKey::QueryValue(const char *szValue, long *plValue) const
   if ( CONST_CAST Open() ) {
     DWORD dwType, dwSize = sizeof(DWORD);
     RegString pBuf = (RegString)plValue;
   if ( CONST_CAST Open() ) {
     DWORD dwType, dwSize = sizeof(DWORD);
     RegString pBuf = (RegString)plValue;

-    m_dwLastError = RegQueryValueEx(m_hKey, szValue, RESERVED, 
+    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,

                                     &dwType, pBuf, &dwSize);
     if ( m_dwLastError != ERROR_SUCCESS ) {
                                     &dwType, pBuf, &dwSize);
     if ( m_dwLastError != ERROR_SUCCESS ) {

-      wxLogSysError(m_dwLastError, "can't read value of key '%s'", 
+      wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),

                     GetName().c_str());
       return FALSE;
     }
                     GetName().c_str());
       return FALSE;
     }


@@ -462,12 +612,13 @@ bool wxRegKey::QueryValue(const char *szValue, wxString& strValue) const
     #ifdef  __WIN32__
       // first get the type and size of the data
       DWORD dwType, dwSize;
     #ifdef  __WIN32__
       // first get the type and size of the data
       DWORD dwType, dwSize;

-      m_dwLastError = RegQueryValueEx(m_hKey, szValue, RESERVED, 
+      m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,

                                       &dwType, NULL, &dwSize);
       if ( m_dwLastError == ERROR_SUCCESS ) {
         RegString pBuf = (RegString)strValue.GetWriteBuf(dwSize);
                                       &dwType, NULL, &dwSize);
       if ( m_dwLastError == ERROR_SUCCESS ) {
         RegString pBuf = (RegString)strValue.GetWriteBuf(dwSize);

-        m_dwLastError = RegQueryValueEx(m_hKey, szValue, RESERVED, 
+        m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,

                                         &dwType, pBuf, &dwSize);
                                         &dwType, pBuf, &dwSize);

+        strValue.UngetWriteBuf();

         if ( m_dwLastError == ERROR_SUCCESS ) {
           // check that it was the right type
           wxASSERT_MSG( dwType == REG_SZ, 
         if ( m_dwLastError == ERROR_SUCCESS ) {
           // check that it was the right type
           wxASSERT_MSG( dwType == REG_SZ, 


@@ -480,13 +631,14 @@ bool wxRegKey::QueryValue(const char *szValue, wxString& strValue) const
       // named registry values don't exist in Win16
       wxASSERT( IsEmpty(szValue) );
 
       // named registry values don't exist in Win16
       wxASSERT( IsEmpty(szValue) );
 

-      m_dwLastError = RegQueryValue(m_hKey, 0, strValue.GetWriteBuf(256), &l);
+      m_dwLastError = RegQueryValue((HKEY) m_hKey, 0, strValue.GetWriteBuf(256), &l);
+      strValue.UngetWriteBuf();

       if ( m_dwLastError == ERROR_SUCCESS )
         return TRUE;
     #endif  //WIN16/32
   }
 
       if ( m_dwLastError == ERROR_SUCCESS )
         return TRUE;
     #endif  //WIN16/32
   }
 

-  wxLogSysError(m_dwLastError, "can't read value of '%s'", 
+  wxLogSysError(m_dwLastError, _("can't read value of '%s'"),

                 GetFullName(this, szValue));
   return FALSE;
 }
                 GetFullName(this, szValue));
   return FALSE;
 }


@@ -495,7 +647,7 @@ bool wxRegKey::SetValue(const char *szValue, const wxString& strValue)
 {
   if ( CONST_CAST Open() ) {
     #ifdef  __WIN32__
 {
   if ( CONST_CAST Open() ) {
     #ifdef  __WIN32__

-      m_dwLastError = RegSetValueEx(m_hKey, szValue, RESERVED, REG_SZ, 
+      m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_SZ,

                                     (RegString)strValue.c_str(), 
                                     strValue.Len() + 1);
       if ( m_dwLastError == ERROR_SUCCESS )
                                     (RegString)strValue.c_str(), 
                                     strValue.Len() + 1);
       if ( m_dwLastError == ERROR_SUCCESS )


@@ -504,13 +656,13 @@ bool wxRegKey::SetValue(const char *szValue, const wxString& strValue)
       // named registry values don't exist in Win16
       wxASSERT( IsEmpty(szValue) );
 
       // named registry values don't exist in Win16
       wxASSERT( IsEmpty(szValue) );
 

-      m_dwLastError = RegSetValue(m_hKey, NULL, REG_SZ, strValue, NULL);
+      m_dwLastError = RegSetValue((HKEY) m_hKey, NULL, REG_SZ, strValue, NULL);

       if ( m_dwLastError == ERROR_SUCCESS )
         return TRUE;
     #endif  //WIN16/32
   }
 
       if ( m_dwLastError == ERROR_SUCCESS )
         return TRUE;
     #endif  //WIN16/32
   }
 

-  wxLogSysError(m_dwLastError, "can't set value of '%s'", 
+  wxLogSysError(m_dwLastError, _("can't set value of '%s'"),

                 GetFullName(this, szValue));
   return FALSE;
 }
                 GetFullName(this, szValue));
   return FALSE;
 }


@@ -528,105 +680,79 @@ wxRegKey::operator wxString() const
 //     several concurrently running indexations on the same key
 // ----------------------------------------------------------------------------
 
 //     several concurrently running indexations on the same key
 // ----------------------------------------------------------------------------
 

-#ifdef  __WIN32__

 bool wxRegKey::GetFirstValue(wxString& strValueName, long& lIndex)
 {
   if ( !Open() )
     return FALSE;
 
 bool wxRegKey::GetFirstValue(wxString& strValueName, long& lIndex)
 {
   if ( !Open() )
     return FALSE;
 

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

   lIndex = 0;
   lIndex = 0;

-  m_dwLastError = RegEnumValue(m_hKey, lIndex, 
-                               szValueName, &dwValueLen,
-                               RESERVED, 
-                               NULL,            // [out] type 
-                               NULL,            // [out] buffer for value
-                               NULL);           // [i/o]  it's length
-
-  if ( m_dwLastError != ERROR_SUCCESS ) {
-    if ( m_dwLastError == ERROR_NO_MORE_ITEMS )
-      lIndex = -1;
-    else {
-      wxLogSysError(m_dwLastError, "can't enumerate values of key '%s'", 
-                    GetName().c_str());
-    }
-
-    return FALSE;
-  }
-
-  strValueName = szValueName;
-  return TRUE;
+  return GetNextValue(strValueName, lIndex);

 }
 
 bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
 {
   wxASSERT( IsOpened() );
 }
 
 bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
 {
   wxASSERT( IsOpened() );

-  wxASSERT( lIndex != -1 );

 
 

-  char  szValueName[1024];                  // @@ use RegQueryInfoKey...
-  DWORD dwValueLen = WXSIZEOF(szValueName);
+  // are we already at the end of enumeration?
+  if ( lIndex == -1 )
+    return FALSE;

 
 

-  lIndex++;
-  m_dwLastError = RegEnumValue(m_hKey, lIndex, 
-                               szValueName, &dwValueLen,
-                               RESERVED, 
-                               NULL,           // buffer for type 
-                               NULL, NULL);    // buffer for value and length
+  #ifdef  __WIN32__
+    char  szValueName[1024];                  // @@ use RegQueryInfoKey...
+    DWORD dwValueLen = WXSIZEOF(szValueName);

 
 

-  if ( m_dwLastError != ERROR_SUCCESS ) {
-    if ( m_dwLastError == ERROR_NO_MORE_ITEMS ) {
-      m_dwLastError = ERROR_SUCCESS;
-      lIndex = -1;
-    }
-    else {
-      wxLogSysError(m_dwLastError, "can't enumerate values of key '%s'", 
-                    GetName().c_str());
+    lIndex++;
+    m_dwLastError = RegEnumValue((HKEY) m_hKey, lIndex,
+                                 szValueName, &dwValueLen,
+                                 RESERVED, 
+                                 NULL,            // [out] type 
+                                 NULL,            // [out] buffer for value
+                                 NULL);           // [i/o]  it's length
+
+    if ( m_dwLastError != ERROR_SUCCESS ) {
+      if ( m_dwLastError == ERROR_NO_MORE_ITEMS ) {
+        m_dwLastError = ERROR_SUCCESS;
+        lIndex = -1;
+      }
+      else {
+        wxLogSysError(m_dwLastError, _("can't enumerate values of key '%s'"),
+                      GetName().c_str());
+      }
+
+      return FALSE;

     }
 
     }
 

-    return FALSE;
-  }
+    strValueName = szValueName;
+  #else   //WIN16
+    // only one unnamed value
+    wxASSERT( lIndex == 0 );
+
+    lIndex = -1;
+    strValueName.Empty();
+  #endif

 
 

-  strValueName = szValueName;

   return TRUE;
 }
   return TRUE;
 }

-#endif  //Win32

 
 bool wxRegKey::GetFirstKey(wxString& strKeyName, long& lIndex)
 {
   if ( !Open() )
     return FALSE;
 
 
 bool wxRegKey::GetFirstKey(wxString& strKeyName, long& lIndex)
 {
   if ( !Open() )
     return FALSE;
 

-  char szKeyName[_MAX_PATH + 1];

   lIndex = 0;
   lIndex = 0;

-  m_dwLastError = RegEnumKey(m_hKey, lIndex, szKeyName, WXSIZEOF(szKeyName));
-
-  if ( m_dwLastError != ERROR_SUCCESS ) {
-    if ( m_dwLastError == ERROR_NO_MORE_ITEMS ) {
-      m_dwLastError = ERROR_SUCCESS;
-      lIndex = -1;
-    }
-    else {
-      wxLogSysError(m_dwLastError, "can't enumerate subkeys of key '%s'", 
-                    GetName().c_str());
-    }
-
-    return FALSE;
-  }
-
-  strKeyName = szKeyName;
-  return TRUE;
+  return GetNextKey(strKeyName, lIndex);

 }
 
 bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
 {
   wxASSERT( IsOpened() );
 }
 
 bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
 {
   wxASSERT( IsOpened() );

-  wxASSERT( lIndex != -1 );
+
+  // are we already at the end of enumeration?
+  if ( lIndex == -1 )
+    return FALSE;

 
   char szKeyName[_MAX_PATH + 1];
 
   char szKeyName[_MAX_PATH + 1];

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

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


@@ -634,7 +760,7 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
       lIndex = -1;
     }
     else {
       lIndex = -1;
     }
     else {

-      wxLogSysError(m_dwLastError, "can't enumerate subkeys of key '%s'", 
+      wxLogSysError(m_dwLastError, _("can't enumerate subkeys of key '%s'"),

                     GetName().c_str());
     }
 
                     GetName().c_str());
     }
 


@@ -646,12 +772,12 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
 }
 
 // ============================================================================
 }
 
 // ============================================================================

-// implementation of global functions
+// implementation of global private functions

 // ============================================================================
 // ============================================================================

-bool KeyExists(HKEY hRootKey, const char *szKey)
+bool KeyExists(WXHKEY hRootKey, const char *szKey)

 {
   HKEY hkeyDummy;
 {
   HKEY hkeyDummy;

-  if ( RegOpenKey(hRootKey, szKey, &hkeyDummy) == ERROR_SUCCESS ) {
+  if ( RegOpenKey( (HKEY) hRootKey, szKey, &hkeyDummy) == ERROR_SUCCESS ) {

     RegCloseKey(hkeyDummy);
     return TRUE;
   }
     RegCloseKey(hkeyDummy);
     return TRUE;
   }


@@ -667,4 +793,14 @@ const char *GetFullName(const wxRegKey *pKey, const char *szValue)
     s_str << "\\" << szValue;
 
   return s_str.c_str();
     s_str << "\\" << szValue;
 
   return s_str.c_str();

-}
\ No newline at end of file
+}
+
+void RemoveTrailingSeparator(wxString& str)
+{
+  if ( !str.IsEmpty() && str.Last() == REG_SEPARATOR )
+    str.Truncate(str.Len() - 1);
+}
+
+#endif
+  // __WIN16__
+