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

src/plugin/AdblockPlusClient.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 "PluginStdAfx.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "PluginClass.h"
 
 #include "AdblockPlusClient.h"
 
 #include "../shared/Utils.h"
 
 namespace
 {
   void SpawnAdblockPlusEngine()
   {
     std::wstring engineExecutablePath = GetDllDir() + L"AdblockPlusEngine.exe";
-    CString params = to_CString(L"AdblockPlusEngine.exe " + GetBrowserLanguage());
+    CString params = ToCString(L"AdblockPlusEngine.exe " + GetBrowserLanguage());
 
     STARTUPINFO startupInfo = {};
     PROCESS_INFORMATION processInformation = {};
 
     HANDLE token;
     OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_ADJUST_DEFAULT | TOKEN_QUERY | TOKEN_ASSIGN_PRIMARY, &token);
 
     TOKEN_APPCONTAINER_INFORMATION *acs = NULL;
     DWORD length = 0;
 
@@ skipping 251 matching lines @@
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return false;
 
   bool isWhitelisted;
   response >> isWhitelisted;
   return isWhitelisted;
 }
 
-int CAdblockPlusClient::GetIEVersion()
-{
-  //HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer
-  HKEY hKey;
-  LSTATUS status = RegOpenKey(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Internet Explorer", &hKey);
-  if (status != 0)
-  {
-    return 0;
-  }
-  DWORD type, cbData;
-  BYTE version[50];
-  cbData = 50;
-  status = RegQueryValueEx(hKey, L"Version", NULL, &type, (BYTE*)version, &cbData);
-  if (status != 0)
-  {
-    return 0;
-  }
-  RegCloseKey(hKey);
-  return (int)(version[0] - 48);
-}
-
 bool CAdblockPlusClient::Matches(const std::wstring& url, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_MATCHES << ToUtf8String(url) << static_cast<int32_t>(contentType) << ToUtf8String(domain);
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return false;
 
   bool match;
@@ skipping 207 matching lines @@
   request << Communication::PROC_CHECK_FOR_UPDATES << reinterpret_cast<int32_t>(callbackWindow);
   CallEngine(request);
 }
 
 std::wstring CAdblockPlusClient::GetDocumentationLink()
 {
   DEBUG_GENERAL("GetDocumentationLink");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_GET_DOCUMENTATION_LINK, response)) 
     return L"";
-  std::wstring docLink;
+  std::string docLink;
   response >> docLink;
-  return docLink;
+  return ToUtf16String(docLink);
 }
 
 bool CAdblockPlusClient::TogglePluginEnabled()
 {
   DEBUG_GENERAL("TogglePluginEnabled");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_TOGGLE_PLUGIN_ENABLED, response)) 
     return false;
   bool currentEnabledState;
   response >> currentEnabledState;
@@ skipping 19 matching lines @@
   DEBUG_GENERAL("CompareVersions");
   Communication::OutputBuffer request;
   request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8String(v2);
   Communication::InputBuffer response;
   if (!CallEngine(request, response))
     return 0;
   int result;
   response >> result;
   return result;
 }