This patch modifies some aspects of GCAPI in support of the new Chrome reactivation functions.

chrome/installer/gcapi/gcapi.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.
 
 // NOTE: This code is a legacy utility API for partners to check whether
 //       Chrome can be installed and launched. Recent updates are being made
 //       to add new functionality. These updates use code from Chromium, the old
 //       coded against the win32 api directly. If you have an itch to shave a
 //       yak, feel free to re-write the old code too.
 
@@ skipping 544 matching lines @@
   return days_since_last_run;
 }
 
 BOOL __stdcall CanOfferReactivation(const wchar_t* brand_code,
                                     int previous_brand_codes_length,
                                     const wchar_t** previous_brand_codes,
                                     int shell_mode,
                                     DWORD* error_code) {
   DCHECK(error_code);
 
+  // If this function is invoked in elevated mode, always return TRUE.
+  // We only really care what this function returns when it is invoked
+  // in non-elevated mode.  We return TRUE in elevated mode because we
+  // want this function to return TRUE when ReactivateChrome is invoked
+  // in elevated mode.
+  if (shell_mode == GCAPI_INVOKED_UAC_ELEVATION)

[robertshield, 2012/03/15 03:52:32]

If a partner mistakenly invokes this method while in elevated mode, they will
now always think they can offer reactivation. Is this desired? 

[mgraboski, 2012/03/22 00:33:25]

Rather than always returning true, I've modified this function to now only run
the code that checks HKCU values if running from a non-elevated shell.

[robertshield, 2012/03/23 17:52:16]

Looks good!

+    return TRUE;
+
   if (!brand_code ||
       (previous_brand_codes_length > 0 && previous_brand_codes == NULL)) {
     if (error_code)
       *error_code = REACTIVATE_ERROR_INVALID_INPUT;
     return FALSE;
   }
 
   bool has_system_install = IsChromeInstalled(HKEY_LOCAL_MACHINE);
   bool has_user_install = IsChromeInstalled(HKEY_CURRENT_USER);
 
   if (!has_system_install && !has_user_install) {
     if (error_code)
       *error_code = REACTIVATE_ERROR_NOTINSTALLED;
     return FALSE;
   }
 
   int days_since_last_run = GoogleChromeDaysSinceLastRun();
   if (days_since_last_run >= 0 &&
       days_since_last_run < kReactivationMinDaysDormant) {
     if (error_code)
       *error_code = REACTIVATE_ERROR_NOTDORMANT;
     return FALSE;
   }
 
-  // Make sure we haven't previously been reactivated by this brand code
-  // or any of the previous brand codes from this partner.
-  // Since this function is invoked by ReactivateChrome, and since
-  // ReactivateChrome is called first in non-elevated shell and
-  // second in UAC-elevated shell, we only want to execute this block
-  // of code the first time, in non-elevated mode.
-  if (shell_mode == GCAPI_INVOKED_STANDARD_SHELL) {
-    std::vector<std::wstring> reactivation_brands;
-    reactivation_brands.push_back(brand_code);
-    if (previous_brand_codes_length > 0 && previous_brand_codes != NULL) {
-      std::copy(previous_brand_codes,
-                previous_brand_codes + previous_brand_codes_length,
-                std::back_inserter(reactivation_brands));
-    }
-    if (HasBeenReactivatedByBrandCodes(reactivation_brands)) {
-      if (error_code)
-        *error_code = REACTIVATE_ERROR_ALREADY_REACTIVATED;
-      return FALSE;
-    }
+  std::vector<std::wstring> reactivation_brands;
+  reactivation_brands.push_back(brand_code);
+  if (previous_brand_codes_length > 0 && previous_brand_codes != NULL) {
+    std::copy(previous_brand_codes,
+              previous_brand_codes + previous_brand_codes_length,
+              std::back_inserter(reactivation_brands));
+  }
+  if (HasBeenReactivatedByBrandCodes(reactivation_brands)) {
+    if (error_code)
+      *error_code = REACTIVATE_ERROR_ALREADY_REACTIVATED;
+    return FALSE;
   }
 
   return TRUE;
 }
 
 BOOL __stdcall ReactivateChrome(wchar_t* brand_code,
                                 int previous_brand_codes_length,
                                 const wchar_t** previous_brand_codes,
                                 int shell_mode,
                                 DWORD* error_code) {

[robertshield, 2012/03/15 03:52:32]

If we are short-circuiting CanOfferReactivation when shell_mode is
GCAPI_INVOKED_UAC_ELEVATION, shouldn't we abort early here too?

[mgraboski, 2012/03/22 00:33:25]

We need to run this function in non-elevated mode, to write the
reactivationbrand and Omaha experiment label to HKCU; and in elevated mode, to
write the Omaha experiment label to HKLM.

   BOOL result = FALSE;
   if (CanOfferReactivation(brand_code,
                            previous_brand_codes_length,
                            previous_brand_codes,
                            shell_mode,
                            error_code)) {
     if (SetReactivationBrandCode(brand_code, shell_mode)) {
       // Currently set this as a best-effort thing. We return TRUE if
       // reactivation succeeded regardless of the experiment label result.
       SetOmahaExperimentLabel(brand_code, shell_mode);
 
       result = TRUE;
     } else {
       if (error_code)
         *error_code = REACTIVATE_ERROR_REACTIVATION_FAILED;
     }
   }
 
   return result;
 }