Issue #1484 - Make PassthroughAPP a pass-through again

src/plugin/PluginWbPassThrough.h

 /*
  * 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 66 matching lines @@
 
   STDMETHODIMP ReportResult(
     /* [in] */ HRESULT hrResult,
     /* [in] */ DWORD dwError,
     /* [in] */ LPCWSTR szResult);
 
   STDMETHODIMP Switch(
     /* [in] */ PROTOCOLDATA *pProtocolData);
 };
 
-class WBPassthru;
-typedef PassthroughAPP::CustomSinkStartPolicy<WBPassthru, WBPassthruSink> WBStartPolicy;
+class WbPassthroughProtocol;
 
-class WBPassthru : public PassthroughAPP::CInternetProtocol<WBStartPolicy>
+class WbPassthroughSinkStartPolicy
+  : public PassthroughAPP::CustomSinkStartPolicy<WbPassthroughProtocol, WBPassthruSink>
 {
-  typedef PassthroughAPP::CInternetProtocol<WBStartPolicy> BaseClass;
+  typedef PassthroughAPP::CustomSinkStartPolicy<WbPassthroughProtocol, WBPassthruSink> BaseClass;

[sergei, 2015/12/22 14:04:40]

I would use __super instead of BaseClass because it's simpler but the it's also
fine.

 public:
-  WBPassthru();
-  // IInternetProtocolRoot
+  HRESULT OnStart(LPCWSTR szUrl,
+    IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,

[sergei, 2015/12/22 14:04:40]

Just noticed that we are using '*' and ' ' slightly differently, compare
`IInternetProtocolSink* pOIProtSink`
`IInternetProtocolSink *pOIProtSink` // current code.
For example the last argument is written in a different style
`IInternetProtocol* pTargetProtocol`.

[Eric, 2015/12/22 14:34:31]

I changed them all. Patch set 2 is rebase only. Patch set three makes all the
'*' types consistent.

[sergei, 2015/12/22 14:39:37]

It's also the same in cpp file, but for me it's not critical, especially it
might be better to be in another no-issue commit.

+    DWORD grfPI, HANDLE_PTR dwReserved,
+    IInternetProtocol* pTargetProtocol);
+};
+
+/**
+ * Implementation of "Protocol" interfaces
+ */
+class WbPassthroughProtocol
+  : public PassthroughAPP::CInternetProtocol<WbPassthroughSinkStartPolicy>
+{
+  typedef PassthroughAPP::CInternetProtocol<WbPassthroughSinkStartPolicy> BaseClass;
+public:
+  WbPassthroughProtocol()
+    : m_shouldSupplyCustomContent(false)
+  {
+  }
+
+  // derived from IInternetProtocolRoot
   STDMETHODIMP Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
     IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) override;
 
-  // IInternetProtocol
+  // derived from IInternetProtocol
   STDMETHODIMP Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead) override;
 
   bool m_shouldSupplyCustomContent;
 };
+
+typedef PassthroughAPP::CMetaFactory<PassthroughAPP::CComClassFactoryProtocol, WbPassthroughProtocol> MetaFactory;
+
+