Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4995)

Unified Diff: chrome/installer/gcapi/gcapi_reactivation.cc

Issue 300593002: Make omaha, gcapi and uninstall registry accesses use Wow6432Node on 64-bit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/gcapi/gcapi_last_run_test.cc ('k') | chrome/installer/gcapi/gcapi_reactivation_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/gcapi/gcapi_reactivation.cc
diff --git a/chrome/installer/gcapi/gcapi_reactivation.cc b/chrome/installer/gcapi/gcapi_reactivation.cc
index 3d576c76512ec7c021e95bebcd40e9013d7d0b68..8580271137334423d2d8098a904d9a8d63b0a1f5 100644
--- a/chrome/installer/gcapi/gcapi_reactivation.cc
+++ b/chrome/installer/gcapi/gcapi_reactivation.cc
@@ -28,7 +28,7 @@ std::wstring GetReactivationHistoryKeyPath() {
bool HasBeenReactivated() {
RegKey reactivation_key(HKEY_CURRENT_USER,
GetReactivationHistoryKeyPath().c_str(),
- KEY_QUERY_VALUE);
+ KEY_QUERY_VALUE | KEY_WOW64_32KEY);
return reactivation_key.Valid();
}
@@ -45,7 +45,8 @@ bool SetReactivationBrandCode(const std::wstring& brand_code, int shell_mode) {
path += L"\\";
path += google_update::kChromeUpgradeCode;
- RegKey client_state_key(HKEY_CURRENT_USER, path.c_str(), KEY_SET_VALUE);
+ RegKey client_state_key(
+ HKEY_CURRENT_USER, path.c_str(), KEY_SET_VALUE | KEY_WOW64_32KEY);
if (client_state_key.Valid()) {
success = client_state_key.WriteValue(
google_update::kRegRLZReactivationBrandField,
@@ -57,7 +58,7 @@ bool SetReactivationBrandCode(const std::wstring& brand_code, int shell_mode) {
// a currently un-used timestamp for future proofing.
RegKey reactivation_key(HKEY_CURRENT_USER,
GetReactivationHistoryKeyPath().c_str(),
- KEY_WRITE);
+ KEY_WRITE | KEY_WOW64_32KEY);
if (reactivation_key.Valid()) {
int64 timestamp = Time::Now().ToInternalValue();
reactivation_key.WriteValue(brand_code.c_str(),
« no previous file with comments | « chrome/installer/gcapi/gcapi_last_run_test.cc ('k') | chrome/installer/gcapi/gcapi_reactivation_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698