Issue #1234 - Convert strings associated with URL's

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
 #include "../shared/Utils.h"
 #include "../shared/Dictionary.h"
 #include <thread>
+#include <array>
 
 #ifdef DEBUG_HIDE_EL
 DWORD profileTime = 0;
 #endif
 
 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR);
 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPRECT);
 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE);
 
 HICON CPluginClass::s_hIcons[ICON_MAX] = { NULL, NULL, NULL };
 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;
 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;
-std::map<UINT,CString> CPluginClass::s_menuDomains;
 
 /*
  * Without namespace declaration, the identifier "Rectangle" is ambiguous
  * See http://msdn.microsoft.com/en-us/library/windows/desktop/dd162898(v=vs.85).aspx
  */
 namespace AdblockPlus
 {
   /**
     * Replacement for ATL type CRect.
     */
@@ skipping 145 matching lines @@
 
   return browser;
 }
 
 std::wstring CPluginClass::GetBrowserUrl() const
 {
   std::wstring url;
   CComQIPtr<IWebBrowser2> browser = GetBrowser();
   if (browser)
   {
-    BSTR bstrURL;

[sergei, 2014/10/17 10:10:12]

Why is ATL::CComBSTR replaced by BSTR? Looks like degradation.

[Eric, 2014/10/20 02:36:01]

Because we don't need CComBSTR here. The only reason to use it is to call
SysFreeString. Eliminating it improves the code by showing explicitly what the
BSTR needs. There's no mysterious secret hiding within CComBSTR.

CComBSTR doesn't convert naturally to std::wstring like our own class would,
either. Having such a conversion improves the readability of the code
significantly (I know because I've already done it once). Keeping the shroud of
mystery around CComBSTR just keeps the code from moving forward.

[sergei, 2014/10/21 09:45:17]

Sorry, I don't understand about which mystery your talking.
The main rule is to use RAII, ATL::CComBSTR completely satisfies it and it's
completely enough for us in my personal opinion. Using manual resource
management is a step backward.
What concerns using our own wrapper around BSTR. First of all we should ask
whether we need it or not, I am not convinced that we need it. Secondly, to
replace ATL::CComBSTR by it seems easier than to replace
BSTR+SysStringLen+SysFreeString

[Eric, 2014/10/21 17:19:52]

That's because there is no mystery.

I take it, then, that you do understand that all we need here is to call
SysFreeString in a destructor, whether that be in CComBSTR or in some other
wrapper class.
I agree about RAII, but CComBSTR is not the only way of accomplishing it.

Continuing to use CComBSTR is failing to step forward. We did not decide to
enshrine ATL; we decided to de-prioritize removing it.
Somehow, even though I keep repeating them, I haven't seen you acknowledge that
there are advantages to using our own wrapper class. We haven't even got to the
point where we are able to weigh advantages vs. disadvantages. 

So, once more, there are several advantages to having our own wrapper class for
this case, namely, [in] arguments on the client side:

1) Built-in conversion operator to std::wstring().
  a) Without such an operator, each and every conversion requires
    i) A condition to check that the BSTR value (raw or wrapped) is not null,
and
    ii) An explicit call to SysStringLen(), because BSTR are not guaranteed to
be
        null-terminated.

2) We can make all the tests for empty strings consistent by calling 'empty()'.
  a) The code at present does not
  
3) Its constructor can be declared 'noexcept', since it doesn't allocate.
  a) Don't expect Microsoft to update ATL for C++11.

4) Throw an exception for erroneous uses of 'operator&'.
  a) The ATL version does not do so in Release configurations
  b) We can throw 'std::logic_error' instead of the non-'std' ATL exception.
If we were to use CComBSTR, we cannot replace SysStringLen. BSTR is not
guaranteed to be null-terminated, so we cannot use the simpler constructor for
'wstring'. That means that if we enshrine CComBSTR, we enshrine explicit calls
to SysStringLen.

Apropos the issue of ease of replacement, I have done this conversion once
already. I assure you it is the same amount of work to replace BSTR or CComBSTR
or whatever else is there.

[Oleksandr, 2015/01/05 11:55:40]

Let's move back to this specific code change. As I see it:

1. We do want to have RAII here.
2. We do not want to have a custom BSTR wrapper class (we've established that
earlier)

I really don't see why we can't just leave the CComBSTR and have something like:

  url = std::wstring(bstrURL, bstrURL.Length());

I agree it is a failure to move forward, in a way, but so is not 100% removal of
ATL dependencies. We have discussed this before quite extensively, I believe.

[Eric, 2015/01/05 16:18:26]

Done.
SysStringLength returns an unsigned integer, but CComBSTR::Length returns a
signed one. I've left SysStringLength in as a result.

+    CComBSTR bstrURL;
     if (SUCCEEDED(browser->get_LocationURL(&bstrURL)) && bstrURL)
     {
       url = std::wstring(bstrURL, SysStringLen(bstrURL));
-      SysFreeString(bstrURL);
       UnescapeUrl(url);
     }
   }
   else
   {
     url = m_tab->GetDocumentUrl();
   }
   return url;
 }
 
@@ skipping 154 matching lines @@
     {
       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.empty())
       {
+        // TODO: Explicitly releasing a resource when a container becomes empty looks like a job better suited for shared_ptr
         CPluginClientFactory::ReleaseMimeFilterClientInstance();
       }
     }
     s_criticalSectionLocal.Unlock();
 
     // Release browser interface
     s_criticalSectionBrowser.Lock();
     {
       m_webBrowser2.Release();
     }
     s_criticalSectionBrowser.Unlock();
 
     DEBUG_GENERAL("================================================================================\nNEW TAB UI - END\n================================================================================")
 
     ::CoUninitialize();
   }
 
   return IObjectWithSiteImpl<CPluginClass>::SetSite(unknownSite);
 }
 
 bool CPluginClass::IsStatusBarEnabled()
 {
   DEBUG_GENERAL("IsStatusBarEnabled start");
   HKEY pHkey;
   HKEY pHkeySub;
   RegOpenCurrentUser(KEY_QUERY_VALUE, &pHkey);
-  DWORD trueth = 1;
-  DWORD truethSize = sizeof(DWORD);
+  DWORD truth = 1;
+  DWORD truthSize = sizeof(truth);
   RegOpenKey(pHkey, L"Software\\Microsoft\\Internet Explorer\\Main", &pHkeySub);
-  LONG res = RegQueryValueEx(pHkeySub, L"StatusBarWeb", NULL, NULL, (BYTE*)&trueth, &truethSize);
+  LONG res = RegQueryValueEx(pHkeySub, L"StatusBarWeb", NULL, NULL, (BYTE*)&truth, &truthSize);
   RegCloseKey(pHkey);
   if (res != ERROR_SUCCESS)
   {
     res = RegOpenKey(pHkey, L"Software\\Microsoft\\Internet Explorer\\MINIE", &pHkeySub);
     if (res == ERROR_SUCCESS)
     {
-      LONG res = RegQueryValueEx(pHkeySub, L"ShowStatusBar", NULL, NULL, (BYTE*)&trueth, &truethSize);
+      LONG res = RegQueryValueEx(pHkeySub, L"ShowStatusBar", NULL, NULL, (BYTE*)&truth, &truthSize);
       if (res == ERROR_SUCCESS)
       {
         RegCloseKey(pHkey);
       }
     }
   }
   DEBUG_GENERAL("IsStatusBarEnabled end");
-  return trueth == 1;
+  return truth == 1;
 }
 
 void CPluginClass::ShowStatusBar()
 {
   DEBUG_GENERAL("ShowStatusBar start");
 
   VARIANT_BOOL isVisible;
 
 
   CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
@@ skipping 24 matching lines @@
               MB_OK);
           return;
         }
         // Ask if a user wants to enable a status bar automatically
         LRESULT res = MessageBox((HWND)m_hTabWnd,
             dictionary->Lookup("status-bar", "question").c_str(),
             dictionary->Lookup("status-bar", "title").c_str(),
             MB_YESNO);
         if (res == IDYES)
         {
-          DWORD trueth = 1;
+          DWORD truth = 1;
           regRes = RegOpenKey(pHkey, L"Software\\Microsoft\\Internet Explorer\\MINIE", &pHkeySub);
-          regRes = RegSetValueEx(pHkeySub, L"ShowStatusBar", 0, REG_DWORD, (BYTE*)&trueth, sizeof(DWORD));
+          regRes = RegSetValueEx(pHkeySub, L"ShowStatusBar", 0, REG_DWORD, (BYTE*)&truth, sizeof(truth));
           regRes = RegCloseKey(pHkeySub);
           regRes = RegOpenKey(pHkey, L"Software\\Microsoft\\Internet Explorer\\Main", &pHkeySub);
-          regRes = RegSetValueEx(pHkeySub, L"StatusBarWeb", 0, REG_DWORD, (BYTE*)&trueth, sizeof(DWORD));
+          regRes = RegSetValueEx(pHkeySub, L"StatusBarWeb", 0, REG_DWORD, (BYTE*)&truth, sizeof(truth));
           regRes = RegCloseKey(pHkeySub);
           hr = browser->put_StatusBar(TRUE);
           if (FAILED(hr))
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_PUT_STATUSBAR, "Class::Enable statusbar");
           }
           CreateStatusBarPane();
 
           // We need to restart the tab now, to enable the status bar properly
           VARIANT vFlags;
@@ skipping 18 matching lines @@
       }
     }
     else
     {
       DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_STATUSBAR, "Class::Get statusbar state");
     }
   }
   DEBUG_GENERAL("ShowStatusBar end");
 }
 
+/*
+ * #1163 This class is the implementation for method DISPID_BEFORENAVIGATE2 in CPluginClass::Invoke.
+ * - It validates and convertes its own arguments, rather than unifying them in the Invoke body.
+ * - It's declared void and not HRESULT, so DISPID_BEFORENAVIGATE2 can only return S_OK.
+ */
 void CPluginClass::BeforeNavigate2(DISPPARAMS* pDispParams)
 {
 
   if (pDispParams->cArgs < 7)
   {
     return;
   }
   //Register a mime filter if it's not registered yet
   if (s_mimeFilter == NULL)
   {
     s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
   }
 
   // Get the IWebBrowser2 interface
   CComQIPtr<IWebBrowser2, &IID_IWebBrowser2> WebBrowser2Ptr;
   VARTYPE vt = pDispParams->rgvarg[6].vt;
   if (vt == VT_DISPATCH)
   {
     WebBrowser2Ptr = pDispParams->rgvarg[6].pdispVal;
   }
   else
   {
     // Wrong type, return.
     return;
   }
 
   // Get the URL
   std::wstring url;
-  auto arg = pDispParams->rgvarg[5];

[sergei, 2014/10/17 10:10:12]

I would prefer `const auto&` here.

[Eric, 2014/10/20 02:36:01]

OK.

+  const auto& arg = pDispParams->rgvarg[5];
   vt = arg.vt;
-  if (vt == VT_BYREF + VT_VARIANT && arg.pvarVal->vt == VT_BSTR)

[sergei, 2014/10/17 10:10:12]

'+' here looks unusual, despite it works, I think we could change it in that
commit to '|'.

[Eric, 2014/10/20 02:36:01]

It's out of scope, but it's also trivial.

Done.

+  if (vt == (VT_BYREF | VT_VARIANT) && arg.pvarVal->vt == VT_BSTR)
   {
     BSTR b = arg.pvarVal->bstrVal;
     if (b) {
       url = std::wstring(b, SysStringLen(b));
-      SysFreeString(b);

[sergei, 2014/10/17 10:10:12]

It's not allowed to modify arguments, especially by freeing the memory.

[Eric, 2014/10/20 02:36:01]

Brain fart. Forgot that this was deriving from IDispatch::Invoke.

       UnescapeUrl(url);
     }
   }
   else
   {
     // Wrong type, return.
     return;
   }
 
   // If webbrowser2 is equal to top level browser (as set in SetSite), we are navigating new page
@@ skipping 14 matching lines @@
 
     UpdateStatusBar();
   }
   else
   {
     DEBUG_NAVI(L"Navi::Begin navigation url:" + urlLegacy)
     m_tab->CacheFrame(url);
   }
 }
 
+/*
+ * #1163 implements behavior for method DISPID_WINDOWSTATECHANGED in CPluginClass::Invoke
+ * - should validate and convert arguments in Invoke, not here
+ * - does not validate number of arguments before indexing into 'rgvarg'
+ * - does not validate type of argument before using its value
+ */
 STDMETHODIMP CPluginClass::OnTabChanged(DISPPARAMS* pDispParams, WORD wFlags)
 {
   DEBUG_GENERAL("Tab changed");
   bool newtabshown = pDispParams->rgvarg[1].intVal==3;
   if (newtabshown)
   {
     std::map<DWORD,CPluginClass*>::const_iterator it = s_threadInstances.find(GetCurrentThreadId());
     if (it == s_threadInstances.end())
     {
       s_threadInstances[::GetCurrentThreadId()] = this;
-
-
       if (!m_isInitializedOk)
       {
         m_isInitializedOk = true;
-        if (!InitObject(true))
-        {
-          //                                    Unadvice();
-        }
+        InitObject(true);
         UpdateStatusBar();
       }
     }
   }
   notificationMessage.Hide();
   DEBUG_GENERAL("Tab change end");
-  return VARIANT_TRUE;
+  return S_OK;
 }
 
 // This gets called whenever there's a browser event
+// ENTRY POINT
 STDMETHODIMP CPluginClass::Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pvarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr)
 {
-  WCHAR tmp[256];
-  wsprintf(tmp, L"Invoke: %d\n", dispidMember);
-  DEBUG_GENERAL(tmp);
-  switch (dispidMember)
-  {
-
-  case DISPID_WINDOWSTATECHANGED:
-    return OnTabChanged(pDispParams, wFlags);
-    break;
-  case DISPID_HTMLDOCUMENTEVENTS2_ONBEFOREUPDATE:
-    return VARIANT_TRUE;
-    break;
-
-  case DISPID_HTMLDOCUMENTEVENTS2_ONCLICK:
-    return VARIANT_TRUE;
-    break;
-
-  case DISPID_EVMETH_ONLOAD:
-    DEBUG_NAVI("Navi::OnLoad")
-      return VARIANT_TRUE;
-    break;
-
-  case DISPID_EVMETH_ONCHANGE:
-    return VARIANT_TRUE;
-
-  case DISPID_EVMETH_ONMOUSEDOWN:
-    return VARIANT_TRUE;
-
-  case DISPID_EVMETH_ONMOUSEENTER:
-    return VARIANT_TRUE;
-
-  case DISPID_IHTMLIMGELEMENT_START:
-    return VARIANT_TRUE;
-
-  case STDDISPID_XOBJ_ERRORUPDATE:
-    return VARIANT_TRUE;
-
-  case STDDISPID_XOBJ_ONPROPERTYCHANGE:
-    return VARIANT_TRUE;
-
-  case DISPID_READYSTATECHANGE:
-    DEBUG_NAVI("Navi::ReadyStateChange")
-      return VARIANT_TRUE;
-
-  case DISPID_BEFORENAVIGATE:
-    DEBUG_NAVI("Navi::BeforeNavigate")
-      return VARIANT_TRUE;
-  case DISPID_COMMANDSTATECHANGE:
-    if (m_hPaneWnd == NULL)
-    {
-      CreateStatusBarPane();
-    }
-    else
-    {
-      if (CPluginClient::GetInstance()->GetIEVersion() > 6)
-      {
-        RECT rect;
-        BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect);
-        if (rectRes == TRUE)
-        {
-          MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE);
-        }
-      }      
-    }
-    break;
-  case DISPID_STATUSTEXTCHANGE:
-    break;
-
-  case DISPID_BEFORENAVIGATE2:
-    BeforeNavigate2(pDispParams);
-    break;
-
-  case DISPID_DOWNLOADBEGIN:
-    {
-      DEBUG_NAVI("Navi::Download Begin")
-    }
-    break;
-
-  case DISPID_DOWNLOADCOMPLETE:
-    {
-      DEBUG_NAVI("Navi::Download Complete")
-
+  try
+  {
+    WCHAR tmp[256];
+    wsprintf(tmp, L"Invoke: %d\n", dispidMember);
+    DEBUG_GENERAL(tmp);
+    switch (dispidMember)
+    {
+    case DISPID_WINDOWSTATECHANGED:
+      {
+        // #1163 should validate and convert arguments here
+        return OnTabChanged(pDispParams, wFlags);
+      }
+
+    case DISPID_HTMLDOCUMENTEVENTS2_ONBEFOREUPDATE:
+      break;
+
+    case DISPID_HTMLDOCUMENTEVENTS2_ONCLICK:
+      break;
+
+    case DISPID_EVMETH_ONLOAD:
+      DEBUG_NAVI("Navi::OnLoad")
+      break;
+
+    case DISPID_EVMETH_ONCHANGE:
+      break;
+
+    case DISPID_EVMETH_ONMOUSEDOWN:
+      break;
+
+    case DISPID_EVMETH_ONMOUSEENTER:
+      break;
+
+    case DISPID_IHTMLIMGELEMENT_START:
+      break;
+
+    case STDDISPID_XOBJ_ERRORUPDATE:
+      break;
+
+    case STDDISPID_XOBJ_ONPROPERTYCHANGE:
+      break;
+
+    case DISPID_READYSTATECHANGE:
+      DEBUG_NAVI("Navi::ReadyStateChange");
+      break;
+
+    case DISPID_BEFORENAVIGATE:
+      DEBUG_NAVI("Navi::BeforeNavigate");
+      break;
+
+    case DISPID_COMMANDSTATECHANGE:
+      if (m_hPaneWnd == NULL)
+      {
+        CreateStatusBarPane();
+      }
+      else
+      {
+        if (CPluginClient::GetInstance()->GetIEVersion() > 6)
+        {
+          RECT rect;
+          BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect);
+          if (rectRes == TRUE)
+          {
+            MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE);
+          }
+        }      
+      }
+      break;
+
+    case DISPID_STATUSTEXTCHANGE:
+      break;
+
+    case DISPID_BEFORENAVIGATE2:
+      {
+        // #1163 should validate and convert parameters here
+        BeforeNavigate2(pDispParams);
+      }
+      break;
+
+    case DISPID_DOWNLOADBEGIN:
+      {
+        DEBUG_NAVI("Navi::Download Begin")
+      }
+      break;
+
+    case DISPID_DOWNLOADCOMPLETE:
+      {
+        DEBUG_NAVI("Navi::Download Complete");
         CComQIPtr<IWebBrowser2> browser = GetBrowser();
-      if (browser)
-      {
-        m_tab->OnDownloadComplete(browser);
-      }
-    }
-    break;
-
-  case DISPID_DOCUMENTCOMPLETE:
-    {
-      DEBUG_NAVI("Navi::Document Complete")
-
+        if (browser)
+        {
+          m_tab->OnDownloadComplete(browser);
+        }
+      }
+      break;
+
+    case DISPID_DOCUMENTCOMPLETE:
+      {
+        DEBUG_NAVI("Navi::Document Complete");
         CComQIPtr<IWebBrowser2> browser = GetBrowser();
-
-      if (browser && pDispParams->cArgs >= 2 && pDispParams->rgvarg[1].vt == VT_DISPATCH)
-      {
-        CComQIPtr<IWebBrowser2> pBrowser = pDispParams->rgvarg[1].pdispVal;
-        if (pBrowser)
-        {
-          BSTR bstrUrl;

[sergei, 2014/10/17 10:10:12]

Again CComBSTR is replaced by BSTR.

[Eric, 2014/10/20 02:36:01]

And for the same reasons I stated above.

-          if (SUCCEEDED(pBrowser->get_LocationURL(&bstrUrl)) && ::SysStringLen(bstrUrl) > 0)
+        if (browser && pDispParams->cArgs >= 2 && pDispParams->rgvarg[1].vt == VT_DISPATCH)
+        {
+          CComQIPtr<IWebBrowser2> pBrowser = pDispParams->rgvarg[1].pdispVal;
+          if (pBrowser)
           {
-            std::wstring url(bstrUrl, SysStringLen(bstrUrl));
-            SysFreeString(bstrUrl);
-            UnescapeUrl(url);
-            m_tab->OnDocumentComplete(browser, url, browser.IsEqualObject(pBrowser));
+            CComBSTR bstrUrl;
+            if (SUCCEEDED(pBrowser->get_LocationURL(&bstrUrl)) && bstrUrl && ::SysStringLen(bstrUrl) > 0)
+            {
+              std::wstring url = std::wstring(bstrUrl, SysStringLen(bstrUrl));
+              UnescapeUrl(url);
+              m_tab->OnDocumentComplete(browser, url, browser.IsEqualObject(pBrowser));
+            }
           }
         }
       }
-    }
-    break;
-
-  case DISPID_ONQUIT:
-  case DISPID_QUIT:
-    {
-      Unadvice();
-    }
-    break;
-
-  default:
-    {
-      CString did;
-      did.Format(L"DispId:%u", dispidMember);
-
-      DEBUG_NAVI(L"Navi::Default " + did)
-    }
-
-    // do nothing
-    break;
-  }
-
-  return VARIANT_TRUE;
+      break;
+
+    case DISPID_ONQUIT:
+    case DISPID_QUIT:
+      {
+        Unadvice();
+      }
+      break;
+
+    default:
+      {
+        CString did;
+        did.Format(L"DispId:%u", dispidMember);
+
+        DEBUG_NAVI(L"Navi::Default " + did)
+      }
+      /*
+       * Ordinarily a method not dispatched should return DISP_E_MEMBERNOTFOUND.
+       * As a conservative initial change, we leave it behaving as before,
+       *   which is to do nothing and return S_OK.
+       */
+      // do nothing
+      break;
+    }
+  }
+  catch(...)
+  {
+    DEBUG_GENERAL( "Caught unknown exception in CPluginClass::Invoke" );
+    return E_FAIL;
+  }
+  return S_OK;
 }
 
 bool CPluginClass::InitObject(bool bBHO)
 {
   DEBUG_GENERAL("InitObject");
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   if (!settings->GetPluginEnabled())
   {
     s_mimeFilter->Unregister();
@@ skipping 31 matching lines @@
       }
     }
   }
   s_criticalSectionLocal.Unlock();
 
   // Register pane class
   if (!GetAtomPaneClass())
   {
     WNDCLASSEX wcex;
 
-    wcex.cbSize = sizeof(WNDCLASSEX);
+    wcex.cbSize = sizeof(wcex);
     wcex.style = 0;
     wcex.lpfnWndProc = (WNDPROC)PaneWindowProc;
     wcex.cbClsExtra = 0;
     wcex.cbWndExtra = 0;
     wcex.hInstance = _Module.m_hInst;
     wcex.hIcon = NULL;
     wcex.hCursor = NULL;
     wcex.hbrBackground = NULL;
     wcex.lpszMenuName = NULL;
     wcex.lpszClassName = STATUSBAR_PANE_NAME;
@@ skipping 55 matching lines @@
   s_criticalSectionLocal.Unlock();
   return true;
 }
 
 bool CPluginClass::CreateStatusBarPane()
 {
   CriticalSection::Lock lock(m_csStatusBar);
 
   CPluginClient* client = CPluginClient::GetInstance();
 
-  wchar_t szClassName[MAX_PATH];
+  std::array<wchar_t, MAX_PATH> className;
   // Get browser window and url
   HWND hBrowserWnd = GetBrowserHWND();
   if (!hBrowserWnd)
   {
     DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_BROWSER, "Class::CreateStatusBarPane - No status bar")
     return false;
   }
 
   // Looking for a TabWindowClass window in IE7
   // the last one should be parent for statusbar
   HWND hWndStatusBar = NULL;
 
   HWND hTabWnd = ::GetWindow(hBrowserWnd, GW_CHILD);
   UINT amoundOfNewTabs = 0;
   HWND uniqueNewTab = NULL;
   while (hTabWnd)
   {
-    memset(szClassName, 0, MAX_PATH);
-    GetClassName(hTabWnd, szClassName, MAX_PATH);
-
-    if (wcscmp(szClassName, L"TabWindowClass") == 0 || wcscmp(szClassName,L"Frame Tab") == 0)
+    className[0] = L'\0';
+    // GetClassNameW returns the number of characters without '\0'
+    int classNameLength = GetClassNameW(hTabWnd, className.data(), className.size());
+
+    if (classNameLength && (wcscmp(className.data(), L"TabWindowClass") == 0 || wcscmp(className.data(), L"Frame Tab") == 0))
     {
       // IE8 support
       HWND hTabWnd2 = hTabWnd;
-      if (wcscmp(szClassName,L"Frame Tab") == 0)
+      if (wcscmp(className.data(), L"Frame Tab") == 0)
       {
         hTabWnd2 = ::FindWindowEx(hTabWnd2, NULL, L"TabWindowClass", NULL);
       }
 
       if (hTabWnd2)
       {
         DWORD nProcessId;
         ::GetWindowThreadProcessId(hTabWnd2, &nProcessId);
         if (::GetCurrentProcessId() == nProcessId)
         {
@@ skipping 26 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   HWND hWnd = ::GetWindow(hBrowserWnd, GW_CHILD);
   while (hWnd)
   {
-    memset(szClassName, 0, MAX_PATH);
-    ::GetClassName(hWnd, szClassName, MAX_PATH);
-
-    if (wcscmp(szClassName,L"msctls_statusbar32") == 0)
+    className[0] = L'\0';
+    int classNameLength = GetClassNameW(hWnd, className.data(), className.size());
+
+    if (classNameLength && wcscmp(className.data(), L"msctls_statusbar32") == 0)
     {
       hWndStatusBar = hWnd;
       break;
     }
 
     hWnd = ::GetWindow(hWnd, GW_HWNDNEXT);
   }
 
   if (!hWndStatusBar)
   {
@@ skipping 176 matching lines @@
   HINSTANCE hInstance = _AtlBaseModule.GetModuleInstance();
 
   HMENU hMenu = ::LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MENU1));
 
   HMENU hMenuTrackPopup = GetSubMenu(hMenu, 0);
 
   SetMenuBar(hMenuTrackPopup, url);
 
   return hMenuTrackPopup;
 }
-BOOL CreateLowProcess(WCHAR* wszProcessName, WCHAR* cmdLine)
-{
-
-  BOOL                  fRet;
-  HANDLE                hToken        = NULL;
-  HANDLE                hNewToken     = NULL;
-  PSID                  pIntegritySid = NULL;
-  TOKEN_MANDATORY_LABEL TIL           = {0};
-  PROCESS_INFORMATION   ProcInfo      = {0};
-  STARTUPINFO           StartupInfo   = {0};
-
-
-
-  // Low integrity SID
-  WCHAR wszIntegritySid[20] = L"S-1-16-4096";
-
-
-  fRet = OpenProcessToken(GetCurrentProcess(),
-    TOKEN_DUPLICATE |
-    TOKEN_ADJUST_DEFAULT |
-    TOKEN_QUERY |
-    TOKEN_ASSIGN_PRIMARY,
-    &hToken);
-
-  if (!fRet)
-  {
-    goto CleanExit;
-  }
-
-  fRet = DuplicateTokenEx(hToken,
-    0,
-    NULL,
-    SecurityImpersonation,
-    TokenPrimary,
-    &hNewToken);
-
-  if (!fRet)
-  {
-    goto CleanExit;
-  }
-
-  fRet = ConvertStringSidToSid(wszIntegritySid, &pIntegritySid);
-
-  if (!fRet)
-  {
-    goto CleanExit;
-  }
-
-
-  TIL.Label.Attributes = SE_GROUP_INTEGRITY;
-  TIL.Label.Sid        = pIntegritySid;
-
-
-  //
-  // Set the process integrity level
-  //
-
-  fRet = SetTokenInformation(hNewToken,
-    TokenIntegrityLevel,
-    &TIL,
-    sizeof(TOKEN_MANDATORY_LABEL) + GetLengthSid(pIntegritySid));
-
-  if (!fRet)
-  {
-    goto CleanExit;
-  }
-
-  //
-  // Create the new process at Low integrity
-  //
-
-  fRet  = CreateProcessAsUser(hNewToken,
-    wszProcessName,
-    cmdLine,
-    NULL,
-    NULL,
-    FALSE,
-    0,
-    NULL,
-    NULL,
-    &StartupInfo,
-    &ProcInfo);
-
-
-CleanExit:
-
-  if (ProcInfo.hProcess != NULL)
-  {
-    CloseHandle(ProcInfo.hProcess);
-  }
-
-  if (ProcInfo.hThread != NULL)
-  {
-    CloseHandle(ProcInfo.hThread);
-  }
-
-  LocalFree(pIntegritySid);
-
-  if (hNewToken != NULL)
-  {
-    CloseHandle(hNewToken);
-  }
-
-  if (hToken != NULL)
-  {
-    CloseHandle(hToken);
-  }
-
-  return fRet;
-}
 
 void CPluginClass::DisplayPluginMenu(HMENU hMenu, int nToolbarCmdID, POINT pt, UINT nMenuFlags)
 {
   CPluginClient* client = CPluginClient::GetInstance();
 
   // Create menu parent window
   HWND hMenuWnd = ::CreateWindowEx(
     NULL,
     MAKEINTATOM(GetAtomPaneClass()),
     L"",
@@ skipping 99 matching lines @@
   // Invalidate and redraw the control
   UpdateStatusBar();
 }
 
 
 bool CPluginClass::SetMenuBar(HMENU hMenu, const std::wstring& url)
 {
   DEBUG_GENERAL("SetMenuBar");
 
   std::wstring ctext;
-
-  s_criticalSectionLocal.Lock();
-  {
-    s_menuDomains.clear();
-  }
-  s_criticalSectionLocal.Unlock();
-
   Dictionary* dictionary = Dictionary::GetInstance();
 
-  MENUITEMINFOW fmii;
-  memset(&fmii, 0, sizeof(MENUITEMINFO));
-  fmii.cbSize = sizeof(MENUITEMINFO);
-
-  MENUITEMINFOW miiSep;
-  memset(&miiSep, 0, sizeof(MENUITEMINFO));
-  miiSep.cbSize = sizeof(MENUITEMINFO);
+  MENUITEMINFOW fmii = {};
+  fmii.cbSize = sizeof(fmii);
+
+  MENUITEMINFOW miiSep = {};
+  miiSep.cbSize = sizeof(miiSep);
   miiSep.fMask = MIIM_TYPE | MIIM_FTYPE;
   miiSep.fType = MFT_SEPARATOR;
 
   CPluginClient* client = CPluginClient::GetInstance();
   CPluginSettings* settings = CPluginSettings::GetInstance();
   {
     ctext = dictionary->Lookup("menu", "menu-disable-on-site");
     // Is domain in white list?
     ReplaceString(ctext, L"?1?", client->GetHostFromUrl(url));
     if (client->IsWhitelistedUrl(GetTab()->GetDocumentUrl()))
@@ skipping 74 matching lines @@
   DWORD nProcessId;
   ::GetWindowThreadProcessId(hWndToolBar, &nProcessId);
 
   if (hWndToolBar && ::GetCurrentProcessId() == nProcessId)
   {
     ::ScreenToClient(hWndToolBar, &pt);
     int nButton = (int)::SendMessage(hWndToolBar, TB_HITTEST, 0, (LPARAM)&pt);
 
     if (nButton > 0)
     {
-      TBBUTTON pTBBtn;
-      memset(&pTBBtn, 0, sizeof(TBBUTTON));
+      TBBUTTON pTBBtn = {};
 
       if (SendMessage(hWndToolBar, TB_GETBUTTON, nButton, (LPARAM)&pTBBtn))
       {
         RECT rcButton;
         nIDCommand = pTBBtn.idCommand;
 
         if (SendMessage(hWndToolBar, TB_GETRECT, nIDCommand, (LPARAM)&rcButton))
         {
           pt.x = rcButton.left;
           pt.y = rcButton.bottom;
@@ skipping 117 matching lines @@
 
 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 = GetTab(::GetCurrentThreadId());
   if (tab)
   {
     CPluginClient* client = CPluginClient::GetInstance();
-    if (!CPluginSettings::GetInstance()->IsPluginEnabled())
-    {
-    }
-    else if (client->IsWhitelistedUrl(url))
-    {
-      hIcon = GetIcon(ICON_PLUGIN_DISABLED);
-    }
-    else
-    {
-      CPluginSettings* settings = CPluginSettings::GetInstance();
-      hIcon = GetIcon(ICON_PLUGIN_ENABLED);
+    if (CPluginSettings::GetInstance()->IsPluginEnabled())
+    {
+      if (client->IsWhitelistedUrl(url))
+      {
+        hIcon = GetIcon(ICON_PLUGIN_DISABLED);
+      }
+      else
+      {
+        CPluginSettings* settings = CPluginSettings::GetInstance();
+        hIcon = GetIcon(ICON_PLUGIN_ENABLED);
+      }
     }
   }
   return hIcon;
 }
 
 
 LRESULT CALLBACK CPluginClass::PaneWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
   // Find tab
   CPluginClass *pClass = FindInstance(GetParent(hWnd));
@@ skipping 253 matching lines @@
   return icon;
 }
 
 ATOM CPluginClass::GetAtomPaneClass()
 {
   return s_atomPaneClass;
 }
 
 HWND CPluginClass::GetTabHWND() const
 {
-  wchar_t szClassName[MAX_PATH];
+  std::array<wchar_t, MAX_PATH> className;
   // Get browser window and url
   HWND hBrowserWnd = GetBrowserHWND();
   if (!hBrowserWnd)
   {
     DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_BROWSER, "Class::GetTabWindow - No tab window")
       s_criticalSectionWindow.Unlock();
 
     return false;
   }
 
   // Looking for a TabWindowClass window in IE7
 
   HWND hTabWnd = ::GetWindow(hBrowserWnd, GW_CHILD);
   while (hTabWnd)
   {
-    memset(szClassName, 0, MAX_PATH);
-    GetClassName(hTabWnd, szClassName, MAX_PATH);
-
-    if (wcscmp(szClassName, L"TabWindowClass") == 0 || wcscmp(szClassName, L"Frame Tab") == 0)
+    className[0] = L'\0';
+    int classNameLength = GetClassNameW(hTabWnd, className.data(), className.size());
+
+    if (classNameLength && (wcscmp(className.data(), L"TabWindowClass") == 0 || wcscmp(className.data(), L"Frame Tab") == 0))
     {
       // IE8 support
       HWND hTabWnd2 = hTabWnd;
-      if (wcscmp(szClassName, L"Frame Tab") == 0)
+      if (wcscmp(className.data(), L"Frame Tab") == 0)
       {
         hTabWnd2 = ::FindWindowEx(hTabWnd2, NULL, L"TabWindowClass", NULL);
       }
 
       if (hTabWnd2)
       {
         DWORD nProcessId;
         ::GetWindowThreadProcessId(hTabWnd2, &nProcessId);
         if (::GetCurrentProcessId() == nProcessId)
         {
@@ skipping 23 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }