diff options
| author | wfh@chromium.org <wfh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 01:54:38 +0000 |
|---|---|---|
| committer | wfh@chromium.org <wfh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 01:54:38 +0000 |
| commit | f7c566f7c49967f6bd468400acf9515766a67c42 (patch) | |
| tree | 8ebfc81fb9410b19708817a89fb121f0108c981f /chrome/installer/mini_installer | |
| parent | 3adff91954d847094b62d4960a5255418123d251 (diff) | |
| download | chromium_src-f7c566f7c49967f6bd468400acf9515766a67c42.zip chromium_src-f7c566f7c49967f6bd468400acf9515766a67c42.tar.gz chromium_src-f7c566f7c49967f6bd468400acf9515766a67c42.tar.bz2 | |
Omaha configuration parameters now use Wow6432Node (32-bit registry) on 64-bit installs. GCAPI configuration parameters also use these same accesses since they read/write the same data.
Also, force installation of Win64 into C:\Program Files (x86) until the code is added to support moving the files to the right place during upgrade and downgrade. Uninstall information will remain stored in the 32-bit registry (even on 64-bit) until the installation location is changed.
This fixes system installs on Win64.
BUG=338706
R=grt@chromium.org
Review URL: https://codereview.chromium.org/300593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer')
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc index 25b0c80..21208a6 100644 --- a/chrome/installer/mini_installer/mini_installer.cc +++ b/chrome/installer/mini_installer/mini_installer.cc @@ -145,7 +145,9 @@ bool OpenClientStateKey(HKEY root_key, const wchar_t* app_guid, REGSAM access, PathString client_state_key; return client_state_key.assign(kApRegistryKeyBase) && client_state_key.append(app_guid) && - (key->Open(root_key, client_state_key.get(), access) == ERROR_SUCCESS); + (key->Open(root_key, + client_state_key.get(), + access | KEY_WOW64_32KEY) == ERROR_SUCCESS); } // This function sets the flag in registry to indicate that Google Update |