chrome/installer/util/shell_util.cc - Issue 300593002: Make omaha, gcapi and uninstall registry accesses use Wow6432Node on 64-bit

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/installer/util/shell_util.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

Index: chrome/installer/util/shell_util.cc

diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc

index 43de6fafde41ce36d6020d8cf01134432e0180a0..8e7772edee2b1022ffc8af81e06a033ac4cf291a 100644

--- a/chrome/installer/util/shell_util.cc

+++ b/chrome/installer/util/shell_util.cc

@@ -712,7 +712,8 @@ bool ElevateAndRegisterChrome(BrowserDistribution* dist,

if (!base::PathExists(exe_path)) {

HKEY reg_root = InstallUtil::IsPerUserInstall(chrome_exe.c_str()) ?

HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;

- RegKey key(reg_root, dist->GetUninstallRegPath().c_str(), KEY_READ);

+ RegKey key(reg_root, dist->GetUninstallRegPath().c_str(),

+ KEY_READ | KEY_WOW64_32KEY);

grt (UTC plus 2) 2014/05/27 16:42:08 i think this should be in the default; see other c

Will Harris 2014/05/27 19:25:10 see general comment on 32/64 uninstall.

base::string16 uninstall_string;

key.ReadValue(installer::kUninstallStringField, &uninstall_string);

CommandLine command_line = CommandLine::FromString(uninstall_string);

« chrome/installer/util/installation_state.cc ('K') | « chrome/installer/util/product.cc ('k') | no next file » | no next file with comments »