Issue #1234 - Remove 'CString' from PluginFilter.*

src/plugin/PluginFilter.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "PluginStdAfx.h"
 #include "AdblockPlusClient.h"
 #include "PluginFilter.h"
 #include "PluginSettings.h"
 #include "PluginMutex.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginClass.h"
+#include "PluginUtil.h"
 #include "mlang.h"
-#include "TokenSequence.h"
 #include "..\shared\CriticalSection.h"
 #include "..\shared\Utils.h"
 #include "..\shared\MsHTMLUtils.h"
 
 // The filters are described at http://adblockplus.org/en/filters
 
 static CriticalSection s_criticalSectionFilterMap;
-
-namespace
-{
-  std::wstring ToLowerString(const std::wstring& s)
-  {
-    return ToWstring(ToCString(s).MakeLower());

[Oleksandr, 2015/12/04 01:03:16]

Converting to CString and back seems redundant. How about _wcslwr_s instead?

[Eric, 2015/12/06 17:39:56]

I put this in the commit message as out-of-scope.

The particular issue is this. HTML attribute names can contain Unicode
characters. If it were just ASCII, it would be an easy issue. I don't want to
delve into all the associated locale issues here.

Rather than commingle this change into an already-large review, I decided to
just use the same function as the previous change, avoiding a regression on this
point. A future change set can change it. If such a change causes problems, it
will be isolated and easier to deal with.

-  }
-}
 
 // ============================================================================
 // CFilterElementHide
 // ============================================================================
 namespace
 {
   class ElementHideParseException
     : public std::runtime_error
   {
     std::string message(const std::wstring& filterText, const std::string& reason)
@@ skipping 24 matching lines @@
     // Any tag
     filterSuffix = filterSuffix.substr(1);
   }
   else if (firstTag == '[' || firstTag == '.' || firstTag == '#')
   {
     // Any tag (implicitly)
   }
   else if (isalnum(firstTag))
   {
     // Real tag
-    //TODO: Add support for descendant selectors 
+    // TODO: Add support for descendant selectors
     auto pos = filterSuffix.find_first_of(L".#[(");
     if (pos == std::wstring::npos)
     {
       pos = filterSuffix.length();
     }
     m_tag = ToLowerString(filterSuffix.substr(0, pos));
     filterSuffix = filterSuffix.substr(pos);
   }
   else
   {
@@ skipping 187 matching lines @@
     std::wstring classNameList(ToWstring(classNameListBstr));
     if (classNameList.empty())
     {
       return false;
     }
     // TODO: Consider case of multiple classes. (m_tagClassName can be something like "foo.bar")
     /*
      * Match when 'm_tagClassName' appears as a token within classNameList
      */
     bool foundMatch = false;
-    TokenSequence<std::wstring> ts(classNameList, L" ");
-    for (auto iterClassName = ts.cbegin(); iterClassName != ts.cend(); ++iterClassName)
-    {
-      if (*iterClassName == m_tagClassName)
+    wchar_t* nextToken = nullptr;
+    const wchar_t* token = wcstok_s(&classNameList[0], L" ", &nextToken);
+    while (token != nullptr)
+    {
+      if (std::wstring(token) == m_tagClassName)
       {
         foundMatch = true;
         break;
       }
+      token = wcstok_s(nullptr, L" ", &nextToken);
     }
     if (!foundMatch)
     {
       return false;
     }
   }
   /*
    * If a tag name is specified, it must match
    */
   if (!m_tag.empty())
@@ skipping 249 matching lines @@
           CPluginDebug::DebugResultHiding(tag, L"id:" + id, idIt->second.m_filterText);
 #endif
           return true;
         }
       }
     }
 
     // Search tag/className filters
     if (!classNames.empty())
     {
-      TokenSequence<std::wstring> ts(classNames, L" \t\n\r");
-      for (auto iterClassName = ts.cbegin(); iterClassName != ts.cend(); ++iterClassName)
-      {
-        std::wstring className = *iterClassName;
+      wchar_t* nextToken = nullptr;
+      const wchar_t* token = wcstok_s(&classNames[0], L" \t\n\r", &nextToken);
+      while (token != nullptr)
+      {
+        std::wstring className(token);
         auto classItEnum = m_elementHideTagsClass.equal_range(std::make_pair(tag, className));
         for (auto classIt = classItEnum.first; classIt != classItEnum.second; ++classIt)
         {
           if (classIt->second.IsMatchFilterElementHide(pEl))
           {
 #ifdef ENABLE_DEBUG_RESULT
             DEBUG_HIDE_EL(indent + L"HideEl::Found (tag/class) filter:" + classIt->second.m_filterText);
             CPluginDebug::DebugResultHiding(tag, L"class:" + className, classIt->second.m_filterText);
 #endif
             return true;
           }
         }
 
         // Search general class name
         classItEnum = m_elementHideTagsClass.equal_range(std::make_pair(L"", className));
         for (auto classIt = classItEnum.first; classIt != classItEnum.second; ++ classIt)
         {
           if (classIt->second.IsMatchFilterElementHide(pEl))
           {
 #ifdef ENABLE_DEBUG_RESULT
             DEBUG_HIDE_EL(indent + L"HideEl::Found (?/class) filter:" + classIt->second.m_filterText);
             CPluginDebug::DebugResultHiding(tag, L"class:" + className, classIt->second.m_filterText);
 #endif
             return true;
           }
         }
+        token = wcstok_s(nullptr, L" \t\n\r", &nextToken);
       }
     }
 
     // Search tag filters
     auto tagItEnum = m_elementHideTags.equal_range(tag);
     for (auto tagIt = tagItEnum.first; tagIt != tagItEnum.second; ++tagIt)
     {
       if (tagIt->second.IsMatchFilterElementHide(pEl))
       {
 #ifdef ENABLE_DEBUG_RESULT
@@ skipping 47 matching lines @@
 
 void CPluginFilter::ClearFilters()
 {
   // Clear filter maps
   CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
   m_elementHideTags.clear();
   m_elementHideTagsId.clear();
   m_elementHideTagsClass.clear();
 }
 
-bool CPluginFilter::ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug) const
-{
-  std::wstring srcTrimmed = TrimString(src);
-
-  // We should not block the empty string, so all filtering does not make sense
-  // Therefore we just return
-  if (srcTrimmed.empty())
-  {
-    return false;
-  }
-
-  CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  CPluginClient* client = CPluginClient::GetInstance();
-  bool result = client->Matches(srcTrimmed, contentType, domain);
-
-#ifdef ENABLE_DEBUG_RESULT
-  if (addDebug)
-  {
-    std::wstring type = ToUtf16String(AdblockPlus::FilterEngine::ContentTypeToString(contentType));
-    if (result)
-    {
-      CPluginDebug::DebugResultBlocking(type, srcTrimmed, domain);
-    }
-    else
-    {
-      CPluginDebug::DebugResultIgnoring(type, srcTrimmed, domain);
-    }
-  }
-#endif
-  return result;
-}