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

Side by Side Diff: chrome/browser/importer/firefox_importer_utils_win.cc

Issue 6090006: Regkey functions return error code instead of bool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/browser/first_run/first_run_win.cc ('k') | chrome/browser/importer/ie_importer.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser/importer/firefox_importer_utils.h" 5 #include "chrome/browser/importer/firefox_importer_utils.h"
6 6
7 #include <shlobj.h> 7 #include <shlobj.h>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/win/registry.h" 10 #include "base/win/registry.h"
(...skipping 13 matching lines...) Expand all
24 TCHAR ver_buffer[128]; 24 TCHAR ver_buffer[128];
25 DWORD ver_buffer_length = sizeof(ver_buffer); 25 DWORD ver_buffer_length = sizeof(ver_buffer);
26 int highest_version = 0; 26 int highest_version = 0;
27 // When installing Firefox with admin account, the product keys will be 27 // When installing Firefox with admin account, the product keys will be
28 // written under HKLM\Mozilla. Otherwise it the keys will be written under 28 // written under HKLM\Mozilla. Otherwise it the keys will be written under
29 // HKCU\Mozilla. 29 // HKCU\Mozilla.
30 for (int i = 0; i < arraysize(kFireFoxRegistryPaths); ++i) { 30 for (int i = 0; i < arraysize(kFireFoxRegistryPaths); ++i) {
31 base::win::RegKey reg_key(kFireFoxRegistryPaths[i], 31 base::win::RegKey reg_key(kFireFoxRegistryPaths[i],
32 L"Software\\Mozilla\\Mozilla Firefox", KEY_READ); 32 L"Software\\Mozilla\\Mozilla Firefox", KEY_READ);
33 33
34 bool result = reg_key.ReadValue(L"CurrentVersion", ver_buffer, 34 LONG result = reg_key.ReadValue(L"CurrentVersion", ver_buffer,
35 &ver_buffer_length, NULL); 35 &ver_buffer_length, NULL);
36 if (!result) 36 if (result != ERROR_SUCCESS)
37 continue; 37 continue;
38 highest_version = std::max(highest_version, _wtoi(ver_buffer)); 38 highest_version = std::max(highest_version, _wtoi(ver_buffer));
39 } 39 }
40 return highest_version; 40 return highest_version;
41 } 41 }
42 42
43 std::wstring GetFirefoxInstallPathFromRegistry() { 43 std::wstring GetFirefoxInstallPathFromRegistry() {
44 // Detects the path that Firefox is installed in. 44 // Detects the path that Firefox is installed in.
45 std::wstring registry_path = L"Software\\Mozilla\\Mozilla Firefox"; 45 std::wstring registry_path = L"Software\\Mozilla\\Mozilla Firefox";
46 wchar_t buffer[MAX_PATH]; 46 wchar_t buffer[MAX_PATH];
47 DWORD buffer_length = sizeof(buffer); 47 DWORD buffer_length = sizeof(buffer);
48 base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, registry_path.c_str(), 48 base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, registry_path.c_str(),
49 KEY_READ); 49 KEY_READ);
50 bool result = reg_key.ReadValue(L"CurrentVersion", buffer, 50 LONG result = reg_key.ReadValue(L"CurrentVersion", buffer,
51 &buffer_length, NULL); 51 &buffer_length, NULL);
52 if (!result) 52 if (result != ERROR_SUCCESS)
53 return std::wstring(); 53 return std::wstring();
54 registry_path += L"\\" + std::wstring(buffer) + L"\\Main"; 54 registry_path += L"\\" + std::wstring(buffer) + L"\\Main";
55 buffer_length = sizeof(buffer); 55 buffer_length = sizeof(buffer);
56 base::win::RegKey reg_key_directory(HKEY_LOCAL_MACHINE, 56 base::win::RegKey reg_key_directory(HKEY_LOCAL_MACHINE,
57 registry_path.c_str(), KEY_READ); 57 registry_path.c_str(), KEY_READ);
58 result = reg_key_directory.ReadValue(L"Install Directory", buffer, 58 result = reg_key_directory.ReadValue(L"Install Directory", buffer,
59 &buffer_length, NULL); 59 &buffer_length, NULL);
60 if (!result) 60 if (result != ERROR_SUCCESS)
61 return std::wstring(); 61 return std::wstring();
62 return buffer; 62 return buffer;
63 } 63 }
64 64
65 FilePath GetProfilesINI() { 65 FilePath GetProfilesINI() {
66 FilePath ini_file; 66 FilePath ini_file;
67 // The default location of the profile folder containing user data is 67 // The default location of the profile folder containing user data is
68 // under the "Application Data" folder in Windows XP. 68 // under the "Application Data" folder in Windows XP.
69 wchar_t buffer[MAX_PATH] = {0}; 69 wchar_t buffer[MAX_PATH] = {0};
70 if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 70 if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL,
71 SHGFP_TYPE_CURRENT, buffer))) { 71 SHGFP_TYPE_CURRENT, buffer))) {
72 ini_file = FilePath(buffer).Append(L"Mozilla\\Firefox\\profiles.ini"); 72 ini_file = FilePath(buffer).Append(L"Mozilla\\Firefox\\profiles.ini");
73 } 73 }
74 if (file_util::PathExists(ini_file)) 74 if (file_util::PathExists(ini_file))
75 return ini_file; 75 return ini_file;
76 76
77 return FilePath(); 77 return FilePath();
78 } 78 }
OLDNEW
« no previous file with comments | « chrome/browser/first_run/first_run_win.cc ('k') | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698