Left: | ||
Right: |
OLD | NEW |
---|---|
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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
16 */ | 16 */ |
17 | 17 |
18 #include "PluginStdAfx.h" | 18 #include "PluginStdAfx.h" |
19 | 19 |
20 #include "PluginClass.h" | 20 #include "PluginClass.h" |
21 #include "PluginSettings.h" | 21 #include "PluginSettings.h" |
22 #include "PluginSystem.h" | 22 #include "PluginSystem.h" |
23 #include "PluginFilter.h" | 23 #include "PluginFilter.h" |
24 #include "PluginMimeFilterClient.h" | 24 #include "PluginMimeFilterClient.h" |
25 #include "PluginClient.h" | 25 #include "AdblockPlusClient.h" |
26 #include "PluginClientBase.h" | |
26 #include "PluginClientFactory.h" | 27 #include "PluginClientFactory.h" |
27 #include "PluginMutex.h" | 28 #include "PluginMutex.h" |
28 #include "sddl.h" | 29 #include "sddl.h" |
29 #include "PluginUtil.h" | 30 #include "PluginUtil.h" |
30 #include "PluginUserSettings.h" | 31 #include "PluginUserSettings.h" |
31 #include "../shared/Utils.h" | 32 #include "../shared/Utils.h" |
32 #include "../shared/Dictionary.h" | 33 #include "../shared/Dictionary.h" |
33 #include "../shared/IE_version.h" | 34 #include "../shared/IE_version.h" |
35 #include "../shared/Version.h" | |
34 #include <thread> | 36 #include <thread> |
Oleksandr
2015/03/19 04:39:32
thread, PluginUserSettings.h, sddl.h, PluginMutex.
Eric
2015/03/20 09:09:45
I removed all but <thread>. I left that one in bec
| |
35 #include <array> | 37 #include <array> |
36 | 38 |
37 #ifdef DEBUG_HIDE_EL | 39 #ifdef DEBUG_HIDE_EL |
38 DWORD profileTime = 0; | 40 DWORD profileTime = 0; |
39 #endif | 41 #endif |
40 | 42 |
43 extern CComModule _Module; | |
44 | |
41 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR); | 45 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR); |
42 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPR ECT); | 46 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPR ECT); |
43 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE); | 47 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE); |
44 | 48 |
45 HICON CPluginClass::s_hIcons[ICON_MAX] = { NULL, NULL, NULL }; | 49 HICON CPluginClass::s_hIcons[ICON_MAX] = { NULL, NULL, NULL }; |
46 DWORD CPluginClass::s_hIconTypes[ICON_MAX] = { IDI_ICON_DISABLED, IDI_ICON_ENABL ED, IDI_ICON_DEACTIVATED }; | 50 DWORD CPluginClass::s_hIconTypes[ICON_MAX] = { IDI_ICON_DISABLED, IDI_ICON_ENABL ED, IDI_ICON_DEACTIVATED }; |
47 uint32_t iconHeight = 32; | 51 uint32_t iconHeight = 32; |
48 uint32_t iconWidth = 32; | 52 uint32_t iconWidth = 32; |
49 | 53 |
50 CPluginMimeFilterClient* CPluginClass::s_mimeFilter = NULL; | 54 CPluginMimeFilterClient* CPluginClass::s_mimeFilter = NULL; |
(...skipping 1707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1758 s_criticalSectionLocal.Unlock(); | 1762 s_criticalSectionLocal.Unlock(); |
1759 | 1763 |
1760 } | 1764 } |
1761 } | 1765 } |
1762 } | 1766 } |
1763 | 1767 |
1764 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); | 1768 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); |
1765 } | 1769 } |
1766 return hTabWnd; | 1770 return hTabWnd; |
1767 } | 1771 } |
OLD | NEW |