Fix issue where OpenKey() would call Close() and reset the wow64_access to 0

base/win/registry.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/win/registry.h"
 
 #include <shlwapi.h>
 #include <algorithm>
 
 #include "base/logging.h"
@@ skipping 87 matching lines @@
   if ((access & kWow64AccessMask) != wow64access_) {
     NOTREACHED();
     return ERROR_INVALID_PARAMETER;
   }
   HKEY subkey = NULL;
   LONG result = RegCreateKeyEx(key_, name, 0, NULL, REG_OPTION_NON_VOLATILE,
                                access, NULL, &subkey, NULL);
   if (result == ERROR_SUCCESS) {
     Close();
     key_ = subkey;
+    wow64access_ = access & kWow64AccessMask;
   }
 
   return result;
 }
 
 LONG RegKey::Open(HKEY rootkey, const wchar_t* subkey, REGSAM access) {
   DCHECK(rootkey && subkey && access);
   HKEY subhkey = NULL;
 
   LONG result = RegOpenKeyEx(rootkey, subkey, 0, access, &subhkey);
@@ skipping 18 matching lines @@
     return ERROR_INVALID_PARAMETER;
   }
   HKEY subkey = NULL;
   LONG result = RegOpenKeyEx(key_, relative_key_name, 0, access, &subkey);
 
   // We have to close the current opened key before replacing it with the new
   // one.
   if (result == ERROR_SUCCESS) {
     Close();
     key_ = subkey;
+    wow64access_ = access & kWow64AccessMask;
   }
   return result;
 }
 
 void RegKey::Close() {
   StopWatching();
   if (key_) {
     ::RegCloseKey(key_);
     key_ = NULL;
     wow64access_ = 0;
   }
 }
 
 // TODO(wfh): Remove this and other unsafe methods. See http://crbug.com/375400
 void RegKey::Set(HKEY key) {
   if (key_ != key) {
     Close();
     key_ = key;
     wow64access_ = 0;

[grt (UTC plus 2), 2014/06/14 13:23:17]

this is redundant. remove it?

[Will Harris, 2014/06/16 16:04:50]

Done.

   }
 }
 
 HKEY RegKey::Take() {
   DCHECK(wow64access_ == 0);
   StopWatching();
   HKEY key = key_;
   key_ = NULL;
   return key;
 }
@@ skipping 453 matching lines @@
     if (ERROR_SUCCESS == r)
       return true;
   }
 
   name_[0] = '\0';
   return false;
 }
 
 }  // namespace win
 }  // namespace base