Issue 1669 - Report blocked object subrequests as failed, not as empty HTML

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 56 matching lines @@
   bool IsXmlHttpRequest(const std::wstring& additionalHeaders)
   {
     auto requestedWithHeader = ExtractHttpHeader<std::wstring>(additionalHeaders, L"X-Requested-With:", L"\n");
     return TrimString(requestedWithHeader) == L"XMLHttpRequest";
   }
 }
 
 WBPassthruSink::WBPassthruSink()
   : m_currentPositionOfSentPage(0)
   , m_contentType(CFilter::EContentType::contentTypeAny)
-  , m_blockedInTransaction(false)
+  , m_isCustomResponse(false)
 {
 }
 
 int WBPassthruSink::GetContentTypeFromMimeType(const CString& mimeType)
 {
   if (mimeType.Find(L"image/") >= 0)
   {
     return CFilter::contentTypeImage;
   }
   if (mimeType.Find(L"text/css") >= 0)
@@ skipping 235 matching lines @@
   if (IsFlashRequest(pszAdditionalHeaders))
   {
     m_contentType = CFilter::EContentType::contentTypeObjectSubrequest;
   }
 
   if (pszAdditionalHeaders && *pszAdditionalHeaders && IsXmlHttpRequest(*pszAdditionalHeaders))
   {
     m_contentType = CFilter::EContentType::contentTypeXmlHttpRequest;
   }
 
-  m_blockedInTransaction = client->ShouldBlock(szURL, m_contentType, m_boundDomain, /*debug flag but must be set*/true);
-  if (m_blockedInTransaction)
-  {
+  if (client->ShouldBlock(szURL, m_contentType, m_boundDomain, /*debug flag but must be set*/true))
+  {
+    // NOTE: Feeding custom HTML to Flash, instead of original object subrequest
+    // doesn't have much sense. It also can manifest in unwanted result 
+    // like video being blocked (See https://issues.adblockplus.org/ticket/1669)        
+    // So we report blocked object subrequests as failed, not just empty HTML.
+    m_isCustomResponse = m_contentType != CFilter::contentTypeObjectSubrequest; 
     return E_ABORT;
   }
   return nativeHr;
 }
 
 STDMETHODIMP WBPassthruSink::OnResponse(DWORD dwResponseCode, LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders)
 {
   if (pszAdditionalRequestHeaders)
   {
     *pszAdditionalRequestHeaders = 0;
   }
 
   CComPtr<IHttpNegotiate> spHttpNegotiate;
   QueryServiceFromClient(&spHttpNegotiate);
 
   return spHttpNegotiate ? spHttpNegotiate->OnResponse(dwResponseCode, szResponseHeaders, szRequestHeaders, pszAdditionalRequestHeaders) : S_OK;
 }
 
 STDMETHODIMP WBPassthruSink::ReportProgress(ULONG ulStatusCode, LPCWSTR szStatusText)
 {
   return m_spInternetProtocolSink ? m_spInternetProtocolSink->ReportProgress(ulStatusCode, szStatusText) : S_OK;
 }
 
 STDMETHODIMP WBPassthruSink::ReportResult(/* [in] */ HRESULT hrResult, /* [in] */ DWORD dwError, /* [in] */ LPCWSTR szResult)
 {
-  if (m_blockedInTransaction)
+  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.
-    // NOTE: Feeding custom HTML to Flash, instead of original object subrequest
-    // doesn't have much sense. It also can manifest in unwanted result
-    // like video being blocked (See https://issues.adblockplus.org/ticket/1669)
-    // So we report blocked object subrequests as failed, not just empty HTML.
-    if (m_contentType != CFilter::contentTypeObjectSubrequest)
-    {
-      return S_OK;
-    }
+    return S_OK;
   }
   return BaseClass::ReportResult(hrResult, dwError, szResult);
 }
 
 
 WBPassthru::WBPassthru()
   : m_shouldSupplyCustomContent(false)
 {
 }
 
 STDMETHODIMP WBPassthru::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)
 {
   WBPassthruSink* pSink = GetSink();
   return pSink->OnRead(pv, cb, pcbRead);
 }