Issue 1103 - Migrate Simple Adblock users

src/plugin/PluginUserSettings.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 23 matching lines @@
     dispatchID_SetLanguage,
     dispatchID_GetLanguage,
     dispatchID_GetWhitelistDomains,
     dispatchID_AddWhitelistDomain,
     dispatchID_RemoveWhitelistDomain,
     dispatchID_GetAppLocale,
     dispatchID_GetDocumentationLink,
     dispatchID_IsAcceptableAdsEnabled,
     dispatchID_SetAcceptableAdsEnabled,
     dispatchID_IsUpdate,
+    dispatchID_GetConversion
   };
 
   /**
    * Auxiliary for static initialization
    */
   std::unordered_map<std::wstring, DISPID> InitMethodIndex()
   {
     std::unordered_map<std::wstring, DISPID> m;
     // try-block for safety during static initialization
     try
     {
       m.emplace(L"GetMessage", dispatchID_GetMessage);
       m.emplace(L"GetLanguageCount", dispatchID_GetLanguageCount);
       m.emplace(L"GetLanguageByIndex", dispatchID_GetLanguageByIndex);
       m.emplace(L"GetLanguageTitleByIndex", dispatchID_GetLanguageTitleByIndex);
       m.emplace(L"SetLanguage", dispatchID_SetLanguage);
       m.emplace(L"GetLanguage", dispatchID_GetLanguage);
       m.emplace(L"GetWhitelistDomains", dispatchID_GetWhitelistDomains);
       m.emplace(L"AddWhitelistDomain", dispatchID_AddWhitelistDomain);
       m.emplace(L"RemoveWhitelistDomain", dispatchID_RemoveWhitelistDomain);
       m.emplace(L"GetAppLocale", dispatchID_GetAppLocale);
       m.emplace(L"GetDocumentationLink", dispatchID_GetDocumentationLink);
       m.emplace(L"IsAcceptableAdsEnabled", dispatchID_IsAcceptableAdsEnabled);
       m.emplace(L"SetAcceptableAdsEnabled", dispatchID_SetAcceptableAdsEnabled);
       m.emplace(L"IsUpdate", dispatchID_IsUpdate);
+      m.emplace(L"GetConversion", dispatchID_GetConversion);
     }
     catch(...)
     {
     }
     return m;
   }
 
   /**
    * Static map from method names to dispatch identifiers.
    */
@@ skipping 339 matching lines @@
           return DISP_E_TYPEMISMATCH;
         }
         if (pDispparams->rgvarg[0].boolVal != VARIANT_FALSE)
         {
           CPluginClient* client = CPluginClient::GetInstance();
           client->AddSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));
         }
         else
         {
           CPluginClient* client = CPluginClient::GetInstance();
           client->RemoveSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));

[Eric, 2015/05/17 00:29:25]

See here, for example, of why explicit conversions to 'std::wstring' aren't
necessary.

         }
       }
       break;
     case dispatchID_IsUpdate:
       {
         if (pDispparams->cArgs != 0)
         {
           return DISP_E_BADPARAMCOUNT;
         }
         if (pVarResult)
         {
           pVarResult->vt = VT_BOOL;
           pVarResult->boolVal = CPluginClient::GetInstance()->GetPref(L"displayUpdatePage", false) ? VARIANT_TRUE : VARIANT_FALSE;
         }
       }
       break;
+    case dispatchID_GetConversion:
+      {
+        if (pDispparams->cArgs != 0)
+        {
+          return DISP_E_BADPARAMCOUNT;
+        }
+        if (pVarResult)
+        {
+          pVarResult->vt = VT_BSTR;
+          pVarResult->bstrVal = CComBSTR(CPluginClient::GetInstance()->GetPref(std::wstring(L"convertedFrom"), std::wstring(L"")).c_str());

[sergei, 2015/04/28 14:41:15]

Is it necessary to explicitly construct std::wstring here?

[Eric, 2015/05/17 00:29:25]

It's not. There's an explicit pass through function for second argument
'wchar_t*' that invokes the 'std::wstring' version.

+        }
+      }
+      break;
     default:
       return DISP_E_MEMBERNOTFOUND;
       break;
     }
   }
   catch (...)
   {
     return E_FAIL;
   }
   return S_OK;
 }