This fixes a crash in IE8 with ChromeFrame when a new tab was created. ...

chrome_frame/bho.cc

 // Copyright (c) 2009 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_frame/bho.h"
 
 #include <shlguid.h>
 #include <shobjidl.h>
 
 #include "base/logging.h"
 #include "base/registry.h"
 #include "base/scoped_bstr_win.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "chrome_tab.h" // NOLINT
 #include "chrome_frame/protocol_sink_wrap.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/vtable_patch_manager.h"
 
-const wchar_t kUrlMonDllName[] = L"urlmon.dll";
 const wchar_t kPatchProtocols[] = L"PatchProtocols";
 static const int kIBrowserServiceOnHttpEquivIndex = 30;
 
 PatchHelper g_patch_helper;
 
 BEGIN_VTABLE_PATCHES(IBrowserService)
   VTABLE_PATCH_ENTRY(kIBrowserServiceOnHttpEquivIndex, Bho::OnHttpEquiv)
 END_VTABLE_PATCHES()
 
 _ATL_FUNC_INFO Bho::kBeforeNavigate2Info = {
@@ skipping 178 matching lines @@
 
   return S_OK;
 }
 
 void PatchHelper::InitializeAndPatchProtocolsIfNeeded() {
   if (state_ != UNKNOWN)
     return;
 
   bool patch_protocol = GetConfigBool(true, kPatchProtocols);
   if (patch_protocol) {
-    ProtocolSinkWrap::PatchProtocolHandler(kUrlMonDllName, CLSID_HttpProtocol);
-    ProtocolSinkWrap::PatchProtocolHandler(kUrlMonDllName, CLSID_HttpSProtocol);
+    ProtocolSinkWrap::PatchProtocolHandlers();
     state_ = PATCH_PROTOCOL;
   } else {
     state_ = PATCH_IBROWSER;
   }
 }
 
 void PatchHelper::PatchBrowserService(IBrowserService* browser_service) {
   DCHECK(state_ == PATCH_IBROWSER);
   state_ = PATCH_IBROWSER_OK;
   vtable_patch::PatchInterfaceMethods(browser_service,
                                       IBrowserService_PatchInfo);
 }
 
-extern vtable_patch::MethodPatchInfo IInternetProtocol_PatchInfo[];
-extern vtable_patch::MethodPatchInfo IInternetProtocolEx_PatchInfo[];
 void PatchHelper::UnpatchIfNeeded() {
   if (state_ == PATCH_PROTOCOL) {
-    vtable_patch::UnpatchInterfaceMethods(IInternetProtocol_PatchInfo);
-    vtable_patch::UnpatchInterfaceMethods(IInternetProtocolEx_PatchInfo);
+    ProtocolSinkWrap::UnpatchProtocolHandlers();
   } else if (state_ == PATCH_IBROWSER_OK) {
     vtable_patch::UnpatchInterfaceMethods(IBrowserService_PatchInfo);
   }
 
   state_ = UNKNOWN;
 }