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

Unified Diff: chrome/installer/mini_installer/mini_installer.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: move the uninstall registry access to 32-bit 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 | « no previous file | chrome/installer/setup/install_worker.cc » ('j') | chrome/installer/setup/install_worker.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer/mini_installer.cc
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc
index 25b0c80413049d6618a1e153e5cb0a0460fc4ced..c2ee715bf3e0b10c10db84f4149b5ab704fdc71e 100644
--- a/chrome/installer/mini_installer/mini_installer.cc
+++ b/chrome/installer/mini_installer/mini_installer.cc
@@ -132,7 +132,8 @@ bool ReadValueFromRegistry(HKEY root_key, const wchar_t *sub_key,
size_t size) {
RegKey key;
- if (key.Open(root_key, sub_key, KEY_QUERY_VALUE) == ERROR_SUCCESS &&
+ if (key.Open(root_key, sub_key,
+ KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS &&
grt (UTC plus 2) 2014/05/27 16:42:08 this function is only used for a key in HKCU that
Will Harris 2014/05/27 19:25:10 Done.
key.ReadValue(value_name, value, size) == ERROR_SUCCESS) {
return true;
}
@@ -156,7 +157,7 @@ bool OpenClientStateKey(HKEY root_key, const wchar_t* app_guid, REGSAM access,
// TODO(grt): Write a unit test for this that uses registry virtualization.
void SetInstallerFlags(const Configuration& configuration) {
RegKey key;
- const REGSAM key_access = KEY_QUERY_VALUE | KEY_SET_VALUE;
+ const REGSAM key_access = KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WOW64_32KEY;
const HKEY root_key =
configuration.is_system_level() ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
// This is ignored if multi-install is true.
@@ -229,7 +230,8 @@ bool GetSetupExePathForGuidFromRegistry(bool system_level,
size_t size) {
const HKEY root_key = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
RegKey key;
- return OpenClientStateKey(root_key, app_guid, KEY_QUERY_VALUE, &key) &&
+ return OpenClientStateKey(root_key, app_guid,
+ KEY_QUERY_VALUE | KEY_WOW64_32KEY, &key) &&
(key.ReadValue(kUninstallRegistryValueName, path, size) == ERROR_SUCCESS);
}
« no previous file with comments | « no previous file | chrome/installer/setup/install_worker.cc » ('j') | chrome/installer/setup/install_worker.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698