Add options to write version number to registry.

chrome/installer/setup/setup_main.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 "chrome/installer/setup/setup_main.h"
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 62 matching lines @@
 using installer::InstallerState;
 using installer::InstallationState;
 using installer::InstallationValidator;
 using installer::MasterPreferences;
 using installer::Product;
 using installer::ProductState;
 using installer::Products;
 
 const wchar_t kGoogleUpdatePipeName[] = L"\\\\.\\pipe\\GoogleCrashServices\\";
 const wchar_t kSystemPrincipalSid[] = L"S-1-5-18";
+const wchar_t kDisplayVersion[] = L"DisplayVersion";
 
 const MINIDUMP_TYPE kLargerDumpType = static_cast<MINIDUMP_TYPE>(
     MiniDumpWithProcessThreadData |  // Get PEB and TEB.
     MiniDumpWithUnloadedModules |  // Get unloaded modules when available.
     MiniDumpWithIndirectlyReferencedMemory);  // Get memory referenced by stack.
 
 namespace {
 
+// Overwrite an existing DisplayVersion as written by the MSI installer
+// with the real version number of Chrome.
+LONG OverwriteDisplayVersion(base::string16 path, base::string16 value) {

[robertshield, 2015/08/08 04:32:38]

pass by reference, no need to make a copy: const base::string16&

[bcwhite, 2015/08/13 16:25:58]

Done.

+  base::win::RegKey key;
+  LONG result;

[robertshield, 2015/08/08 04:32:39]

 = 0

[bcwhite, 2015/08/13 16:25:58]

Done.

+  std::wstring existing;

[robertshield, 2015/08/08 04:32:39]

Should be able to use base::string16 here

[bcwhite, 2015/08/13 16:25:58]

Done.

+  if ((result = key.Open(HKEY_LOCAL_MACHINE, path.c_str(),
+                         KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WOW64_64KEY))
+      != ERROR_SUCCESS) {
+    return result;
+  }
+  if ((result = key.ReadValue(kDisplayVersion, &existing)) != ERROR_SUCCESS)

[robertshield, 2015/08/08 04:33:30]

We should log to the installer log when the value can't be found as that will
suggest that the --delay parameter isn't long enough.

[bcwhite, 2015/08/13 16:25:58]

Done.

+    return result;

[robertshield, 2015/08/08 04:32:39]

It looks like we don't use the value of |existing|. If we just want to check for
existence, then key.HasValue() could serve instead.

[bcwhite, 2015/08/13 16:25:58]

Done.

+  if ((result = key.WriteValue(kDisplayVersion, value.c_str()))
+      != ERROR_SUCCESS) {
+    return result;
+  }
+  return ERROR_SUCCESS;
+}
+
 // Returns NULL if no compressed archive is available for processing, otherwise
 // returns a patch helper configured to uncompress and patch.
 scoped_ptr<installer::ArchivePatchHelper> CreateChromeArchiveHelper(
     const base::FilePath& setup_exe,
     const base::CommandLine& command_line,
     const installer::InstallerState& installer_state,
     const base::FilePath& working_directory) {
   // A compressed archive is ordinarily given on the command line by the mini
   // installer. If one was not given, look for chrome.packed.7z next to the
   // running program.
@@ skipping 1044 matching lines @@
                                                patch_file,
                                                output_file);
     } else {
       *exit_code = installer::PATCH_INVALID_ARGUMENTS;
     }
   } else if (cmd_line.HasSwitch(installer::switches::kReenableAutoupdates)) {
     // setup.exe has been asked to attempt to reenable updates for Chrome.
     bool updates_enabled = GoogleUpdateSettings::ReenableAutoupdates();
     *exit_code = updates_enabled ? installer::REENABLE_UPDATES_SUCCEEDED :
                                    installer::REENABLE_UPDATES_FAILED;
+  } else if (cmd_line.HasSwitch(installer::switches::kSetDisplayVersionPath)) {
+    const base::string16 registry_path(
+        cmd_line.GetSwitchValueNative(
+            installer::switches::kSetDisplayVersionPath));
+    const base::string16 registry_value(
+        cmd_line.GetSwitchValueNative(
+            installer::switches::kSetDisplayVersionValue));
+    *exit_code = OverwriteDisplayVersion(registry_path, registry_value);
   } else {
     handled = false;
   }
 
   return handled;
 }
 
 bool ShowRebootDialog() {
   // Get a token for this process.
   HANDLE token;
@@ skipping 487 matching lines @@
         cmd_line.HasSwitch(installer::switches::kInactiveUserToast) ||
         cmd_line.HasSwitch(installer::switches::kSystemLevelToast)) {
       return installer::SXS_OPTION_NOT_SUPPORTED;
     }
   }
 
   // Some command line options are no longer supported and must error out.
   if (installer::ContainsUnsupportedSwitch(cmd_line))
     return installer::UNSUPPORTED_OPTION;
 
+  if (cmd_line.HasSwitch(installer::switches::kDelay)) {

[robertshield, 2015/08/08 04:32:39]

Could this block be placed at the top of HandleNonInstallCmdLineOptions?

[bcwhite, 2015/08/13 16:25:58]

Done.

+    std::string delay_seconds_string(

[robertshield, 2015/08/08 04:32:38]

const

[bcwhite, 2015/08/13 16:25:58]

Done.

+        cmd_line.GetSwitchValueASCII(installer::switches::kDelay));
+    int delay_seconds = std::stoi(delay_seconds_string);

[robertshield, 2015/08/08 04:32:38]

Most code I see uses base::StringToInt rather than stoi()

[bcwhite, 2015/08/13 16:25:58]

Done.

+    if (delay_seconds > 0) {
+      ::Sleep(delay_seconds * 1000);
+    }
+  }
+
   // A variety of installer operations require the path to the current
   // executable. Get it once here for use throughout these operations. Note that
   // the path service is the authoritative source for this path. One might think
   // that CommandLine::GetProgram would suffice, but it won't since
   // CreateProcess may have been called with a command line that is somewhat
   // ambiguous (e.g., an unquoted path with spaces, or a path lacking the file
   // extension), in which case CommandLineToArgv will not yield an argv with the
   // true path to the program at position 0.
   base::FilePath setup_exe;
   PathService::Get(base::FILE_EXE, &setup_exe);
@@ skipping 62 matching lines @@
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
   }
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }