Issue #1234, #2058 - Rewrite log facility, improving thread implementation

src/plugin/PluginSettings.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2016 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 "AdblockPlusClient.h"
 #include "PluginSystem.h"
 #include "PluginMutex.h"
 #include "../shared/Utils.h"
 
 namespace
 {
-  std::wstring CreateDomainWhitelistingFilter(const CString& domain)
-  {
-    return L"@@||" + ToWstring(domain) + L"^$document";
+  std::wstring CreateDomainWhitelistingFilter(const std::wstring& domain)
+  {
+    return L"@@||" + domain + L"^$document";
   }
 }
 
 class CPluginSettingsWhitelistLock : public CPluginMutex
 {
 public:
   CPluginSettingsWhitelistLock() : CPluginMutex(L"SettingsFileWhitelist", PLUGIN_ERROR_MUTEX_SETTINGS_FILE_WHITELIST) {}
   ~CPluginSettingsWhitelistLock() {}
 };
 
 CPluginSettings* CPluginSettings::s_instance = NULL;
 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal;
 
 CPluginSettings::CPluginSettings()
 {
   s_instance = NULL;
-  m_WindowsBuildNumber = 0;
   ClearWhitelist();
 }
 
 CPluginSettings::~CPluginSettings()
 {
   s_instance = NULL;
 }
 
 CPluginSettings* CPluginSettings::GetInstance()
 {
@@ skipping 12 matching lines @@
 
   return instance;
 }
 
 
 bool CPluginSettings::IsPluginEnabled() const
 {
   return GetPluginEnabled();
 }
 
-std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList() const
-{
-  std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
-
-  std::map<CString, CString> filterList;
+std::map<std::wstring, std::wstring> CPluginSettings::GetFilterLanguageTitleList() const
+{
+  auto subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
+
+  std::map<std::wstring, std::wstring> filterList;
   for (size_t i = 0; i < subscriptions.size(); i ++)
   {
-    SubscriptionDescription it = subscriptions[i];
-    filterList.insert(std::make_pair(CString(it.url.c_str()), CString(it.title.c_str())));
+    auto it = subscriptions[i];
+    filterList.insert(std::make_pair(it.url, it.title));
   }
   return filterList;
 }
 
 void CPluginSettings::TogglePluginEnabled()
 {
   CPluginClient::GetInstance()->TogglePluginEnabled();  
 }
 bool CPluginSettings::GetPluginEnabled() const
 {
   return CPluginClient::GetInstance()->GetPref(L"enabled", true);
 }
-
 
 // ============================================================================
 // Whitelist settings
 // ============================================================================
 
 void CPluginSettings::ClearWhitelist()
 {
   s_criticalSectionLocal.Lock();
   {
     m_whitelistedDomains.clear();
@@ skipping 22 matching lines @@
       s_criticalSectionLocal.Unlock();
     }
     else
     {
       isRead = false;
     }
 
     return isRead;
 }
 
-void CPluginSettings::AddWhiteListedDomain(const CString& domain)
+void CPluginSettings::AddWhiteListedDomain(const std::wstring& domain)
 {
   DEBUG_SETTINGS("SettingsWhitelist::AddWhiteListedDomain domain:" + domain)
   CPluginClient::GetInstance()->AddFilter(CreateDomainWhitelistingFilter(domain));
 }
 
-void CPluginSettings::RemoveWhiteListedDomain(const CString& domain)
+void CPluginSettings::RemoveWhiteListedDomain(const std::wstring& domain)
 {
   DEBUG_SETTINGS("SettingsWhitelist::RemoveWhiteListedDomain domain:" + domain)
   CPluginClient::GetInstance()->RemoveFilter(CreateDomainWhitelistingFilter(domain));
 }
 
 int CPluginSettings::GetWhiteListedDomainCount() const
 {
   int count = 0;
 
   s_criticalSectionLocal.Lock();
@@ skipping 16 matching lines @@
 {
   CPluginSettingsWhitelistLock lock;
   if (lock.IsLocked())
   {
     ReadWhitelist(true);
   }
 
   return true;
 }
 
-DWORD CPluginSettings::GetWindowsBuildNumber()
-{
-  if (m_WindowsBuildNumber == 0)
-  {
-    OSVERSIONINFOEX osvi = {};
-    osvi.dwOSVersionInfoSize = sizeof(osvi);
-    if (GetVersionExW(reinterpret_cast<OSVERSIONINFO*>(&osvi)) != 0)
-    {
-      m_WindowsBuildNumber = osvi.dwBuildNumber;
-    }
-  }
-
-  return m_WindowsBuildNumber;
-}
-
 void CPluginSettings::SetSubscription(const std::wstring& url)
 {
   CPluginClient::GetInstance()->SetSubscription(url);
   RefreshWhitelist();
 }
 
-CString CPluginSettings::GetSubscription()
-{
-  std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
+std::wstring CPluginSettings::GetSubscription()
+{
+  auto subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
   std::wstring aaUrl = CPluginClient::GetInstance()->GetPref(L"subscriptions_exceptionsurl", L"");
 
-  for (std::vector<SubscriptionDescription>::iterator subscription = subscriptions.begin(); subscription != subscriptions.end(); subscription++)
+  for (auto subscription = subscriptions.begin(); subscription != subscriptions.end(); subscription++)
   {
     if (subscription->url != aaUrl)
     {
-      return CString(subscription->url.c_str());
-    }
-  }
-  return CString(L"");
-}
-
-CString CPluginSettings::GetAppLocale()
-{
-  return ToCString(GetBrowserLanguage());
-}
-
-CString CPluginSettings::GetDocumentationLink()
-{
-  return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
-}
+      return subscription->url;
+    }
+  }
+  return std::wstring();
+}