diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 22:19:26 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 22:19:26 +0000 |
commit | 31b5774e06e6355825dd6e8ddd480a322f5931ae (patch) | |
tree | 9fad6a547917e0e94dc0f483d4a265ba41ec8c03 /chrome_frame/test | |
parent | b24420c17bf0019da511dc85783ff6966537272e (diff) | |
download | chromium_src-31b5774e06e6355825dd6e8ddd480a322f5931ae.zip chromium_src-31b5774e06e6355825dd6e8ddd480a322f5931ae.tar.gz chromium_src-31b5774e06e6355825dd6e8ddd480a322f5931ae.tar.bz2 |
Fix Chrome frame builder redness.
The CLSCTX_ENABLE_CLOAKING flag if passed in to CoCreateInstance for Internet Explorer on IE causes the
API to fail with E_INVALIDARG. We now or in this flag only for vista or greater.
TBR=stoyan
Review URL: http://codereview.chromium.org/434013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r-- | chrome_frame/test/chrome_frame_unittests.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc index 225eda8..92ba2d0 100644 --- a/chrome_frame/test/chrome_frame_unittests.cc +++ b/chrome_frame/test/chrome_frame_unittests.cc @@ -1194,6 +1194,7 @@ HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser) { return E_INVALIDARG; HRESULT hr = S_OK; + DWORD cocreate_flags = CLSCTX_LOCAL_SERVER; chrome_frame_test::LowIntegrityToken token; if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) { // Create medium integrity browser that will launch IE broker. @@ -1208,11 +1209,13 @@ HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser) { hr = HRESULT_FROM_WIN32(GetLastError()); return hr; } + + cocreate_flags |= CLSCTX_ENABLE_CLOAKING; } hr = ::CoCreateInstance(CLSID_InternetExplorer, NULL, - CLSCTX_LOCAL_SERVER | CLSCTX_ENABLE_CLOAKING, IID_IWebBrowser2, - reinterpret_cast<void**>(web_browser)); + cocreate_flags, IID_IWebBrowser2, + reinterpret_cast<void**>(web_browser)); // ~LowIntegrityToken() will switch integrity back to medium. return hr; } |