Report Windows build and patch number in the component updater checks.

base/win/windows_version.cc

 // Copyright (c) 2012 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/win/windows_version.h"
 
 #include <windows.h>
 
 #include <memory>
 
@@ skipping 65 matching lines @@
         LOWORD(file_version_info->fixed_file_info()->dwFileVersionMS);
     const int build =
         HIWORD(file_version_info->fixed_file_info()->dwFileVersionLS);
     return MajorMinorBuildToVersion(major, minor, build);
   }
 
   NOTREACHED();
   return VERSION_WIN_LAST;
 }
 
+// Returns the the "UBR" value from the registry. Introduced in Windows 10,
+// this undocumented value appears to be similar to a patch number.
+// Returns 0 if the value does not exist or it could not be read.
+int GetUBR() {
+  // The values under the CurrentVersion registry hive are mirrored under
+  // the corresponding Wow6432 hive.
+  constexpr wchar_t kRegKeyWindowsNTCurrentVersion[] =

[grt (UTC plus 2), 2016/11/15 20:59:09]

"static constexpr ..." so that the string isn't pushed onto the stack.

[Sorin Jianu, 2016/11/15 23:03:29]

Done.

This had a massive impact, which I admit I did not expect. I expected that in
both cases, with and without static, the code will use the address of the string
literals and not push anything that is not needed on the stack. Effectively, I
expected the local variables to be optimized out, especially in the constexpr
case.

That did not happen in the optimized build I inspected. 

With static constexpr, the entire function is inlined. With just the constexpr
declaration, the function is not optimized, the local variables are not pushed
onto the stack but there are some streaming XMM instructions moving strings
around, which I don't understand.

+      L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
+  constexpr wchar_t kRegValUBR[] = L"UBR";
+
+  base::win::RegKey key;
+  if (key.Open(HKEY_LOCAL_MACHINE, kRegKeyWindowsNTCurrentVersion,
+               KEY_QUERY_VALUE) != ERROR_SUCCESS) {
+    return 0;
+  }
+
+  DWORD ubr = 0;
+  key.ReadValueDW(kRegValUBR, &ubr);

[grt (UTC plus 2), 2016/11/15 20:59:09]

nit: i would use L"UBR" directly here since using a local var neither reduces
wrapping nor avoids repetition of the value. i would likely keep
kRegKeyWindowsNTCurrentVersion as-is since it may avoid linewrapping.

[Sorin Jianu, 2016/11/15 23:03:29]

Done.

+
+  return static_cast<int>(ubr);
+}
+
 }  // namespace
 
 // static
 OSInfo* OSInfo::GetInstance() {
   // Note: we don't use the Singleton class because it depends on AtExitManager,
   // and it's convenient for other modules to use this classs without it. This
   // pattern is copied from gurl.cc.
   static OSInfo* info;
   if (!info) {
     OSInfo* new_info = new OSInfo();
     if (InterlockedCompareExchangePointer(
         reinterpret_cast<PVOID*>(&info), new_info, NULL)) {
       delete new_info;
     }
   }
   return info;
 }
 
 OSInfo::OSInfo()
     : version_(VERSION_PRE_XP),
       kernel32_version_(VERSION_PRE_XP),
       got_kernel32_version_(false),
       architecture_(OTHER_ARCHITECTURE),
       wow64_status_(GetWOW64StatusForProcess(GetCurrentProcess())) {
   OSVERSIONINFOEX version_info = { sizeof version_info };
   ::GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info));
   version_number_.major = version_info.dwMajorVersion;
   version_number_.minor = version_info.dwMinorVersion;
   version_number_.build = version_info.dwBuildNumber;
+  version_number_.patch = GetUBR();
   version_ = MajorMinorBuildToVersion(
       version_number_.major, version_number_.minor, version_number_.build);
   service_pack_.major = version_info.wServicePackMajor;
   service_pack_.minor = version_info.wServicePackMinor;
   service_pack_str_ = base::WideToUTF8(version_info.szCSDVersion);
 
   SYSTEM_INFO system_info = {};
   ::GetNativeSystemInfo(&system_info);
   switch (system_info.wProcessorArchitecture) {
     case PROCESSOR_ARCHITECTURE_INTEL: architecture_ = X86_ARCHITECTURE; break;
@@ skipping 97 matching lines @@
     return WOW64_UNKNOWN;
   return is_wow64 ? WOW64_ENABLED : WOW64_DISABLED;
 }
 
 Version GetVersion() {
   return OSInfo::GetInstance()->version();
 }
 
 }  // namespace win
 }  // namespace base