Issue 1104 - Cannot uncheck Disable on website option in tool bar

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 278 matching lines @@
           {
             m_isAdviced = true;
 
             try
             {
               std::thread startInitObjectThread(StartInitObject, this);
               startInitObjectThread.detach(); // TODO: but actually we should wait for the thread in the dtr.
             }
             catch (const std::system_error& ex)
             {
-              auto errDescription = std::string("Class::Thread - Failed to create StartInitObject thread, ") +
-                ex.code().message() + ex.what();
-              DEBUG_ERROR_LOG(ex.code().value(), PLUGIN_ERROR_THREAD, PLUGIN_ERROR_MAIN_THREAD_CREATE_PROCESS, errDescription.c_str());
+              DEBUG_SYSTEM_EXCEPTION(ex, PLUGIN_ERROR_THREAD, PLUGIN_ERROR_MAIN_THREAD_CREATE_PROCESS, 
+                "Class::Thread - Failed to create StartInitObject thread");
             }
           }
           else
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_SET_SITE, PLUGIN_ERROR_SET_SITE_ADVICE, "Class::SetSite - Advice");
           }
         }
       }
       else // Check if loaded as toolbar handler
       {
@@ skipping 22 matching lines @@
             }
             s_criticalSectionBrowser.Unlock();
           }
         }
         else
         {
           DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_SET_SITE, PLUGIN_ERROR_SET_SITE_QUERY_SERVICE_PROVIDER, "Class::SetSite - QueryInterface (service provider)");
         }
       }
     }
-    catch (std::runtime_error e)
-    {
-      DEBUG_ERROR(e.what());
+    catch (const std::runtime_error& ex)
+    {
+      DEBUG_EXCEPTION(ex);
       Unadvice();
     }
   }
   else
   {
     // Unadvice
     Unadvice();
 
     // Destroy window
     if (m_pWndProcStatus)
@@ skipping 213 matching lines @@
   // If webbrowser2 is equal to top level browser (as set in SetSite), we are navigating new page
   CPluginClient* client = CPluginClient::GetInstance();
   CString urlLegacy = ToCString(url);
   if (urlLegacy.Find(L"javascript") == 0)
   {
   }
   else if (GetBrowser().IsEqualObject(WebBrowser2Ptr))
   {
     m_tab->OnNavigate(url);
 
-    DEBUG_GENERAL(L"================================================================================\nBegin main navigation url:" + urlLegacy + "\n================================================================================")
+    DEBUG_GENERAL(
+      L"================================================================================\n"
+      L"Begin main navigation url:" + url + L"\n"
+      L"================================================================================")
 
 #ifdef ENABLE_DEBUG_RESULT
-      CPluginDebug::DebugResultDomain(urlLegacy);
+      CPluginDebug::DebugResultDomain(url);
 #endif
 
     UpdateStatusBar();
   }
   else
   {
-    DEBUG_NAVI(L"Navi::Begin navigation url:" + urlLegacy)
+    DEBUG_NAVI(L"Navi::Begin navigation url:" + url)
     m_tab->CacheFrame(url);
   }
 }
 
 /*
  * #1163 implements behavior for method DISPID_WINDOWSTATECHANGED in CPluginClass::Invoke
  * - should validate and convert arguments in Invoke, not here
  * - does not validate number of arguments before indexing into 'rgvarg'
  * - does not validate type of argument before using its value
  */
@@ skipping 664 matching lines @@
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed")
           }
         }
       }
       break;
     }
   case ID_MENU_DISABLE_ON_SITE:
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
       std::wstring urlString = GetTab()->GetDocumentUrl();
-      std::string filterText;
-      if (client->IsWhitelistedUrl(urlString, filterText))

[Oleksandr, 2015/03/11 13:10:38]

Felix has pointed out that we are actually leaking abstraction here. How about
leaving IsWhitelistedUrl as is, and instead adding
CPluginSettings:RemoveWhitelistedUrl that would retrieve the whitelisting filter
inside and remove it

[sergei, 2015/03/11 13:16:06]

Has Felix seen the previous approach, which is much far ahead?

+      std::string filterText = client->GetWhitelistingFilter(urlString);
+      if (!filterText.empty())
       {
         client->RemoveFilter(filterText);
       }
       else
       {
         settings->AddWhiteListedDomain(ToCString(client->GetHostFromUrl(urlString)));
       }
       GetBrowser()->Refresh();
     }
   default:
@@ skipping 513 matching lines @@
 
   s_criticalSectionLocal.Lock();
   {
     if (!s_hIcons[type])
     {
       std::wstring imageToLoad = L"#";
       imageToLoad += std::to_wstring(s_hIconTypes[type]);
       s_hIcons[type] = (HICON)::LoadImage(_Module.m_hInst, imageToLoad.c_str(), IMAGE_ICON, iconWidth, iconHeight, LR_SHARED);
       if (!s_hIcons[type])
       {
-        DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_LOAD_ICON, "Class::GetIcon - LoadIcon")
+        DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_LOAD_ICON, "Class::GetIcon - LoadIcon");
       }
     }
 
     icon = s_hIcons[type];
   }
   s_criticalSectionLocal.Unlock();
 
   return icon;
 }
 
@@ skipping 64 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }