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 0653504aea7b859ea166a3fe808d680003a74027..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,6 +27,9 @@
 #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
 /*


@@ -86,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
 // ----------------------------------------------------------------------------


@@ -104,7 +107,7 @@ aStdKeys[] =
 static inline void RemoveTrailingSeparator(wxString& str);
 
 // returns TRUE if given registry key exists
 static inline void RemoveTrailingSeparator(wxString& str);
 
 // 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, 


@@ -122,7 +125,7 @@ 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
   wxCHECK_MSG( key < nStdKeys, "", "invalid key in wxRegKey::GetStdKeyName" );
 {
   // return empty string if key is invalid
   wxCHECK_MSG( key < nStdKeys, "", "invalid key in wxRegKey::GetStdKeyName" );


@@ -130,7 +133,7 @@ const char *wxRegKey::GetStdKeyName(uint key)
   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
   wxCHECK( key < nStdKeys, "" );
 {
   // return empty string if key is invalid
   wxCHECK( key < nStdKeys, "" );


@@ -142,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 ) {


@@ -166,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;
   }
   


@@ -185,14 +188,14 @@ 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;
 }
 
   m_dwLastError = 0;
 }
 


@@ -200,8 +203,8 @@ wxRegKey::wxRegKey(const wxString& strKey) : m_strKey(strKey)
 wxRegKey::wxRegKey(StdKey keyParent, const wxString& strKey) : m_strKey(strKey)
 {
   RemoveTrailingSeparator(m_strKey);
 wxRegKey::wxRegKey(StdKey keyParent, const wxString& strKey) : m_strKey(strKey)
 {
   RemoveTrailingSeparator(m_strKey);

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

   m_dwLastError = 0;
 }
 
   m_dwLastError = 0;
 }
 


@@ -210,14 +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() && strKey[0] != REG_SEPARATOR )
-      m_strKey  += REG_SEPARATOR;
+  if ( !m_strKey.IsEmpty() && 
+       (strKey.IsEmpty() || strKey[0] != REG_SEPARATOR) ) {
+      m_strKey += REG_SEPARATOR;
+  }

 
   m_strKey += strKey;
   RemoveTrailingSeparator(m_strKey);
 
   m_hRootKey  = keyParent.m_hRootKey;
 
   m_strKey += strKey;
   RemoveTrailingSeparator(m_strKey);
 
   m_hRootKey  = keyParent.m_hRootKey;

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

   m_dwLastError = 0;
 }
 
   m_dwLastError = 0;
 }
 


@@ -237,7 +242,7 @@ void wxRegKey::SetName(const wxString& strKey)
   Close();
 
   m_strKey = strKey;
   Close();
 
   m_strKey = strKey;

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

 }
 
 // the name is relative to the parent key
 }
 
 // the name is relative to the parent key


@@ -247,7 +252,7 @@ void wxRegKey::SetName(StdKey keyParent, const wxString& strKey)
 
   m_strKey = strKey;
   RemoveTrailingSeparator(m_strKey);
 
   m_strKey = strKey;
   RemoveTrailingSeparator(m_strKey);

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

 }
 
 // the name is relative to the parent key
 }
 
 // the name is relative to the parent key


@@ -267,7 +272,7 @@ void wxRegKey::SetName(const wxRegKey& keyParent, const wxString& strKey)
 }
 
 // hKey should be opened and will be closed in wxRegKey dtor
 }
 
 // hKey should be opened and will be closed in wxRegKey dtor

-void wxRegKey::SetHkey(HKEY hKey)
+void wxRegKey::SetHkey(WXHKEY hKey)

 {
   Close();
 
 {
   Close();
 


@@ -288,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() )


@@ -298,10 +303,10 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
 }
 
 #ifdef __GNUWIN32__
 }
 
 #ifdef __GNUWIN32__

-bool wxRegKey::GetKeyInfo(uint* pnSubKeys,
-                          uint* pnMaxKeyLen,
-                          uint* pnValues,
-                          uint* pnMaxValueLen) const
+bool wxRegKey::GetKeyInfo(size_t* pnSubKeys,
+                          size_t* pnMaxKeyLen,
+                          size_t* pnValues,
+                          size_t* pnMaxValueLen) const

 #else
 bool wxRegKey::GetKeyInfo(ulong *pnSubKeys,
                           ulong *pnMaxKeyLen,
 #else
 bool wxRegKey::GetKeyInfo(ulong *pnSubKeys,
                           ulong *pnMaxKeyLen,


@@ -312,7 +317,7 @@ bool wxRegKey::GetKeyInfo(ulong *pnSubKeys,
 #ifdef  __WIN32__
   m_dwLastError = ::RegQueryInfoKey
                   (
 #ifdef  __WIN32__
   m_dwLastError = ::RegQueryInfoKey
                   (

-                    m_hKey,
+                    (HKEY) m_hKey,

                     NULL,           // class name
                     NULL,           // (ptr to) size of class name buffer
                     RESERVED,
                     NULL,           // class name
                     NULL,           // (ptr to) size of class name buffer
                     RESERVED,


@@ -350,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 ) {
     wxLogSysError(m_dwLastError, _("can't open registry key '%s'"),
                   GetName().c_str());
     return FALSE;
   }
   else
   if ( m_dwLastError != ERROR_SUCCESS ) {
     wxLogSysError(m_dwLastError, _("can't open registry key '%s'"),
                   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


@@ -371,21 +380,25 @@ 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 ) {
     wxLogSysError(m_dwLastError, _("can't create registry key '%s'"),
                   GetName().c_str());
     return FALSE;
   }
   else
   if ( m_dwLastError != ERROR_SUCCESS ) {
     wxLogSysError(m_dwLastError, _("can't create registry key '%s'"),
                   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() ) {
 }
 
 // close the key, it's not an error to call it when not opened
 bool wxRegKey::Close()
 {
   if ( IsOpened() ) {

-    m_dwLastError = RegCloseKey(m_hKey);
+    m_dwLastError = RegCloseKey((HKEY) m_hKey);

     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());


@@ -427,8 +440,8 @@ bool wxRegKey::DeleteSelf()
     bCont = GetNextKey(strKey, lIndex);
   }
 
     bCont = GetNextKey(strKey, lIndex);
   }
 

-  uint nKeyCount = astrSubkeys.Count();
-  for ( uint nKey = 0; nKey < nKeyCount; nKey++ ) {
+  size_t nKeyCount = astrSubkeys.Count();
+  for ( size_t nKey = 0; nKey < nKeyCount; nKey++ ) {

     wxRegKey key(*this, astrSubkeys[nKey]);
     if ( !key.DeleteSelf() )
       return FALSE;
     wxRegKey key(*this, astrSubkeys[nKey]);
     if ( !key.DeleteSelf() )
       return FALSE;


@@ -437,7 +450,7 @@ bool wxRegKey::DeleteSelf()
   // now delete this key itself
   Close();
 
   // now delete this key itself
   Close();
 

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

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


@@ -462,7 +475,7 @@ 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 ) {
       wxLogSysError(m_dwLastError, _("can't delete value '%s' from key '%s'"),
                     szValue, GetName().c_str());
     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("can't delete value '%s' from key '%s'"),
                     szValue, GetName().c_str());


@@ -473,7 +486,7 @@ 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 ) {
       wxLogSysError(m_dwLastError, _("can't delete value of key '%s'"),
                     GetName().c_str());
     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("can't delete value of key '%s'"),
                     GetName().c_str());


@@ -491,9 +504,12 @@ bool wxRegKey::DeleteValue(const char *szValue)
 // return TRUE if value exists
 bool wxRegKey::HasValue(const char *szValue) const
 {
 // 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() ) {
   #ifdef  __WIN32__
     if ( CONST_CAST Open() ) {

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

                              NULL, NULL, NULL) == ERROR_SUCCESS;
     }
     else
                              NULL, NULL, NULL) == ERROR_SUCCESS;
     }
     else


@@ -507,6 +523,9 @@ bool wxRegKey::HasValue(const char *szValue) const
 // 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;


@@ -516,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


@@ -529,7 +551,7 @@ 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 ) {
       wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),
                                     &dwType, NULL, NULL);
     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),


@@ -547,7 +569,7 @@ 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;


@@ -563,7 +585,7 @@ 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 ) {
       wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),
                                     &dwType, pBuf, &dwSize);
     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),


@@ -590,11 +612,11 @@ 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);
         strValue.UngetWriteBuf();
         if ( m_dwLastError == ERROR_SUCCESS ) {
                                         &dwType, pBuf, &dwSize);
         strValue.UngetWriteBuf();
         if ( m_dwLastError == ERROR_SUCCESS ) {


@@ -609,7 +631,7 @@ 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;
       strValue.UngetWriteBuf();
       if ( m_dwLastError == ERROR_SUCCESS )
         return TRUE;


@@ -625,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 )


@@ -634,7 +656,7 @@ 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


@@ -680,7 +702,7 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
     DWORD dwValueLen = WXSIZEOF(szValueName);
 
     lIndex++;
     DWORD dwValueLen = WXSIZEOF(szValueName);
 
     lIndex++;

-    m_dwLastError = RegEnumValue(m_hKey, lIndex, 
+    m_dwLastError = RegEnumValue((HKEY) m_hKey, lIndex,

                                  szValueName, &dwValueLen,
                                  RESERVED, 
                                  NULL,            // [out] type 
                                  szValueName, &dwValueLen,
                                  RESERVED, 
                                  NULL,            // [out] type 


@@ -730,7 +752,7 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
     return FALSE;
 
   char szKeyName[_MAX_PATH + 1];
     return FALSE;
 
   char szKeyName[_MAX_PATH + 1];

-  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 ) {


@@ -750,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;
   }


@@ -778,3 +800,7 @@ void RemoveTrailingSeparator(wxString& str)
   if ( !str.IsEmpty() && str.Last() == REG_SEPARATOR )
     str.Truncate(str.Len() - 1);
 }
   if ( !str.IsEmpty() && str.Last() == REG_SEPARATOR )
     str.Truncate(str.Len() - 1);
 }

+
+#endif
+  // __WIN16__
+