Unregister previous ChromeFrame UA strings registered under the PostPlatform ...

chrome_frame/chrome_tab.cc

 // Copyright (c) 2010 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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 #include <atlsecurity.h>
@@ skipping 416 matching lines @@
 const wchar_t kChromeFramePrefix[] = L"chromeframe/";
 
 // To delete the user agent, set value to NULL.
 // The is_system parameter indicates whether this is a per machine or a per
 // user installation.
 HRESULT SetChromeFrameUA(bool is_system, const wchar_t* value) {
   HRESULT hr = E_FAIL;
   HKEY parent_hive = is_system ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
 
   RegKey ua_key;
-  if (ua_key.Create(parent_hive, kPostPlatformUAKey, KEY_WRITE)) {
+  if (ua_key.Create(parent_hive, kPostPlatformUAKey, KEY_READ | KEY_WRITE)) {
+
+    // Make sure that we unregister ChromeFrame UA strings registered previously
+    std::wstring chrome_frame_ua_pattern = kChromeFramePrefix;
+    chrome_frame_ua_pattern += L"*";
+
+    wchar_t name[MAX_PATH + 1] = {};
+    wchar_t value[MAX_PATH + 1] = {};
+
+    for (DWORD value_index = 0; value_index < ua_key.ValueCount();

[amit, 2011/01/14 06:38:51]

nit: while (value_index < ua_key.ValueCount()) and increment if !MatchPattern?

[ananta, 2011/01/14 06:44:11]

Done.

+         value_index++) {
+      DWORD name_size = arraysize(name);
+      DWORD value_size = arraysize(value);
+      DWORD type = 0;
+      LRESULT ret = ::RegEnumValue(ua_key.Handle(),

[amit, 2011/01/14 06:38:51]

nit: fit more on one line to match rest of the source file?

[ananta, 2011/01/14 06:44:11]

Done.

+                                   value_index,
+                                   name,
+                                   &name_size,
+                                   NULL,
+                                   &type, reinterpret_cast<BYTE*>(value),
+                                   &value_size);
+      if (ret == ERROR_SUCCESS) {
+        if (MatchPattern(name, chrome_frame_ua_pattern)) {

[amit, 2011/01/14 06:38:51]

A simple StartsWith is enough instead of MatchPattern?

[ananta, 2011/01/14 06:44:11]

Done.

+          ua_key.DeleteValue(name);
+          value_index--;
+        }
+      } else {
+        break;
+      }
+    }
+
     std::wstring chrome_frame_ua_value_name = kChromeFramePrefix;
     chrome_frame_ua_value_name += GetCurrentModuleVersion();
     if (value) {
       ua_key.WriteValue(chrome_frame_ua_value_name.c_str(), value);
-    } else {
-      ua_key.DeleteValue(chrome_frame_ua_value_name.c_str());
     }
     hr = S_OK;
   } else {
     DLOG(ERROR) << __FUNCTION__ << ": " << kPostPlatformUAKey;
     hr = E_UNEXPECTED;
   }
   return hr;
 }
 
 enum RegistrationFlags {
@@ skipping 334 matching lines @@
     sd.GetDacl(&new_dacl);
     new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
     if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
       result = SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }