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
@@ skipping 230 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 CPluginAppNamespaceClient());

[Oleksandr, 2015/04/13 03:34:51]

It doesn't look like CPluginAppNammespaceClient() actually throws anything, so
no need for being extra cautious here.

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

It can throw. This constructor calls 'CMetaFactory::GetInstance', which calls
various ATL functions that can throw. But then again, it's never a good idea to
assume that something can't throw unless it's explicitly declared 'noexcept'.

It's not immediately apparent that this constructor can throw because it's
written to suppress errors. In order to make incremental progress, we can still
suppress errors, but we should be suppressing them by catching a constructor
exception.

[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 996 matching lines @@
           s_criticalSectionLocal.Unlock();
 
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
   return hTabWnd;
 }