Issue #1234 - remove CString from declarations representing domains.

src/plugin/PluginWbPassThrough.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginWbPassThrough.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginSettings.h"
 #include "PluginClass.h"
@@ skipping 74 matching lines @@
   {
     return CFilter::contentTypeSubdocument;
   }
   else
   {
     return CFilter::contentTypeAny & ~CFilter::contentTypeSubdocument;
   }
 
 }
 
-int WBPassthruSink::GetContentType(CString mimeType, CString domain, CString src)
+int WBPassthruSink::GetContentType(CString mimeType, std::wstring domain, CString src)
 {
   // No referer or mime type
   // BINDSTRING_XDR_ORIGIN works only for IE v8+
-  if (mimeType.IsEmpty() && domain.IsEmpty() && CPluginClient::GetInstance()->GetIEVersion() >= 8)
+  if (mimeType.IsEmpty() && domain.empty() && CPluginClient::GetInstance()->GetIEVersion() >= 8)
   {
     return CFilter::contentTypeXmlHttpRequest;
   }
   int contentType = GetContentTypeFromMimeType(mimeType);
   if (contentType == CFilter::contentTypeAny)
   {
     contentType = GetContentTypeFromURL(src);
   }
   return contentType;
 }
@@ skipping 10 matching lines @@
 
   m_pTargetProtocol = pTargetProtocol;
   bool isBlocked = false;
   m_shouldBlock = false;
   m_lastDataReported = false;
   CString src;
   src.Append(szUrl);
   DEBUG_GENERAL(src);
   CPluginClient::UnescapeUrl(src);
 
-  CString boundDomain;
+  std::wstring boundDomain;
   CString mimeType;
   LPOLESTR mime[10];
   if (pOIBindInfo)
   {
     ULONG resLen = 0;
 
     // Apparently IE will report random mime type if there's more then 1 in the list.
     // So we get the whole list and just use the first one (top priority one)
     pOIBindInfo->GetBindString(BINDSTRING_ACCEPT_MIMES, mime, 10, &resLen);
     if (mime && resLen > 0)
     {
       mimeType.SetString(mime[0]);
     }
     LPOLESTR bindToObject = 0;
     pOIBindInfo->GetBindString(BINDSTRING_FLAG_BIND_TO_OBJECT, &bindToObject, 1, &resLen);
-    LPOLESTR domainRetrieved = 0;
+    wchar_t* domainRetrieved = 0;
     if (resLen == 0 || wcscmp(bindToObject, L"FALSE") == 0)
-    {   
+    {
       HRESULT hr = pOIBindInfo->GetBindString(BINDSTRING_XDR_ORIGIN, &domainRetrieved, 1, &resLen);
       
       if ((hr == S_OK) && domainRetrieved && (resLen > 0))
       {
-        boundDomain.SetString(domainRetrieved);
+        boundDomain = std::wstring(domainRetrieved);
       }
     }
   }
 
   CString cookie;
   ULONG len1 = 2048;
   ULONG len2 = 2048;
 
 #ifdef SUPPORT_FILTER
   int contentType = CFilter::contentTypeAny;
 
   CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId());
   CPluginClient* client = CPluginClient::GetInstance();
 
 
   if (tab && client)
   {
     CString documentUrl = tab->GetDocumentUrl();
     // Page is identical to document => don't block
     if (documentUrl == src)
     {
       // fall through
     }
     else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(std::wstring(documentUrl)))
     {
-      boundDomain = tab->GetDocumentUrl();
+      boundDomain = to_wstring(tab->GetDocumentUrl());
 
       contentType = CFilter::contentTypeAny;
 
 #ifdef SUPPORT_FRAME_CACHING
       if ((tab != 0) && (tab->IsFrameCached(src)))
       {
         contentType = CFilter::contentTypeSubdocument;
       }
       else
 #endif // SUPPORT_FRAME_CACHING
       contentType = GetContentType(mimeType, boundDomain, src);
-      if (client->ShouldBlock(to_wstring(src), contentType, to_wstring(boundDomain), true))
+      if (client->ShouldBlock(to_wstring(src), contentType, boundDomain, true))
       {
         isBlocked = true;
         DEBUG_BLOCKER("Blocker::Blocking Http-request:" + src);
       }
     }
     if (!isBlocked)
     {
       DEBUG_BLOCKER("Blocker::Ignoring Http-request:" + src)
     }
   }
 
 
   if (tab == NULL)
   {
     contentType = GetContentType(mimeType, boundDomain, src);
-    if (client->ShouldBlock(to_wstring(src), contentType, to_wstring(boundDomain), true))
+    if (client->ShouldBlock(to_wstring(src), contentType, boundDomain, true))
     {
       isBlocked = true;
     }
   }
 
 #ifdef _DEBUG
   CString type;
 
   if (contentType == CFilter::contentTypeDocument) type = "DOCUMENT";
   else if (contentType == CFilter::contentTypeObject) type = "OBJECT";
@@ skipping 176 matching lines @@
   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI,
     dwReserved, m_spInternetProtocol);
 }
 
  STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
  {
    
    WBPassthruSink* pSink = GetSink();
    return pSink->Read(pv, cb, pcbRead);
  }