Issue #1234, #2058 - Rewrite log facility, improving thread implementation

src/plugin/PluginClass.cpp

Index: src/plugin/PluginClass.cpp
===================================================================
--- a/src/plugin/PluginClass.cpp
+++ b/src/plugin/PluginClass.cpp
@@ -23,7 +23,6 @@
 #include "PluginFilter.h"
 #include "PluginMimeFilterClient.h"
 #include "AdblockPlusClient.h"
-#include "PluginClientBase.h"
 #include "PluginClientFactory.h"
 #include "PluginUtil.h"
 #include "../shared/Utils.h"
@@ -143,7 +142,7 @@
     HRESULT hr = browser->get_HWND(&hBrowserWndHandle);
     if (FAILED(hr))
     {
-      DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_BROWSER_WINDOW, "Class::GetBrowserHWND - failed")
+      DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_BROWSER_WINDOW, "Class::GetBrowserHWND - failed");
     }
   }
 
@@ -446,7 +445,7 @@
             hr = browser->Navigate(CComBSTR(curLoc), &vFlags, NULL, NULL, NULL);
             if (FAILED(hr))
             {
-              DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION, "Navigation::Failed")
+              DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION, "Navigation::Failed");
             }
           }
           browser->Quit();
@@ -750,7 +749,7 @@
   HWND hBrowserWnd = GetBrowserHWND();
   if (!hBrowserWnd)
   {
-    DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_BROWSER, "Class::CreateStatusBarPane - No status bar")
+    TRACE("No window handle for browser site", HERE_F);
     return false;
   }
 
@@ -832,7 +831,7 @@
 
   if (!hWndStatusBar)
   {
-    DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_WIN, "Class::CreateStatusBarPane - No status bar")
+    TRACE("No status bar", HERE_F);
     return true;
   }
 
@@ -876,7 +875,7 @@
 
   if (!hWndNewPane)
   {
-    DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_CREATE_STATUSBAR_PANE, "Class::CreateStatusBarPane - CreateWindowEx")
+    DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_CREATE_STATUSBAR_PANE, "Class::CreateStatusBarPane - CreateWindowEx");
     return false;
   }
 
@@ -932,7 +931,7 @@
 
   if (FAILED(hr))
   {
-    DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_WELCOME, "Navigation::Welcome page failed")
+    DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_WELCOME, "Navigation::Welcome page failed");
   }
 }
 void CPluginClass::CloseTheme()
@@ -1114,7 +1113,7 @@
           hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL);
           if (FAILED(hr))
           {
-            DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed")
+            DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed");
           }
         }
       }
@@ -1548,7 +1547,6 @@
       CPluginTab* tab = GetTab(::GetCurrentThreadId());
       if (tab)
       {
-        tab->OnActivate();
         RECT rect;
         GetWindowRect(pClass->m_hPaneWnd, &rect);
         pClass->notificationMessage.Move(rect.left + (rect.right - rect.left) / 2, rect.top + (rect.bottom - rect.top) / 2); 
@@ -1675,9 +1673,8 @@
   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();
-
+    DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_BROWSER, "Class::GetTabWindow - No tab window");
+    s_criticalSectionWindow.Unlock();
     return false;
   }