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

Side by Side Diff: src/plugin/Plugin.cpp

Issue 5032147387678720: NoIssue - Refactor HTTP and HTTPS namespaces registration
Patch Set: Created April 13, 2015, 3:14 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/plugin/AdblockPlusClient.cpp ('k') | src/plugin/PluginClass.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 STDAPI DllCanUnloadNow(void) 78 STDAPI DllCanUnloadNow(void)
79 { 79 {
80 LONG count = _Module.GetLockCount(); 80 LONG count = _Module.GetLockCount();
81 if (_Module.GetLockCount() == 0) 81 if (_Module.GetLockCount() == 0)
82 { 82 {
83 if (CPluginSettings::s_instance != NULL) 83 if (CPluginSettings::s_instance != NULL)
84 { 84 {
85 delete CPluginSettings::s_instance; 85 delete CPluginSettings::s_instance;
86 } 86 }
87 87
88 if (CPluginClass::s_mimeFilter != NULL)
89 {
90 CPluginClass::s_mimeFilter->Unregister();
91 CPluginClass::s_mimeFilter = NULL;
92 }
93
94 _CrtDumpMemoryLeaks(); 88 _CrtDumpMemoryLeaks();
95 } 89 }
96 return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE; 90 return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
97 } 91 }
98 92
99 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) 93 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
100 { 94 {
101 return _Module.GetClassObject(rclsid, riid, ppv); 95 return _Module.GetClassObject(rclsid, riid, ppv);
102 } 96 }
103 97
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 EXTERN_C void STDAPICALLTYPE OnInstall(MSIHANDLE hInstall, MSIHANDLE tmp) 136 EXTERN_C void STDAPICALLTYPE OnInstall(MSIHANDLE hInstall, MSIHANDLE tmp)
143 { 137 {
144 InitPlugin(true); 138 InitPlugin(true);
145 } 139 }
146 140
147 // Called from updater 141 // Called from updater
148 EXTERN_C void STDAPICALLTYPE OnUpdate(void) 142 EXTERN_C void STDAPICALLTYPE OnUpdate(void)
149 { 143 {
150 InitPlugin(false); 144 InitPlugin(false);
151 } 145 }
OLDNEW
« no previous file with comments | « src/plugin/AdblockPlusClient.cpp ('k') | src/plugin/PluginClass.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld