Issue #1467, #3397 - Rewrite the map from threads to tabs

src/plugin/PluginClass.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * 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
@@ skipping 64 matching lines @@
     typedef SyncMap<DWORD, CPluginClass*, nullptr> Base;
 
   public:
     bool AddIfAbsent(CPluginClass* p)
     {
       return Base::AddIfAbsent(::GetCurrentThreadId(), p);
     }
 
     bool RemoveAndCheck()
     {
-      return Base::RemoveAndCheck(::GetCurrentThreadId());
+      return Base::RemoveIfPresent(::GetCurrentThreadId());
     }
 
     CPluginClass* Locate()
     {
       return Base::Locate(::GetCurrentThreadId());
     }
   };
 
   /**
    * Map from thread ID's to CPluginClass instances
@@ skipping 178 matching lines @@
           ss << L"CPluginClass::SetSite, this = " << ToHexLiteral(this);
           ss << L", browser = " << ToHexLiteral(m_webBrowser2);
           return ss.str();
         }());
 
       /*
        * Add ourselves to the thread map.
        */
       if (!threadMap.AddIfAbsent(this))
       {
         throw std::logic_error("CPluginClass::SetSite - May not overwrite existing entry in thread map");

[sergei, 2016/02/08 13:35:37]

I would also like to have asserts here and for RemoveAndCheck to be notified in
time.

[Eric, 2016/02/08 18:45:31]

No. We have error handling already. Doubling it up is just code bloat.

[Oleksandr, 2016/02/10 10:58:48]

I don't think we need asserts here as well.

       }
 
       //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();
         s_asyncWebBrowser2 = unknownSite;
@@ skipping 722 matching lines @@
   s_criticalSectionLocal.Unlock();
 
   return result;
 }
 
 CPluginTab* CPluginClass::GetTab()
 {
   return m_tab;
 }
 
-CPluginTab* CPluginClass::GetTabCurrentThread()
+CPluginTab* CPluginClass::GetTabForCurrentThread()
 {
   auto p = threadMap.Locate();
   return p ? p->m_tab : nullptr;
 }
 
 // Entry point
 STDMETHODIMP CPluginClass::QueryStatus(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT* pCmdText)
 {
   try
   {
@@ skipping 393 matching lines @@
   }
   return ::CallWindowProc(pClass->m_pWndProcStatus, hWnd, message, wParam, lParam);
 }
 
 
 HICON CPluginClass::GetStatusBarIcon(const std::wstring& url)
 {
   // use the disable icon as defualt, if the client doesn't exists
   HICON hIcon = GetIcon(ICON_PLUGIN_DEACTIVATED);
 
-  CPluginTab* tab = GetTabCurrentThread();
+  CPluginTab* tab = GetTabForCurrentThread();
   if (tab)
   {
     CPluginClient* client = CPluginClient::GetInstance();
     if (CPluginSettings::GetInstance()->IsPluginEnabled())
     {
       if (client->IsWhitelistedUrl(url))
       {
         hIcon = GetIcon(ICON_PLUGIN_DISABLED);
       }
       else
@@ skipping 143 matching lines @@
         pClass->DisplayPluginMenu(hMenu, -1, pt, TPM_LEFTALIGN | TPM_BOTTOMALIGN);
         break;
       }
     case WM_DESTROY:
       break;
     case SC_CLOSE:
       break;
 
     case WM_UPDATEUISTATE:
       {
-      CPluginTab* tab = GetTabCurrentThread();
+        CPluginTab* tab = GetTabForCurrentThread();
         if (tab)
         {
           tab->OnActivate();
           RECT rect;
           GetWindowRect(pClass->m_hPaneWnd, &rect);
           pClass->notificationMessage.MoveToCenter(rect);
         }
         if (LOWORD(wParam) == UIS_CLEAR)
         {
           pClass->notificationMessage.Hide();
@@ skipping 112 matching lines @@
   s_criticalSectionLocal.Unlock();
 
   return icon;
 }
 
 ATOM CPluginClass::GetAtomPaneClass()
 {
   return s_atomPaneClass;
 }