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 40 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)
   {
     contentType = GetContentTypeFromURL(src);
   }
   return contentType;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
 //WBPassthruSink
 //Monitor and/or cancel every request and responde
 //WB makes, including images, sounds, scripts, etc
 ////////////////////////////////////////////////////////////////////////////////////////
 HRESULT WBPassthruSink::OnStart(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
                                 IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved,
                                 IInternetProtocol* pTargetProtocol, bool& handled)
 {
   m_pTargetProtocol = pTargetProtocol;
   bool isBlocked = false;
-  CString src = szUrl;
-  DEBUG_GENERAL(src);
-  CPluginClient::UnescapeUrl(src);
+  std::wstring src(szUrl);
+  DEBUG_GENERAL(ToCString(src));
+  UnescapeUrl(src);
 
   // call the impl of the base class as soon as possible because it initializes the base class
   // members, used by this method. It queries for the required interfaces.
   HRESULT hr = BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
   if (FAILED(hr))
   {
     return hr;
   }
 
   CString mimeType;
@@ skipping 26 matching lines @@
 
   CString cookie;
   ULONG len1 = 2048;
   ULONG len2 = 2048;
 
   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 == src)
     {
       // fall through
     }
-    else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(std::wstring(documentUrl)))
+    else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(documentUrl))
     {
       m_boundDomain = tab->GetDocumentUrl();
       m_contentType = CFilter::contentTypeAny;
       if (tab != nullptr && tab->IsFrameCached(src))
       {
         m_contentType = CFilter::contentTypeSubdocument;
       }
       else
       {
         m_contentType = GetContentType(mimeType, m_boundDomain, src);
@@ skipping 27 matching lines @@
       }
     }
   }
 
   // The descision about EContentType::contentTypeAny is made later in
   // WBPassthruSink::BeginningTransaction. Sometimes here we cannot detect the request type, but
   // in WBPassthruSink::BeginningTransaction the header Accept is available which allows to
   // obtain the "request type" in our terminology.
   if (nullptr != client
     && CFilter::EContentType::contentTypeAny != m_contentType
-    && client->ShouldBlock(static_cast<const wchar_t*>(src), m_contentType, m_boundDomain, true))
+    && client->ShouldBlock(src, m_contentType, m_boundDomain, true))
   {
     isBlocked = true;
   }
 
   // For IE6 and earlier there is iframe back button issue, so avoid it.
   if (isBlocked && client->GetIEVersion() > 6)
   {
     handled = true;
     if (CFilter::EContentType::contentTypeImage == m_contentType)
     {
@@ skipping 220 matching lines @@
 }
 
 STDMETHODIMP WBPassthru::UnlockRequest()
 {
   if (!m_hasOriginalStartCalled)
   {
     return S_OK;
   }
   return BaseClass::UnlockRequest();
 }