[IE] Replace ATL::CSimpleArray

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
@@ skipping 18 matching lines @@
 DWORD CPluginClass::s_hIconTypes[ICON_MAX] = { IDI_ICON_DISABLED, IDI_ICON_ENABLED, IDI_ICON_DEACTIVATED };
 
 CPluginMimeFilterClient* CPluginClass::s_mimeFilter = NULL;
 
 CLOSETHEMEDATA pfnClose = NULL;
 DRAWTHEMEBACKGROUND pfnDrawThemeBackground = NULL;
 OPENTHEMEDATA pfnOpenThemeData = NULL;
 
 ATOM CPluginClass::s_atomPaneClass = NULL;
 HINSTANCE CPluginClass::s_hUxtheme = NULL;
-CSimpleArray<CPluginClass*> CPluginClass::s_instances;
+std::set<CPluginClass*> CPluginClass::s_instances;
 std::map<DWORD, CPluginClass*> CPluginClass::s_threadInstances;
 
 CComAutoCriticalSection CPluginClass::s_criticalSectionLocal;
 CComAutoCriticalSection CPluginClass::s_criticalSectionBrowser;
 CComAutoCriticalSection CPluginClass::s_criticalSectionWindow;
 
 CComQIPtr<IWebBrowser2> CPluginClass::s_asyncWebBrowser2;
 
 #ifdef SUPPORT_WHITELIST
 std::map<UINT,CString> CPluginClass::s_menuDomains;
@@ skipping 204 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
       s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
       s_asyncWebBrowser2 = unknownSite;
-      s_instances.Add(this);
+      s_instances.insert(this);
     }
     s_criticalSectionLocal.Unlock();
 
     try
     {
       // Check if loaded as BHO
       if (GetBrowser())
       {
         DEBUG_GENERAL("Loaded as BHO");
         CComPtr<IConnectionPoint> pPoint = GetConnectionPoint();
@@ skipping 83 matching lines @@
 
     m_hTabWnd = NULL;
     m_hStatusBarWnd = NULL;
 
     // Remove instance from the list, shutdown threads
     HANDLE hMainThread = NULL;
     HANDLE hTabThread = NULL;
 
     s_criticalSectionLocal.Lock();
     {
-      s_instances.Remove(this);
+      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.GetSize() == 0)
+      if (s_instances.empty())
       {
         CPluginClientFactory::ReleaseMimeFilterClientInstance();
       }
     }
     s_criticalSectionLocal.Unlock();
 
     // Release browser interface
     s_criticalSectionBrowser.Lock();
     {
       m_webBrowser2.Release();
@@ skipping 500 matching lines @@
       if (hTabWnd2)
       {
         DWORD nProcessId;
         ::GetWindowThreadProcessId(hTabWnd2, &nProcessId);
         if (::GetCurrentProcessId() == nProcessId)
         {
           bool bExistingTab = false;
 
           s_criticalSectionLocal.Lock();
           {
-            for (int i = 0; i < s_instances.GetSize(); i++)
+            for (auto instance : s_instances)
             {
-              if (s_instances[i]->m_hTabWnd == hTabWnd2)
+              if (instance->m_hTabWnd == hTabWnd2)
               {
-
                 bExistingTab = true;
                 break;
               }
             }
           }
           s_criticalSectionLocal.Unlock();
 
           if (!bExistingTab)
           {
             amoundOfNewTabs ++;
@@ skipping 144 matching lines @@
     m_hTheme = pfnOpenThemeData(m_hPaneWnd, L"STATUS");
     if (!m_hTheme)
     {
     }
   }
 }
 
 
 CPluginClass* CPluginClass::FindInstance(HWND hStatusBarWnd)
 {
-  CPluginClass* instance = NULL;
+  CPluginClass* return_instance = nullptr;

[Wladimir Palant, 2014/07/24 06:41:53]

Nit: this variable should simply be called "result" or something like that.

[Eric, 2014/07/24 12:33:48]

Done.

 
   s_criticalSectionLocal.Lock();
   {
-    for (int i = 0; i < s_instances.GetSize(); i++)
+    for (auto instance : s_instances)
     {
-      if (s_instances[i]->m_hStatusBarWnd == hStatusBarWnd)
+      if (instance->m_hStatusBarWnd == hStatusBarWnd)
       {
-        instance = s_instances[i];
+        return_instance = instance;
         break;
       }
     }
   }
   s_criticalSectionLocal.Unlock();
 
-  return instance;
+  return return_instance;
 }
 
 CPluginTab* CPluginClass::GetTab()
 {
   return m_tab;
 }
 
 CPluginTab* CPluginClass::GetTab(DWORD dwThreadId)
 {
   CPluginTab* tab = NULL;
@@ skipping 851 matching lines @@
       if (hTabWnd2)
       {
         DWORD nProcessId;
         ::GetWindowThreadProcessId(hTabWnd2, &nProcessId);
         if (::GetCurrentProcessId() == nProcessId)
         {
           bool bExistingTab = false;
           s_criticalSectionLocal.Lock();
 
           {
-            for (int i = 0; i < s_instances.GetSize(); i++)
+            for (auto instance : s_instances)
             {
-              if (s_instances[i]->m_hTabWnd == hTabWnd2)
+              if (instance->m_hTabWnd == hTabWnd2)
               {
                 bExistingTab = true;
                 break;
               }
             }
           }
 
           if (!bExistingTab)
           {
             hBrowserWnd = hTabWnd2;
             hTabWnd = hTabWnd2;
             s_criticalSectionLocal.Unlock();
             break;
           }
           s_criticalSectionLocal.Unlock();
 
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }