Issue #3432 - Manage COM events with a resource class

src/plugin/PluginClass.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 90 matching lines @@
  * \tparam Source
  *   Type of event source. Implements IConnectionPoint
  */
 template<class Sink, class Source>
 class AtlEventRegistrationHolder
 {
   typedef AtlEventRegistration<Sink, Source> ImplType;
   std::unique_ptr<ImplType> impl;
 
 public:
-  AtlEventRegistrationHolder()
-    : impl(nullptr)
-  {}
-
-  ~AtlEventRegistrationHolder() // = default;
-  {}
-
   bool Start(Sink* consumer, Source* producer) // noexcept
   {
     try
     {
-      impl = new ImplType(consumer, producer);
+      impl.reset(new ImplType(consumer, producer));
     }
     catch (...)
     {
-      impl = nullptr;
+      impl.reset();
       return false;
     }
     return true;
   }
 
-  Stop() // noexcept
-  {
-    impl = nullptr;
+  void Stop() // noexcept
+  {
+    impl.reset();
   }
 };
-
 class ATL_NO_VTABLE CPluginClass :
   public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>,
   public ATL::CComCoClass<CPluginClass, &CLSID_PluginClass>,
   public ATL::IObjectWithSiteImpl<CPluginClass>,
   public IOleCommandTarget,
   public ATL::IDispEventImpl<1, CPluginClass, &DIID_DWebBrowserEvents2, &LIBID_SHDocVw, 1, 1>
 {
 
   friend class CPluginTab;
 
@@ skipping 24 matching lines @@
   ~CPluginClass();
 
   // IObjectWithSite
   STDMETHOD(SetSite)(IUnknown *pUnkSite);
 
   // IOleCommandTarget
   STDMETHOD(QueryStatus)(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT* pCmdText);
   STDMETHOD(Exec)(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG* pvaOut);
 
 
-  static CPluginTab* GetTab(DWORD dwThreadId);
+  static CPluginTab* GetTabForCurrentThread();
   CPluginTab* GetTab();
 
   void UpdateStatusBar();
 
 private:
 
   bool SetMenuBar(HMENU hMenu, const std::wstring& url);
   HMENU CreatePluginMenu(const std::wstring& url);
 
   void DisplayPluginMenu(HMENU hMenu, int nToolbarCmdID, POINT pt, UINT nMenuFlags);
@@ skipping 72 matching lines @@
   static DWORD s_hIconTypes[ICON_MAX];
 
   static HICON GetIcon(int type);
 
   // Main thread
   static HANDLE s_hMainThread;
   static bool s_isMainThreadDone;
 
   static HINSTANCE s_hUxtheme;
   static std::set<CPluginClass*> s_instances;
-  static std::map<DWORD,CPluginClass*> s_threadInstances;
   static CComAutoCriticalSection s_criticalSectionLocal;
   static CComAutoCriticalSection s_criticalSectionWindow;
 
   // Async browser
   static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2;
   static CComQIPtr<IWebBrowser2> GetAsyncBrowser();
 };
 
 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass)
 
-
 #endif // _PLUGIN_CLASS_H_