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 "PluginClient.h"
-#include "PluginClientFactory.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;
 
-CPluginMimeFilterClient* CPluginClass::s_mimeFilter = NULL;
+std::shared_ptr<CPluginMimeFilterClient> 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 179 matching lines @@
       }
       s_criticalSectionBrowser.Unlock();
 
       //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
-        s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
+        if (!s_mimeFilter)
+        {
+          s_mimeFilter.reset(new CPluginMimeFilterClient());
+        }
         s_asyncWebBrowser2 = unknownSite;
         s_instances.insert(this);
       }
       s_criticalSectionLocal.Unlock();
 
       try
       {
         auto webBrowser = GetBrowser();
         if (webBrowser)
         {
@@ skipping 52 matching lines @@
 
       s_criticalSectionLocal.Lock();
       {
         s_instances.erase(this);
 
         std::map<DWORD,CPluginClass*>::iterator it = s_threadInstances.find(::GetCurrentThreadId());
         if (it != s_threadInstances.end())
         {
           s_threadInstances.erase(it);
         }
-        if (s_instances.empty())
-        {
-          // TODO: Explicitly releasing a resource when a container becomes empty looks like a job better suited for shared_ptr
-          CPluginClientFactory::ReleaseMimeFilterClientInstance();
-        }
       }
       s_criticalSectionLocal.Unlock();
 
       // Release browser interface
       s_criticalSectionBrowser.Lock();
       {
         m_webBrowser2.Release();
       }
       s_criticalSectionBrowser.Unlock();
 
@@ skipping 285 matching lines @@
   }
 }
 
 bool CPluginClass::InitObject()
 {
   DEBUG_GENERAL("InitObject");
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   if (!settings->GetPluginEnabled())
   {
-    s_mimeFilter->Unregister();
+    s_mimeFilter.reset();
   }
 
   // Load theme module
   s_criticalSectionLocal.Lock();
   {
     if (!s_hUxtheme)
     {
       s_hUxtheme = ::GetModuleHandle(L"uxtheme.dll");
       if (s_hUxtheme)
       {
@@ skipping 438 matching lines @@
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
 
       settings->TogglePluginEnabled();
 
       // Enable / disable mime filter
       s_criticalSectionLocal.Lock();
       {
         if (settings->GetPluginEnabled())
         {
-          s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
+          s_mimeFilter.reset(new CPluginMimeFilterClient());
         }
         else
         {
-          s_mimeFilter = NULL;
-
-          CPluginClientFactory::ReleaseMimeFilterClientInstance();
+          s_mimeFilter.reset();
         }
       }
       s_criticalSectionLocal.Unlock();
     }
     break;
   case ID_MENU_SETTINGS:
     {
       CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
       if (browser)
       {
@@ skipping 627 matching lines @@
           s_criticalSectionLocal.Unlock();
 
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
   return hTabWnd;
 }