Index: chrome/installer/util/install_util.cc |
=================================================================== |
--- chrome/installer/util/install_util.cc (revision 273136) |
+++ chrome/installer/util/install_util.cc (working copy) |
@@ -221,9 +221,8 @@ |
DCHECK(dist); |
RegKey key; |
HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; |
- LONG result = key.Open(reg_root, |
- dist->GetVersionKey().c_str(), |
- KEY_QUERY_VALUE | KEY_WOW64_32KEY); |
+ LONG result = key.Open(reg_root, dist->GetVersionKey().c_str(), |
+ KEY_QUERY_VALUE); |
base::string16 version_str; |
if (result == ERROR_SUCCESS) |
@@ -247,9 +246,8 @@ |
DCHECK(dist); |
RegKey key; |
HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; |
- LONG result = key.Open(reg_root, |
- dist->GetVersionKey().c_str(), |
- KEY_QUERY_VALUE | KEY_WOW64_32KEY); |
+ LONG result = |
+ key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_QUERY_VALUE); |
base::string16 version_str; |
if (result == ERROR_SUCCESS) |
@@ -288,16 +286,17 @@ |
DCHECK(install_list); |
const HKEY root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; |
DWORD installer_result = (GetInstallReturnCode(status) == 0) ? 0 : 1; |
- install_list->AddCreateRegKeyWorkItem(root, state_key, KEY_WOW64_32KEY); |
+ install_list->AddCreateRegKeyWorkItem( |
+ root, state_key, WorkItem::kWow64Default); |
install_list->AddSetRegValueWorkItem(root, |
state_key, |
- KEY_WOW64_32KEY, |
+ WorkItem::kWow64Default, |
installer::kInstallerResult, |
installer_result, |
true); |
install_list->AddSetRegValueWorkItem(root, |
state_key, |
- KEY_WOW64_32KEY, |
+ WorkItem::kWow64Default, |
installer::kInstallerError, |
static_cast<DWORD>(status), |
true); |
@@ -305,7 +304,7 @@ |
base::string16 msg = installer::GetLocalizedString(string_resource_id); |
install_list->AddSetRegValueWorkItem(root, |
state_key, |
- KEY_WOW64_32KEY, |
+ WorkItem::kWow64Default, |
installer::kInstallerResultUIString, |
msg, |
true); |
@@ -314,7 +313,7 @@ |
install_list->AddSetRegValueWorkItem( |
root, |
state_key, |
- KEY_WOW64_32KEY, |
+ WorkItem::kWow64Default, |
installer::kInstallerSuccessLaunchCmdLine, |
*launch_cmd, |
true); |
@@ -328,10 +327,8 @@ |
DCHECK_GT(installer::NUM_STAGES, stage); |
const HKEY root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; |
RegKey state_key; |
- LONG result = |
- state_key.Open(root, |
- state_key_path.c_str(), |
- KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WOW64_32KEY); |
+ LONG result = state_key.Open(root, state_key_path.c_str(), |
+ KEY_QUERY_VALUE | KEY_SET_VALUE); |
if (result == ERROR_SUCCESS) { |
if (stage == installer::NO_STAGE) { |
result = state_key.DeleteValue(installer::kInstallerExtraCode1); |