// - 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"
#include "wx/intl.h"
#include "wx/log.h"
+#include "wx/config.h" // for wxExpandEnvVars
+
// Windows headers
/*
#define STRICT
// 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
// ----------------------------------------------------------------------------
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,
// @@ 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 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, "" );
wxString strRoot = strKey.Left(REG_SEPARATOR);
HKEY hRootKey;
- uint ui;
+ size_t ui;
for ( ui = 0; ui < nStdKeys; ui++ ) {
if ( strRoot.CmpNoCase(aStdKeys[ui].szName) == 0 ||
strRoot.CmpNoCase(aStdKeys[ui].szShortName) == 0 ) {
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;
}
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_hRootKey = aStdKeys[ExtractKeyName(m_strKey)].hkey;
+ m_hRootKey = (WXHKEY) aStdKeys[ExtractKeyName(m_strKey)].hkey;
m_hKey = NULL;
m_dwLastError = 0;
}
wxRegKey::wxRegKey(StdKey keyParent, const wxString& strKey) : m_strKey(strKey)
{
RemoveTrailingSeparator(m_strKey);
- m_hRootKey = aStdKeys[keyParent].hkey;
+ m_hRootKey = (WXHKEY) aStdKeys[keyParent].hkey;
m_hKey = NULL;
m_dwLastError = 0;
}
: m_strKey(keyParent.m_strKey)
{
// combine our name with parent's to get the full name
- if ( !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);
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
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
}
// hKey should be opened and will be closed in wxRegKey dtor
-void wxRegKey::SetHkey(HKEY hKey)
+void wxRegKey::SetHkey(WXHKEY hKey)
{
Close();
// 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() )
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
(
- m_hKey,
+ (HKEY) m_hKey,
NULL, // class name
NULL, // (ptr to) size of class name buffer
RESERVED,
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
+ {
+ m_hKey = (WXHKEY) tmpKey;
return TRUE;
+ }
}
// creates key, failing if it exists and !bOkIfExists
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
+ {
+ m_hKey = (WXHKEY) tmpKey;
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);
+ m_dwLastError = RegCloseKey((HKEY) m_hKey);
if ( m_dwLastError != ERROR_SUCCESS ) {
wxLogSysError(m_dwLastError, _("can't close registry key '%s'"),
GetName().c_str());
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;
// 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());
return FALSE;
#ifdef __WIN32__
- m_dwLastError = RegDeleteValue(m_hKey, szValue);
+ m_dwLastError = RegDeleteValue((HKEY) m_hKey, szValue);
if ( m_dwLastError != ERROR_SUCCESS ) {
wxLogSysError(m_dwLastError, _("can't delete value '%s' from key '%s'"),
szValue, GetName().c_str());
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());
// 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(m_hKey, szValue, RESERVED,
+ return RegQueryValueEx((HKEY) m_hKey, szValue, RESERVED,
NULL, NULL, NULL) == ERROR_SUCCESS;
}
else
return Type_None;
DWORD dwType;
- m_dwLastError = RegQueryValueEx(m_hKey, szValue, RESERVED,
+ m_dwLastError = RegQueryValueEx((HKEY) m_hKey, szValue, RESERVED,
&dwType, NULL, NULL);
if ( m_dwLastError != ERROR_SUCCESS ) {
wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),
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, RESERVED, REG_DWORD,
(RegString)&lValue, sizeof(lValue));
if ( m_dwLastError == ERROR_SUCCESS )
return TRUE;
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, szValue, RESERVED,
&dwType, pBuf, &dwSize);
if ( m_dwLastError != ERROR_SUCCESS ) {
wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),
#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, szValue, RESERVED,
&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, szValue, RESERVED,
&dwType, pBuf, &dwSize);
+ strValue.UngetWriteBuf();
if ( m_dwLastError == ERROR_SUCCESS ) {
// check that it was the right type
wxASSERT_MSG( dwType == REG_SZ,
// 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 ( CONST_CAST Open() ) {
#ifdef __WIN32__
- m_dwLastError = RegSetValueEx(m_hKey, szValue, RESERVED, REG_SZ,
+ m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, RESERVED, REG_SZ,
(RegString)strValue.c_str(),
strValue.Len() + 1);
if ( m_dwLastError == ERROR_SUCCESS )
// 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
DWORD dwValueLen = WXSIZEOF(szValueName);
lIndex++;
- m_dwLastError = RegEnumValue(m_hKey, lIndex,
+ m_dwLastError = RegEnumValue((HKEY) m_hKey, lIndex,
szValueName, &dwValueLen,
RESERVED,
NULL, // [out] type
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 ) {
}
// ============================================================================
-// 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;
- if ( RegOpenKey(hRootKey, szKey, &hkeyDummy) == ERROR_SUCCESS ) {
+ if ( RegOpenKey( (HKEY) hRootKey, szKey, &hkeyDummy) == ERROR_SUCCESS ) {
RegCloseKey(hkeyDummy);
return TRUE;
}
projects / wxWidgets.git / blobdiff