Issue #1234 - Convert strings associated with URL's

src/plugin/PluginWbPassThrough.h

 #pragma once
-
+#include <cstdint>
 #include "ProtocolCF.h"
 #include "ProtocolImpl.h"
 #define IE_MAX_URL_LENGTH 2048
 
 class WBPassthruSink :
         public PassthroughAPP::CInternetProtocolSinkWithSP<WBPassthruSink, CComMultiThreadModel>,
         public IHttpNegotiate
 {
         typedef PassthroughAPP::CInternetProtocolSinkWithSP<WBPassthruSink, CComMultiThreadModel> BaseClass;
 
 public:
+        WBPassthruSink();
 
-        bool m_shouldBlock;
-        bool m_lastDataReported;
+        uint64_t m_currentPositionOfSentPage;
         CComPtr<IInternetProtocol> m_pTargetProtocol;
+        int m_contentType;
+        std::wstring m_boundDomain;
+        bool m_isCustomResponse;
 
-  int GetContentTypeFromMimeType(CString mimeType);
-  int GetContentTypeFromURL(std::wstring& src);

[sergei, 2014/10/21 09:45:17]

Why is it not const here and below?

[Eric, 2014/10/21 17:19:52]

Because I'm focusing only on type conversion. I have not also been checking
whether the arguments could be declare 'const'.

I've added the declarations.

-  int GetContentType(CString mimeType, std::wstring& domain, std::wstring& src);
+        int GetContentTypeFromMimeType(const CString& mimeType);
+  int GetContentTypeFromURL(const std::wstring& src);

[sergei, 2015/01/06 13:18:18]

We use tabs in this file, but here are spaces, it's inconsistent.

I think the file should be converted, but I not in this changeset.

[Eric, 2015/01/06 19:38:59]

Even more than inconsistent, the existing code violates the indentation rule of
our style guide.

It's true, replacing all the tabs deserves its own change.

+  int GetContentType(const CString& mimeType, const std::wstring& domain, const std::wstring& src);
+        bool IsFlashRequest(const wchar_t* const* additionalHeaders);
 public:
         BEGIN_COM_MAP(WBPassthruSink)
                 COM_INTERFACE_ENTRY(IHttpNegotiate)
                 COM_INTERFACE_ENTRY_CHAIN(BaseClass)
         END_COM_MAP()
 
         BEGIN_SERVICE_MAP(WBPassthruSink)
                 SERVICE_ENTRY(IID_IHttpNegotiate)
         END_SERVICE_MAP()
 
         STDMETHODIMP BeginningTransaction(
                 /* [in] */ LPCWSTR szURL,
                 /* [in] */ LPCWSTR szHeaders,
                 /* [in] */ DWORD dwReserved,
                 /* [out] */ LPWSTR *pszAdditionalHeaders);
 
         STDMETHODIMP OnResponse(
                 /* [in] */ DWORD dwResponseCode,
                 /* [in] */ LPCWSTR szResponseHeaders,
                 /* [in] */ LPCWSTR szRequestHeaders,
                 /* [out] */ LPWSTR *pszAdditionalRequestHeaders);
 
         HRESULT OnStart(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
                 IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved,
-                IInternetProtocol* pTargetProtocol);
-        HRESULT Read(void *pv, ULONG cb, ULONG* pcbRead);
+                IInternetProtocol* pTargetProtocol, bool& handled);
+        HRESULT OnRead(void *pv, ULONG cb, ULONG* pcbRead);
 
         STDMETHODIMP ReportProgress(
                 /* [in] */ ULONG ulStatusCode,
                 /* [in] */ LPCWSTR szStatusText);
+
+        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 WBPassthru : public PassthroughAPP::CInternetProtocol<WBStartPolicy>
 {
+  typedef PassthroughAPP::CInternetProtocol<WBStartPolicy> BaseClass;
 public:
+  WBPassthru();
   // IInternetProtocolRoot
   STDMETHODIMP Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
-    IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved);
+    IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) override;
 
   //IInternetProtocol
-  STDMETHODIMP Read(    /* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead);
+  STDMETHODIMP Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead) override;
+
+  bool m_shouldSupplyCustomContent;
 };