Issue #1234 - Convert strings associated with URL's

src/plugin/PluginWbPassThrough.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginWbPassThrough.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginFilter.h"
 #include "PluginSettings.h"
 #include "PluginClass.h"
 #include "PluginSystem.h"
 #include <WinInet.h>
@@ skipping 91 matching lines @@
   }
   // It is important to have this check last, since it is rather generic, and might overlay text/html, for example
   if (mimeType.Find(L"xml") >= 0)
   {
     return CFilter::contentTypeXmlHttpRequest;
   }
 
   return CFilter::contentTypeAny;
 }
 
-int WBPassthruSink::GetContentTypeFromURL(const CString& src)
+int WBPassthruSink::GetContentTypeFromURL(const std::wstring& src)
 {
-  CString srcExt = src;
+  CString srcLegacy = ToCString(src);
+  CString srcExt = srcLegacy;
 
   int pos = 0;
-  if ((pos = src.Find('?')) > 0)
+  if ((pos = srcLegacy.Find('?')) > 0)
   {
-    srcExt = src.Left(pos);
+    srcExt = srcLegacy.Left(pos);
   }
 
   int lastDotIndex = srcExt.ReverseFind('.');
   if (lastDotIndex < 0)
     return CFilter::contentTypeAny;
   CString ext = srcExt.Mid(lastDotIndex);
   if (ext == L".jpg" || ext == L".gif" || ext == L".png" || ext == L".jpeg")
   {
     return CFilter::contentTypeImage;
   }
@@ skipping 13 matching lines @@
   {
     return CFilter::contentTypeObject;
   }
   else if (ext == L".jsp" || ext == L".php" || ext == L".html")
   {
     return CFilter::contentTypeSubdocument;
   }
   return CFilter::contentTypeAny;
 }
 
-int WBPassthruSink::GetContentType(const CString& mimeType, const std::wstring& domain, const CString& src)
+int WBPassthruSink::GetContentType(const CString& mimeType, const std::wstring& domain, const std::wstring& src)
 {
   // No referer or mime type
   // BINDSTRING_XDR_ORIGIN works only for IE v8+
   if (mimeType.IsEmpty() && domain.empty() && CPluginClient::GetInstance()->GetIEVersion() >= 8)
   {
     return CFilter::contentTypeXmlHttpRequest;
   }
   int contentType = GetContentTypeFromMimeType(mimeType);
   if (contentType == CFilter::contentTypeAny)
   {
@@ skipping 134 matching lines @@
   if (pszAdditionalHeaders && *pszAdditionalHeaders)
   {
     m_boundDomain = ExtractHttpHeader<std::wstring>(*pszAdditionalHeaders, L"Referer:", L"\n");
   }
   m_boundDomain = TrimString(m_boundDomain);
   CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId());
   CPluginClient* client = CPluginClient::GetInstance();
 
   if (tab && client)
   {
-    CString documentUrl = tab->GetDocumentUrl();
+    std::wstring documentUrl = tab->GetDocumentUrl();
     // Page is identical to document => don't block
-    if (documentUrl == ToCString(src))
+    if (documentUrl == src)
     {
       return nativeHr;
     }
-    else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(std::wstring(documentUrl)))
+    else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(documentUrl))
     {
-      if (tab->IsFrameCached(ToCString(src)))
+      if (tab->IsFrameCached(src))
       {
         m_contentType = CFilter::contentTypeSubdocument;
       }
     }
   }
 
   if (IsFlashRequest(pszAdditionalHeaders))
   {
     m_contentType = CFilter::EContentType::contentTypeObjectSubrequest;
   }
@@ skipping 61 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->OnRead(pv, cb, pcbRead);
 }