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

src/engine/Main.cpp

 #include <AdblockPlus.h>
 #include <functional>
 #include <vector>
 #include <thread>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
 #include "../shared/Version.h"
 #include "../shared/CriticalSection.h"
+#include "../shared/IE_version.h"
+#include "AdblockPlus.h"
 #include "Debug.h"
 #include "Updater.h"
 
 namespace
 {
   std::auto_ptr<AdblockPlus::FilterEngine> filterEngine;
   std::auto_ptr<Updater> updater;
   int activeConnections = 0;
   CriticalSection activeConnectionsLock;
   HWND callbackWindow;
@@ skipping 45 matching lines @@
       checkingForUpdate = false;
       callbackWindow = 0;
     }
     return;
   }
 
 
   CriticalSection firstRunLock;
   CriticalSection updateCheckLock;
   bool firstRunActionExecuted = false;
+  AdblockPlus::ReferrerMapping referrerMapping;
   Communication::OutputBuffer HandleRequest(Communication::InputBuffer& request)
   {
     Communication::OutputBuffer response;
 
     Communication::ProcType procedure;
     request >> procedure;
     switch (procedure)
     {
       case Communication::PROC_MATCHES:
       {
         std::string url;
         std::string type;
         std::string documentUrl;
         request >> url >> type >> documentUrl;
-        AdblockPlus::FilterPtr filter = filterEngine->Matches(url, type, documentUrl);
+        referrerMapping.Add(url, documentUrl); 
+        AdblockPlus::FilterPtr filter = filterEngine->Matches(url, type, referrerMapping.BuildReferrerChain(documentUrl));
         response << (filter && filter->GetType() != AdblockPlus::Filter::TYPE_EXCEPTION);
         break;
       }
       case Communication::PROC_GET_ELEMHIDE_SELECTORS:
       {
         std::string domain;
         request >> domain;
         WriteStrings(response, filterEngine->GetElementHidingSelectors(domain));
         break;
       }
       case Communication::PROC_AVAILABLE_SUBSCRIPTIONS:
       {
         WriteSubscriptions(response, filterEngine->FetchAvailableSubscriptions());
         break;
       }
       case Communication::PROC_LISTED_SUBSCRIPTIONS:
       {
         WriteSubscriptions(response, filterEngine->GetListedSubscriptions());
         break;
       }
       case Communication::PROC_SET_SUBSCRIPTION:
       {
         std::string url;
         request >> url;
 
+        AdblockPlus::JsValuePtr valuePtr = filterEngine->GetPref("subscriptions_exceptionsurl");
+        std::string aaUrl = "";
+        if (!valuePtr->IsNull())
+        {
+          aaUrl = valuePtr->AsString();
+        }
         std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
+
+        // Remove all subscriptions, besides the Acceptable Ads
         for (size_t i = 0, count = subscriptions.size(); i < count; i++)
-          subscriptions[i]->RemoveFromList();
+        {
+          if (subscriptions[i]->GetProperty("url")->AsString() != aaUrl)
+          {
+            subscriptions[i]->RemoveFromList();
+          }
+        }
 
         filterEngine->GetSubscription(url)->AddToList();
+        break;
+      }
+      case Communication::PROC_ADD_SUBSCRIPTION:
+      {
+        std::string url;
+        request >> url;
+
+        filterEngine->GetSubscription(url)->AddToList();
+        break;
+      }
+      case Communication::PROC_REMOVE_SUBSCRIPTION:
+      {
+        std::string url;
+        request >> url;
+
+        filterEngine->GetSubscription(url)->RemoveFromList();
         break;
       }
       case Communication::PROC_UPDATE_ALL_SUBSCRIPTIONS:
       {
         std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
         for (size_t i = 0, count = subscriptions.size(); i < count; i++)
           subscriptions[i]->UpdateFilters();
         break;
       }
       case Communication::PROC_GET_EXCEPTION_DOMAINS:
@@ skipping 24 matching lines @@
         break;
       }
       case Communication::PROC_IS_WHITELISTED_URL:
       {
         std::string url;
         request >> url;
         AdblockPlus::FilterPtr match = filterEngine->Matches(url, "DOCUMENT", url);
         response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
         break;
       }
+      case Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL:
+      {
+        std::string url;
+        request >> url;
+        AdblockPlus::FilterPtr match = filterEngine->Matches(url, "ELEMHIDE", url);
+        response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
+        break;
+      }
       case Communication::PROC_ADD_FILTER:
       {
         std::string text;
         request >> text;
 
         filterEngine->GetFilter(text)->AddToList();
         break;
       }
       case Communication::PROC_REMOVE_FILTER:
       {
@@ skipping 88 matching lines @@
         CriticalSection::Lock lock(firstRunLock);
         if (!firstRunActionExecuted && filterEngine->IsFirstRun())
         {
           response << true;
           firstRunActionExecuted = true;
         }
         else
         {
           response << false;
         }
+        break;
+      }
+      case Communication::PROC_COMPARE_VERSIONS:
+      {
+        std::string v1, v2;
+        request >> v1 >> v2;
+
+        response << filterEngine->CompareVersions(v1, v2);
         break;
       }
       case Communication::PROC_GET_DOCUMENTATION_LINK:
       {
         response << ToUtf16String(filterEngine->GetPref("documentation_link")->AsString());
         break;
       }
       case Communication::PROC_TOGGLE_PLUGIN_ENABLED:
       {
         filterEngine->SetPref("enabled", filterEngine->GetJsEngine()->NewValue(!filterEngine->GetPref("enabled")->AsBool()));
@@ skipping 82 matching lines @@
 std::auto_ptr<AdblockPlus::FilterEngine> CreateFilterEngine(const std::wstring& locale)
 {
   AdblockPlus::AppInfo appInfo;
   appInfo.version = ToUtf8String(IEPLUGIN_VERSION);
   appInfo.name = "adblockplusie";
 #ifdef _WIN64
   appInfo.application = "msie64";
 #else
   appInfo.application = "msie32";
 #endif
-  appInfo.applicationVersion = ToUtf8String( ABP::IE::installed_version_string() );
+  appInfo.applicationVersion = ToUtf8String(AdblockPlus::IE::InstalledVersionString());
   appInfo.locale = ToUtf8String(locale);
 #ifdef ADBLOCK_PLUS_TEST_MODE
   appInfo.developmentBuild = true;
 #else
   appInfo.developmentBuild = false;
 #endif
 
   AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::New(appInfo);
   jsEngine->SetEventCallback("updateAvailable", &OnUpdateAvailable);
 
@@ skipping 48 matching lines @@
     }
     catch (const std::runtime_error& e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }