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

Side by Side Diff: chrome/installer/util/install_util.cc

Issue 62142: Min XP Service Pack required is two not one. (Closed)
Patch Set: Created 11 years, 8 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
« no previous file with comments | « no previous file | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // See the corresponding header file for description of the functions in this 5 // See the corresponding header file for description of the functions in this
6 // file. 6 // file.
7 7
8 #include "chrome/installer/util/install_util.h" 8 #include "chrome/installer/util/install_util.h"
9 9
10 #include <shellapi.h> 10 #include <shellapi.h>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 key.Close(); 71 key.Close();
72 LOG(INFO) << "Existing Chrome version found " << version_str; 72 LOG(INFO) << "Existing Chrome version found " << version_str;
73 return installer::Version::GetVersionFromString(version_str); 73 return installer::Version::GetVersionFromString(version_str);
74 } 74 }
75 75
76 bool InstallUtil::IsOSSupported() { 76 bool InstallUtil::IsOSSupported() {
77 int major, minor; 77 int major, minor;
78 win_util::WinVersion version = win_util::GetWinVersion(); 78 win_util::WinVersion version = win_util::GetWinVersion();
79 win_util::GetServicePackLevel(&major, &minor); 79 win_util::GetServicePackLevel(&major, &minor);
80 80
81 // We do not support Win2K or older, or XP without service pack 1. 81 // We do not support Win2K or older, or XP without service pack 2.
82 LOG(INFO) << "Windows Version: " << version 82 LOG(INFO) << "Windows Version: " << version
83 << ", Service Pack: " << major << "." << minor; 83 << ", Service Pack: " << major << "." << minor;
84 if ((version > win_util::WINVERSION_XP) || 84 if ((version > win_util::WINVERSION_XP) ||
85 (version == win_util::WINVERSION_XP && major >= 1)) { 85 (version == win_util::WINVERSION_XP && major >= 2)) {
86 return true; 86 return true;
87 } 87 }
88 return false; 88 return false;
89 } 89 }
90 90
91 void InstallUtil::WriteInstallerResult(bool system_install, 91 void InstallUtil::WriteInstallerResult(bool system_install,
92 installer_util::InstallStatus status, 92 installer_util::InstallStatus status,
93 int string_resource_id, 93 int string_resource_id,
94 const std::wstring* const launch_cmd) { 94 const std::wstring* const launch_cmd) {
95 HKEY root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; 95 HKEY root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 DCHECK(NULL != registration_list); 135 DCHECK(NULL != registration_list);
136 bool success = true; 136 bool success = true;
137 for (int i = 0; i < dll_names_count; i++) { 137 for (int i = 0; i < dll_names_count; i++) {
138 std::wstring dll_file_path(install_path); 138 std::wstring dll_file_path(install_path);
139 file_util::AppendToPath(&dll_file_path, dll_names[i]); 139 file_util::AppendToPath(&dll_file_path, dll_names[i]);
140 success = registration_list->AddSelfRegWorkItem(dll_file_path, 140 success = registration_list->AddSelfRegWorkItem(dll_file_path,
141 do_register) && success; 141 do_register) && success;
142 } 142 }
143 return (dll_names_count > 0) && success; 143 return (dll_names_count > 0) && success;
144 } 144 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698