Left: | ||
Right: |
OLD | NEW |
---|---|
1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
2 | 2 |
3 #include <Wbemidl.h> | 3 #include <Wbemidl.h> |
4 #include <time.h> | 4 #include <time.h> |
5 #include "PluginSettings.h" | 5 #include "PluginSettings.h" |
6 #include "PluginClient.h" | 6 #include "PluginClient.h" |
7 #include "PluginSystem.h" | 7 #include "PluginSystem.h" |
8 #ifdef SUPPORT_FILTER | 8 #ifdef SUPPORT_FILTER |
9 #include "PluginFilter.h" | 9 #include "PluginFilter.h" |
10 #endif | 10 #endif |
11 #include "PluginMutex.h" | 11 #include "PluginMutex.h" |
12 #include "../shared/Utils.h" | 12 #include "../shared/Utils.h" |
13 #include <memory> | 13 #include <memory> |
14 | 14 |
15 | 15 |
16 // IE functions | 16 // IE functions |
17 #pragma comment(lib, "iepmapi.lib") | 17 #pragma comment(lib, "iepmapi.lib") |
18 | 18 |
19 #include <knownfolders.h> | 19 #include <knownfolders.h> |
20 | 20 |
21 namespace | 21 namespace |
22 { | 22 { |
23 std::wstring CreateDomainWhitelistingFilter(const CString domain) | 23 std::wstring CreateDomainWhitelistingFilter(const CString domain) |
24 { | 24 { |
25 return L"@@||" + domain + L"^$document"; | 25 return std::wstring(L"@@||") + domain.GetString() + std::wstring(L"^$documen t"); |
Felix Dahlke
2013/07/25 13:52:33
What is this change for? It worked before, didn't
Oleksandr
2013/07/26 14:20:04
This is just to remove the warning C4927 here. htt
| |
26 } | 26 } |
27 } | 27 } |
28 | 28 |
29 class TSettings | 29 class TSettings |
30 { | 30 { |
31 DWORD processorId; | 31 DWORD processorId; |
32 | 32 |
33 char sPluginId[44]; | 33 char sPluginId[44]; |
34 }; | 34 }; |
35 | 35 |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
380 std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstanc e()->GetListedSubscriptions(); | 380 std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstanc e()->GetListedSubscriptions(); |
381 if (subscriptions.size() > 0) | 381 if (subscriptions.size() > 0) |
382 return CString(subscriptions.front().url.c_str()); | 382 return CString(subscriptions.front().url.c_str()); |
383 else | 383 else |
384 return CString(L""); | 384 return CString(L""); |
385 } | 385 } |
386 | 386 |
387 | 387 |
388 | 388 |
389 #endif // SUPPORT_WHITELIST | 389 #endif // SUPPORT_WHITELIST |
OLD | NEW |