First step for cleaning registration code for ChromeFrame....

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 65 matching lines @@
 // the objects to a lib. Also reduces magic.
 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol)
 
 
 // See comments in DllGetClassObject.
 LPFNGETCLASSOBJECT g_dll_get_class_object_redir_ptr = NULL;
 
-class ChromeTabModule
-    : public AtlPerUserModule<CAtlDllModuleT<ChromeTabModule> > {
+class ChromeTabModule : public CAtlDllModuleT<ChromeTabModule> {
  public:
-  typedef AtlPerUserModule<CAtlDllModuleT<ChromeTabModule> > ParentClass;
+  typedef CAtlDllModuleT<ChromeTabModule> ParentClass;
 
   DECLARE_LIBID(LIBID_ChromeTabLib)
   DECLARE_REGISTRY_APPID_RESOURCEID(IDR_CHROMETAB,
                                     "{FD9B1B31-F4D8-436A-8F4F-D3C2E36733D3}")
 
   // Override to add our SYSTIME binary value to registry scripts.
   // See chrome_frame_activex.rgs for usage.
   virtual HRESULT AddCommonRGSReplacements(IRegistrarBase* registrar) throw() {
     HRESULT hr = ParentClass::AddCommonRGSReplacements(registrar);
 
@@ skipping 135 matching lines @@
     }
 
     FreeLibrary(ieframe_module);
   } else {
     hr = HRESULT_FROM_WIN32(GetLastError());
   }
 
   return hr;
 }
 
-HRESULT RegisterChromeTabBHO() {
-  RegKey ie_bho_key;
-  if (!ie_bho_key.Create(HKEY_LOCAL_MACHINE, kBhoRegistryPath,
-                       KEY_CREATE_SUB_KEY)) {
-    DLOG(WARNING) << "Failed to open registry key "
-                  << kBhoRegistryPath
-                  << " for write";
-    return E_FAIL;
-  }
-
-  wchar_t bho_class_id_as_string[MAX_PATH] = {0};
-  StringFromGUID2(CLSID_ChromeFrameBHO, bho_class_id_as_string,
-                  arraysize(bho_class_id_as_string));
-
-  if (!ie_bho_key.CreateKey(bho_class_id_as_string, KEY_READ | KEY_WRITE)) {
-    DLOG(WARNING) << "Failed to create bho registry key under "
-                  << kBhoRegistryPath
-                  << " for write";
-    return E_FAIL;
-  }
-
-  ie_bho_key.WriteValue(kBhoNoLoadExplorerValue, 1);
-  DLOG(INFO) << "Registered ChromeTab BHO";
-
-  // We now add the chromeframe user agent at runtime.
-  RefreshElevationPolicy();
-  return S_OK;
-}
-
-HRESULT UnregisterChromeTabBHO() {
-  RegKey ie_bho_key;
-  if (!ie_bho_key.Open(HKEY_LOCAL_MACHINE, kBhoRegistryPath,
-                       KEY_READ | KEY_WRITE)) {
-    DLOG(WARNING) << "Failed to open registry key "
-                  << kBhoRegistryPath
-                  << " for write.";
-    return E_FAIL;
-  }
-
-  wchar_t bho_class_id_as_string[MAX_PATH] = {0};
-  StringFromGUID2(CLSID_ChromeFrameBHO, bho_class_id_as_string,
-                  arraysize(bho_class_id_as_string));
-
-  if (!ie_bho_key.DeleteKey(bho_class_id_as_string)) {
-    DLOG(WARNING) << "Failed to delete bho registry key "
-                  << bho_class_id_as_string
-                  << " under "
-                  << kBhoRegistryPath;
-    return E_FAIL;
-  }
-
-  DLOG(INFO) << "Unregistered ChromeTab BHO";
-  return S_OK;
-}
-
 // Experimental boot prefetch optimization for Chrome Frame
 //
 // If chrome is warmed up during a single reboot, it gets paged
 // in for subsequent reboots and the cold startup times essentially
 // look like warm times thereafter! The 'warm up' is done by
 // setting up a 'RunOnce' key during DLLRegisterServer of
 // npchrome_frame.dll.
 //
 // This works because chrome prefetch becomes part of boot
 // prefetch file ntosboot-b00dfaad.pf and paged in on subsequent
@@ skipping 47 matching lines @@
   if (g_dll_get_class_object_redir_ptr) {
     return g_dll_get_class_object_redir_ptr(rclsid, riid, ppv);
   } else {
     g_patch_helper.InitializeAndPatchProtocolsIfNeeded();
     return _AtlModule.DllGetClassObject(rclsid, riid, ppv);
   }
 }
 
 // DllRegisterServer - Adds entries to the system registry
 STDAPI DllRegisterServer() {
-  // registers object, typelib and all interfaces in typelib
+  // registers objects, typelib and all interfaces in typelib
   HRESULT hr = _AtlModule.DllRegisterServer(TRUE);
 
   if (SUCCEEDED(hr)) {
     // Best effort attempt to register the BHO. At this point we silently
     // ignore any errors during registration. There are some traces emitted
     // to the debug log.
-    RegisterChromeTabBHO();
+    _AtlModule.UpdateRegistryFromResourceS(IDR_REGISTER_BHO, TRUE);
     if (!RegisterSecuredMimeHandler(true))
       hr = E_FAIL;
     SetupRunOnce();
   }
 
   if (UtilIsPersistentNPAPIMarkerSet()) {
     hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_NPAPI, TRUE);
   }
 
   return hr;
 }
 
 // DllUnregisterServer - Removes entries from the system registry
 STDAPI DllUnregisterServer() {
   HRESULT hr = _AtlModule.DllUnregisterServer(TRUE);
 
   if (SUCCEEDED(hr)) {
     // Best effort attempt to unregister the BHO. At this point we silently
     // ignore any errors during unregistration. There are some traces emitted
     // to the debug log.
-    UnregisterChromeTabBHO();
+    _AtlModule.UpdateRegistryFromResourceS(IDR_REGISTER_BHO, FALSE);
     if (!RegisterSecuredMimeHandler(false))
       hr = E_FAIL;
   }
 
   if (UtilIsNPAPIPluginRegistered()) {
     hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_NPAPI, FALSE);
   }
 
   return hr;
 }
@@ skipping 193 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);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }