Make the windows_version.h functions threadsafe by using a singleton.

sandbox/src/sandbox_utils.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 "sandbox/src/sandbox_utils.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
+#include "base/win/windows_version.h"
 #include "sandbox/src/internal_types.h"
 #include "sandbox/src/nt_internals.h"
 
 namespace sandbox {
 
 bool GetModuleHandleHelper(DWORD flags, const wchar_t* module_name,
                            HMODULE* module) {
   DCHECK(module);
 
   HMODULE kernel32_base = ::GetModuleHandle(kKerneldllName);
@@ skipping 29 matching lines @@
     MEMORY_BASIC_INFORMATION info = {0};
     size_t returned = VirtualQuery(module_name, &info, sizeof(info));
     if (sizeof(info) != returned)
       return false;
     *module = reinterpret_cast<HMODULE>(info.AllocationBase);
   }
   return true;
 }
 
 bool IsXPSP2OrLater() {
-  OSVERSIONINFOEX version = {0};
-  version.dwOSVersionInfoSize = sizeof(version);
-  if (!::GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version))) {
-    NOTREACHED();
-    return false;
-  }
-
-  // Vista or later
-  if (version.dwMajorVersion > 5)
-    return true;
-
-  // 2k, xp or 2003
-  if (version.dwMajorVersion == 5) {
-    // 2003
-    if (version.dwMinorVersion > 1)
-      return true;
-
-    // 2000
-    if (version.dwMinorVersion == 0)
-      return false;
-
-    // Windows Xp Sp2 or later
-    if (version.wServicePackMajor >= 2)
-      return true;
-  }
-
-  return false;
+  base::win::Version version = base::win::GetVersion();
+  return (version > base::win::VERSION_XP) ||
+      ((version == base::win::VERSION_XP) &&

[rvargas (doing something else), 2011/04/06 23:28:05]

nit: I think this should be indented like an if (under version)

[Peter Kasting, 2011/04/07 00:29:19]

ifs are indent-4 too.  It coincidentally happens that "if (" is 4 characters. 
To make sure, I asked Brett how I should indent here, and he said to do it how I
have it currently.

+       (base::win::OSInfo::GetInstance()->service_pack()[0] >= 2));
 }
 
 void InitObjectAttribs(const std::wstring& name, ULONG attributes, HANDLE root,
                        OBJECT_ATTRIBUTES* obj_attr, UNICODE_STRING* uni_name) {
   static RtlInitUnicodeStringFunction RtlInitUnicodeString;
   if (!RtlInitUnicodeString) {
     HMODULE ntdll = ::GetModuleHandle(kNtdllName);
     RtlInitUnicodeString = reinterpret_cast<RtlInitUnicodeStringFunction>(
       GetProcAddress(ntdll, "RtlInitUnicodeString"));
     DCHECK(RtlInitUnicodeString);
@@ skipping 13 matching lines @@
     return std::string();
 
   std::string mb;
   WideCharToMultiByte(CP_UTF8, 0, wide.c_str(), -1,
                       WriteInto(&mb, charcount), charcount, NULL, NULL);
 
   return mb;
 }
 
 };  // namespace sandbox