[IE] Replace ATL::CRect

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 31 matching lines @@
 CComAutoCriticalSection CPluginClass::s_criticalSectionLocal;
 CComAutoCriticalSection CPluginClass::s_criticalSectionBrowser;
 CComAutoCriticalSection CPluginClass::s_criticalSectionWindow;
 
 CComQIPtr<IWebBrowser2> CPluginClass::s_asyncWebBrowser2;
 
 #ifdef SUPPORT_WHITELIST
 std::map<UINT,CString> CPluginClass::s_menuDomains;
 #endif
 
+/*
+ * 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

[Felix Dahlke, 2014/07/24 07:24:17]

This would normally be an anonymous namespace, so I'm not sure if we should have
it clash with the namespace used by libadblockplus. I still think the most
pragmatic way would be to just give the class a name that won't clash with
globals, i.e. "Rect".

+{
+  /**
+    * Replacement for ATL type CRect.
+    */
+  class Rectangle
+    : public RECT
+  {
+  public:
+    int Height() const
+    {
+      return bottom - top;
+    }
+
+    int Width() const
+    {
+      return right - left;
+    }
+  };
+}
 
 CPluginClass::CPluginClass()
 {
   //Use this line to debug memory leaks
   //    _CrtDumpMemoryLeaks();
 
   m_isAdviced = false;
   m_nConnectionID = 0;
   m_hTabWnd = NULL;
   m_hStatusBarWnd = NULL;
@@ skipping 875 matching lines @@
     hWnd = ::GetWindow(hWnd, GW_HWNDNEXT);
   }
 
   if (!hWndStatusBar)
   {
     DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_WIN, "Class::CreateStatusBarPane - No status bar")
     return true;
   }
 
   // Calculate pane height
-  CRect rcStatusBar;
+  AdblockPlus::Rectangle rcStatusBar;
   ::GetClientRect(hWndStatusBar, &rcStatusBar);
 
   if (rcStatusBar.Height() > 0)
   {
 #ifdef _DEBUG
     m_nPaneWidth = 70;
 #else
     m_nPaneWidth = min(rcStatusBar.Height(), 22);
 #endif
   }
@@ skipping 610 matching lines @@
       HLOCAL hLocal = LocalAlloc(LHND, sizeof(int) * (nParts+1));
       LPINT lpParts = (LPINT)LocalLock(hLocal);
       memcpy(lpParts, (void*)lParam, wParam*sizeof(int));
 
       for (unsigned i = 0; i < STATUSBAR_PANE_NUMBER; i++)
       {
         lpParts[i] -= pClass->m_nPaneWidth;
       }
       LRESULT hRet = CallWindowProc(pClass->m_pWndProcStatus, hWnd, message, wParam, (LPARAM)lpParts);
 
-      CRect rcPane;
+      AdblockPlus::Rectangle rcPane;
       ::SendMessage(hWnd, SB_GETRECT, STATUSBAR_PANE_NUMBER, (LPARAM)&rcPane);
 
-      CRect rcClient;
+      AdblockPlus::Rectangle rcClient;
       ::GetClientRect(hWnd, &rcClient);
 
       ::MoveWindow(
         pClass->m_hPaneWnd,
         lpParts[STATUSBAR_PANE_NUMBER] - pClass->m_nPaneWidth,
         0,
         pClass->m_nPaneWidth,
         rcClient.Height(),
         TRUE);
 
@@ skipping 66 matching lines @@
   case WM_SETCURSOR:
     {
       ::SetCursor(::LoadCursor(NULL, IDC_ARROW));
       return TRUE;
     }
   case WM_PAINT:
     {
       PAINTSTRUCT ps;
       HDC hDC = ::BeginPaint(hWnd, &ps);
 
-      CRect rcClient;
+      AdblockPlus::Rectangle rcClient;
       ::GetClientRect(hWnd, &rcClient);
 
       int nDrawEdge = 0;
 
       // Old Windows background drawing
       if (pClass->m_hTheme == NULL)
       {
         ::FillRect(hDC, &rcClient, (HBRUSH)(COLOR_BTNFACE + 1));
         ::DrawEdge(hDC, &rcClient, BDR_RAISEDINNER, BF_LEFT);
 
         nDrawEdge = 3;
         rcClient.left += 3;
 
         ::DrawEdge(hDC, &rcClient, BDR_SUNKENOUTER, BF_RECT);
       }
       // Themed background drawing
       else
       {
         // Draw background
         if (pfnDrawThemeBackground)
         {
-          CRect rc = rcClient;
+          AdblockPlus::Rectangle rc = rcClient;
           rc.right -= 2;
           pfnDrawThemeBackground(pClass->m_hTheme, hDC, 0, 0, &rc, NULL);
         }
 
         // Copy separator picture to left side
         int nHeight = rcClient.Height();
         int nWidth = rcClient.Width() - 2;
 
         for (int i = 0; i < 2; i++)
         {
@@ skipping 19 matching lines @@
         if (hIcon)
         {
           ::DrawIconEx(hDC, offx, (rcClient.Height() - 16)/2 + 2, hIcon, 16, 16, NULL, NULL, DI_NORMAL);
           offx += 22;
         }
 #ifdef _DEBUG
         // Display version
         HFONT hFont = (HFONT)::SendMessage(pClass->m_hStatusBarWnd, WM_GETFONT, 0, 0);
         HGDIOBJ hOldFont = ::SelectObject(hDC,hFont);
 
-        CRect rcText = rcClient;
+        AdblockPlus::Rectangle rcText = rcClient;
         rcText.left += offx;
         ::SetBkMode(hDC, TRANSPARENT);
         ::DrawTextW(hDC, IEPLUGIN_VERSION, -1, &rcText, DT_WORD_ELLIPSIS|DT_LEFT|DT_SINGLELINE|DT_VCENTER);
 
         ::SelectObject(hDC, hOldFont);
 #endif // _DEBUG
       }
 
       // Done!
       EndPaint(hWnd, &ps);
@@ skipping 229 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }