Issue #41 - Bring method of determining IE version up to date

src/plugin/PluginWbPassThrough.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginWbPassThrough.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginSettings.h"
 #include "PluginClass.h"
 #include "PluginSystem.h"
-
+#include "../shared/IE_version.h"
 #include "wtypes.h"
 
 EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 
 
 
 int WBPassthruSink::GetContentTypeFromMimeType(CString mimeType)
 {
   if (mimeType.Find(L"image/") >= 0)
   {
@@ skipping 66 matching lines @@
   {
     return CFilter::contentTypeAny & ~CFilter::contentTypeSubdocument;
   }
 
 }
 
 int WBPassthruSink::GetContentType(CString mimeType, CString domain, CString src)
 {
   // No referer or mime type
   // BINDSTRING_XDR_ORIGIN works only for IE v8+
-  if (mimeType.IsEmpty() && domain.IsEmpty() && CPluginClient::GetInstance()->GetIEVersion() >= 8)
+  if (mimeType.IsEmpty() && domain.IsEmpty() && AdblockPlus::IE::InstalledMajorVersion() >= 8)
   {
     return CFilter::contentTypeXmlHttpRequest;
   }
   int contentType = GetContentTypeFromMimeType(mimeType);
   if (contentType == CFilter::contentTypeAny)
   {
     contentType = GetContentTypeFromURL(src);
   }
   return contentType;
 }
@@ skipping 118 matching lines @@
   {
     CPluginDebug::DebugResultBlocking(type, src, boundDomain);
   }
   else
   {
     CPluginDebug::DebugResultIgnoring(type, src, boundDomain);
   }
 #endif
 
   //Fixes the iframe back button issue
-  if (client->GetIEVersion() > 6)
+  if (AdblockPlus::IE::InstalledMajorVersion() > 6)
   {
     if ((contentType == CFilter::contentTypeImage) && (isBlocked))
     {
       m_shouldBlock = true;
       BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
 
       return INET_E_REDIRECT_FAILED;
 
     }
     if (((contentType == CFilter::contentTypeSubdocument))&& (isBlocked)) 
@@ skipping 146 matching lines @@
   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI,
     dwReserved, m_spInternetProtocol);
 }
 
  STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
  {
    
    WBPassthruSink* pSink = GetSink();
    return pSink->Read(pv, cb, pcbRead);
  }