Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/plugin/PluginWbPassThrough.cpp

Issue 29332980: Issue #1484 - Use the currently distributed version of PassthroughAPP unaltered
Left Patch Set: new version of PassthroughAPP Created Dec. 22, 2015, 4:56 p.m.
Right Patch Set: use OnStartEx() instead of OnStart() Created Dec. 23, 2015, 3:18 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
LEFTRIGHT
(no file at all)
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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 contentType = GetContentTypeFromURL(src); 211 contentType = GetContentTypeFromURL(src);
212 } 212 }
213 return contentType; 213 return contentType;
214 } 214 }
215 215
216 //////////////////////////////////////////////////////////////////////////////// //////// 216 //////////////////////////////////////////////////////////////////////////////// ////////
217 //WBPassthruSink 217 //WBPassthruSink
218 //Monitor and/or cancel every request and responde 218 //Monitor and/or cancel every request and responde
219 //WB makes, including images, sounds, scripts, etc 219 //WB makes, including images, sounds, scripts, etc
220 //////////////////////////////////////////////////////////////////////////////// //////// 220 //////////////////////////////////////////////////////////////////////////////// ////////
221 HRESULT WBPassthruSink::OnStart(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSin k, 221 HRESULT WBPassthruSink::OnStartEx(IUri* pUri, IInternetProtocolSink *pOIProtSink ,
222 IInternetBindInfo *pOIBindInfo, DWORD grfPI, HAN DLE_PTR dwReserved, 222 IInternetBindInfo *pOIBindInfo, DWORD grfPI, HAN DLE_PTR dwReserved,
223 IInternetProtocol* pTargetProtocol) 223 IInternetProtocol* pTargetProtocol)
224 { 224 {
225 m_pTargetProtocol = pTargetProtocol; 225 m_pTargetProtocol = pTargetProtocol;
226 return BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol); 226 return BaseClass::OnStartEx(pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
227 } 227 }
228 228
229 HRESULT WBPassthruSink::OnRead(void* pv, ULONG cb, ULONG* pcbRead) 229 HRESULT WBPassthruSink::OnRead(void* pv, ULONG cb, ULONG* pcbRead)
230 { 230 {
231 if (!pv || !pcbRead) 231 if (!pv || !pcbRead)
232 { 232 {
233 return E_POINTER; 233 return E_POINTER;
234 } 234 }
235 *pcbRead = 0; 235 *pcbRead = 0;
236 236
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 } 445 }
446 446
447 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInterne tProtocol); 447 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInterne tProtocol);
448 } 448 }
449 449
450 STDMETHODIMP WbPassthroughProtocol::Read(/* [in, out] */ void *pv,/* [in] */ ULO NG cb,/* [out] */ ULONG *pcbRead) 450 STDMETHODIMP WbPassthroughProtocol::Read(/* [in, out] */ void *pv,/* [in] */ ULO NG cb,/* [out] */ ULONG *pcbRead)
451 { 451 {
452 WBPassthruSink* pSink = GetSink(); 452 WBPassthruSink* pSink = GetSink();
453 return pSink->OnRead(pv, cb, pcbRead); 453 return pSink->OnRead(pv, cb, pcbRead);
454 } 454 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld