| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 #include <AdblockPlus.h> | 1 #include <AdblockPlus.h> |
| 2 #include <functional> | 2 #include <functional> |
| 3 #include <vector> | 3 #include <vector> |
| 4 #include <Windows.h> | 4 #include <Windows.h> |
| 5 | 5 |
| 6 #include "../shared/AutoHandle.h" | 6 #include "../shared/AutoHandle.h" |
| 7 #include "../shared/Communication.h" | 7 #include "../shared/Communication.h" |
| 8 #include "../shared/Dictionary.h" | 8 #include "../shared/Dictionary.h" |
| 9 #include "../shared/Utils.h" | 9 #include "../shared/Utils.h" |
| 10 #include "../shared/Version.h" | 10 #include "../shared/Version.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 Updater updater(jsEngine, params[0]->AsString()); | 163 Updater updater(jsEngine, params[0]->AsString()); |
| 164 updater.Update(); | 164 updater.Update(); |
| 165 } | 165 } |
| 166 } | 166 } |
| 167 | 167 |
| 168 std::auto_ptr<AdblockPlus::FilterEngine> CreateFilterEngine(const std::wstring& locale) | 168 std::auto_ptr<AdblockPlus::FilterEngine> CreateFilterEngine(const std::wstring& locale) |
| 169 { | 169 { |
| 170 AdblockPlus::AppInfo appInfo; | 170 AdblockPlus::AppInfo appInfo; |
| 171 appInfo.version = ToUtf8String(IEPLUGIN_VERSION); | 171 appInfo.version = ToUtf8String(IEPLUGIN_VERSION); |
| 172 appInfo.name = "adblockplusie"; | 172 appInfo.name = "adblockplusie"; |
| 173 appInfo.platform = "msie"; | 173 #ifdef _WIN64 |
| 174 appInfo.platform = "win64"; | |
|
Felix Dahlke
2013/06/11 10:07:52
Not sure what we'll want to use the platform for,
Wladimir Palant
2013/06/11 14:42:10
It is used for some branching in the JS code. And
| |
| 175 #else | |
| 176 appInfo.platform = "win32"; | |
| 177 #endif | |
| 174 appInfo.locale = ToUtf8String(locale); | 178 appInfo.locale = ToUtf8String(locale); |
| 175 #ifdef ADBLOCK_PLUS_TEST_MODE | 179 #ifdef ADBLOCK_PLUS_TEST_MODE |
| 176 appInfo.developmentBuild = true; | 180 appInfo.developmentBuild = true; |
| 177 #else | 181 #else |
| 178 appInfo.developmentBuild = false; | 182 appInfo.developmentBuild = false; |
| 179 #endif | 183 #endif |
| 180 | 184 |
| 181 AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::New(appInfo); | 185 AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::New(appInfo); |
| 182 jsEngine->SetEventCallback("updateAvailable", | 186 jsEngine->SetEventCallback("updateAvailable", |
| 183 std::bind(&OnUpdateAvailable, jsEngine, std::placeholders::_1)); | 187 std::bind(&OnUpdateAvailable, jsEngine, std::placeholders::_1)); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 229 } | 233 } |
| 230 catch (std::runtime_error e) | 234 catch (std::runtime_error e) |
| 231 { | 235 { |
| 232 DebugException(e); | 236 DebugException(e); |
| 233 return 1; | 237 return 1; |
| 234 } | 238 } |
| 235 } | 239 } |
| 236 | 240 |
| 237 return 0; | 241 return 0; |
| 238 } | 242 } |
| OLD | NEW |