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

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

Issue 5491870822039552: Issue #1234 - Remove old versions of ToWstring and ToCString (Closed)
Patch Set: Created Jan. 13, 2015, 3:35 p.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/ATL_Deprecate.cpp ('k') | src/plugin/AdblockPlusDomTraverser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 #include "PluginSettings.h" 2 #include "PluginSettings.h"
3 #include "PluginSystem.h" 3 #include "PluginSystem.h"
4 #include "PluginFilter.h" 4 #include "PluginFilter.h"
5 #include "PluginClientFactory.h" 5 #include "PluginClientFactory.h"
6 #include "PluginMutex.h" 6 #include "PluginMutex.h"
7 #include "PluginClass.h" 7 #include "PluginClass.h"
8 8
9 #include "AdblockPlusClient.h" 9 #include "AdblockPlusClient.h"
10 10
11 #include "../shared/Utils.h" 11 #include "../shared/Utils.h"
12 12
13 namespace 13 namespace
14 { 14 {
15 void SpawnAdblockPlusEngine() 15 void SpawnAdblockPlusEngine()
16 { 16 {
17 std::wstring engineExecutablePath = GetDllDir() + L"AdblockPlusEngine.exe"; 17 std::wstring engineExecutablePath = GetDllDir() + L"AdblockPlusEngine.exe";
18 CString params = to_CString(L"AdblockPlusEngine.exe " + GetBrowserLanguage() ); 18 CString params = ToCString(L"AdblockPlusEngine.exe " + GetBrowserLanguage()) ;
19 19
20 STARTUPINFO startupInfo = {}; 20 STARTUPINFO startupInfo = {};
21 PROCESS_INFORMATION processInformation = {}; 21 PROCESS_INFORMATION processInformation = {};
22 22
23 HANDLE token; 23 HANDLE token;
24 OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_ADJUST_DEFAULT | TOKEN_QUERY | TOKEN_ASSIGN_PRIMARY, &token); 24 OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_ADJUST_DEFAULT | TOKEN_QUERY | TOKEN_ASSIGN_PRIMARY, &token);
25 25
26 TOKEN_APPCONTAINER_INFORMATION *acs = NULL; 26 TOKEN_APPCONTAINER_INFORMATION *acs = NULL;
27 DWORD length = 0; 27 DWORD length = 0;
28 28
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 DEBUG_GENERAL("CompareVersions"); 549 DEBUG_GENERAL("CompareVersions");
550 Communication::OutputBuffer request; 550 Communication::OutputBuffer request;
551 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S tring(v2); 551 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S tring(v2);
552 Communication::InputBuffer response; 552 Communication::InputBuffer response;
553 if (!CallEngine(request, response)) 553 if (!CallEngine(request, response))
554 return 0; 554 return 0;
555 int result; 555 int result;
556 response >> result; 556 response >> result;
557 return result; 557 return result;
558 } 558 }
OLDNEW
« no previous file with comments | « src/plugin/ATL_Deprecate.cpp ('k') | src/plugin/AdblockPlusDomTraverser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld