Issue 1538 - Replace ABP icon with new one (v.1.1) - for Internet Explorer

src/plugin/PluginClass.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
@@ skipping 27 matching lines @@
 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 };
 uint32_t iconHeight = 32;
 uint32_t iconWidth = 32;

[Eric, 2015/02/03 16:07:48]

At the very least, it's time to introduce an anonymous namespace here for new
file-scope variables.

If you need to introduce new such variables here, it's also the right time to
remove 'h_Icons' and 'h_IconTypes' from CPluginClass and declare them in
parallel, since they're part of the same icon facility.

Even better yet would be to take this opportunity and add the first files to a
new 'ui/' directory under 'src/'. This was one directory that was not at all in
question in the code quality meeting.

 
 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;
@@ skipping 932 matching lines @@
   // Calculate pane height
   AdblockPlus::Rectangle rcStatusBar;
   ::GetClientRect(hWndStatusBar, &rcStatusBar);
 
   if (rcStatusBar.Height() > 0)
   {
     if (rcStatusBar.Height() < iconWidth)
     { 
       iconWidth = 19;
       iconHeight = 19;
-      CPluginClass::s_hIconTypes[0] = IDI_ICON_DISABLED_19;
-      CPluginClass::s_hIconTypes[1] = IDI_ICON_ENABLED_19;
-      CPluginClass::s_hIconTypes[2] = IDI_ICON_DEACTIVATED_19;
     }
 
 #ifdef _DEBUG
     m_nPaneWidth = 70;
 #else
     m_nPaneWidth = min(rcStatusBar.Height(), iconWidth);
 #endif
   }
   else
   {
@@ skipping 783 matching lines @@
 }
 
 HICON CPluginClass::GetIcon(int type)
 {
   HICON icon = NULL;
 
   s_criticalSectionLocal.Lock();
   {
     if (!s_hIcons[type])
     {
-      s_hIcons[type] = ::LoadIcon(_Module.m_hInst, MAKEINTRESOURCE(s_hIconTypes[type]));
+      std::wstring imageToLoad = L"#";
+      imageToLoad += std::to_wstring(s_hIconTypes[type]);
+      s_hIcons[type] = (HICON)::LoadImage(_Module.m_hInst, imageToLoad.c_str(), IMAGE_ICON, iconWidth, iconHeight, LR_SHARED);
       if (!s_hIcons[type])
       {
         DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_LOAD_ICON, "Class::GetIcon - LoadIcon")
       }
     }
 
     icon = s_hIcons[type];
   }
   s_criticalSectionLocal.Unlock();
 
@@ skipping 67 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }