Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/plugin/Plugin.cpp

Issue 4899473029332992: Noissue - Remove dead code (Closed)
Patch Set: Created March 17, 2015, 2:35 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/plugin/Plugin.cpp
===================================================================
--- a/src/plugin/Plugin.cpp
+++ b/src/plugin/Plugin.cpp
@@ -15,137 +15,94 @@
* 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 "PluginSettings.h"
+#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 "PluginMimeFilterClient.h"
-#include "Msiquery.h"
-#include "PluginFilter.h"
-
-#include "../shared/Dictionary.h"
-
-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)
-{
- switch( fdwReason )
- {
- case DLL_PROCESS_ATTACH:
- wchar_t szFilename[MAX_PATH];
- GetModuleFileName(NULL, szFilename, MAX_PATH);
- _wcslwr_s(szFilename);
-
- if (wcsstr(szFilename, L"explorer.exe"))
- {
- return FALSE;
- }
-
- _Module.Init(ObjectMap, _Module.GetModuleInstance(), &LIBID_PluginLib);
- break;
-
- case DLL_THREAD_ATTACH:
- // thread-specific initialization.
- break;
-
- case DLL_THREAD_DETACH:
- // thread-specific cleanup.
- break;
-
- case DLL_PROCESS_DETACH:
- // any necessary cleanup.
- break;
- }
-
- return TRUE;
-}
-
-
-STDAPI DllCanUnloadNow(void)
-{
- LONG count = _Module.GetLockCount();
- if (_Module.GetLockCount() == 0)
- {
- if (CPluginSettings::s_instance != NULL)
- {
- delete CPluginSettings::s_instance;
- }
-
- if (CPluginClass::s_mimeFilter != NULL)
- {
- CPluginClass::s_mimeFilter->Unregister();
- CPluginClass::s_mimeFilter = NULL;
- }
-
- _CrtDumpMemoryLeaks();
- }
- return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
-}
-
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
-{
- return _Module.GetClassObject(rclsid, riid, ppv);
-}
-
-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);
-}
+#include "PluginSettings.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)
+{
+ switch( fdwReason )
+ {
+ case DLL_PROCESS_ATTACH:
+ wchar_t szFilename[MAX_PATH];
+ GetModuleFileName(NULL, szFilename, MAX_PATH);
+ _wcslwr_s(szFilename);
+
+ if (wcsstr(szFilename, L"explorer.exe"))
+ {
+ return FALSE;
+ }
+
+ _Module.Init(ObjectMap, _Module.GetModuleInstance(), &LIBID_PluginLib);
+ break;
+
+ case DLL_THREAD_ATTACH:
+ // thread-specific initialization.
+ break;
+
+ case DLL_THREAD_DETACH:
+ // thread-specific cleanup.
+ break;
+
+ case DLL_PROCESS_DETACH:
+ // any necessary cleanup.
+ break;
+ }
+
+ return TRUE;
+}
+
+
+STDAPI DllCanUnloadNow(void)
+{
+ LONG count = _Module.GetLockCount();
+ if (_Module.GetLockCount() == 0)
+ {
+ if (CPluginSettings::s_instance != NULL)
+ {
+ delete CPluginSettings::s_instance;
+ }
+
+ if (CPluginClass::s_mimeFilter != NULL)
+ {
+ CPluginClass::s_mimeFilter->Unregister();
+ CPluginClass::s_mimeFilter = NULL;
+ }
+
+ _CrtDumpMemoryLeaks();
+ }
+ return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
+}
+
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+{
+ return _Module.GetClassObject(rclsid, riid, ppv);
+}
+
+STDAPI DllRegisterServer(void)
+{
+ return _Module.RegisterServer(TRUE);
+}
+
+STDAPI DllUnregisterServer(void)
+{
+ return _Module.UnregisterServer(TRUE);
+}
+

Powered by Google App Engine
This is Rietveld