Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later.

src/engine/Main.cpp

+/*
+ * 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/>.
+ */
+
 #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;
@@ skipping 58 matching lines @@
   {
     Communication::OutputBuffer response;
 
     Communication::ProcType procedure;
     request >> procedure;
     switch (procedure)
     {
       case Communication::PROC_MATCHES:
       {
         std::string url;
+        using namespace AdblockPlus;
+        std::string documentUrl;
         int32_t type;
-        std::string documentUrl;
         request >> url >> type >> documentUrl;
         referrerMapping.Add(url, documentUrl);
-        auto contentType = static_cast<AdblockPlus::FilterEngine::ContentType>(type);
-        AdblockPlus::FilterPtr filter = filterEngine->Matches(url, contentType, referrerMapping.BuildReferrerChain(documentUrl));
-        response << (filter && filter->GetType() != AdblockPlus::Filter::TYPE_EXCEPTION);
+        auto contentType = static_cast<FilterEngine::ContentType>(type);
+        FilterPtr filter = filterEngine->Matches(url, contentType, referrerMapping.BuildReferrerChain(documentUrl));
+        response << (filter && filter->GetType() != 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:
@@ skipping 90 matching lines @@
         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,
           AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_ELEMHIDE, url);
         response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
-        if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
-        {
-          std::string();
-        }
         break;
       }
       case Communication::PROC_ADD_FILTER:
       {
         std::string text;
         request >> text;
 
         filterEngine->GetFilter(text)->AddToList();
         break;
       }
@@ skipping 102 matching lines @@
       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());
+        response << filterEngine->GetPref("documentation_link")->AsString();
         break;
       }
       case Communication::PROC_TOGGLE_PLUGIN_ENABLED:
       {
         filterEngine->SetPref("enabled", filterEngine->GetJsEngine()->NewValue(!filterEngine->GetPref("enabled")->AsBool()));
         response << filterEngine->GetPref("enabled")->AsBool();
         break;
       }
       case Communication::PROC_GET_HOST:
       {
@@ skipping 77 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
-  // TODO: Set applicationVersion parameter
+  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;
 }