NoIssue - Refactor HTTP and HTTPS namespaces registration

src/plugin/PluginClass.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 "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
-#include "PluginMimeFilterClient.h"
+#include "PluginAppNamespaceClient.h"
 #include "PluginClient.h"
 #include "PluginMutex.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
 #include "../shared/Utils.h"
 #include "../shared/Dictionary.h"
 #include "../shared/IE_version.h"
 #include <thread>
 #include <array>
 
 #ifdef DEBUG_HIDE_EL
 DWORD profileTime = 0;
 #endif
 
 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR);
 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPRECT);
 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE);
 
 HICON CPluginClass::s_hIcons[ICON_MAX] = { NULL, NULL, NULL };
 DWORD CPluginClass::s_hIconTypes[ICON_MAX] = { IDI_ICON_DISABLED, IDI_ICON_ENABLED, IDI_ICON_DEACTIVATED };
 uint32_t iconHeight = 32;
 uint32_t iconWidth = 32;
 
-std::shared_ptr<CPluginMimeFilterClient> CPluginClass::s_mimeFilter = NULL;
+std::shared_ptr<CPluginAppNamespaceClient> CPluginClass::s_mimeFilter = NULL;
 
 CLOSETHEMEDATA pfnClose = NULL;
 DRAWTHEMEBACKGROUND pfnDrawThemeBackground = NULL;
 OPENTHEMEDATA pfnOpenThemeData = NULL;
 
 ATOM CPluginClass::s_atomPaneClass = NULL;
 HINSTANCE CPluginClass::s_hUxtheme = NULL;
 std::set<CPluginClass*> CPluginClass::s_instances;
 std::map<DWORD, CPluginClass*> CPluginClass::s_threadInstances;
 
@@ skipping 181 matching lines @@
 
       //register the mimefilter
       //and only mimefilter
       //on some few computers the mimefilter does not get properly registered when it is done on another thread
 
       s_criticalSectionLocal.Lock();
       {
         // Always register on startup, then check if we need to unregister in a separate thread
         if (!s_mimeFilter)
         {
-          s_mimeFilter.reset(new CPluginMimeFilterClient());
+          s_mimeFilter.reset(new CPluginAppNamespaceClient());

[Eric, 2015/05/16 21:00:48]

's_mimeFilter' should probably also be renamed in this change set.

         }
         s_asyncWebBrowser2 = unknownSite;
         s_instances.insert(this);
       }
       s_criticalSectionLocal.Unlock();
 
       try
       {
         auto webBrowser = GetBrowser();
         if (webBrowser)
@@ skipping 213 matching lines @@
     {
       return;
     }
     if (!urlVariant || urlVariant->vt != VT_BSTR)
     {
       return;
     }
     std::wstring url(urlVariant->bstrVal, SysStringLen(urlVariant->bstrVal));
     UnescapeUrl(url);
 
+    //Register a mime filter if it's not registered yet
+    if (s_mimeFilter == nullptr)
+    {
+      s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
+    }
     // If webbrowser2 is equal to top level browser (as set in SetSite), we are
     // navigating new page
     CPluginClient* client = CPluginClient::GetInstance();
     if (url.find(L"javascript") == 0)
     {
     }
     else if (GetBrowser().IsEqualObject(webBrowser))
     {
       m_tab->OnNavigate(url);
       DEBUG_GENERAL(
@@ skipping 201 matching lines @@
   }
 
   int ieVersion = AdblockPlus::IE::InstalledMajorVersion();
   // Create status pane
   if (ieVersion > 6 && !CreateStatusBarPane())
   {
     return false;
   }
   
   s_criticalSectionLocal.Lock();
-  if (CPluginClient::GetInstance()->GetPref(L"currentVersion", L"0.0").find(L"simpleadblock") != std::wstring::npos)
-  {
-    CPluginClient::GetInstance()->SetPref(L"isFromSimpleAdblock", true);
-    CPluginClient::GetInstance()->SetPref(L"currentVersion", std::wstring(IEPLUGIN_VERSION));
-  }
   int versionCompRes = CPluginClient::GetInstance()->CompareVersions(CPluginClient::GetInstance()->GetPref(L"currentVersion", L"0.0"), L"1.2");
 
   bool isFirstRun = CPluginClient::GetInstance()->IsFirstRun();
   CPluginClient::GetInstance()->SetPref(L"currentVersion", std::wstring(IEPLUGIN_VERSION));
   // This is the first time ABP was installed
   // Or ABP was updated from the version that did not support Acceptable Ads (<1.2)
   if (isFirstRun || versionCompRes < 0)
   {   
     if (!isFirstRun)
     {
-      if (!CPluginClient::GetInstance()->GetPref(std::wstring(L"isFromSimpleAdblock"), false))
-      {
-        CPluginClient::GetInstance()->SetPref(L"displayUpdatePage", true);
-      }
+      CPluginClient::GetInstance()->SetPref(L"displayUpdatePage", true);
     }
 
     // IE6 can't be accessed from another thread, execute in current thread
     if (ieVersion < 7)
     {
       FirstRunThread();
     }
     else
     {
       CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThread, NULL, NULL, NULL);
@@ skipping 344 matching lines @@
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
 
       settings->TogglePluginEnabled();
 
       // Enable / disable mime filter
       s_criticalSectionLocal.Lock();
       {
         if (settings->GetPluginEnabled())
         {
-          s_mimeFilter.reset(new CPluginMimeFilterClient());
+          s_mimeFilter.reset(new CPluginAppNamespaceClient());
         }
         else
         {
           s_mimeFilter.reset();
         }
       }
       s_criticalSectionLocal.Unlock();
     }
     break;
   case ID_MENU_SETTINGS:
@@ skipping 631 matching lines @@
           s_criticalSectionLocal.Unlock();
 
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
   return hTabWnd;
 }