Fix domain whitelisting and remove unused code

src/plugin/AdblockPlusClient.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginClientFactory.h"
 #include "PluginHttpRequest.h"
 #include "PluginMutex.h"
 #include "PluginClass.h"
 
@@ skipping 78 matching lines @@
     std::vector<SubscriptionDescription> result;
     for (int32_t i = 0; i < count; i++)
     {
       SubscriptionDescription description;
       message >> description.url >> description.title
               >> description.specialization >> description.listed;
       result.push_back(description);
     }
     return result;
   }
+
+  Communication::InputBuffer CallAdblockPlusEngineProcedure(Communication::OutputBuffer& message)
+  {
+    std::auto_ptr<Communication::Pipe> pipe = OpenAdblockPlusEnginePipe();
+    pipe->WriteMessage(message);
+    return pipe->ReadMessage();
+  }
+
+  Communication::InputBuffer CallAdblockPlusEngineProcedure(Communication::ProcType proc)
+  {
+    Communication::OutputBuffer message;
+    message << proc;
+    return CallAdblockPlusEngineProcedure(message);
+  }
 }
 
 CAdblockPlusClient* CAdblockPlusClient::s_instance = NULL;
 
 CAdblockPlusClient::CAdblockPlusClient() : CPluginClientBase()
 {
   m_filter = std::auto_ptr<CPluginFilter>(new CPluginFilter());
 }
 
 CAdblockPlusClient::~CAdblockPlusClient()
@@ skipping 71 matching lines @@
 {
   bool isHidden;
   m_criticalSectionFilter.Lock();
   {
     isHidden = filter && filter->IsElementHidden(tag, pEl, domain, indent);
   }
   m_criticalSectionFilter.Unlock();
   return isHidden;
 }
 
 bool CAdblockPlusClient::IsUrlWhiteListed(const CString& url)

[Felix Dahlke, 2013/06/25 09:46:58]

Do you think I should change this to accept an std::string? Most methods of
AdblockPlusClient want one.

[Wladimir Palant, 2013/06/25 12:00:40]

Yes, that would be nice - we should be gradually moving away from CString.

 {
-  bool isWhitelisted = CPluginClientBase::IsUrlWhiteListed(url);
-  if (isWhitelisted == false && !url.IsEmpty())
+  Communication::OutputBuffer request;
+  request << Communication::PROC_IS_WHITELISTED_URL << ToUtf8String(std::wstring(url));
+
+  try
   {
-    m_criticalSectionFilter.Lock();
-    {
-      isWhitelisted = m_filter.get() && m_filter->ShouldWhiteList(url);
-    }
-    m_criticalSectionFilter.Unlock();
+    Communication::InputBuffer response = CallAdblockPlusEngineProcedure(request);
+
+    bool isWhitelisted;
+    response >> isWhitelisted;
+    return isWhitelisted;
   }
-
-  return isWhitelisted;
+  catch (const std::exception& e)
+  {
+    DEBUG_GENERAL(e.what());
+    return false;
+  }
 }
 
 int CAdblockPlusClient::GetIEVersion()
 {
   //HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer
   HKEY hKey;
   LSTATUS status = RegOpenKey(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Internet Explorer", &hKey);
   if (status != 0)
   {
     return 0;
   }
   DWORD type, cbData;
   BYTE version[50];
   cbData = 50;
   status = RegQueryValueEx(hKey, L"Version", NULL, &type, (BYTE*)version, &cbData);
   if (status != 0)
   {
     return 0;
   }
   RegCloseKey(hKey);
   return (int)(version[0] - 48);
 }
 
-Communication::InputBuffer CallAdblockPlusEngineProcedure(Communication::OutputBuffer& message)
-{
-  std::auto_ptr<Communication::Pipe> pipe = OpenAdblockPlusEnginePipe();
-  pipe->WriteMessage(message);
-  return pipe->ReadMessage();
-}
-
-Communication::InputBuffer CallAdblockPlusEngineProcedure(Communication::ProcType proc)
-{
-  Communication::OutputBuffer message;
-  message << proc;
-  return CallAdblockPlusEngineProcedure(message);
-}
-
 bool CAdblockPlusClient::Matches(const std::string& url, const std::string& contentType, const std::string& domain)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_MATCHES << url << contentType << domain;
 
   try
   {
     Communication::InputBuffer response = CallAdblockPlusEngineProcedure(request);
 
     bool match;
@@ skipping 115 matching lines @@
 
   try
   {
     CallAdblockPlusEngineProcedure(request);
   }
   catch (const std::exception& e)
   {
     DEBUG_GENERAL(e.what());
   }
 }