Initial libadblockplus integration

Shared/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginDictionary.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
@@ skipping 1425 matching lines @@
 
   case ID_ABOUT:
     {
       url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_ABOUT);
       navigationErrorId = PLUGIN_ERROR_NAVIGATION_ABOUT;
     }
     break;
 
   default:
 
-#ifdef SUPPORT_WHITELIST
-    {
-      if (nCommand >= WM_WHITELIST_DOMAIN && nCommand <= WM_WHITELIST_DOMAIN_MAX)
-      {
-        CPluginSettings* settings = CPluginSettings::GetInstance();
-
-        CString domain;
-
-        s_criticalSectionLocal.Lock();
-        {
-          domain = s_menuDomains[nCommand];
-        }
-        s_criticalSectionLocal.Unlock();
-
-        if (settings->IsWhiteListedDomain(domain)) 
-        {
-          settings->AddWhiteListedDomain(domain, 3, true);
-        }
-        else
-        {
-          settings->AddWhiteListedDomain(domain, 1, true);
-        }
-
-        client->ClearWhiteListCache();
-      }
-    }
-#endif // SUPPORT_WHITELIST
     break;
   }
 
   // Invalidate and redraw the control
   UpdateStatusBar();
 
   CComQIPtr<IWebBrowser2> browser = GetBrowser();    
   if (!url.IsEmpty() && browser)
   {
     VARIANT vFlags;
@@ skipping 71 matching lines @@
 #ifdef SUPPORT_WHITELIST
   {
     // White list domain
     ctext = dictionary->Lookup("MENU_DISABLE_ON");
     fmii.fMask = MIIM_STRING | MIIM_STATE;
     fmii.fState = MFS_DISABLED;
     fmii.dwTypeData = ctext.GetBuffer();
     fmii.cch = ctext.GetLength();
 
     UINT index = WM_WHITELIST_DOMAIN;
-
-    // Add domains from history
-    if (client)
-    {
-      bool isFirst = true;
-
-      TDomainHistory domainHistory = settings->GetDomainHistory();
-
-      CString documentDomain = tab->GetDocumentDomain();
-
-      if (CPluginClient::IsValidDomain(documentDomain))
-      {
-        CString documentDomainT = documentDomain;
-
-        for (TDomainHistory::const_reverse_iterator it = domainHistory.rbegin(); it != domainHistory.rend(); ++it)
-        {
-          if (documentDomain == it->first)
-          {
-            if (isFirst)
-            {
-              fmii.fState = MFS_ENABLED;
-              fmii.fMask |= MIIM_SUBMENU;
-              fmii.hSubMenu = ::CreateMenu();
-            }
-
-            MENUITEMINFO smii;
-            memset(&smii, 0, sizeof(MENUITEMINFO));
-            smii.cbSize = sizeof(MENUITEMINFO);
-
-            smii.fMask = MIIM_STRING | MIIM_ID;
-            smii.dwTypeData = documentDomainT.GetBuffer();
-            smii.cch = documentDomainT.GetLength();
-            smii.wID = index;
-
-            bool isWhitelisted = settings->IsWhiteListedDomain(it->first);
-            if (isWhitelisted)
-            {
-              smii.fMask |= MIIM_STATE;
-              smii.fState |= MFS_CHECKED;
-            }
-
-            if (isFirst)
-            {
-              smii.fMask |= MIIM_STATE;
-              smii.fState |= MFS_DEFAULT;
-
-              isFirst = false;
-            }
-
-            InsertMenuItem(fmii.hSubMenu, index, FALSE, &smii);
-
-            s_criticalSectionLocal.Lock();
-            {
-              s_menuDomains[index++] = documentDomain;
-            }
-            s_criticalSectionLocal.Unlock();
-          }
-        }
-      }
-
-      // Add last domains
-      for (TDomainHistory::const_reverse_iterator it = domainHistory.rbegin(); it != domainHistory.rend(); ++it)
-      {
-        if (it->first != documentDomain)
-        {
-          if (isFirst)
-          {
-            fmii.fMask |= MIIM_STATE | MIIM_SUBMENU;
-            fmii.fState = MFS_ENABLED;
-            fmii.hSubMenu = CreateMenu();
-
-            isFirst = false;
-          }
-
-          CString domain = it->first;
-
-          MENUITEMINFO smii;
-          memset(&smii, 0, sizeof(MENUITEMINFO));
-          smii.cbSize = sizeof(MENUITEMINFO);
-          smii.fMask = MIIM_STRING | MIIM_ID;
-          smii.dwTypeData = domain.GetBuffer();
-          smii.cch = domain.GetLength();
-          smii.wID = index;
-
-          bool isWhitelisted = settings->IsWhiteListedDomain(it->first);
-          if (isWhitelisted)
-          {
-            smii.fMask |= MIIM_STATE;
-            smii.fState |= MFS_CHECKED;
-          }
-
-          ::InsertMenuItem(fmii.hSubMenu, index, FALSE, &smii);
-
-          s_criticalSectionLocal.Lock();
-          {
-            s_menuDomains[index++] = it->first;
-          }
-          s_criticalSectionLocal.Unlock();                 
-        }
-      }
-    }
 
     ::SetMenuItemInfo(hMenu, ID_WHITELISTDOMAIN, FALSE, &fmii);
   }
 #else
   {
     ::DeleteMenu(hMenu, ID_WHITELISTDOMAIN, FALSE);
   }
 #endif // SUPPORT_WHITELIST
 
   // Invite friends
@@ skipping 658 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }