Don't use std::string in the plugin, convert when communicating with the engine

src/plugin/PluginFilter.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginFilter.h"
 
 #if (defined PRODUCT_ADBLOCKPLUS)
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #endif
 
@@ skipping 601 matching lines @@
           CPluginDebug::DebugResultHiding(tag, "-", tagIt->second.m_filterText);
 #endif
         return true;
       }
     }
   }
 
   return false;
 }
 
-bool CPluginFilter::LoadHideFilters(std::vector<std::string> filters)
+bool CPluginFilter::LoadHideFilters(std::vector<std::wstring> filters)
 {
 
   ClearFilters();
 
   bool isRead = false;
 
 #ifdef PRODUCT_ADBLOCKPLUS
   CPluginClient* client = CPluginClient::GetInstance();
 #endif
 
   // Parse hide string
   int pos = 0;
 
   CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);    
   {
-    for (std::vector<std::string>::iterator it = filters.begin(); it < filters.end(); ++it)
+    for (std::vector<std::wstring>::iterator it = filters.begin(); it < filters.end(); ++it)
     {
       CString filter((*it).c_str());

[Felix Dahlke, 2013/06/27 10:53:06]

As you can see, I didn't this. The UTF-8->UTF-16 conversion was missing there.

       // If the line is not commented out
       if (!filter.Trim().IsEmpty() && filter.GetAt(0) != '!' && filter.GetAt(0) != '[')
       {
         int filterType = 0;
 
         // See http://adblockplus.org/en/filters for further documentation
 
         try
         {
           AddFilterElementHide(filter);
@@ skipping 48 matching lines @@
     type = "OTHER";
 
     std::map<int,CString>::const_iterator it = m_contentMapText.find(contentType);
     if (it != m_contentMapText.end())
     {
       type = it->second;
     }
   }
 
   CPluginClient* client = CPluginClient::GetInstance();
-
-  std::string contentTypeString = CT2A(type, CP_UTF8);
-
-  CT2CA srcMb(src, CP_UTF8);
-  std::string url(srcMb);
-
-  std::string domainMb = CT2CA(domain);
-
-  if (client->Matches(url, contentTypeString, domainMb))
+  if (client->Matches(std::wstring(src), std::wstring(type), std::wstring(domain)))
   {
     if (addDebug)
     {
       DEBUG_FILTER("Filter::ShouldBlock " + type + " YES")
 
 #ifdef ENABLE_DEBUG_RESULT
         CPluginDebug::DebugResultBlocking(type, src, domain);
 #endif
     }
     return true;
@@ skipping 145 matching lines @@
   if (pos > 0 && domain.GetLength() + pos == subdomain.GetLength())
   {
     if (subdomain.GetAt(pos - 1) == '.')
     {
       return true;
     }
   }
 
   return false;
 }