Issue #1484 - Make PassthroughAPP a pass-through again

src/plugin/PluginWbPassThrough.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 126 matching lines @@
 
 WBPassthruSink::WBPassthruSink()
   : m_currentPositionOfSentPage(0)
   , m_contentType(ContentType::CONTENT_TYPE_OTHER)
   , m_isCustomResponse(false)
 {
 }
 
 ContentType WBPassthruSink::GetContentTypeFromMimeType(const std::wstring& mimeType)
 {
+  if ((mimeType.find(L"text/html") != std::wstring::npos) ||
+      (mimeType.find(L"application/xhtml+xml") != std::wstring::npos))
+  {
+    return ContentType::CONTENT_TYPE_SUBDOCUMENT;
+  }
   if (mimeType.find(L"image/") != std::wstring::npos)
   {
     return ContentType::CONTENT_TYPE_IMAGE;
   }
   if (mimeType.find(L"text/css") != std::wstring::npos)
   {
     return ContentType::CONTENT_TYPE_STYLESHEET;
   }
   if ((mimeType.find(L"application/javascript") != std::wstring::npos) || (mimeType.find(L"application/json") != std::wstring::npos))
   {
     return ContentType::CONTENT_TYPE_SCRIPT;
   }
   if (mimeType.find(L"application/x-shockwave-flash") != std::wstring::npos)
   {
     return ContentType::CONTENT_TYPE_OBJECT;
-  }
-  if (mimeType.find(L"text/html") != std::wstring::npos)
-  {
-    return ContentType::CONTENT_TYPE_SUBDOCUMENT;
   }
   // 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") != std::wstring::npos)
   {
     return ContentType::CONTENT_TYPE_XMLHTTPREQUEST;
   }
 
   return ContentType::CONTENT_TYPE_OTHER;
 }
 
@@ skipping 241 matching lines @@
   return BaseClass::ReportResult(hrResult, dwError, szResult);
 }
 
 HRESULT WbPassthroughSinkStartPolicy::OnStart(LPCWSTR szUrl,
   IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
   DWORD grfPI, HANDLE_PTR dwReserved,
   IInternetProtocol* pTargetProtocol)
 {
   HRESULT hr = BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
   WBPassthruSink* pSink = GetSink();
   if (hr == E_ABORT && pSink->m_isCustomResponse)

[Oleksandr, 2015/12/16 13:33:30]

I am actually not even sure we need this clause at all. m_isCustomResponse is
set in BeginningTransaction, which is called after OnStart. Not a good idea to
remove this in a purely refactoring commit of course, but just a note for
future.

   {
     GetProtocol(pSink)->m_shouldSupplyCustomContent = true;
     pSink->m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"text/html");
     pSink->m_spInternetProtocolSink->ReportData(BSCF_FIRSTDATANOTIFICATION, 0, static_cast<ULONG>(g_blockedByABPPage.size()));
     return S_OK;
   }
   return hr;
 }
 
 STDMETHODIMP WbPassthroughProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
     IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved)
 {
   ATLASSERT(m_spInternetProtocol != 0);
   if (!m_spInternetProtocol)
   {
     return E_UNEXPECTED;
   }
 
   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInternetProtocol);
 }
 
 STDMETHODIMP WbPassthroughProtocol::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
 {
   WBPassthruSink* pSink = GetSink();
   return pSink->OnRead(pv, cb, pcbRead);
 }