Issue #276 - introduce classes BSTR_ParamArgument and BSTR_ParamResult

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"
@@ skipping 197 matching lines @@
   return browser;
 }
 
 CString CPluginClass::GetBrowserUrl() const
 {
   CString url;
 
   CComQIPtr<IWebBrowser2> browser = GetBrowser();
   if (browser)
   {
-    CComBSTR bstrURL;
-
-    if (SUCCEEDED(browser->get_LocationURL(&bstrURL)))
+    AdblockPlus::COM::BSTR_ParamResult result;
+    if (SUCCEEDED(browser->get_LocationURL(&result)))
     {
-      url = bstrURL;
+      url = to_CString(result);
       CPluginClient::UnescapeUrl(url);
     }
   }
   else
   {
     url = m_tab->GetDocumentUrl();
   }
 
   return url;
 }
@@ skipping 264 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;
 
-          CComBSTR curLoc;
+          AdblockPlus::COM::BSTR_ParamResult curLoc;
           browser->get_LocationURL(&curLoc);
-          HRESULT hr = browser->Navigate(curLoc, &vFlags, NULL, NULL, NULL);
+          std::wstring location = curLoc;
+          AdblockPlus::COM::BSTR_ParamArgument targetLocation(location);
+          HRESULT hr = browser->Navigate(targetLocation, &vFlags, NULL, NULL, NULL);
           if (FAILED(hr))
           {
             vFlags.intVal = navOpenInNewWindow;
 
-            hr = browser->Navigate(CComBSTR(curLoc), &vFlags, NULL, NULL, NULL);
+            hr = browser->Navigate(targetLocation, &vFlags, NULL, NULL, NULL);
             if (FAILED(hr))
             {
               DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION, "Navigation::Failed")
             }
           }
           browser->Quit();
         }
       }
     }
     else
@@ skipping 198 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;
-          CComBSTR bstrUrl;
-          if (SUCCEEDED(pBrowser->get_LocationURL(&bstrUrl)) && ::SysStringLen(bstrUrl) > 0)
+          AdblockPlus::COM::BSTR_ParamResult result;
+          if (SUCCEEDED(pBrowser->get_LocationURL(&result)) && !result.operator std::wstring().empty())
           {
-            url = bstrUrl;
+            url = to_CString(result);
 
             CPluginClient::UnescapeUrl(url);
 
             m_tab->OnDocumentComplete(browser, url, browser.IsEqualObject(pBrowser));
           }
         }
       }
     }
     break;
 
@@ skipping 285 matching lines @@
   return true;
 }
 
 void CPluginClass::FirstRunThread()
 {
   CoInitialize(NULL);
   VARIANT vFlags;
   vFlags.vt = VT_I4;
   vFlags.intVal = navOpenInNewTab;
 
-  CComBSTR navigatePath = CComBSTR(FirstRunPageFileUrl().c_str());
-  
+  AdblockPlus::COM::BSTR_ParamArgument navigatePath(FirstRunPageFileUrl());
   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 937 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }