Issue #276 - replace TCHAR etc. with wide-character versions

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
-#include "COM_Value.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
 #include "../shared/Utils.h"
 #include "../shared/Dictionary.h"
-#include "../shared/IE_version.h"
 #include <thread>
 
 #ifdef DEBUG_HIDE_EL
 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);
 
@@ skipping 57 matching lines @@
   m_hStatusBarWnd = NULL;
   m_hPaneWnd = NULL;
   m_nPaneWidth = 0;
   m_pWndProcStatus = NULL;
   m_hTheme = NULL;
   m_isInitializedOk = false;
 
 
   m_tab = new CPluginTab(this);
 
-  CPluginSystem* system = CPluginSystem::GetInstance();
-
-  std::wstring locale((LPCWSTR)system->GetBrowserLanguage());
-  Dictionary::Create(locale);
+  Dictionary::Create(GetBrowserLanguage());
 }
 
 CPluginClass::~CPluginClass()
 {
   delete m_tab;
 }
 
 
 /////////////////////////////////////////////////////////////////////////////
 // Initialization
@@ skipping 101 matching lines @@
   return browser;
 }
 
 CString CPluginClass::GetBrowserUrl() const
 {
   CString url;
 
   CComQIPtr<IWebBrowser2> browser = GetBrowser();
   if (browser)
   {
-    AdblockPlus::COM::BSTR_Argument result;
-    if (SUCCEEDED(browser->get_LocationURL(&result)))
-    {
-      url = to_CString(result);
+    CComBSTR bstrURL;
+
+    if (SUCCEEDED(browser->get_LocationURL(&bstrURL)))
+    {
+      url = bstrURL;
       CPluginClient::UnescapeUrl(url);
     }
   }
   else
   {
     url = m_tab->GetDocumentUrl();
   }
 
   return url;
 }
@@ skipping 13 matching lines @@
 
 
 // This gets called when a new browser window is created (which also triggers the
 // creation of this object). The pointer passed in should be to a IWebBrowser2
 // interface that represents the browser for the window.
 // it is also called when a tab is closed, this unknownSite will be null
 // so we should handle that it is called this way several times during a session
 STDMETHODIMP CPluginClass::SetSite(IUnknown* unknownSite)
 {
   CPluginSettings* settings = CPluginSettings::GetInstance();
-  CPluginSystem* system = CPluginSystem::GetInstance();
 
   MULTIPLE_VERSIONS_CHECK();
 
   if (unknownSite)
   {
 
     DEBUG_GENERAL(L"================================================================================\nNEW TAB UI\n================================================================================")
 
     HRESULT hr = ::CoInitialize(NULL);
     if (FAILED(hr))
@@ skipping 230 matching lines @@
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_PUT_STATUSBAR, "Class::Enable statusbar");
           }
           CreateStatusBarPane();
 
           // We need to restart the tab now, to enable the status bar properly
           VARIANT vFlags;
           vFlags.vt = VT_I4;
           vFlags.intVal = navOpenInNewTab;
 
-          AdblockPlus::COM::BSTR_Argument curLoc;
+          CComBSTR curLoc;
           browser->get_LocationURL(&curLoc);
           HRESULT hr = browser->Navigate(curLoc, &vFlags, NULL, NULL, NULL);
           if (FAILED(hr))
           {
             vFlags.intVal = navOpenInNewWindow;
 
-            hr = browser->Navigate(curLoc, &vFlags, NULL, NULL, NULL);
+            hr = browser->Navigate(CComBSTR(curLoc), &vFlags, NULL, NULL, NULL);
             if (FAILED(hr))
             {
               DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION, "Navigation::Failed")
             }
           }
           browser->Quit();
         }
       }
     }
     else
@@ skipping 150 matching lines @@
   case DISPID_BEFORENAVIGATE:
     DEBUG_NAVI("Navi::BeforeNavigate")
       return VARIANT_TRUE;
   case DISPID_COMMANDSTATECHANGE:
     if (m_hPaneWnd == NULL)
     {
       CreateStatusBarPane();
     }
     else
     {
-      if (AdblockPlus::IE::installed_major_version() > 6)
+      if (CPluginClient::GetInstance()->GetIEVersion() > 6)
       {
         RECT rect;
         BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect);
         if (rectRes == TRUE)
         {
           MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE);
         }
       }      
     }
     break;
@@ skipping 27 matching lines @@
       DEBUG_NAVI("Navi::Document Complete")
 
         CComQIPtr<IWebBrowser2> browser = GetBrowser();
 
       if (browser && pDispParams->cArgs >= 2 && pDispParams->rgvarg[1].vt == VT_DISPATCH)
       {
         CComQIPtr<IWebBrowser2> pBrowser = pDispParams->rgvarg[1].pdispVal;
         if (pBrowser)
         {
           CString url;
-          AdblockPlus::COM::BSTR_Argument result;
-          if (SUCCEEDED(pBrowser->get_LocationURL(&result)) && !result.operator std::wstring().empty())
+          CComBSTR bstrUrl;
+          if (SUCCEEDED(pBrowser->get_LocationURL(&bstrUrl)) && ::SysStringLen(bstrUrl) > 0)
           {
-            url = to_CString(result);
+            url = bstrUrl;
 
             CPluginClient::UnescapeUrl(url);
 
             m_tab->OnDocumentComplete(browser, url, browser.IsEqualObject(pBrowser));
           }
         }
       }
     }
     break;
 
@@ skipping 87 matching lines @@
     }
     s_criticalSectionLocal.Unlock();
 
     if (!GetAtomPaneClass())
     {
       DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTER_PANE_CLASS, "Class::InitObject - RegisterClassEx");
       return false;
     }
   }
 
-  int ieVersion = AdblockPlus::IE::installed_major_version();
+
+  int ieVersion = CPluginClient::GetInstance()->GetIEVersion();
   // Create status pane
   if (bBHO && ieVersion > 6 && !CreateStatusBarPane())
   {
     return false;
   }
   
   if (CPluginClient::GetInstance()->IsFirstRun())
   {   
     // IE6 can't be accessed from another thread, execute in current thread
     if (ieVersion < 7)
@@ skipping 177 matching lines @@
   return true;
 }
 
 void CPluginClass::FirstRunThread()
 {
   CoInitialize(NULL);
   VARIANT vFlags;
   vFlags.vt = VT_I4;
   vFlags.intVal = navOpenInNewTab;
 
-  AdblockPlus::COM::BSTR_Argument navigatePath(FirstRunPageFileUrl());
+  CComBSTR navigatePath = CComBSTR(FirstRunPageFileUrl().c_str());
+  
   HRESULT hr = GetAsyncBrowser()->Navigate(navigatePath, &vFlags, NULL, NULL, NULL);
   if (FAILED(hr))
   {
     vFlags.intVal = navOpenInNewWindow;
     hr = GetAsyncBrowser()->Navigate(navigatePath, &vFlags, NULL, NULL, NULL);
   }
 
   if (FAILED(hr))
   {
     DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_WELCOME, "Navigation::Welcome page failed")
@@ skipping 200 matching lines @@
     CloseHandle(hToken);
   }
 
   return fRet;
 }
 
 void CPluginClass::DisplayPluginMenu(HMENU hMenu, int nToolbarCmdID, POINT pt, UINT nMenuFlags)
 {
   CPluginClient* client = CPluginClient::GetInstance();
 
-  CPluginSystem* system = CPluginSystem::GetInstance();
-
   // Create menu parent window
   HWND hMenuWnd = ::CreateWindowEx(
     NULL,
     MAKEINTATOM(GetAtomPaneClass()),
     L"",
     0,
     0,0,0,0,
     NULL,
     NULL,
     _Module.m_hInst,
@@ skipping 387 matching lines @@
 
 LRESULT CALLBACK CPluginClass::PaneWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
   // Find tab
   CPluginClass *pClass = FindInstance(GetParent(hWnd));
   if (!pClass)
   {
     return ::DefWindowProc(hWnd, message, wParam, lParam);
   }
 
-  CPluginSystem* system = CPluginSystem::GetInstance();
-
   // Process message
   switch (message)
   {
 
   case WM_SETCURSOR:
     {
       ::SetCursor(::LoadCursor(NULL, IDC_ARROW));
       return TRUE;
     }
   case WM_PAINT:
@@ skipping 305 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }