Make the windows_version.h functions threadsafe by using a singleton. Add accessors to the singl...

base/sys_info_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/sys_info.h"
 
 #include <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
+#include "base/win/windows_version.h"
 
 namespace base {
 
 // static
 int SysInfo::NumberOfProcessors() {
-  SYSTEM_INFO info;
-  GetSystemInfo(&info);
-  return static_cast<int>(info.dwNumberOfProcessors);
+  return win::OSInfo::GetInstance()->processors();
 }
 
 // static
 int64 SysInfo::AmountOfPhysicalMemory() {
   MEMORYSTATUSEX memory_info;
   memory_info.dwLength = sizeof(memory_info);
   if (!GlobalMemoryStatusEx(&memory_info)) {
     NOTREACHED();
     return 0;
   }
@@ skipping 16 matching lines @@
   return rv;
 }
 
 // static
 std::string SysInfo::OperatingSystemName() {
   return "Windows NT";
 }
 
 // static
 std::string SysInfo::OperatingSystemVersion() {
-  OSVERSIONINFO info = {0};
-  info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-  GetVersionEx(&info);
-
-  return base::StringPrintf("%lu.%lu",
-                            info.dwMajorVersion, info.dwMinorVersion);
+  win::OSInfo* os_info = win::OSInfo::GetInstance();
+  win::OSInfo::VersionNumber version_number = os_info->version_number();
+  std::string version(StringPrintf("%d.%d", version_number.major,
+                                   version_number.minor));
+  win::OSInfo::ServicePack service_pack = os_info->service_pack();
+  if (service_pack.major != 0) {
+    version += StringPrintf(" SP%d", service_pack.major);
+    if (service_pack.minor != 0)
+      version += StringPrintf(".%d", service_pack.minor);
+  }
+  return version;
 }
 
 // TODO: Implement OperatingSystemVersionComplete, which would include
 // patchlevel/service pack number.
 // See chrome/browser/ui/views/bug_report_view.cc, BugReportView::SetOSVersion.
 
 // static
 std::string SysInfo::CPUArchitecture() {
   // TODO: Make this vary when we support any other architectures.
   return "x86";
 }
 
 // static
 void SysInfo::GetPrimaryDisplayDimensions(int* width, int* height) {
   if (width)
     *width = GetSystemMetrics(SM_CXSCREEN);
 
   if (height)
     *height = GetSystemMetrics(SM_CYSCREEN);
 }
 
 // static
 int SysInfo::DisplayCount() {
   return GetSystemMetrics(SM_CMONITORS);
 }
 
 // static
 size_t SysInfo::VMAllocationGranularity() {
-  SYSTEM_INFO sysinfo;
-  GetSystemInfo(&sysinfo);
-
-  return sysinfo.dwAllocationGranularity;
+  return win::OSInfo::GetInstance()->allocation_granularity();
 }
 
 // static
-void SysInfo::OperatingSystemVersionNumbers(int32 *major_version,
-                                            int32 *minor_version,
-                                            int32 *bugfix_version) {
-  OSVERSIONINFO info = {0};
-  info.dwOSVersionInfoSize = sizeof(info);
-  GetVersionEx(&info);
-  *major_version = info.dwMajorVersion;
-  *minor_version = info.dwMinorVersion;
+void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
+                                            int32* minor_version,
+                                            int32* bugfix_version) {
+  win::OSInfo* os_info = win::OSInfo::GetInstance();
+  *major_version = os_info->version_number().major;
+  *minor_version = os_info->version_number().minor;
   *bugfix_version = 0;
 }
 
 }  // namespace base