Issue #1356 - Improve detection of the issuer of the request

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 1118 matching lines @@
     std::map<DWORD,CPluginClass*>::const_iterator it = s_threadInstances.find(dwThreadId);
     if (it != s_threadInstances.end())
     {
       tab = it->second->m_tab;
     }
   }
   s_criticalSectionLocal.Unlock();
 
   return tab;
 }
 

[Eric, 2014/10/08 17:37:54]

I'm mildly concerned that this version of GetTab is using a linear search on
strings. On the other hand, maintaining a cache of results from calls to
GetBrowserURL() would be necessary to use a hash-map, and that means reliably
trapping all the ways it could change.

[sergei, 2014/10/09 13:46:22]

I think it should be fast enough with linear search for now. If we have some
performance issues I would prefer firstly to profile the plugin.

+CPluginTab* CPluginClass::GetTab(const std::wstring& url)
+{
+  CPluginTab* tab = NULL;
+
+  s_criticalSectionLocal.Lock();
+  {
+    std::map<DWORD,CPluginClass*>::const_iterator it;
+    for (it = s_threadInstances.begin(); it != s_threadInstances.end(); ++it)

[Eric, 2014/10/08 17:37:54]

We can use the range-for syntax here. It's supported by our version of Visual
Studio.

+    {
+      if (it->second->GetBrowserUrl() == url.c_str())
+      {
+        s_criticalSectionLocal.Unlock();
+        return it->second->m_tab;

[Eric, 2014/10/08 17:37:54]

If we were using a sentry object to control the mutex, we wouldn't need a
separate call to Unlock() and returning in the middle of a loop wouldn't look
awkward. Instead, I'd assign to 'tab' and then 'break'.

[sergei, 2014/10/09 13:46:22]

+1 for scoped lock
I also don't like return if it's not an error case, but here it's OK for me.

+      }
+    }
+  }
+  s_criticalSectionLocal.Unlock();
+
+  return tab;
+}
+
 
 STDMETHODIMP CPluginClass::QueryStatus(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT* pCmdText)
 {
   if (cCmds == 0) return E_INVALIDARG;
   if (prgCmds == 0) return E_POINTER;
 
   prgCmds[0].cmdf = OLECMDF_ENABLED;
 
   return S_OK;
 }
@@ skipping 851 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }