Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/plugin/PluginTabBase.cpp

Issue 11450010: IE6 status bar and FRP fix. Debugging info added. (Closed)
Patch Set: Created Aug. 19, 2013, 8:12 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/plugin/PluginClass.cpp ('K') | « src/plugin/PluginTabBase.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/PluginTabBase.cpp
===================================================================
--- a/src/plugin/PluginTabBase.cpp
+++ b/src/plugin/PluginTabBase.cpp
@@ -111,15 +111,18 @@
void CPluginTabBase::InjectABP(IWebBrowser2* browser)
{
+ CriticalSection::Lock lock(m_csInject);
CString url = GetDocumentUrl();
CString log;
- log.Format(L"Current URL: %s, settings URL: %s", url, UserSettingsFileUrl().c_str());
+ log.Format(L"InjectABP. Current URL: %s, settings URL: %s", url, UserSettingsFileUrl().c_str());
DEBUG_GENERAL(log);
if (!(0 == url.CompareNoCase(CString(UserSettingsFileUrl().c_str())) ||
0 == url.CompareNoCase(CString(FirstRunPageFileUrl().c_str()))))
{
+ DEBUG_GENERAL(L"Not injecting");
return;
}
+ DEBUG_GENERAL(L"Going to inject");
CComPtr<IDispatch> pDocDispatch;
browser->get_Document(&pDocDispatch);
CComQIPtr<IHTMLDocument2> pDoc2 = pDocDispatch;
@@ -152,12 +155,15 @@
}
CComVariant var((IDispatch*)&m_pluginUserSettings);
+ DEBUG_GENERAL("Injecting");
+
DISPPARAMS params;
params.cArgs = 1;
params.cNamedArgs = 0;
params.rgvarg = &var;
params.rgdispidNamedArgs = 0;
hr = pWndEx->Invoke(dispid, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF, &params, 0, 0, 0);
+ DEBUG_GENERAL("Invoke");
if (FAILED(hr))
{
DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_CREATE_SETTINGS_JAVASCRIPT, PLUGIN_ERROR_CREATE_SETTINGS_JAVASCRIPT_INVOKE, "CPluginTabBase::InjectABP - Failed to create Settings in JavaScript");
« src/plugin/PluginClass.cpp ('K') | « src/plugin/PluginTabBase.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld