IE6 status bar and FRP fix. Debugging info added.

src/plugin/AdblockPlusClient.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "PluginClass.h"
 
 #include "AdblockPlusClient.h"
@@ skipping 95 matching lines @@
 
 CAdblockPlusClient* CAdblockPlusClient::s_instance = NULL;
 
 CAdblockPlusClient::CAdblockPlusClient() : CPluginClientBase()
 {
   m_filter = std::auto_ptr<CPluginFilter>(new CPluginFilter());
 }
 
 bool CAdblockPlusClient::CallEngine(Communication::OutputBuffer& message, Communication::InputBuffer& inputBuffer)
 {
+  DEBUG_GENERAL("CallEngine start");
   CriticalSection::Lock lock(enginePipeLock);
   try
   {
     if (!enginePipe)
       enginePipe.reset(OpenEnginePipe());
     enginePipe->WriteMessage(message);
     inputBuffer = enginePipe->ReadMessage();
   }
   catch (const std::exception& e)
   {
     DEBUG_GENERAL(e.what());
     return false;
   }
+  DEBUG_GENERAL("CallEngine end");
   return true;
 }
 
 bool CAdblockPlusClient::CallEngine(Communication::ProcType proc, Communication::InputBuffer& inputBuffer)
 {
   Communication::OutputBuffer message;
   message << proc;
   return CallEngine(message, inputBuffer);
 }
 
@@ skipping 74 matching lines @@
   m_criticalSectionFilter.Lock();
   {
     isHidden = filter && filter->IsElementHidden(tag, pEl, domain, indent);
   }
   m_criticalSectionFilter.Unlock();
   return isHidden;
 }
 
 bool CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url)
 {
+  DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" start").c_str());
   Communication::OutputBuffer request;
   request << Communication::PROC_IS_WHITELISTED_URL << ToUtf8String(url);
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return false;
 
   bool isWhitelisted;
   response >> isWhitelisted;
+
+  DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" end").c_str());
   return isWhitelisted;
 }
 
 int CAdblockPlusClient::GetIEVersion()
 {
   //HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer
   HKEY hKey;
   LSTATUS status = RegOpenKey(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Internet Explorer", &hKey);
   if (status != 0)
   {
@@ skipping 67 matching lines @@
 std::vector<std::wstring> CAdblockPlusClient::GetExceptionDomains()
 {
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_GET_EXCEPTION_DOMAINS, response)) 
     return std::vector<std::wstring>();
   return ReadStrings(response);
 }
 
 bool CAdblockPlusClient::IsFirstRun()
 {
+  DEBUG_GENERAL("IsFirstRun");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_IS_FIRST_RUN_ACTION_NEEDED, response)) return false;
   bool res;
   response >> res;
   return res;
 }
 void CAdblockPlusClient::AddFilter(const std::wstring& text)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_ADD_FILTER << ToUtf8String(text);
@@ skipping 27 matching lines @@
   request << Communication::PROC_SET_PREF << ToUtf8String(name) << value;
   CallEngine(request);
 }
 
 std::wstring CAdblockPlusClient::GetPref(const std::wstring& name, const wchar_t* defaultValue)
 {
   return GetPref(name, std::wstring(defaultValue));
 }
 std::wstring CAdblockPlusClient::GetPref(const std::wstring& name, const std::wstring& defaultValue)
 {
+  DEBUG_GENERAL((L"GetPref: " + name + L" start").c_str());
   Communication::OutputBuffer request;
   request << Communication::PROC_GET_PREF << ToUtf8String(name);
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return defaultValue;
   bool success;
   response >> success;
   if (success)
   {
     std::string value;
     response >> value;
+    DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return ToUtf16String(value);
   }
   else
+  {
+    DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return defaultValue;
+  }
 }
 
 bool CAdblockPlusClient::GetPref(const std::wstring& name, bool defaultValue)
 {
+  DEBUG_GENERAL((L"GetPref: " + name + L" start").c_str());
   Communication::OutputBuffer request;
   request << Communication::PROC_GET_PREF << ToUtf8String(name);
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return defaultValue;
   bool success;
   response >> success;
   if (success)
   {
     bool value;
     response >> value;
+    DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return value;
   }
   else
+  {
+    DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return defaultValue;
+  }
 }
 int64_t CAdblockPlusClient::GetPref(const std::wstring& name, int64_t defaultValue)
 {
+  DEBUG_GENERAL((L"GetPref: " + name + L" start").c_str());
   Communication::OutputBuffer request;
   request << Communication::PROC_GET_PREF << ToUtf8String(name);
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return defaultValue;
   bool success;
   response >> success;
   if (success)
   {
     int64_t value;
     response >> value;
+    DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return value;
   }
   else
+  {
+    DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return defaultValue;
+  }
 }
 
 void CAdblockPlusClient::CheckForUpdates()
 {
   CallEngine(Communication::PROC_CHECK_FOR_UPDATES);
 }
 
 std::wstring CAdblockPlusClient::GetDocumentationLink()
 {
+  DEBUG_GENERAL("GetDocumentationLink");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_GET_DOCUMENTATION_LINK, response)) 
     return L"";
   std::wstring docLink;
   response >> docLink;
   return docLink;
 }