| Index: src/plugin/PluginClientBase.cpp | 
| =================================================================== | 
| --- a/src/plugin/PluginClientBase.cpp | 
| +++ b/src/plugin/PluginClientBase.cpp | 
| @@ -17,10 +17,6 @@ | 
|  | 
| #include "PluginClientBase.h" | 
|  | 
| -#include <memory> | 
| -#include <WinInet.h> | 
| -#include <shlwapi.h> | 
| - | 
| #include "PluginSettings.h" | 
| #include "Config.h" | 
| #include "PluginDebug.h" | 
| @@ -28,35 +24,6 @@ | 
| CComAutoCriticalSection LogQueue::s_criticalSectionQueue; | 
| std::vector<CPluginError> LogQueue::s_pluginErrors; | 
|  | 
| - | 
| -void UnescapeUrl(std::wstring& url) | 
| -{ | 
| -  try | 
| -  { | 
| -    DWORD result_length = INTERNET_MAX_URL_LENGTH; | 
| -    std::unique_ptr<wchar_t[]> result(new wchar_t[result_length]); | 
| -    HRESULT hr = UrlUnescapeW(const_cast<wchar_t*>(url.c_str()), result.get(), &result_length, 0); | 
| -    if (hr == S_OK) | 
| -    { | 
| -      url = std::wstring(result.get(), result_length); | 
| -    } | 
| -    /* | 
| -     * Do nothing. This masks error return values from UrlUnescape without logging the error. | 
| -     */ | 
| -  } | 
| -  catch(std::bad_alloc e) | 
| -  { | 
| -    /* | 
| -     * When the code has a systematic way of handling bad_alloc, we'll rethrow (probably). | 
| -     * Until then, we mask the exception and make no modification. | 
| -     */ | 
| -  } | 
| -  catch(...) | 
| -  { | 
| -    // no modification if any other exception | 
| -  } | 
| -} | 
| - | 
| void LogQueue::LogPluginError(DWORD errorCode, int errorId, int errorSubid, const std::string& description, bool isAsync, DWORD dwProcessId, DWORD dwThreadId) | 
| { | 
| // Prevent circular references | 
|  |