| OLD | NEW |
| 1 #include <AdblockPlus.h> | 1 #include <AdblockPlus.h> |
| 2 #include <functional> | 2 #include <functional> |
| 3 #include <vector> | 3 #include <vector> |
| 4 #include <thread> | 4 #include <thread> |
| 5 #include <Windows.h> | 5 #include <Windows.h> |
| 6 | 6 |
| 7 #include "../shared/AutoHandle.h" | 7 #include "../shared/AutoHandle.h" |
| 8 #include "../shared/Communication.h" | 8 #include "../shared/Communication.h" |
| 9 #include "../shared/Dictionary.h" | 9 #include "../shared/Dictionary.h" |
| 10 #include "../shared/Utils.h" | 10 #include "../shared/Utils.h" |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 std::auto_ptr<AdblockPlus::FilterEngine> CreateFilterEngine(const std::wstring&
locale) | 367 std::auto_ptr<AdblockPlus::FilterEngine> CreateFilterEngine(const std::wstring&
locale) |
| 368 { | 368 { |
| 369 AdblockPlus::AppInfo appInfo; | 369 AdblockPlus::AppInfo appInfo; |
| 370 appInfo.version = ToUtf8String(IEPLUGIN_VERSION); | 370 appInfo.version = ToUtf8String(IEPLUGIN_VERSION); |
| 371 appInfo.name = "adblockplusie"; | 371 appInfo.name = "adblockplusie"; |
| 372 #ifdef _WIN64 | 372 #ifdef _WIN64 |
| 373 appInfo.application = "msie64"; | 373 appInfo.application = "msie64"; |
| 374 #else | 374 #else |
| 375 appInfo.application = "msie32"; | 375 appInfo.application = "msie32"; |
| 376 #endif | 376 #endif |
| 377 // TODO: Set applicationVersion parameter | 377 appInfo.applicationVersion = ToUtf8String( ABP::IE::installed_version_string()
); |
| 378 appInfo.locale = ToUtf8String(locale); | 378 appInfo.locale = ToUtf8String(locale); |
| 379 #ifdef ADBLOCK_PLUS_TEST_MODE | 379 #ifdef ADBLOCK_PLUS_TEST_MODE |
| 380 appInfo.developmentBuild = true; | 380 appInfo.developmentBuild = true; |
| 381 #else | 381 #else |
| 382 appInfo.developmentBuild = false; | 382 appInfo.developmentBuild = false; |
| 383 #endif | 383 #endif |
| 384 | 384 |
| 385 AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::New(appInfo); | 385 AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::New(appInfo); |
| 386 jsEngine->SetEventCallback("updateAvailable", &OnUpdateAvailable); | 386 jsEngine->SetEventCallback("updateAvailable", &OnUpdateAvailable); |
| 387 | 387 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 } | 436 } |
| 437 catch (const std::runtime_error& e) | 437 catch (const std::runtime_error& e) |
| 438 { | 438 { |
| 439 DebugException(e); | 439 DebugException(e); |
| 440 return 1; | 440 return 1; |
| 441 } | 441 } |
| 442 } | 442 } |
| 443 | 443 |
| 444 return 0; | 444 return 0; |
| 445 } | 445 } |
| OLD | NEW |