Issue #1466 - fix usage of BSTR

src/plugin/PluginDomTraverserBase.h

 /*
  * 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 118 matching lines @@
 
 template <class T>
 void CPluginDomTraverserBase<T>::TraverseDocument(IWebBrowser2* pBrowser, bool isMainDoc, CString indent)
 {
   DWORD res = WaitForSingleObject(m_tab->m_filter->hideFiltersLoadedEvent, ENGINE_STARTUP_TIMEOUT);
   if (!IsEnabled()) return;
 
   VARIANT_BOOL isBusy;
   if (SUCCEEDED(pBrowser->get_Busy(&isBusy)))
   {
-    if (isBusy)
+    if (isBusy != VARIANT_FALSE)
     {
       return;
     }
   }
 
   // Get document
   CComPtr<IDispatch> pDocDispatch;
   HRESULT hr = pBrowser->get_Document(&pDocDispatch);
   if (FAILED(hr) || !pDocDispatch)
   {
@@ skipping 14 matching lines @@
 
   CComPtr<IHTMLElement> pBodyEl;
 
   if (m_isHeaderTraversed)
   {
     pBodyEl = pBody;
   }
   else
   {
     CComPtr<IHTMLElementCollection> pBodyCollection;
-    if (FAILED(pDoc->getElementsByTagName(L"body", &pBodyCollection)) || !pBodyCollection)
+    if (FAILED(pDoc->getElementsByTagName(ATL::CComBSTR(L"body"), &pBodyCollection)) || !pBodyCollection)
     {
       return;
     }
 
     CComVariant vIndex(0);
     CComPtr<IDispatch> pBodyDispatch;
     if (FAILED(pBodyCollection->item(vIndex, vIndex, &pBodyDispatch)) || !pBodyDispatch)
     {
       return;
     }
 
     if (FAILED(pBodyDispatch->QueryInterface(IID_IHTMLElement, (LPVOID*)&pBodyEl)) || !pBodyEl)
     {
       return;
     }
   }
 
   // Clear cache (if eg. refreshing) ???
   if (isMainDoc)
   {
     CComVariant vCacheIndex;
 
-    if (FAILED(pBodyEl->getAttribute(L"abp", 0, &vCacheIndex)) || vCacheIndex.vt == VT_NULL)
+    if (FAILED(pBodyEl->getAttribute(ATL::CComBSTR(L"abp"), 0, &vCacheIndex)) || vCacheIndex.vt == VT_NULL)
     {
       ClearCache();
     }
   }
 
   // Hide elements in body part
   TraverseChild(pBodyEl, pBrowser, indent);
 
   // Check frames and iframes
   bool hasFrames = false;
   bool hasIframes = false;
 
   m_criticalSection.Lock();
   {
     hasFrames = m_cacheDocumentHasFrames.find(m_documentName) != m_cacheDocumentHasFrames.end();
     hasIframes = m_cacheDocumentHasIframes.find(m_documentName) != m_cacheDocumentHasIframes.end();
   }
   m_criticalSection.Unlock();
 
   // Frames
   if (hasFrames)
   {
     // eg. http://gamecopyworld.com/
     long frameCount = 0;
     CComPtr<IHTMLElementCollection> pFrameCollection;
-    if (SUCCEEDED(pDoc->getElementsByTagName(L"frame", &pFrameCollection)) && pFrameCollection)
+    if (SUCCEEDED(pDoc->getElementsByTagName(ATL::CComBSTR(L"frame"), &pFrameCollection)) && pFrameCollection)
     {
       pFrameCollection->get_length(&frameCount);
     }
 
     // Iterate through all frames
     for (long i = 0; i < frameCount; i++)
     {
       CComVariant vIndex(i);
       CComVariant vRetIndex;
       CComPtr<IDispatch> pFrameDispatch;
@@ skipping 17 matching lines @@
         }
       }
     }
   }
 
   // Iframes
   if (hasIframes)
   {
     long frameCount = 0;
     CComPtr<IHTMLElementCollection> pFrameCollection;
-    if (SUCCEEDED(pDoc->getElementsByTagName(L"iframe", &pFrameCollection)) && pFrameCollection)
+    if (SUCCEEDED(pDoc->getElementsByTagName(ATL::CComBSTR(L"iframe"), &pFrameCollection)) && pFrameCollection)
     {
       pFrameCollection->get_length(&frameCount);
     }
 
     // Iterate through all iframes
     for (long i = 0; i < frameCount; i++)
     {
       CComVariant vIndex(i);
       CComVariant vRetIndex;
       CComPtr<IDispatch> pFrameDispatch;
 
       if (SUCCEEDED(pFrameCollection->item(vIndex, vRetIndex, &pFrameDispatch)) && pFrameDispatch)
       {
         CComQIPtr<IHTMLElement> pFrameEl = pFrameDispatch;
         if (pFrameEl)
         {
           CComVariant vAttr;
 
-          if (SUCCEEDED(pFrameEl->getAttribute(L"src", 0, &vAttr)) && vAttr.vt == VT_BSTR && ::SysStringLen(vAttr.bstrVal) > 0)
+          if (SUCCEEDED(pFrameEl->getAttribute(ATL::CComBSTR(L"scr"), 0, &vAttr)) && vAttr.vt == VT_BSTR && ::SysStringLen(vAttr.bstrVal) > 0)
           {
             CString srcLegacy = vAttr.bstrVal;
 
             // Some times, domain is missing. Should this be added on image src's as well?''
 
             // eg. gadgetzone.com.au
             if (srcLegacy.Left(2) == L"//")
             {
               srcLegacy = L"http:" + srcLegacy;
             }
@@ skipping 24 matching lines @@
 
 template <class T>
 void CPluginDomTraverserBase<T>::TraverseChild(IHTMLElement* pEl, IWebBrowser2* pBrowser, CString& indent, bool isCached)
 {
   int  cacheIndex = -1;
   long cacheAllElementsCount = -1;
 
   m_criticalSection.Lock();
   {
     CComVariant vCacheIndex;
-    if (isCached && SUCCEEDED(pEl->getAttribute(L"abp", 0, &vCacheIndex)) && vCacheIndex.vt == VT_I4)
+    if (isCached && SUCCEEDED(pEl->getAttribute(ATL::CComBSTR(L"abp"), 0, &vCacheIndex)) && vCacheIndex.vt == VT_I4)
     {
       cacheIndex = vCacheIndex.intVal;
 
       cacheAllElementsCount = m_cacheElements[cacheIndex].m_elements;
     }
     else
     {
       isCached = false;
 
       cacheIndex = m_cacheIndexLast++;
@@ skipping 10 matching lines @@
         m_cacheElementsMax *= 2;
 
         delete [] oldCacheElements;
       }
 
       m_cacheElements[cacheIndex].Init();
 
       vCacheIndex.vt = VT_I4;
       vCacheIndex.intVal = cacheIndex;
 
-      pEl->setAttribute(L"abp", vCacheIndex);
+      pEl->setAttribute(ATL::CComBSTR(L"abp"), vCacheIndex);
     }
   }
   m_criticalSection.Unlock();
 
   // Get number of elements in the scope of pEl
   long allElementsCount = 0;
 
   CComPtr<IDispatch> pAllCollectionDisp;
 
   if (SUCCEEDED(pEl->get_all(&pAllCollectionDisp)) && pAllCollectionDisp)
@@ skipping 96 matching lines @@
   {
     m_cacheIndexLast = 0;
     m_cacheDocumentHasFrames.clear();
     m_cacheDocumentHasIframes.clear();
   }
   m_criticalSection.Unlock();
 }
 
 
 #endif // _PLUGIN_DOM_TRAVERSER_BASE_H_