Issue #1484 - Use the currently distributed version of PassthroughAPP unaltered

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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef PASSTHROUGHAPP_SINKPOLICY_INL
 #define PASSTHROUGHAPP_SINKPOLICY_INL
 
 #if _MSC_VER > 1000
         #pragma once
 #endif // _MSC_VER > 1000
 
 #ifndef PASSTHROUGHAPP_SINKPOLICY_H
         #error SinkPolicy.inl requires SinkPolicy.h to be included first
 #endif
 
 namespace PassthroughAPP
 {
 
 // ===== NoSinkStartPolicy =====
 
 inline HRESULT NoSinkStartPolicy::OnStart(LPCWSTR szUrl,
         IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
         DWORD grfPI, HANDLE_PTR dwReserved,
         IInternetProtocol* pTargetProtocol) const
 {
         ATLASSERT(pTargetProtocol != 0);
         return pTargetProtocol->Start(szUrl, pOIProtSink, pOIBindInfo,
                 grfPI, dwReserved);
 }
 
+inline HRESULT NoSinkStartPolicy::OnStartEx(IUri* pUri,
+        IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
+        DWORD grfPI, HANDLE_PTR dwReserved,
+        IInternetProtocolEx* pTargetProtocol) const
+{
+        ATLASSERT(pTargetProtocol != 0);
+        return pTargetProtocol->StartEx(pUri, pOIProtSink, pOIBindInfo,
+                grfPI, dwReserved);
+}
 
 // ===== CComObjectSharedRef =====
 
 template<class Base>
 inline CComObjectSharedRef<Base>::
         CComObjectSharedRef(IUnknown* punkRefCount, IUnknown*) :
                 m_punkRefCount(punkRefCount)
 {
         ATLASSERT(punkRefCount != 0);
 }
@@ skipping 326 matching lines @@
         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));
+                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));
+                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);
+                hr = pTargetProtocol->Start(szUrl, spSink, spBindInfo, grfPI,
+                        dwReserved);
         }
         return hr;
 }
 
+template <class Protocol, class Sink>
+inline HRESULT CustomSinkStartPolicy<Protocol, Sink>::OnStartEx(IUri* pUri,
+        IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
+        DWORD grfPI, HANDLE_PTR dwReserved,
+        IInternetProtocolEx* pTargetProtocol) const
+{
+        ATLASSERT(pTargetProtocol != 0);
+
+        Sink* pSink = GetSink(static_cast<const Protocol*>(this));
+        HRESULT hr = pSink->OnStartEx(pUri, 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->StartEx(pUri, spSink, spBindInfo, grfPI,
+                        dwReserved);
+        }
+        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
+#endif // PASSTHROUGHAPP_SINKPOLICY_INL