Issue 1283 - wrong usage of memset, fix sizeof, make proper initializing

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 };
@@ skipping 381 matching lines @@
 
   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 301 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);
+    className[0] = L'\0';
+    // GetClassNameW returns the number of characters without '\0'
+    int classNameLength = GetClassNameW(hTabWnd, className.data(), className.size());

[Oleksandr, 2014/10/17 07:09:07]

In other places of the code we use std::wstring in situations like this.
Like:

std::wstring className;
className.resize(MAX_PATH);
GetClassName(..., &className[0]...);

I agree, it might be less pretty, but if we do the same here we could use the
std::wstring's operator "==" instead of wcscmp, and we would be more consistent
across the code, which would be preferable, IMHO. And it would add some
consistence as to how we treat these cases.

 
-    if (wcscmp(szClassName, L"TabWindowClass") == 0 || wcscmp(szClassName,L"Frame Tab") == 0)
+    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);
+    className[0] = L'\0';
+    int classNameLength = GetClassNameW(hWnd, className.data(), className.size());
 
-    if (wcscmp(szClassName,L"msctls_statusbar32") == 0)
+    if (classNameLength && wcscmp(className.data(), L"msctls_statusbar32") == 0)
     {
       hWndStatusBar = hWnd;
       break;
     }
 
     hWnd = ::GetWindow(hWnd, GW_HWNDNEXT);
   }
 
   if (!hWndStatusBar)
   {
@@ skipping 304 matching lines @@
   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 fmii = {};
+  fmii.cbSize = sizeof(fmii);
 
-  MENUITEMINFOW miiSep;
-  memset(&miiSep, 0, sizeof(MENUITEMINFO));
-  miiSep.cbSize = sizeof(MENUITEMINFO);
+  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(to_wstring(url)));
     if (client->IsWhitelistedUrl(to_wstring(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 401 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);
+    className[0] = L'\0';
+    int classNameLength = GetClassNameW(hTabWnd, className.data(), className.size());
 
-    if (wcscmp(szClassName, L"TabWindowClass") == 0 || wcscmp(szClassName, L"Frame Tab") == 0)
+    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;
 
 }