Issues #276, #1163 - introduce class IncomingParam

src/plugin/PluginUserSettings.cpp

 #include "PluginStdAfx.h"
 #include "PluginUserSettings.h"
 #include <algorithm>
+#include "COM_Value.h"
 #include "PluginSettings.h"
 #include "PluginClient.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";
@@ skipping 121 matching lines @@
   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);
+      AdblockPlus::COM::Incoming_Param key(pDispparams->rgvarg[0].bstrVal);
+      AdblockPlus::COM::Incoming_Param section(pDispparams->rgvarg[1].bstrVal);
+      CStringW message = sGetMessage(to_CString(section), to_CString(key));
 
       pVarResult->vt = VT_BSTR;
       pVarResult->bstrVal = SysAllocString(message);
     }
   }
   else if (s_GetLanguageCount == method)
   {
     if (pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
@@ skipping 76 matching lines @@
     }
   }
   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);
+    AdblockPlus::COM::Incoming_Param url(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();
 
@@ skipping 24 matching lines @@
     }
   }
   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())
+    AdblockPlus::COM::Incoming_Param domain(pDispparams->rgvarg[0].bstrVal);
+    if (!domain.empty())
     {
-      settings->AddWhiteListedDomain((BSTR)domain);
+      settings->AddWhiteListedDomain(to_CString(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())
+    AdblockPlus::COM::Incoming_Param domain(pDispparams->rgvarg[0].bstrVal);
+    if (!domain.empty())
     {
-      settings->RemoveWhiteListedDomain((BSTR)domain);
+      settings->RemoveWhiteListedDomain(to_CString(domain));
     }
   }
   else if (s_GetAppLocale == method)
   {
     if (0 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     pVarResult->vt = VT_BSTR;
     pVarResult->bstrVal = SysAllocString(settings->GetAppLocale());
   }
@@ skipping 33 matching lines @@
       CPluginClient* client = CPluginClient::GetInstance();
       client->RemoveSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));
     }
   }
   else
     return DISP_E_MEMBERNOTFOUND;
 
   return S_OK;
 }