| OLD | NEW |
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
| 2 | 2 |
| 3 #include "PluginWbPassThrough.h" | 3 #include "PluginWbPassThrough.h" |
| 4 #include "PluginClient.h" | 4 #include "PluginClient.h" |
| 5 #include "PluginClientFactory.h" | 5 #include "PluginClientFactory.h" |
| 6 #include "PluginFilter.h" | 6 #include "PluginFilter.h" |
| 7 #include "PluginSettings.h" | 7 #include "PluginSettings.h" |
| 8 #include "PluginClass.h" | 8 #include "PluginClass.h" |
| 9 #include "PluginSystem.h" | 9 #include "PluginSystem.h" |
| 10 | 10 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 | 164 |
| 165 | 165 |
| 166 if (tab && client) | 166 if (tab && client) |
| 167 { | 167 { |
| 168 CString documentUrl = tab->GetDocumentUrl(); | 168 CString documentUrl = tab->GetDocumentUrl(); |
| 169 // Page is identical to document => don't block | 169 // Page is identical to document => don't block |
| 170 if (documentUrl == src) | 170 if (documentUrl == src) |
| 171 { | 171 { |
| 172 // fall through | 172 // fall through |
| 173 } | 173 } |
| 174 else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhi
telistedUrl(std::wstring(documentUrl))) | 174 else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhi
telistedUrl(to_wstring(documentUrl))) |
| 175 { | 175 { |
| 176 boundDomain = tab->GetDocumentUrl(); | 176 boundDomain = tab->GetDocumentUrl(); |
| 177 contentType = CFilter::contentTypeAny; | 177 contentType = CFilter::contentTypeAny; |
| 178 if ((tab != 0) && (tab->IsFrameCached(src))) | 178 if ((tab != 0) && (tab->IsFrameCached(src))) |
| 179 { | 179 { |
| 180 contentType = CFilter::contentTypeSubdocument; | 180 contentType = CFilter::contentTypeSubdocument; |
| 181 } | 181 } |
| 182 else | 182 else |
| 183 { | 183 { |
| 184 contentType = GetContentType(mimeType, boundDomain, src); | 184 contentType = GetContentType(mimeType, boundDomain, src); |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, | 387 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, |
| 388 dwReserved, m_spInternetProtocol); | 388 dwReserved, m_spInternetProtocol); |
| 389 } | 389 } |
| 390 | 390 |
| 391 STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/*
[out] */ ULONG *pcbRead) | 391 STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/*
[out] */ ULONG *pcbRead) |
| 392 { | 392 { |
| 393 | 393 |
| 394 WBPassthruSink* pSink = GetSink(); | 394 WBPassthruSink* pSink = GetSink(); |
| 395 return pSink->Read(pv, cb, pcbRead); | 395 return pSink->Read(pv, cb, pcbRead); |
| 396 } | 396 } |
| OLD | NEW |