Issue #1484 - Make PassthroughAPP a pass-through again

src/plugin/passthroughapp/SinkPolicy.inl

 /*
  * 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 357 matching lines @@
                 static_cast<const CComObjectProtSink*>(pProtocolObject));
         return pThis->m_sink.GetContainedObject();
 }
 
 // ===== CustomSinkStartPolicy =====
 
 template <class Protocol, class Sink>
 inline HRESULT CustomSinkStartPolicy<Protocol, Sink>::OnStart(LPCWSTR szUrl,
         IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
         DWORD grfPI, HANDLE_PTR dwReserved,
-        IInternetProtocol* pTargetProtocol)
+        IInternetProtocol* pTargetProtocol) const
 {
         ATLASSERT(pTargetProtocol != 0);
 
         Sink* pSink = GetSink(static_cast<const Protocol*>(this));
         HRESULT hr = pSink->OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI,
                 dwReserved, pTargetProtocol);
 
         CComPtr<IInternetProtocolSink> spSink;
         CComPtr<IInternetBindInfo> spBindInfo;
         if (SUCCEEDED(hr))
         {
                 hr = pSink->QueryInterface(IID_IInternetProtocolSink, reinterpret_cast<void**>(&spSink));
                 ATLASSERT(SUCCEEDED(hr) && spSink != 0);
         }
         if (SUCCEEDED(hr))
         {
                 hr = pSink->QueryInterface(IID_IInternetBindInfo, reinterpret_cast<void**>(&spBindInfo));
                 ATLASSERT(SUCCEEDED(hr) && spBindInfo != 0);
         }
         if (SUCCEEDED(hr))
         {
                 hr = pTargetProtocol->Start(szUrl, spSink, spBindInfo, grfPI, dwReserved);
         }
-        if (E_ABORT == hr && pSink->m_isCustomResponse)
-        {
-                static_cast<Protocol*>(this)->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;
 }
 
 
 template <class Protocol, class Sink>
 inline Sink* CustomSinkStartPolicy<Protocol, Sink>::GetSink(
         const Protocol* pProtocol)
 {
         return Protocol::ComObjectClass::GetSink(pProtocol);
 }
 
 template <class Protocol, class Sink>
 inline Sink* CustomSinkStartPolicy<Protocol, Sink>::GetSink() const
 {
         return GetSink(static_cast<const Protocol*>(this));
 }
 
 template <class Protocol, class Sink>
 inline Protocol* CustomSinkStartPolicy<Protocol, Sink>::GetProtocol(
         const Sink* pSink)
 {
         return Protocol::ComObjectClass::GetProtocol(pSink);
 }
 
 } // end namespace PassthroughAPP
 
 #endif // PASSTHROUGHAPP_SINKPOLICY_INL