Noissue - Remove dead code

src/plugin/Plugin.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "PluginStdAfx.h"
 
 #include "Plugin.h"
 #ifdef _WIN64
 #include "../../build/x64/AdblockPlus_i.c"
 #else
 #include "../../build/ia32/AdblockPlus_i.c"
 #endif
 
 #include "PluginClass.h"
-#include "PluginClient.h"
-#include "PluginSystem.h"
+#include "PluginMimeFilterClient.h"
 #include "PluginSettings.h"
-#include "PluginMimeFilterClient.h"
-#include "Msiquery.h"
-#include "PluginFilter.h"
-
-#include "../shared/Dictionary.h"
+#include "PluginWbPassThrough.h"

[Oleksandr, 2015/03/19 04:39:32]

I think this can be removed

 
 CComModule _Module;
 
 BEGIN_OBJECT_MAP(ObjectMap)
   OBJECT_ENTRY(CLSID_PluginClass, CPluginClass)
 END_OBJECT_MAP()
 
 //Dll Entry Point
 BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID reserved)
 {
@@ skipping 58 matching lines @@
 STDAPI DllRegisterServer(void)
 {
   return _Module.RegisterServer(TRUE);
 }
 
 STDAPI DllUnregisterServer(void)
 {
   return _Module.UnregisterServer(TRUE);
 }
 
-void InitPlugin(bool isInstall)
-{
-  CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  if (isInstall)
-  {
-    DEBUG_GENERAL(
-      L"================================================================================\n"
-      L"INSTALLER " IEPLUGIN_VERSION L"\n"
-      L"================================================================================")
-  }
-  else
-  {
-    DEBUG_GENERAL(
-      L"================================================================================\n"
-      L"UPDATER " IEPLUGIN_VERSION L"\n"
-      L"================================================================================")
-  }
-
-  // Post async plugin error
-  CPluginError pluginError;
-  while (LogQueue::PopFirstPluginError(pluginError))
-  {
-    LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginError.GetProcessId(), pluginError.GetThreadId());
-  }
-}
-
-// Called from installer
-EXTERN_C void STDAPICALLTYPE OnInstall(MSIHANDLE hInstall, MSIHANDLE tmp)
-{
-  InitPlugin(true);
-}
-
-// Called from updater
-EXTERN_C void STDAPICALLTYPE OnUpdate(void)
-{
-  InitPlugin(false);
-}