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

Side by Side Diff: chrome/installer/util/app_command.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, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/compat_checks.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/installer/util/app_command.h" 5 #include "chrome/installer/util/app_command.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/win/registry.h" 8 #include "base/win/registry.h"
9 #include "chrome/installer/util/google_update_constants.h" 9 #include "chrome/installer/util/google_update_constants.h"
10 #include "chrome/installer/util/work_item_list.h" 10 #include "chrome/installer/util/work_item_list.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 key.ReadValueDW(kNameBoolVars[i].name, &value); 63 key.ReadValueDW(kNameBoolVars[i].name, &value);
64 this->*(kNameBoolVars[i].data) = (value != 0); 64 this->*(kNameBoolVars[i].data) = (value != 0);
65 } 65 }
66 66
67 return true; 67 return true;
68 } 68 }
69 69
70 void AppCommand::AddWorkItems(HKEY predefined_root, 70 void AppCommand::AddWorkItems(HKEY predefined_root,
71 const base::string16& command_path, 71 const base::string16& command_path,
72 WorkItemList* item_list) const { 72 WorkItemList* item_list) const {
73 // Command_path is derived from GetRegCommandKey which always returns
74 // value from GetVersionKey() which should be 32-bit hive.
73 item_list->AddCreateRegKeyWorkItem( 75 item_list->AddCreateRegKeyWorkItem(
74 predefined_root, command_path, WorkItem::kWow64Default) 76 predefined_root, command_path, KEY_WOW64_32KEY)
75 ->set_log_message("creating AppCommand registry key"); 77 ->set_log_message("creating AppCommand registry key");
76 item_list->AddSetRegValueWorkItem(predefined_root, 78 item_list->AddSetRegValueWorkItem(predefined_root,
77 command_path, 79 command_path,
78 WorkItem::kWow64Default, 80 KEY_WOW64_32KEY,
79 google_update::kRegCommandLineField, 81 google_update::kRegCommandLineField,
80 command_line_, 82 command_line_,
81 true) 83 true)
82 ->set_log_message("setting AppCommand CommandLine registry value"); 84 ->set_log_message("setting AppCommand CommandLine registry value");
83 85
84 for (int i = 0; i < arraysize(kNameBoolVars); ++i) { 86 for (int i = 0; i < arraysize(kNameBoolVars); ++i) {
85 const wchar_t* var_name = kNameBoolVars[i].name; 87 const wchar_t* var_name = kNameBoolVars[i].name;
86 bool var_data = this->*(kNameBoolVars[i].data); 88 bool var_data = this->*(kNameBoolVars[i].data);
87 89
88 // Adds a work item to set |var_name| to DWORD 1 if |var_data| is true; 90 // Adds a work item to set |var_name| to DWORD 1 if |var_data| is true;
89 // adds a work item to remove |var_name| otherwise. 91 // adds a work item to remove |var_name| otherwise.
90 if (var_data) { 92 if (var_data) {
91 item_list->AddSetRegValueWorkItem(predefined_root, 93 item_list->AddSetRegValueWorkItem(predefined_root,
92 command_path, 94 command_path,
93 WorkItem::kWow64Default, 95 KEY_WOW64_32KEY,
94 var_name, 96 var_name,
95 static_cast<DWORD>(1), 97 static_cast<DWORD>(1),
96 true); 98 true);
97 } else { 99 } else {
98 item_list->AddDeleteRegValueWorkItem( 100 item_list->AddDeleteRegValueWorkItem(
99 predefined_root, command_path, WorkItem::kWow64Default, var_name); 101 predefined_root, command_path, KEY_WOW64_32KEY, var_name);
100 } 102 }
101 } 103 }
102 } 104 }
103 105
104 } // namespace installer 106 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/compat_checks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698