[IE] First round of ATL removal

src/plugin/PluginUserSettings.cpp

 #include "PluginStdAfx.h"
 #include "PluginUserSettings.h"
 #include <algorithm>
 #include "PluginSettings.h"
 #include "PluginClient.h"
+#include "COM_Client.h"
 #include "../shared/Dictionary.h"
 
-static const CString s_GetMessage = L"GetMessage";
-static const CString s_GetLanguageCount = L"GetLanguageCount";
-static const CString s_GetLanguageByIndex = L"GetLanguageByIndex";
-static const CString s_GetLanguageTitleByIndex = L"GetLanguageTitleByIndex";
-static const CString s_SetLanguage = L"SetLanguage";
-static const CString s_GetLanguage = L"GetLanguage";
-static const CString s_GetWhitelistDomains = L"GetWhitelistDomains";
-static const CString s_AddWhitelistDomain = L"AddWhitelistDomain";
-static const CString s_RemoveWhitelistDomain = L"RemoveWhitelistDomain";
-static const CString s_GetAppLocale = L"GetAppLocale";
-static const CString s_GetDocumentationLink = L"GetDocumentationLink";
+static const std::wstring s_GetMessage = L"GetMessage";
+static const std::wstring s_GetLanguageCount = L"GetLanguageCount";
+static const std::wstring s_GetLanguageByIndex = L"GetLanguageByIndex";
+static const std::wstring s_GetLanguageTitleByIndex = L"GetLanguageTitleByIndex";
+static const std::wstring s_SetLanguage = L"SetLanguage";
+static const std::wstring s_GetLanguage = L"GetLanguage";
+static const std::wstring s_GetWhitelistDomains = L"GetWhitelistDomains";
+static const std::wstring s_AddWhitelistDomain = L"AddWhitelistDomain";
+static const std::wstring s_RemoveWhitelistDomain = L"RemoveWhitelistDomain";
+static const std::wstring s_GetAppLocale = L"GetAppLocale";
+static const std::wstring s_GetDocumentationLink = L"GetDocumentationLink";
 
-static const CString s_Methods[] = {s_GetMessage, s_GetLanguageCount, s_GetLanguageByIndex, s_GetLanguageTitleByIndex, s_SetLanguage, s_GetLanguage, s_GetWhitelistDomains, s_AddWhitelistDomain, s_RemoveWhitelistDomain, s_GetAppLocale, s_GetDocumentationLink};
+static const std::wstring s_Methods[] = {s_GetMessage, s_GetLanguageCount, s_GetLanguageByIndex, s_GetLanguageTitleByIndex, s_SetLanguage, s_GetLanguage, s_GetWhitelistDomains, s_AddWhitelistDomain, s_RemoveWhitelistDomain, s_GetAppLocale, s_GetDocumentationLink};
 
 CPluginUserSettings::CPluginUserSettings()
 {
 }
 
 
 STDMETHODIMP CPluginUserSettings::QueryInterface(REFIID riid, void **ppvObj)
 {
   if (IID_IUnknown == riid  ||  IID_IDispatch == riid)
   {
@@ skipping 54 matching lines @@
 
   if (indxMethod == countof(s_Methods))
     return DISP_E_MEMBERNOTFOUND;
 
   *rgdispid = static_cast<DISPID>(indxMethod);
 
   return S_OK;
 }
 
 
-static CString sGetLanguage()
+static std::wstring sGetLanguage()
 {
   CPluginSettings* settings = CPluginSettings::GetInstance();
   return settings->GetSubscription();
 }
 
 
-CStringW sGetMessage(const CString& section, const CString& key)
-{
-  Dictionary* dictionary = Dictionary::GetInstance();
-  return CStringW(dictionary->Lookup(std::string(CW2A(section)), std::string(CW2A(key))).c_str());
-}
-
 std::wstring sGetMessage(const std::string& section, const std::string& key)
 {
   Dictionary* dictionary = Dictionary::GetInstance();
   return dictionary->Lookup(section, key);
 }
 
 
 STDMETHODIMP CPluginUserSettings::Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispparams, VARIANT* pVarResult,
                                          EXCEPINFO* pExcepinfo, UINT* pArgErr)
 {
   if (!pDispparams)
     return E_POINTER;
 
   if (!pExcepinfo)
     return E_POINTER;
 
   if (pDispparams->cNamedArgs)
     return DISP_E_NONAMEDARGS;
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   if (dispidMember  < 0  ||  dispidMember >= countof(s_Methods))
     return DISP_E_BADINDEX;
 
-  const CString& method = s_Methods[dispidMember];
+  const std::wstring method = s_Methods[dispidMember];
 
   if (s_GetMessage == method)
   {
     if (2 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_BSTR != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
     if (pVarResult)
     {
-      CComBSTR key = pDispparams->rgvarg[0].bstrVal;
-      CComBSTR section = pDispparams->rgvarg[1].bstrVal;
-      CStringW message = sGetMessage((BSTR)section, (BSTR)key);
+      std::wstring key = Incoming_BSTR( pDispparams->rgvarg[0].bstrVal );
+      std::wstring section = Incoming_BSTR( pDispparams->rgvarg[1].bstrVal );
+      // [EH] We should change the interface to Dictionary to accept wstring arguments.
+      std::wstring message = sGetMessage( ABP::debug::narrow( section ), ABP::debug::narrow( key ) );
 
-      pVarResult->vt = VT_BSTR;
-      pVarResult->bstrVal = SysAllocString(message);
+      invoke_result_wstring( *pVarResult, message );
     }
   }
   else if (s_GetLanguageCount == method)
   {
     if (pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (pVarResult)
     {
-      std::map<CString, CString> languageList = settings->GetFilterLanguageTitleList();
+      std::map<std::wstring, std::wstring> languageList = settings->GetFilterLanguageTitleList();
 
       pVarResult->vt = VT_I4;
       pVarResult->lVal = static_cast<LONG>(languageList.size());
     }
   }
   else if (s_GetLanguageByIndex == method)
   {
     if (1 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_I4 != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
     if (pVarResult)
     {
       int indx = pDispparams->rgvarg[0].lVal;
 
-      std::map<CString, CString> languageTitleList = settings->GetFilterLanguageTitleList();
+      std::map<std::wstring, std::wstring> languageTitleList = settings->GetFilterLanguageTitleList();
 
       if (indx < 0  ||  indx >= (int)languageTitleList.size())
         return DISP_E_EXCEPTION;
 
-      CString language;
+      std::wstring language;
 
       int curIndx = 0;
-      for(std::map<CString, CString>::const_iterator it = languageTitleList.begin(); it != languageTitleList.end(); ++it)
+      for(std::map<std::wstring, std::wstring>::const_iterator it = languageTitleList.begin(); it != languageTitleList.end(); ++it)
       {
         if (curIndx == indx)
         {
           language = it->first;
           break;
         }
 
         curIndx++;
       }
-
-      pVarResult->vt = VT_BSTR;
-      pVarResult->bstrVal = SysAllocString(language);
+      invoke_result_wstring( *pVarResult, language );
     }
   }
   else if (s_GetLanguageTitleByIndex == method)
   {
     if (1 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_I4 != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
     if (pVarResult)
     {
       int indx = pDispparams->rgvarg[0].lVal;
 
-      std::map<CString, CString> languageTitleList = settings->GetFilterLanguageTitleList();
+      std::map<std::wstring, std::wstring> languageTitleList = settings->GetFilterLanguageTitleList();
 
       if (indx < 0  ||  indx >= (int)languageTitleList.size())
         return DISP_E_EXCEPTION;
 
-      CString languageTitle;
+      std::wstring languageTitle;
 
       int curIndx = 0;
-      for(std::map<CString, CString>::const_iterator it = languageTitleList.begin(); it != languageTitleList.end(); ++it)
+      for(std::map<std::wstring, std::wstring>::const_iterator it = languageTitleList.begin(); it != languageTitleList.end(); ++it)
       {
         if (curIndx == indx)
         {
           languageTitle = it->second;
           break;
         }
 
         curIndx++;
       }
-
-      pVarResult->vt = VT_BSTR;
-      pVarResult->bstrVal = SysAllocString(languageTitle);
+      invoke_result_wstring( *pVarResult, languageTitle );
     }
   }
   else if (s_SetLanguage == method)
   {
     if (1 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_BSTR != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
-    CComBSTR url = pDispparams->rgvarg[0].bstrVal;
-
-    settings->SetSubscription((BSTR)url);
+    std::wstring url = Incoming_BSTR( pDispparams->rgvarg[0].bstrVal );
+    settings->SetSubscription( url );
   }
   else if (s_GetLanguage == method)
   {
     if (pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (pVarResult)
     {
-      CString url = settings->GetSubscription();
-
-      pVarResult->vt = VT_BSTR;
-      pVarResult->bstrVal = SysAllocString(url);
+      invoke_result_wstring( *pVarResult, settings->GetSubscription() );
     }
   }
   else if (s_GetWhitelistDomains == method)
   {
     if (pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (pVarResult)
     {
       std::vector<std::wstring> whiteList = settings->GetWhiteListedDomainList();
-      CString sWhiteList;
+      std::wstring whitelist_csv;
       for (size_t i = 0; i < whiteList.size(); i++)
       {
-        if (!sWhiteList.IsEmpty())
+        if ( !whitelist_csv.empty() )
         {
-          sWhiteList += ',';
+          whitelist_csv += ',';
         }
-        sWhiteList += CString(whiteList[i].c_str());
+        whitelist_csv += whiteList[i];
       }
-
-      pVarResult->vt = VT_BSTR;
-      pVarResult->bstrVal = SysAllocString(sWhiteList);
+      invoke_result_wstring( *pVarResult, whitelist_csv );
     }
   }
   else if (s_AddWhitelistDomain == method)
   {
     if (1 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_BSTR != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
-    CComBSTR domain = pDispparams->rgvarg[0].bstrVal;
-    if (domain.Length())
+    std::wstring domain = Incoming_BSTR( pDispparams->rgvarg[0].bstrVal );
+    if ( !domain.empty() )
     {
-      settings->AddWhiteListedDomain((BSTR)domain);
+      settings->AddWhiteListedDomain( domain );
     }
   }
   else if (s_RemoveWhitelistDomain == method)
   {
     if (1 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_BSTR != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
-    CComBSTR domain = pDispparams->rgvarg[0].bstrVal;
-    if (domain.Length())
+    std::wstring domain = Incoming_BSTR( pDispparams->rgvarg[0].bstrVal );
+    if ( !domain.empty() )
     {
-      settings->RemoveWhiteListedDomain((BSTR)domain);
+      settings->RemoveWhiteListedDomain( domain );
     }
   }
   else if (s_GetAppLocale == method)
   {
     if (0 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
-    pVarResult->vt = VT_BSTR;
-    pVarResult->bstrVal = SysAllocString(settings->GetAppLocale());
+    if ( pVarResult )
+    {
+      invoke_result_wstring( *pVarResult, settings->GetAppLocale() );
+    }
   }
   else if (s_GetDocumentationLink == method)
   {
     if (0 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
-    pVarResult->vt = VT_BSTR;
-    pVarResult->bstrVal = SysAllocString(settings->GetDocumentationLink());
+    if ( pVarResult )
+    {
+      invoke_result_wstring( *pVarResult, settings->GetDocumentationLink() );
+    }
   }
   else
     return DISP_E_MEMBERNOTFOUND;
 
   return S_OK;
 }