| 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 #ifdef SUPPORT_FILTER | 6 #ifdef SUPPORT_FILTER | 
| 7 #include "PluginFilter.h" | 7 #include "PluginFilter.h" | 
| 8 #endif | 8 #endif | 
| 9 #include "PluginSettings.h" | 9 #include "PluginSettings.h" | 
| 10 #include "PluginClass.h" | 10 #include "PluginClass.h" | 
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 181       contentType = CFilter::contentTypeAny; | 181       contentType = CFilter::contentTypeAny; | 
| 182 | 182 | 
| 183 #ifdef SUPPORT_FRAME_CACHING | 183 #ifdef SUPPORT_FRAME_CACHING | 
| 184       if ((tab != 0) && (tab->IsFrameCached(src))) | 184       if ((tab != 0) && (tab->IsFrameCached(src))) | 
| 185       { | 185       { | 
| 186         contentType = CFilter::contentTypeSubdocument; | 186         contentType = CFilter::contentTypeSubdocument; | 
| 187       } | 187       } | 
| 188       else | 188       else | 
| 189 #endif // SUPPORT_FRAME_CACHING | 189 #endif // SUPPORT_FRAME_CACHING | 
| 190       contentType = GetContentType(mimeType, boundDomain, src); | 190       contentType = GetContentType(mimeType, boundDomain, src); | 
| 191       if (client->ShouldBlock(src, contentType, boundDomain, true)) | 191       if (client->ShouldBlock(to_wstring(src), contentType, to_wstring(boundDoma
     in), true)) | 
| 192       { | 192       { | 
| 193         isBlocked = true; | 193         isBlocked = true; | 
| 194 |  | 
| 195         DEBUG_BLOCKER("Blocker::Blocking Http-request:" + src); | 194         DEBUG_BLOCKER("Blocker::Blocking Http-request:" + src); | 
| 196       } | 195       } | 
| 197     } | 196     } | 
| 198     if (!isBlocked) | 197     if (!isBlocked) | 
| 199     { | 198     { | 
| 200       DEBUG_BLOCKER("Blocker::Ignoring Http-request:" + src) | 199       DEBUG_BLOCKER("Blocker::Ignoring Http-request:" + src) | 
| 201     } | 200     } | 
| 202   } | 201   } | 
| 203 | 202 | 
| 204 | 203 | 
| 205   if (tab == NULL) | 204   if (tab == NULL) | 
| 206   { | 205   { | 
| 207     contentType = GetContentType(mimeType, boundDomain, src); | 206     contentType = GetContentType(mimeType, boundDomain, src); | 
| 208     if (client->ShouldBlock(src, contentType, boundDomain, true)) | 207     if (client->ShouldBlock(to_wstring(src), contentType, to_wstring(boundDomain
     ), true)) | 
| 209     { | 208     { | 
| 210       isBlocked = true; | 209       isBlocked = true; | 
| 211     } | 210     } | 
| 212   } | 211   } | 
| 213 | 212 | 
| 214 #ifdef _DEBUG | 213 #ifdef _DEBUG | 
| 215   CString type; | 214   CString type; | 
| 216 | 215 | 
| 217   if (contentType == CFilter::contentTypeDocument) type = "DOCUMENT"; | 216   if (contentType == CFilter::contentTypeDocument) type = "DOCUMENT"; | 
| 218   else if (contentType == CFilter::contentTypeObject) type = "OBJECT"; | 217   else if (contentType == CFilter::contentTypeObject) type = "OBJECT"; | 
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 395   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, | 394   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, | 
| 396     dwReserved, m_spInternetProtocol); | 395     dwReserved, m_spInternetProtocol); | 
| 397 } | 396 } | 
| 398 | 397 | 
| 399  STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/* 
     [out] */ ULONG *pcbRead) | 398  STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/* 
     [out] */ ULONG *pcbRead) | 
| 400  { | 399  { | 
| 401 | 400 | 
| 402    WBPassthruSink* pSink = GetSink(); | 401    WBPassthruSink* pSink = GetSink(); | 
| 403    return pSink->Read(pv, cb, pcbRead); | 402    return pSink->Read(pv, cb, pcbRead); | 
| 404  } | 403  } | 
| OLD | NEW | 
|---|