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 215 matching lines @@
 }
 
 HRESULT WBPassthruSink::OnRead(void* pv, ULONG cb, ULONG* pcbRead)
 {
   if (!pv || !pcbRead)
   {
     return E_POINTER;
   }
   *pcbRead = 0;
 
-  if (PassthroughAPP::CustomSinkStartPolicy<WBPassthru, WBPassthruSink>::GetProtocol(this)->m_shouldSupplyCustomContent)
+  if (PassthroughAPP::CustomSinkStartPolicy<WbPassthroughProtocol, WBPassthruSink>::GetProtocol(this)->m_shouldSupplyCustomContent)
   {
     ULONG blockedByABPPageSize = static_cast<ULONG>(g_blockedByABPPage.size());
     auto positionGrow = std::min<ULONG>(cb, static_cast<ULONG>(blockedByABPPageSize - m_currentPositionOfSentPage));
     if (positionGrow == 0) {
       return S_FALSE;
     }
     std::copy(g_blockedByABPPage.begin(), g_blockedByABPPage.begin() + positionGrow,
       stdext::make_checked_array_iterator(static_cast<char*>(pv), cb));
     *pcbRead = positionGrow;
     m_currentPositionOfSentPage += positionGrow;
@@ skipping 163 matching lines @@
   if (m_isCustomResponse)
   {
     // Don't notify the client about aborting of the operation, thus don't call BaseClass::ReportResult.
     // Current method is called by the original protocol implementation and we are intercepting the
     // call here and eating it, we will call the proper ReportResult later by ourself.
     return S_OK;
   }
   return BaseClass::ReportResult(hrResult, dwError, szResult);
 }
 
-
-WBPassthru::WBPassthru()
-  : m_shouldSupplyCustomContent(false)
+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 WBPassthru::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
+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 WBPassthru::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
+STDMETHODIMP WbPassthroughProtocol::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
 {
   WBPassthruSink* pSink = GetSink();
   return pSink->OnRead(pv, cb, pcbRead);
 }