| OLD | NEW |
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
| 2 | 2 |
| 3 #include "PluginFilter.h" | 3 #include "PluginFilter.h" |
| 4 #include "PluginSettings.h" | 4 #include "PluginSettings.h" |
| 5 #include "PluginClient.h" | 5 #include "PluginClient.h" |
| 6 #include "PluginClientFactory.h" | 6 #include "PluginClientFactory.h" |
| 7 #include "PluginMutex.h" | 7 #include "PluginMutex.h" |
| 8 #include "PluginSettings.h" | 8 #include "PluginSettings.h" |
| 9 #include "PluginSystem.h" | 9 #include "PluginSystem.h" |
| 10 #include "PluginClass.h" | 10 #include "PluginClass.h" |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 } | 529 } |
| 530 } | 530 } |
| 531 } while (separatorChar != '\0'); | 531 } while (separatorChar != '\0'); |
| 532 } | 532 } |
| 533 | 533 |
| 534 return true; | 534 return true; |
| 535 } | 535 } |
| 536 | 536 |
| 537 bool CPluginFilter::IsElementHidden(const std::wstring& tag, IHTMLElement* pEl,
const std::wstring& domain, const std::wstring& indent) const | 537 bool CPluginFilter::IsElementHidden(const std::wstring& tag, IHTMLElement* pEl,
const std::wstring& domain, const std::wstring& indent) const |
| 538 { | 538 { |
| 539 CString tagCString = to_CString(tag); | 539 CString tagCString = ToCString(tag); |
| 540 | 540 |
| 541 CString id; | 541 CString id; |
| 542 CComBSTR bstrId; | 542 CComBSTR bstrId; |
| 543 if (SUCCEEDED(pEl->get_id(&bstrId)) && bstrId) | 543 if (SUCCEEDED(pEl->get_id(&bstrId)) && bstrId) |
| 544 { | 544 { |
| 545 id = bstrId; | 545 id = bstrId; |
| 546 } | 546 } |
| 547 | 547 |
| 548 CString classNames; | 548 CString classNames; |
| 549 CComBSTR bstrClassNames; | 549 CComBSTR bstrClassNames; |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 type = "OTHER"; | 721 type = "OTHER"; |
| 722 | 722 |
| 723 std::map<int,CString>::const_iterator it = m_contentMapText.find(contentType
); | 723 std::map<int,CString>::const_iterator it = m_contentMapText.find(contentType
); |
| 724 if (it != m_contentMapText.end()) | 724 if (it != m_contentMapText.end()) |
| 725 { | 725 { |
| 726 type = it->second; | 726 type = it->second; |
| 727 } | 727 } |
| 728 } | 728 } |
| 729 | 729 |
| 730 CPluginClient* client = CPluginClient::GetInstance(); | 730 CPluginClient* client = CPluginClient::GetInstance(); |
| 731 if (client->Matches(srcTrimmed, to_wstring(type), domain)) | 731 if (client->Matches(srcTrimmed, ToWstring(type), domain)) |
| 732 { | 732 { |
| 733 if (addDebug) | 733 if (addDebug) |
| 734 { | 734 { |
| 735 DEBUG_FILTER("Filter::ShouldBlock " + type + " YES") | 735 DEBUG_FILTER("Filter::ShouldBlock " + type + " YES") |
| 736 | 736 |
| 737 #ifdef ENABLE_DEBUG_RESULT | 737 #ifdef ENABLE_DEBUG_RESULT |
| 738 CPluginDebug::DebugResultBlocking(type, srcTrimmed, domain); | 738 CPluginDebug::DebugResultBlocking(type, srcTrimmed, domain); |
| 739 #endif | 739 #endif |
| 740 } | 740 } |
| 741 return true; | 741 return true; |
| 742 } | 742 } |
| 743 #ifdef ENABLE_DEBUG_RESULT | 743 #ifdef ENABLE_DEBUG_RESULT |
| 744 CPluginDebug::DebugResultIgnoring(type, srcTrimmed, domain); | 744 CPluginDebug::DebugResultIgnoring(type, srcTrimmed, domain); |
| 745 #endif | 745 #endif |
| 746 return false; | 746 return false; |
| 747 } | 747 } |
| OLD | NEW |