Different test for previously subclassed, for WinCE

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 7d8a62aca13ca32c58dbd84010e063d89aab04d1..9462ef29f0ed6452b45dd8ce2b467c5671d66009 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -36,7 +36,7 @@
 #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"
 
 #ifdef __WXWINCE__
 #include "wx/msw/private.h"


@@ -94,7 +94,7 @@ 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


@@ -376,31 +376,36 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
 // opens key (it's not an error to call Open() on an already opened key)
 bool wxRegKey::Open()
 {
 // opens key (it's not an error to call Open() on an already opened key)
 bool wxRegKey::Open()
 {

-  if ( IsOpened() )
-    return TRUE;
+    if ( IsOpened() )
+        return TRUE;
+
+    HKEY tmpKey;
+    m_dwLastError = ::RegOpenKeyEx
+                    (
+                        (HKEY) m_hRootKey,
+                        m_strKey,
+                        RESERVED,
+                        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 = RegOpenKeyEx((HKEY) m_hRootKey, m_strKey,
-      0, 0, &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;
     m_hKey = (WXHKEY) tmpKey;
     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() ) {
+  if ( !bOkIfExists && Exists() )

     return FALSE;
     return FALSE;

-  }

 
   if ( IsOpened() )
     return TRUE;
 
   if ( IsOpened() )
     return TRUE;


@@ -1083,16 +1088,25 @@ bool wxRegKey::IsNumericValue(const wxChar *szValue) const
 
 bool KeyExists(WXHKEY hRootKey, const wxChar *szKey)
 {
 
 bool KeyExists(WXHKEY hRootKey, const wxChar *szKey)
 {

-  // don't close this key itself for the case of empty szKey!
-  if ( wxIsEmpty(szKey) )
-    return TRUE;
+    // 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_ALL_ACCESS,
+            &hkeyDummy
+         ) == ERROR_SUCCESS )
+    {
+        ::RegCloseKey(hkeyDummy);
+
+        return TRUE;
+    }

 
 

-  HKEY hkeyDummy;
-  if ( RegOpenKeyEx( (HKEY) hRootKey, szKey, 0, 0, &hkeyDummy) == ERROR_SUCCESS ) {
-    RegCloseKey(hkeyDummy);
-    return TRUE;
-  }
-  else

     return FALSE;
 }
 
     return FALSE;
 }