diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-10 19:30:35 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-10 19:30:35 +0000 |
| commit | 8fbab00264861b95a99a8232ba75e0994c46c185 (patch) | |
| tree | 3262192c55378e22383f5890eb9e47aeaa7bb762 /base/win_util.cc | |
| parent | cf9394a2b153cf94ad320d50e380f25c8450bb6f (diff) | |
| download | chromium_src-8fbab00264861b95a99a8232ba75e0994c46c185.zip chromium_src-8fbab00264861b95a99a8232ba75e0994c46c185.tar.gz chromium_src-8fbab00264861b95a99a8232ba75e0994c46c185.tar.bz2 | |
The About box was needlessly blocking Chrome on Vista SP1 (with UAC disabled) from performing an On-demand update. Google Update has worked around the issue - for SP1 and up that is - so we can relax the restriction a bit.
Review URL: http://codereview.chromium.org/1708
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win_util.cc')
| -rw-r--r-- | base/win_util.cc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/base/win_util.cc b/base/win_util.cc index d8f8b4e..6f193cc 100644 --- a/base/win_util.cc +++ b/base/win_util.cc @@ -60,6 +60,24 @@ WinVersion GetWinVersion() { return win_version; } +void GetServicePackLevel(int* major, int* minor) { + DCHECK(major && minor); + static bool checked_version = false; + static int service_pack_major = -1; + static int service_pack_minor = -1; + if (!checked_version) { + OSVERSIONINFOEX version_info = {0}; + version_info.dwOSVersionInfoSize = sizeof(version_info); + GetVersionEx(reinterpret_cast<LPOSVERSIONINFOW>(&version_info)); + service_pack_major = version_info.wServicePackMajor; + service_pack_minor = version_info.wServicePackMinor; + checked_version = true; + } + + *major = service_pack_major; + *minor = service_pack_minor; +} + bool AddAccessToKernelObject(HANDLE handle, WELL_KNOWN_SID_TYPE known_sid, ACCESS_MASK access) { PSECURITY_DESCRIPTOR descriptor = NULL; |