Issue #276 - introduce class BSTR_Argument

src/plugin/AdblockPlusDomTraverser.cpp

 #include "PluginStdAfx.h"
 
+#include "COM_Value.h"
 #include "PluginClient.h"
 #include "PluginFilter.h"
 #include "PluginSettings.h"
 
 #include "AdblockPlusDomTraverser.h"
 
 
 CPluginDomTraverser::CPluginDomTraverser(CPluginTab* tab) : CPluginDomTraverserBase(tab)
 {
 }
@@ skipping 46 matching lines @@
       if (cache->m_isHidden)
       {
         HideElement(pEl, "image", src, true, indent);
         return false;
       }
     }
   }
   // Objects
   else if (tag == "object")
   {
-    CComBSTR bstrInnerHtml;
-
-    if (SUCCEEDED(pEl->get_innerHTML(&bstrInnerHtml)) && bstrInnerHtml)
+    AdblockPlus::COM::BSTR_Argument inner_HTML;
+    if (SUCCEEDED(pEl->get_innerHTML(&inner_HTML)))
     {
-      CString sObjectHtml = bstrInnerHtml;
+      CString sObjectHtml = to_CString(inner_HTML);
       CString src;
 
       int posBegin = sObjectHtml.Find(L"VALUE=\"");
       int posEnd = posBegin >= 0 ? sObjectHtml.Find('\"', posBegin + 7) : -1;
 
       while (posBegin >= 0 && posEnd >= 0)
       {
         posBegin += 7;
 
         src = sObjectHtml.Mid(posBegin, posEnd - posBegin);
@@ skipping 31 matching lines @@
   return client && CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(std::wstring(m_domain));
 }
 
 
 void CPluginDomTraverser::HideElement(IHTMLElement* pEl, const CString& type, const CString& url, bool isDebug, CString& indent)
 {
   CComPtr<IHTMLStyle> pStyle;
 
   if (SUCCEEDED(pEl->get_style(&pStyle)) && pStyle)
   {
-    CComBSTR bstrDisplay;
-
-    if (SUCCEEDED(pStyle->get_display(&bstrDisplay)) && bstrDisplay && CString(bstrDisplay) == L"none")
+    AdblockPlus::COM::BSTR_Argument display;
+    // Explicit call to conversion operator compensates for deficiencies in VS2012
+    if (SUCCEEDED(pStyle->get_display(&display)) && display.operator std::wstring() == L"none")
     {
       return;
     }
 
-    static const CComBSTR sbstrNone(L"none");
-
-    if (SUCCEEDED(pStyle->put_display(sbstrNone)))
+    static const AdblockPlus::COM::BSTR_Argument none(std::wstring(L"none"));
+    if (SUCCEEDED(pStyle->put_display(none)))
     {
       DEBUG_HIDE_EL(indent + L"HideEl::Hiding " + type + L" url:" + url)
 
 #ifdef ENABLE_DEBUG_RESULT
         if (isDebug)
         {
           CPluginDebug::DebugResultHiding(type, url, "-");
         }
 #endif // ENABLE_DEBUG_RESULT
     }
   }
 }