Issue 1148 - ABP on chrome blocks ads but IE doesnt

src/plugin/PluginFilter.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginFilter.h"
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginClass.h"
 #include "mlang.h"
 
 #include "..\shared\CriticalSection.h"
+#include "..\shared\Utils.h"
 
 
 // The filters are described at http://adblockplus.org/en/filters
 
 static CriticalSection s_criticalSectionFilterMap;
 
+namespace
+{
+  struct GetHtmlElementAttributeResult

[Felix Dahlke, 2014/11/27 13:58:46]

How about "HtmlAttributeMatch" or something in that spirit?

[sergei, 2014/11/27 14:47:25]

I also don't feel it to be a good name, but I find "HtmlAttributeMatch" even
more confusing.

[Felix Dahlke, 2014/11/27 14:57:27]

Fair enough, yeah. Let's go with GetHtmlElementAttributeResult then.

+  {
+    GetHtmlElementAttributeResult() : isAttributeFound(false)
+    {
+    }
+    std::wstring attributeValue;
+    bool isAttributeFound;
+  };
+
+  GetHtmlElementAttributeResult GetHtmlElementAttribute(IHTMLElement& htmlElement,
+    const ATL::CComBSTR& attributeName)
+  {
+    GetHtmlElementAttributeResult retValue;
+    ATL::CComVariant vAttr;
+    ATL::CComPtr<IHTMLElement4> htmlElement4;
+    if (FAILED(htmlElement.QueryInterface(&htmlElement4)) || !htmlElement4)
+    {
+      return retValue;
+    }
+    ATL::CComPtr<IHTMLDOMAttribute> attributeNode;
+    if (FAILED(htmlElement4->getAttributeNode(attributeName, &attributeNode)) || !attributeNode)
+    {
+      return retValue;
+    }
+    // we set that attribute found but it's not necessary that we can retrieve its value
+    retValue.isAttributeFound = true;
+    if (FAILED(attributeNode->get_nodeValue(&vAttr)))
+    {
+      return retValue;
+    }
+    if (vAttr.vt == VT_BSTR && vAttr.bstrVal)
+    {
+      retValue.attributeValue = vAttr.bstrVal;
+    }
+    else if (vAttr.vt == VT_I4)
+    {
+      retValue.attributeValue = std::to_wstring(vAttr.iVal);
+    }
+    return retValue;
+  }
+}
+
 // ============================================================================
 // CFilterElementHideAttrSelector
 // ============================================================================
 
 CFilterElementHideAttrSelector::CFilterElementHideAttrSelector() : m_type(TYPE_NONE), m_pos(POS_NONE), m_bstrAttr(NULL)
 {
 }
 
 CFilterElementHideAttrSelector::CFilterElementHideAttrSelector(const CFilterElementHideAttrSelector& filter)
 {
@@ skipping 235 matching lines @@
       }
       if (!foundMatch)
       {
         return false;
       }
     }
   }
   if (!m_tag.IsEmpty())
   {
     CComBSTR tagName;
+    hr = pEl->get_tagName(&tagName);
     tagName.ToLower();
-    hr = pEl->get_tagName(&tagName);
     if ((hr != S_OK) || (tagName != CComBSTR(m_tag)))
     {
       return false;
     }
   }
 
   // Check attributes
   for (std::vector<CFilterElementHideAttrSelector>::const_iterator attrIt = m_attributeSelectors.begin(); 
         attrIt != m_attributeSelectors.end(); ++ attrIt)
   {
-    CString value;
+    ATL::CString value;

[Felix Dahlke, 2014/11/27 13:58:46]

This change seems unrelated, hm? Plus we're still using CString (without ATL::)
elsewhere in this file.

[sergei, 2014/11/27 14:47:25]

Yes, it's not important here, just was irritating the eye. I would not say that
we don't use it in this file elsewhere is an argument. We should tend to use
ATL:: for the same reason that we don't have `using namespace std` in any
header.

[Felix Dahlke, 2014/11/27 14:57:27]

Yes I agree. It's just that we should avoid unrelated changes, particularly with
bug fixes. A commit should make one logical change. That way we can trace down
regressions and back commits out much easier.

     bool attrFound = false;
     if (attrIt->m_type == CFilterElementHideAttrType::STYLE)
     {
       CComPtr<IHTMLStyle> pStyle;
       if (SUCCEEDED(pEl->get_style(&pStyle)) && pStyle)
       {
         CComBSTR bstrStyle;
 
         if (SUCCEEDED(pStyle->get_cssText(&bstrStyle)) && bstrStyle)
         {
@@ skipping 14 matching lines @@
     }
     else if (attrIt->m_type == CFilterElementHideAttrType::ID)
     {
       CComBSTR bstrId;
       if (SUCCEEDED(pEl->get_id(&bstrId)) && bstrId)
       {
         value = bstrId;
         attrFound = true;
       }
     }
-    else 
+    else
     {
-      CComVariant vAttr;
-      if (SUCCEEDED(pEl->getAttribute(attrIt->m_bstrAttr, 0, &vAttr)))
+      auto attributeValue = GetHtmlElementAttribute(*pEl, attrIt->m_bstrAttr);
+      if (attrFound = attributeValue.isAttributeFound)
       {
-        attrFound = true;
-        if (vAttr.vt == VT_BSTR)
-        {
-          value = vAttr.bstrVal;
-        }
-        else if (vAttr.vt == VT_I4)
-        {
-          value.Format(L"%u", vAttr.iVal);
-        }
+        value = ToCString(attributeValue.attributeValue);
       }
     }
 
     if (attrFound)
     {
       if (attrIt->m_pos == CFilterElementHideAttrPos::EXACT)
       {
         // TODO: IE rearranges the style attribute completely. Figure out if anything can be done about it.
         if (value != attrIt->m_value)
           return false;
@@ skipping 82 matching lines @@
   m_contentMapText[CFilter::contentTypeSubdocument] = "SUBDOCUMENT";
   m_contentMapText[CFilter::contentTypeStyleSheet] = "STYLESHEET";
   m_contentMapText[CFilter::contentTypeXmlHttpRequest] = "XMLHTTPREQUEST";
 
   ClearFilters(); 
 }
 
 
 bool CPluginFilter::AddFilterElementHide(CString filterText)
 {
-
-
   DEBUG_FILTER("Input: " + filterText + " filterFile" + filterFile);
-
-  CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);    
+  CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
   {
-
     CString filterString  = filterText;
     // Create filter descriptor
     std::auto_ptr<CFilterElementHide> filter;
 
     CString wholeFilterString = filterString;
     wchar_t separatorChar;
     do
     {
       int chunkEnd = filterText.FindOneOf(L"+>");
       if (chunkEnd > 0)
       {
         separatorChar = filterText.GetAt(chunkEnd);
       }
       else
       {
         chunkEnd = filterText.GetLength();
         separatorChar = L'\0';
       }
 
       CString filterChunk = filterText.Left(chunkEnd).TrimRight();
       std::auto_ptr<CFilterElementHide> filterParent(filter);
 
-      filter.reset(new CFilterElementHide(filterChunk));       
+      filter.reset(new CFilterElementHide(filterChunk));
 
       if (filterParent.get() != 0)
       {
         filter->m_predecessor.reset(filterParent.release());
       }
 
       if (separatorChar != L'\0') // complex selector
       {
         filterText = filterText.Mid(chunkEnd + 1).TrimLeft();
         if (separatorChar == '+')
@@ skipping 34 matching lines @@
     id = bstrId;
   }
 
   CString classNames;
   CComBSTR bstrClassNames;
   if (SUCCEEDED(pEl->get_className(&bstrClassNames)) && bstrClassNames)
   {
     classNames = bstrClassNames;
   }
 
-  CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);    
+  CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
   {
     // Search tag/id filters
     if (!id.IsEmpty())
     {
       std::pair<TFilterElementHideTagsNamed::const_iterator, TFilterElementHideTagsNamed::const_iterator> idItEnum =
         m_elementHideTagsId.equal_range(std::make_pair(tagCString, id));
       for (TFilterElementHideTagsNamed::const_iterator idIt = idItEnum.first; idIt != idItEnum.second; idIt ++)
       {
         if (idIt->second.IsMatchFilterElementHide(pEl))
         {
@@ skipping 81 matching lines @@
 }
 
 bool CPluginFilter::LoadHideFilters(std::vector<std::wstring> filters)
 {
   ClearFilters();
   bool isRead = false;
   CPluginClient* client = CPluginClient::GetInstance();
 
   // Parse hide string
   int pos = 0;
-  CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);    
+  CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
   {
     for (std::vector<std::wstring>::iterator it = filters.begin(); it < filters.end(); ++it)
     {
       CString filter((*it).c_str());
       // 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
@@ skipping 71 matching lines @@
         CPluginDebug::DebugResultBlocking(type, srcCString, domain);
 #endif
     }
     return true;
   }
 #ifdef ENABLE_DEBUG_RESULT
   CPluginDebug::DebugResultIgnoring(type, srcCString, domain);
 #endif
   return false;
 }