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 #include "AdblockPlusClient.h" |
19 #include "PluginSettings.h" | 20 #include "PluginSettings.h" |
20 #include "PluginSystem.h" | 21 #include "PluginSystem.h" |
21 #include "PluginFilter.h" | 22 #include "PluginFilter.h" |
22 #include "PluginClientFactory.h" | |
23 #include "PluginMutex.h" | 23 #include "PluginMutex.h" |
24 #include "PluginClass.h" | 24 #include "PluginClass.h" |
25 | |
26 #include "AdblockPlusClient.h" | |
27 | |
28 #include "../shared/Utils.h" | 25 #include "../shared/Utils.h" |
29 | 26 |
30 namespace | 27 namespace |
31 { | 28 { |
32 void SpawnAdblockPlusEngine() | 29 void SpawnAdblockPlusEngine() |
33 { | 30 { |
34 std::wstring engineExecutablePath = GetDllDir() + L"AdblockPlusEngine.exe"; | 31 std::wstring engineExecutablePath = GetDllDir() + L"AdblockPlusEngine.exe"; |
35 CString params = ToCString(L"AdblockPlusEngine.exe " + GetBrowserLanguage())
; | 32 CString params = ToCString(L"AdblockPlusEngine.exe " + GetBrowserLanguage())
; |
36 | 33 |
37 STARTUPINFO startupInfo = {}; | 34 STARTUPINFO startupInfo = {}; |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 DEBUG_GENERAL("CompareVersions"); | 555 DEBUG_GENERAL("CompareVersions"); |
559 Communication::OutputBuffer request; | 556 Communication::OutputBuffer request; |
560 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S
tring(v2); | 557 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S
tring(v2); |
561 Communication::InputBuffer response; | 558 Communication::InputBuffer response; |
562 if (!CallEngine(request, response)) | 559 if (!CallEngine(request, response)) |
563 return 0; | 560 return 0; |
564 int result; | 561 int result; |
565 response >> result; | 562 response >> result; |
566 return result; | 563 return result; |
567 } | 564 } |
OLD | NEW |