Cleanup

src/plugin/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMutex.h"
 #include "../shared/Utils.h"
 #include <memory>
 
 
 // IE functions
 #pragma comment(lib, "iepmapi.lib")
 
 #include <knownfolders.h>
 
 namespace
 {
   std::wstring CreateDomainWhitelistingFilter(CString domain)
   {
-    return L"@@||" + domain + L"^$document";
+    return std::wstring(L"@@||" + domain + L"^$document");

[Wladimir Palant, 2013/07/11 12:53:10]

What's wrong with the implicit conversion? Instead I would change the type of
the domain parameter into |const std::wstring&| here to make it cleaner
(shouldn't require changing any callers I think).

   }
 }
 
 class TSettings
 {
   DWORD processorId;
 
   char sPluginId[44];
 };
 
@@ skipping 21 matching lines @@
 public:
   CPluginSettingsWhitelistLock() : CPluginMutex("SettingsFileWhitelist", PLUGIN_ERROR_MUTEX_SETTINGS_FILE_WHITELIST) {}
   ~CPluginSettingsWhitelistLock() {}
 };
 
 #endif
 
 CPluginSettings* CPluginSettings::s_instance = NULL;
 
 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal;
-#ifdef SUPPORT_WHITELIST
-CComAutoCriticalSection CPluginSettings::s_criticalSectionDomainHistory;
-#endif
 
 
 CPluginSettings::CPluginSettings() :
-  m_settingsVersion("1"), m_isDirty(false), m_isFirstRun(false), m_isFirstRunUpdate(false), m_dwMainProcessId(0), m_dwMainThreadId(0), m_dwWorkingThreadId(0), 
-  m_isPluginEnabledTab(true), m_tabNumber("1")
+  m_settingsVersion("1"), m_isFirstRun(false), m_dwWorkingThreadId(0), m_isPluginEnabledTab(true)

[Wladimir Palant, 2013/07/11 12:53:10]

m_settingsVersion property can be removed as well.

 {
-
-  CPluginSettings *lightInstance = s_instance;
   s_instance = NULL;
 
   m_WindowsBuildNumber = 0;
 
 #ifdef SUPPORT_WHITELIST
   ClearWhitelist();
 #endif
 }
 
 
@@ skipping 62 matching lines @@
   }
   CString lang;
   lang.Append(language);
   lang.Append(L"-");
   lang.Append(country);
 
   return lang;
 
 }
 
-CString CPluginSettings::GetTempPath(const CString& filename)
-{
-  CString tempPath;
-
-  LPWSTR pwszCacheDir = NULL;
-
-  HRESULT hr = ::IEGetWriteableFolderPath(FOLDERID_InternetCache, &pwszCacheDir);
-  if (SUCCEEDED(hr))
-  {
-    tempPath = pwszCacheDir;
-  }
-  // Not implemented in IE6
-  else if (hr == E_NOTIMPL)
-  {
-    TCHAR path[MAX_PATH] = _T("");
-
-    if (::SHGetSpecialFolderPath(NULL, path, CSIDL_INTERNET_CACHE, TRUE))
-    {
-      tempPath = path;
-    }
-    else
-    {
-      DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_SYSINFO, PLUGIN_ERROR_SYSINFO_GET_SPECIAL_FOLDER_TEMP, "Settings::GetTempPath failed");
-    }
-  }
-  // Other error
-  else
-  {
-    DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_SYSINFO, PLUGIN_ERROR_SYSINFO_TEMP_PATH, "Settings::GetTempPath failed");
-  }
-
-  ::CoTaskMemFree(pwszCacheDir);
-
-  return tempPath + "\\" + filename;
-}
-
-CString CPluginSettings::GetTempFile(const CString& prefix, const CString& extension)
-{
-  TCHAR nameBuffer[MAX_PATH] = _T("");
-
-  CString tempPath;
-
-  DWORD dwRetVal = ::GetTempFileName(GetTempPath(), prefix, 0, nameBuffer);
-  if (dwRetVal == 0)
-  {
-    DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_SYSINFO, PLUGIN_ERROR_SYSINFO_TEMP_FILE, "Settings::GetTempFileName failed");
-
-    tempPath = GetDataPath();
-  }
-  else
-  {
-    tempPath = nameBuffer;
-    if (!extension.IsEmpty())
-    {
-      int pos = tempPath.ReverseFind(_T('.'));
-      if (pos >= 0)
-      {
-        tempPath = tempPath.Left(pos+1) + extension;
-      }
-    }
-  }
-
-  return tempPath;
-}
-
 
 bool CPluginSettings::IsPluginEnabled() const
 {
   return m_isPluginEnabledTab;
 }
 
 
 std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList() const
 {
   std::map<CString, CString> filterList;
   for (size_t i = 0; i < m_subscriptions.size(); i ++)
   {
     SubscriptionDescription it = m_subscriptions[i];
     filterList.insert(std::make_pair(CString(it.url.c_str()), CString(it.title.c_str())));
   }
   return filterList;
 }
 
-bool CPluginSettings::IsMainProcess(DWORD dwProcessId) const
-{
-  if (dwProcessId == 0)
-  {
-    dwProcessId = ::GetCurrentProcessId();
-  }
-  return m_dwMainProcessId == dwProcessId;
-}
-
-void CPluginSettings::SetMainProcessId()
-{
-  m_dwMainProcessId = ::GetCurrentProcessId();
-}
-
-void CPluginSettings::SetMainProcessId(DWORD id)
-{
-  m_dwMainProcessId = id;
-}
-
-
-bool CPluginSettings::IsMainUiThread(DWORD dwThreadId) const
-{
-  if (dwThreadId == 0)
-  {
-    dwThreadId = ::GetCurrentThreadId();
-  }
-  return m_dwMainUiThreadId == dwThreadId;
-}
-
-void CPluginSettings::SetMainUiThreadId()
-{
-  m_dwMainUiThreadId = ::GetCurrentThreadId();
-}
-
-void CPluginSettings::SetMainUiThreadId(DWORD id)
-{
-  m_dwMainUiThreadId = id;
-}
-bool CPluginSettings::IsMainThread(DWORD dwThreadId) const
-{
-  if (dwThreadId == 0)
-  {
-    dwThreadId = ::GetCurrentThreadId();
-  }
-  return m_dwMainThreadId == dwThreadId;
-}
-
-void CPluginSettings::SetMainThreadId()
-{
-  m_dwMainThreadId = ::GetCurrentThreadId();
-}
-
-void CPluginSettings::SetMainThreadId(DWORD id)
-{
-  m_dwMainThreadId = id;
-}
-
 bool CPluginSettings::IsWorkingThread(DWORD dwThreadId) const
 {
   if (dwThreadId == 0)
   {
     dwThreadId = ::GetCurrentThreadId();
   }
   return m_dwWorkingThreadId == dwThreadId;
 }
 
 void CPluginSettings::SetWorkingThreadId()
 {
   m_dwWorkingThreadId = ::GetCurrentThreadId();
 }
 
 void CPluginSettings::SetWorkingThreadId(DWORD id)
 {
   m_dwWorkingThreadId = id;
 }
 
 void CPluginSettings::SetFirstRun()
 {
   m_isFirstRun = true;
 }
 
 bool CPluginSettings::IsFirstRun() const
 {
   return m_isFirstRun;
 }
 
-void CPluginSettings::SetFirstRunUpdate()
-{
-  m_isFirstRunUpdate = true;
-}
-
-bool CPluginSettings::IsFirstRunUpdate() const
-{
-  return m_isFirstRunUpdate;
-}
-
-bool CPluginSettings::IsFirstRunAny() const
-{
-  return m_isFirstRun || m_isFirstRunUpdate;
-}
-
-
-bool CPluginSettings::IncrementTabCount()
-{
-  int tabCount = 1;
-
-  CPluginSettingsTabLock lock;
-  if (lock.IsLocked())
-  {
-    SYSTEMTIME systemTime;
-    ::GetSystemTime(&systemTime);
-
-    CString today;
-    today.Format(L"%d-%d-%d", systemTime.wYear, systemTime.wMonth, systemTime.wDay);
-
-    s_criticalSectionLocal.Lock();
-    {
-      //TODO: Increment tab count in the AdblockPlusEngine
-
-      m_tabNumber.Format(L"%d", tabCount);
-    }
-    s_criticalSectionLocal.Unlock();
-  }
-
-  return tabCount == 1;
-}
-
-
-CString CPluginSettings::GetTabNumber() const
-{
-  CString tabNumber;
-
-  s_criticalSectionLocal.Lock();
-  {
-    tabNumber = m_tabNumber;
-  }
-  s_criticalSectionLocal.Unlock();
-
-  return tabNumber;
-}
-
-
-bool CPluginSettings::DecrementTabCount()
-{
-  int tabCount = 0;
-
-  CPluginSettingsTabLock lock;
-  if (lock.IsLocked())
-  {
-
-    s_criticalSectionLocal.Lock();
-    {
-      //TODO: Retrieve tab count from the AdblockPlusEngine
-      m_tabNumber.Format(L"%d", tabCount);
-    }
-    s_criticalSectionLocal.Unlock();
-  }
-
-  return tabCount == 0;
-}
-
-
 void CPluginSettings::TogglePluginEnabled()
 {
   CPluginSettingsTabLock lock;
   if (lock.IsLocked())
   {
     s_criticalSectionLocal.Lock();
     {
       //TODO: Query if plugin is enabled from the AdblockPlusEngine
       m_isPluginEnabledTab = m_isPluginEnabledTab ? false : true;
       //TODO: Set plugin enabled/disabled in AdblockPlusEngine
@@ skipping 28 matching lines @@
   }
 }
 bool CPluginSettings::GetPluginEnabled() const
 {
   //TODO: Query AdblockPlusEngine
   return m_isPluginEnabledTab;
 }
 
 bool CPluginSettings::GetStatusBarAsked()
 {
-    //TOTO: Get value from the registry;
-  return false;
+  std::wstring res = CPluginClient::GetInstance()->GetPref(L"statusbarasked");
+  return res == L"true";

[Wladimir Palant, 2013/07/11 12:53:10]

As mentioned before, the lack of type safety here is saddening - particularly
considering that both the prefs API and the engine communication protocol are
type-safe.

 }
 
-void CPluginSettings::SetStatusBarAsked(bool asked)
+void CPluginSettings::SetStatusBarAsked()
 {
-  //TODO: Set value in the registry
+  CPluginClient::GetInstance()->SetPref(L"statusbarasked", L"true");
 }
 
 
 void CPluginSettings::AddError(const CString& error, const CString& errorCode)
 {
   DEBUG_SETTINGS(L"SettingsTab::AddError error:" + error + " code:" + errorCode)
 }
 
 
 // ============================================================================
@@ skipping 101 matching lines @@
 
     m_WindowsBuildNumber = osvi.dwBuildNumber;
   }
 
   return m_WindowsBuildNumber;
 }
 
 void CPluginSettings::SetSubscription(const std::wstring& url)
 {
   CPluginClient::GetInstance()->SetSubscription(url);
-  RefreshFilterlist();
   RefreshWhitelist();
 }
 
 CString CPluginSettings::GetSubscription()
 {
   std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
   if (subscriptions.size() > 0)
     return CString(subscriptions.front().url.c_str());
   else
     return CString(L"");
 }
 
 
-void CPluginSettings::RefreshFilterlist()
-{
-  CPluginClient::GetInstance()->UpdateAllSubscriptions();
-}
 
 #endif // SUPPORT_WHITELIST