Issue #1173 - Default behavior for catch-all blocks

src/plugin/PluginClass.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 525 matching lines @@
       UpdateStatusBar();
     }
     else
     {
       DEBUG_NAVI(L"Navi::Begin navigation url:" + url)
       m_tab->CacheFrame(url);
     }
   }
   catch (...)
   {
+    EntryPointExceptionDefault("CPluginClass::OnBeforeNavigate2");
   }
 }
 
 // Entry point
 void STDMETHODCALLTYPE CPluginClass::OnDownloadComplete()
 {
   try
   {
     DEBUG_NAVI(L"Navi::Download Complete")
     ATL::CComPtr<IWebBrowser2> browser = GetBrowser();
     if (browser)
     {
       m_tab->OnDownloadComplete(browser);
     }
   }
   catch (...)
   {
+    EntryPointExceptionDefault("CPluginClass::OnDownloadComplete");
   }
 }
 
 // Entry point
 void STDMETHODCALLTYPE CPluginClass::OnDocumentComplete(IDispatch* frameBrowserDisp, VARIANT* /*urlOrPidl*/)
 {
   try
   {
     DEBUG_NAVI(L"Navi::Document Complete");
     ATL::CComQIPtr<IWebBrowser2> webBrowser2 = frameBrowserDisp;
     if (!webBrowser2)
     {
       return;
     }
     std::wstring frameSrc = GetLocationUrl(*webBrowser2);
     UnescapeUrl(frameSrc);
     bool isRootPageBrowser = GetBrowser().IsEqualObject(webBrowser2);
     m_tab->OnDocumentComplete(webBrowser2, frameSrc, isRootPageBrowser);
   }
   catch (...)
   {
+    EntryPointExceptionDefault("CPluginClass::OnDocumentComplete");
   }
 }
 
 // Entry point
 void STDMETHODCALLTYPE CPluginClass::OnWindowStateChanged(unsigned long flags, unsigned long validFlagsMask)
 {
   try
   {
     DEBUG_GENERAL(L"WindowStateChanged (check tab changed)");
     bool newtabshown = validFlagsMask == (OLECMDIDF_WINDOWSTATE_USERVISIBLE | OLECMDIDF_WINDOWSTATE_ENABLED)
@@ skipping 10 matching lines @@
           InitObject(true);
           UpdateStatusBar();
         }
       }
     }
     notificationMessage.Hide();
     DEBUG_GENERAL(L"WindowStateChanged (check tab changed) end");
   }
   catch (...)
   {
+    EntryPointExceptionDefault("CPluginClass::OnWindowStateChanged");
   }
 }
 
 // Entry point
 void STDMETHODCALLTYPE CPluginClass::OnCommandStateChange(long /*command*/, VARIANT_BOOL /*enable*/)
 {
   try
   {
     if (m_hPaneWnd == NULL)
     {
       CreateStatusBarPane();
     }
     else
     {
       if (AdblockPlus::IE::InstalledMajorVersion() > 6)
       {
         RECT rect;
         //Get the RECT for the leftmost pane (the status text pane)
         BOOL rectRes = ::SendMessage(m_hStatusBarWnd, SB_GETRECT, 0, (LPARAM)&rect);
         if (rectRes == TRUE)
         {
           MoveWindow(m_hPaneWnd, rect.right - m_nPaneWidth, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE);
         }
       }
     }
   }
   catch (...)
   {
+    EntryPointExceptionDefault("CPluginClass::OnCommandStateChange");
   }
 }
 
 // Entry point
 void STDMETHODCALLTYPE CPluginClass::OnOnQuit()
 {
   try
   {
     Unadvise();
   }
   catch (...)
   {
-    EntryPointExceptionDefault("CPluginClass::Invoke");
-
+    EntryPointExceptionDefault("CPluginClass::OnOnQuit");
   }
 }
 
 bool CPluginClass::InitObject(bool bBHO)
 {
   DEBUG_GENERAL("InitObject");
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   if (!settings->GetPluginEnabled())
   {
@@ skipping 1094 matching lines @@
           s_criticalSectionLocal.Unlock();
 
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
   return hTabWnd;
 }