| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-2016 Eyeo GmbH | 3  * Copyright (C) 2006-2016 Eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 349   // There doesn't seem to be any other way to get this header before the reques
     t has been made. | 349   // There doesn't seem to be any other way to get this header before the reques
     t has been made. | 
| 350   HRESULT nativeHr = httpNegotiate ? httpNegotiate->BeginningTransaction(szURL, 
     szHeaders, dwReserved, pszAdditionalHeaders) : S_OK; | 350   HRESULT nativeHr = httpNegotiate ? httpNegotiate->BeginningTransaction(szURL, 
     szHeaders, dwReserved, pszAdditionalHeaders) : S_OK; | 
| 351 | 351 | 
| 352   if (pszAdditionalHeaders && *pszAdditionalHeaders) | 352   if (pszAdditionalHeaders && *pszAdditionalHeaders) | 
| 353   { | 353   { | 
| 354     m_boundDomain = ExtractHttpHeader<std::wstring>(*pszAdditionalHeaders, L"Ref
     erer:", L"\n"); | 354     m_boundDomain = ExtractHttpHeader<std::wstring>(*pszAdditionalHeaders, L"Ref
     erer:", L"\n"); | 
| 355   } | 355   } | 
| 356   m_boundDomain = TrimString(m_boundDomain); | 356   m_boundDomain = TrimString(m_boundDomain); | 
| 357   m_contentType = InferContentType(ToUtf16String(ExtractHttpAcceptHeader(m_spTar
     getProtocol)), m_boundDomain, src); | 357   m_contentType = InferContentType(ToUtf16String(ExtractHttpAcceptHeader(m_spTar
     getProtocol)), m_boundDomain, src); | 
| 358 | 358 | 
| 359   CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId()); | 359   CPluginTab* tab = CPluginClass::GetTabCurrentThread(); | 
| 360   CPluginClient* client = CPluginClient::GetInstance(); | 360   CPluginClient* client = CPluginClient::GetInstance(); | 
| 361 | 361 | 
| 362   if (tab && client) | 362   if (tab && client) | 
| 363   { | 363   { | 
| 364     std::wstring documentUrl = tab->GetDocumentUrl(); | 364     std::wstring documentUrl = tab->GetDocumentUrl(); | 
| 365     // Page is identical to document => don't block | 365     // Page is identical to document => don't block | 
| 366     if (documentUrl == src) | 366     if (documentUrl == src) | 
| 367     { | 367     { | 
| 368       return nativeHr; | 368       return nativeHr; | 
| 369     } | 369     } | 
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 455   } | 455   } | 
| 456 | 456 | 
| 457   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInterne
     tProtocol); | 457   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInterne
     tProtocol); | 
| 458 } | 458 } | 
| 459 | 459 | 
| 460 STDMETHODIMP WbPassthroughProtocol::Read(/* [in, out] */ void *pv,/* [in] */ ULO
     NG cb,/* [out] */ ULONG *pcbRead) | 460 STDMETHODIMP WbPassthroughProtocol::Read(/* [in, out] */ void *pv,/* [in] */ ULO
     NG cb,/* [out] */ ULONG *pcbRead) | 
| 461 { | 461 { | 
| 462   WBPassthruSink* pSink = GetSink(); | 462   WBPassthruSink* pSink = GetSink(); | 
| 463   return pSink->OnRead(pv, cb, pcbRead); | 463   return pSink->OnRead(pv, cb, pcbRead); | 
| 464 } | 464 } | 
| OLD | NEW | 
|---|