more backwards compatible kbd handling in wxScrolledWindow

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index be45070aec0f48f976ba5ea1e157caa17ba6aac9..135825ec85051164bc7deceb8c1fb5498b3385c6 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -62,28 +62,28 @@ typedef unsigned char *RegString;
 static struct
 {
   HKEY        hkey;
 static struct
 {
   HKEY        hkey;

-  const char *szName;
-  const char *szShortName;
+  const wxChar *szName;
+  const wxChar *szShortName;

 }
 aStdKeys[] = 
 { 
 }
 aStdKeys[] = 
 { 

-  { HKEY_CLASSES_ROOT,      "HKEY_CLASSES_ROOT",      "HKCR" },
+  { HKEY_CLASSES_ROOT,      wxT("HKEY_CLASSES_ROOT"),      wxT("HKCR") },

 #ifdef  __WIN32__
 #ifdef  __WIN32__

-  { HKEY_CURRENT_USER,      "HKEY_CURRENT_USER",      "HKCU" },
-  { HKEY_LOCAL_MACHINE,     "HKEY_LOCAL_MACHINE",     "HKLM" },
-  { HKEY_USERS,             "HKEY_USERS",             "HKU"  }, // short name?
-  { HKEY_PERFORMANCE_DATA,  "HKEY_PERFORMANCE_DATA",  "HKPD" },
+  { 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_PERFORMANCE_DATA,  wxT("HKEY_PERFORMANCE_DATA"),  wxT("HKPD") },

 #if     WINVER >= 0x0400
 #if     WINVER >= 0x0400

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

 #ifndef __GNUWIN32__
 #ifndef __GNUWIN32__

-  { HKEY_DYN_DATA,          "HKEY_DYN_DATA",          "HKDD" }, // short name?
+  { HKEY_DYN_DATA,          wxT("HKEY_DYN_DATA"),          wxT("HKDD") }, // short name?

 #endif  //GNUWIN32
 #endif  //WINVER >= 4.0
 #endif  //WIN32
 };
 
 // the registry name separator (perhaps one day MS will change it to '/' ;-)
 #endif  //GNUWIN32
 #endif  //WINVER >= 4.0
 #endif  //WIN32
 };
 
 // the registry name separator (perhaps one day MS will change it to '/' ;-)

-#define   REG_SEPARATOR     '\\'
+#define   REG_SEPARATOR     wxT('\\')

 
 // 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


@@ -107,11 +107,11 @@ 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(WXHKEY hRootKey, const char *szKey);
+static bool KeyExists(WXHKEY hRootKey, const wxChar *szKey);

 
 // combines value and key name (uses static buffer!)
 
 // combines value and key name (uses static buffer!)

-static const char *GetFullName(const wxRegKey *pKey, 
-                               const char *szValue = NULL);
+static const wxChar *GetFullName(const wxRegKey *pKey, 
+                               const wxChar *szValue = NULL);

 
 // ============================================================================
 // implementation of wxRegKey class
 
 // ============================================================================
 // implementation of wxRegKey class


@@ -125,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(size_t key)
+const wxChar *wxRegKey::GetStdKeyName(size_t key)

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

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

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

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

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

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

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


@@ -156,7 +156,7 @@ wxRegKey::StdKey wxRegKey::ExtractKeyName(wxString& strKey)
   }
 
   if ( ui == nStdKeys ) {
   }
 
   if ( ui == nStdKeys ) {

-    wxFAIL_MSG("invalid key prefix in wxRegKey::ExtractKeyName.");
+    wxFAIL_MSG(wxT("invalid key prefix in wxRegKey::ExtractKeyName."));

 
     hRootKey = HKEY_CLASSES_ROOT;
   }
 
     hRootKey = HKEY_CLASSES_ROOT;
   }


@@ -176,7 +176,7 @@ wxRegKey::StdKey wxRegKey::GetStdKeyFromHkey(WXHKEY hkey)
       return (StdKey)ui;
   }
   
       return (StdKey)ui;
   }
   

-  wxFAIL_MSG("non root hkey passed to wxRegKey::GetStdKeyFromHkey.");
+  wxFAIL_MSG(wxT("non root hkey passed to wxRegKey::GetStdKeyFromHkey."));

 
   return HKCR;
 }
 
   return HKCR;
 }


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

-#ifdef __GNUWIN32__
+#if defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)

 bool wxRegKey::GetKeyInfo(size_t* pnSubKeys,
                           size_t* pnMaxKeyLen,
                           size_t* pnValues,
 bool wxRegKey::GetKeyInfo(size_t* pnSubKeys,
                           size_t* pnMaxKeyLen,
                           size_t* pnValues,


@@ -427,6 +427,18 @@ bool wxRegKey::DeleteSelf()
     }
   }
 
     }
   }
 

+  // 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));
+
+      return FALSE;
+  }
+

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


@@ -460,7 +472,7 @@ bool wxRegKey::DeleteSelf()
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxRegKey::DeleteKey(const char *szKey)
+bool wxRegKey::DeleteKey(const wxChar *szKey)

 {
   if ( !Open() )
     return FALSE;
 {
   if ( !Open() )
     return FALSE;


@@ -469,13 +481,13 @@ bool wxRegKey::DeleteKey(const char *szKey)
   return key.DeleteSelf();
 }
 
   return key.DeleteSelf();
 }
 

-bool wxRegKey::DeleteValue(const char *szValue)
+bool wxRegKey::DeleteValue(const wxChar *szValue)

 {
   if ( !Open() )
     return FALSE;
 
 #if defined(__WIN32__) && !defined(__TWIN32__)
 {
   if ( !Open() )
     return FALSE;
 
 #if defined(__WIN32__) && !defined(__TWIN32__)

-    m_dwLastError = RegDeleteValue((HKEY) m_hKey, (char*) (const char*) szValue);
+    m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST 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());


@@ -502,14 +514,14 @@ bool wxRegKey::DeleteValue(const char *szValue)
 // ----------------------------------------------------------------------------
 
 // return TRUE if value exists
 // ----------------------------------------------------------------------------
 
 // return TRUE if value exists

-bool wxRegKey::HasValue(const char *szValue) const
+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() ) {
 {
   // 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,
+      return RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,

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


@@ -520,6 +532,18 @@ bool wxRegKey::HasValue(const char *szValue) const
   #endif  // WIN16/32
 }
 
   #endif  // WIN16/32
 }
 

+// returns TRUE if this key has any values
+bool wxRegKey::HasValues() const
+{
+  // suppress possible messages from GetFirstValue()
+  wxLogNull nolog;
+  
+  // just call GetFirstValue with dummy parameters
+  wxString str;
+  long     l;
+  return CONST_CAST GetFirstValue(str, l);
+}
+

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


@@ -533,7 +557,7 @@ bool wxRegKey::HasSubkeys() const
 }
 
 // returns TRUE if given subkey exists
 }
 
 // returns TRUE if given subkey exists

-bool wxRegKey::HasSubKey(const char *szKey) const
+bool wxRegKey::HasSubKey(const wxChar *szKey) const

 {
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;
 {
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;


@@ -544,14 +568,14 @@ bool wxRegKey::HasSubKey(const char *szKey) const
     return FALSE;
 }
 
     return FALSE;
 }
 

-wxRegKey::ValueType wxRegKey::GetValueType(const char *szValue)
+wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const

 {
   #ifdef  __WIN32__
 {
   #ifdef  __WIN32__

-    if ( !Open() )
+    if ( ! CONST_CAST Open() )

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

-    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
+    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST 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'"),


@@ -566,7 +590,7 @@ wxRegKey::ValueType wxRegKey::GetValueType(const char *szValue)
 }
 
 #ifdef  __WIN32__
 }
 
 #ifdef  __WIN32__

-bool wxRegKey::SetValue(const char *szValue, long lValue)
+bool wxRegKey::SetValue(const wxChar *szValue, long lValue)

 {
 #ifdef __TWIN32__
   wxFAIL_MSG("RegSetValueEx not implemented by TWIN32");
 {
 #ifdef __TWIN32__
   wxFAIL_MSG("RegSetValueEx not implemented by TWIN32");


@@ -585,12 +609,12 @@ bool wxRegKey::SetValue(const char *szValue, long lValue)
 #endif
 }
 
 #endif
 }
 

-bool wxRegKey::QueryValue(const char *szValue, long *plValue) const
+bool wxRegKey::QueryValue(const wxChar *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((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
+    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST 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'"),


@@ -600,7 +624,7 @@ bool wxRegKey::QueryValue(const char *szValue, long *plValue) const
     else {
       // check that we read the value of right type
       wxASSERT_MSG( dwType == REG_DWORD, 
     else {
       // check that we read the value of right type
       wxASSERT_MSG( dwType == REG_DWORD, 

-                    "Type mismatch in wxRegKey::QueryValue()."  );
+                    wxT("Type mismatch in wxRegKey::QueryValue().")  );

 
       return TRUE;
     }
 
       return TRUE;
     }


@@ -611,23 +635,23 @@ bool wxRegKey::QueryValue(const char *szValue, long *plValue) const
 
 #endif  //Win32
 
 
 #endif  //Win32
 

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

 {
   if ( CONST_CAST Open() ) {
     #ifdef  __WIN32__
       // first get the type and size of the data
       DWORD dwType, dwSize;
 {
   if ( CONST_CAST Open() ) {
     #ifdef  __WIN32__
       // first get the type and size of the data
       DWORD dwType, dwSize;

-      m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
+      m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST 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((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
+        m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,

                                         &dwType, pBuf, &dwSize);
         strValue.UngetWriteBuf();
         if ( m_dwLastError == ERROR_SUCCESS ) {
           // check that it was the right type
           wxASSERT_MSG( dwType == REG_SZ, 
                                         &dwType, pBuf, &dwSize);
         strValue.UngetWriteBuf();
         if ( m_dwLastError == ERROR_SUCCESS ) {
           // check that it was the right type
           wxASSERT_MSG( dwType == REG_SZ, 

-                        "Type mismatch in wxRegKey::QueryValue()." );
+                        wxT("Type mismatch in wxRegKey::QueryValue().") );

 
           return TRUE;
         }
 
           return TRUE;
         }


@@ -648,7 +672,7 @@ bool wxRegKey::QueryValue(const char *szValue, wxString& strValue) const
   return FALSE;
 }
 
   return FALSE;
 }
 

-bool wxRegKey::SetValue(const char *szValue, const wxString& strValue)
+bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue)

 {
   if ( CONST_CAST Open() ) {
 #if defined( __WIN32__) && !defined(__TWIN32__)
 {
   if ( CONST_CAST Open() ) {
 #if defined( __WIN32__) && !defined(__TWIN32__)


@@ -703,11 +727,10 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
     return FALSE;
 
 #if defined( __WIN32__) && !defined(__TWIN32__)
     return FALSE;
 
 #if defined( __WIN32__) && !defined(__TWIN32__)

-    char  szValueName[1024];                  // @@ use RegQueryInfoKey...
+    wxChar  szValueName[1024];                  // @@ use RegQueryInfoKey...

     DWORD dwValueLen = WXSIZEOF(szValueName);
 
     DWORD dwValueLen = WXSIZEOF(szValueName);
 

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

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


@@ -756,7 +779,7 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
   if ( lIndex == -1 )
     return FALSE;
 
   if ( lIndex == -1 )
     return FALSE;
 

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

   m_dwLastError = RegEnumKey((HKEY) m_hKey, lIndex++, szKeyName, WXSIZEOF(szKeyName));
 
   if ( m_dwLastError != ERROR_SUCCESS ) {
   m_dwLastError = RegEnumKey((HKEY) m_hKey, lIndex++, szKeyName, WXSIZEOF(szKeyName));
 
   if ( m_dwLastError != ERROR_SUCCESS ) {


@@ -776,10 +799,25 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
   return TRUE;
 }
 
   return TRUE;
 }
 

+// returns TRUE if the value contains a number (else it's some string)
+bool wxRegKey::IsNumericValue(const wxChar *szValue) const
+  { 
+      ValueType type = GetValueType(szValue);
+      switch ( type ) {
+        case Type_Dword:
+        case Type_Dword_little_endian:
+        case Type_Dword_big_endian:
+            return TRUE;
+
+        default:
+            return FALSE;
+      }
+  }
+

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

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

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


@@ -790,12 +828,12 @@ bool KeyExists(WXHKEY hRootKey, const char *szKey)
     return FALSE;
 }
 
     return FALSE;
 }
 

-const char *GetFullName(const wxRegKey *pKey, const char *szValue)
+const wxChar *GetFullName(const wxRegKey *pKey, const wxChar *szValue)

 {
   static wxString s_str;
   s_str = pKey->GetName();
 {
   static wxString s_str;
   s_str = pKey->GetName();

-  if ( !IsEmpty(szValue) )
-    s_str << "\\" << szValue;
+  if ( !wxIsEmpty(szValue) )
+    s_str << wxT("\\") << szValue;

 
   return s_str.c_str();
 }
 
   return s_str.c_str();
 }