Allow Registry Iterator functions to use a specified WOW64 mode when iterating.

base/win/registry.h

Index: base/win/registry.h
diff --git a/base/win/registry.h b/base/win/registry.h
index af1aee7dce9d56d01cf911444bbf017bd67259eb..41d381a9d0059f1e0219b79c4f2be72794e88794 100644
--- a/base/win/registry.h
+++ b/base/win/registry.h
@@ -157,8 +157,19 @@ class BASE_EXPORT RegKey {
 // Iterates the entries found in a particular folder on the registry.
 class BASE_EXPORT RegistryValueIterator {
  public:
+  // Construct a Registry Value Iterator with default WOW64 access.
   RegistryValueIterator(HKEY root_key, const wchar_t* folder_key);
 
+  // Construct a Registry Key Iterator with specific WOW64 access, one of
+  // KEY_WOW64_32KEY or KEY_WOW64_64KEY, or 0.
+  // Note: |wow64access| should be the same access used to open |root_key|
+  // previously, or a predefined key (e.g. HKEY_LOCAL_MACHINE).
+  // See http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129.aspx.
+  RegistryValueIterator(HKEY root_key,
+                        const wchar_t* folder_key,
+                        REGSAM wow64access);
+
+
   ~RegistryValueIterator();
 
   DWORD ValueCount() const;
@@ -181,6 +192,8 @@ class BASE_EXPORT RegistryValueIterator {
   // Read in the current values.
   bool Read();
 
+  void Initialize(HKEY root_key, const wchar_t* folder_key, REGSAM wow64access);
+
   // The registry key being iterated.
   HKEY key_;
 
@@ -198,8 +211,18 @@ class BASE_EXPORT RegistryValueIterator {
 
 class BASE_EXPORT RegistryKeyIterator {
  public:
+  // Construct a Registry Key Iterator with default WOW64 access.
   RegistryKeyIterator(HKEY root_key, const wchar_t* folder_key);
 
+  // Construct a Registry Value Iterator with specific WOW64 access, one of
+  // KEY_WOW64_32KEY or KEY_WOW64_64KEY, or 0.
+  // Note: |wow64access| should be the same access used to open |root_key|
+  // previously, or a predefined key (e.g. HKEY_LOCAL_MACHINE).
+  // See http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129.aspx.
+  RegistryKeyIterator(HKEY root_key,
+                      const wchar_t* folder_key,
+                      REGSAM wow64access);
+
   ~RegistryKeyIterator();
 
   DWORD SubkeyCount() const;
@@ -218,6 +241,8 @@ class BASE_EXPORT RegistryKeyIterator {
   // Read in the current values.
   bool Read();
 
+  void Initialize(HKEY root_key, const wchar_t* folder_key, REGSAM wow64access);
+
   // The registry key being iterated.
   HKEY key_;