| Index: src/plugin/PluginDomTraverserBase.h |
| =================================================================== |
| --- a/src/plugin/PluginDomTraverserBase.h |
| +++ b/src/plugin/PluginDomTraverserBase.h |
| @@ -116,10 +116,10 @@ |
| DWORD res = WaitForSingleObject(m_tab->m_filter->hideFiltersLoadedEvent, ENGINE_STARTUP_TIMEOUT); |
| if (!IsEnabled()) return; |
| - VARIANT_BOOL isBusy; |
| + VARIANT_BOOL isBusy; |
| if (SUCCEEDED(pBrowser->get_Busy(&isBusy))) |
| { |
| - if (isBusy) |
| + if (isBusy != VARIANT_FALSE) |
| { |
| return; |
| } |
| @@ -154,12 +154,12 @@ |
| else |
| { |
| CComPtr<IHTMLElementCollection> pBodyCollection; |
| - if (FAILED(pDoc->getElementsByTagName(L"body", &pBodyCollection)) || !pBodyCollection) |
| + if (FAILED(pDoc->getElementsByTagName(ATL::CComBSTR(L"body"), &pBodyCollection)) || !pBodyCollection) |
| { |
| return; |
| } |
| - CComVariant vIndex(0); |
| + CComVariant vIndex(0); |
| CComPtr<IDispatch> pBodyDispatch; |
| if (FAILED(pBodyCollection->item(vIndex, vIndex, &pBodyDispatch)) || !pBodyDispatch) |
| { |
| @@ -177,7 +177,7 @@ |
| { |
| CComVariant vCacheIndex; |
| - if (FAILED(pBodyEl->getAttribute(L"abp", 0, &vCacheIndex)) || vCacheIndex.vt == VT_NULL) |
| + if (FAILED(pBodyEl->getAttribute(ATL::CComBSTR(L"abp"), 0, &vCacheIndex)) || vCacheIndex.vt == VT_NULL) |
| { |
| ClearCache(); |
| } |
| @@ -203,7 +203,7 @@ |
| // eg. http://gamecopyworld.com/ |
| long frameCount = 0; |
| CComPtr<IHTMLElementCollection> pFrameCollection; |
| - if (SUCCEEDED(pDoc->getElementsByTagName(L"frame", &pFrameCollection)) && pFrameCollection) |
| + if (SUCCEEDED(pDoc->getElementsByTagName(ATL::CComBSTR(L"frame"), &pFrameCollection)) && pFrameCollection) |
| { |
| pFrameCollection->get_length(&frameCount); |
| } |
| @@ -243,7 +243,7 @@ |
| { |
| long frameCount = 0; |
| CComPtr<IHTMLElementCollection> pFrameCollection; |
| - if (SUCCEEDED(pDoc->getElementsByTagName(L"iframe", &pFrameCollection)) && pFrameCollection) |
| + if (SUCCEEDED(pDoc->getElementsByTagName(ATL::CComBSTR(L"iframe"), &pFrameCollection)) && pFrameCollection) |
| { |
| pFrameCollection->get_length(&frameCount); |
| } |
| @@ -262,7 +262,7 @@ |
| { |
| CComVariant vAttr; |
| - if (SUCCEEDED(pFrameEl->getAttribute(L"src", 0, &vAttr)) && vAttr.vt == VT_BSTR && ::SysStringLen(vAttr.bstrVal) > 0) |
| + if (SUCCEEDED(pFrameEl->getAttribute(ATL::CComBSTR(L"scr"), 0, &vAttr)) && vAttr.vt == VT_BSTR && ::SysStringLen(vAttr.bstrVal) > 0) |
| { |
| CString src = vAttr.bstrVal; |
| @@ -307,7 +307,7 @@ |
| m_criticalSection.Lock(); |
| { |
| CComVariant vCacheIndex; |
| - if (isCached && SUCCEEDED(pEl->getAttribute(L"abp", 0, &vCacheIndex)) && vCacheIndex.vt == VT_I4) |
| + if (isCached && SUCCEEDED(pEl->getAttribute(ATL::CComBSTR(L"abp"), 0, &vCacheIndex)) && vCacheIndex.vt == VT_I4) |
| { |
| cacheIndex = vCacheIndex.intVal; |
| @@ -338,7 +338,7 @@ |
| vCacheIndex.vt = VT_I4; |
| vCacheIndex.intVal = cacheIndex; |
| - pEl->setAttribute(L"abp", vCacheIndex); |
| + pEl->setAttribute(ATL::CComBSTR(L"abp"), vCacheIndex); |
| } |
| } |
| m_criticalSection.Unlock(); |