Issue #1234 - Convert strings associated with URL's

src/plugin/PluginDomTraverserBase.h

 #ifndef _PLUGIN_DOM_TRAVERSER_BASE_H_
 #define _PLUGIN_DOM_TRAVERSER_BASE_H_
 
 
 #include "PluginTypedef.h"
 #include "PluginTab.h"
 
 
 class CPluginDomTraverserCacheBase
 {
@@ skipping 13 matching lines @@
 
   CPluginDomTraverserBase(CPluginTab* tab);
   ~CPluginDomTraverserBase();
 
   void TraverseHeader(bool isHeaderTraversed);
 
   void TraverseDocument(IWebBrowser2* pBrowser, const std::wstring& domain, const std::wstring& documentName);
   void TraverseSubdocument(IWebBrowser2* pBrowser, const std::wstring& domain, const CString& documentName);
 
   virtual void ClearCache();
-
-  void ShowNotification(CPluginTab* tab);
 
 protected:
 
   virtual bool OnIFrame(IHTMLElement* pEl, const std::wstring& url, CString& indent) { return true; }
   virtual bool OnElement(IHTMLElement* pEl, const CString& tag, T* cache, bool isDebug, CString& indent) { return true; }
 
   virtual bool IsEnabled();
 
 protected:
 
@@ skipping 169 matching lines @@
     {
       CComVariant vIndex(i);
       CComVariant vRetIndex;
       CComPtr<IDispatch> pFrameDispatch;
 
       if (SUCCEEDED(pFrameCollection->item(vIndex, vRetIndex, &pFrameDispatch)) && pFrameDispatch)
       {
         CComQIPtr<IWebBrowser2> pFrameBrowser = pFrameDispatch;
         if (pFrameBrowser)
         {
-          BSTR bstrSrc;
           std::wstring src;
-          if (SUCCEEDED(pFrameBrowser->get_LocationURL(&bstrSrc)))
+          CComBSTR bstrSrc;
+          if (SUCCEEDED(pFrameBrowser->get_LocationURL(&bstrSrc)) && bstrSrc)
           {
             src = std::wstring(bstrSrc,SysStringLen(bstrSrc));
-            SysFreeString(bstrSrc);
             UnescapeUrl(src);
           }
           if (!src.empty())
           {
             TraverseDocument(pFrameBrowser, false, indent);
           }
         }
       }
     }
   }
@@ skipping 29 matching lines @@
             // 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;
             }
             // eg. http://w3schools.com/html/html_examples.asp
             else if (srcLegacy.Left(4) != L"http" && srcLegacy.Left(6) != L"res://")
             {
               srcLegacy = L"http://" + to_CString(m_domain) + srcLegacy;

[sergei, 2015/01/06 13:18:18]

should ToCString be instead of to_CString here?

[Eric, 2015/01/06 19:38:59]

It's time to do a wholesale replacement, which was the idea all along. After
this change set lands, I'll get to it.

[Oleksandr, 2015/01/13 10:08:06]

Would be great to not commit to_CString anyway though. Since we have a correctly
styled method anyway.

             }
             std::wstring src(ToWstring(srcLegacy));
             UnescapeUrl(src);
 
             // Check if Iframe should be traversed
             if (OnIFrame(pFrameEl, src, indent))
             {
               CComQIPtr<IWebBrowser2> pFrameBrowser = pFrameDispatch;
               if (pFrameBrowser)
               {
@@ skipping 155 matching lines @@
 void CPluginDomTraverserBase<T>::ClearCache()
 {
   m_criticalSection.Lock();
   {
     m_cacheIndexLast = 0;
     m_cacheDocumentHasFrames.clear();
     m_cacheDocumentHasIframes.clear();
   }
   m_criticalSection.Unlock();
 }
-template <class T>
-void CPluginDomTraverserBase<T>::ShowNotification(CPluginTab* tab)
-{
-  if (tab->m_plugin->GetTabHWND() == NULL)
-  {
-    return;
-  }
-
-
-}
 
 
 #endif // _PLUGIN_DOM_TRAVERSER_BASE_H_