diff options
Diffstat (limited to 'chrome')
30 files changed, 28 insertions, 896 deletions
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc index 4e61732..1b62b9a 100644 --- a/chrome/browser/chrome_plugin_host.cc +++ b/chrome/browser/chrome_plugin_host.cc @@ -711,7 +711,7 @@ CPError STDCALL CPB_SendMessage(CPID id, const void *data, uint32 data_len) { if (!service) return CPERR_FAILURE; PluginProcessHost *host = - service->FindOrStartPluginProcess(plugin->filename(), std::string()); + service->FindOrStartPluginProcess(plugin->filename()); if (!host) return CPERR_FAILURE; diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 49bbba4..0befa1c 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -329,7 +329,6 @@ PluginProcessHost::~PluginProcessHost() { } bool PluginProcessHost::Init(const WebPluginInfo& info, - const std::string& activex_clsid, const std::wstring& locale) { info_ = info; set_name(info_.name); @@ -363,7 +362,6 @@ bool PluginProcessHost::Init(const WebPluginInfo& info, switches::kLoggingLevel, switches::kLogPluginMessages, switches::kUserDataDir, - switches::kAllowAllActiveX, switches::kEnableDCHECK, switches::kSilentDumpOnDCHECK, switches::kMemoryProfiling, diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h index 7b5c6c1..66b5098 100644 --- a/chrome/browser/plugin_process_host.h +++ b/chrome/browser/plugin_process_host.h @@ -40,12 +40,8 @@ class PluginProcessHost : public ChildProcessHost, ~PluginProcessHost(); // Initialize the new plugin process, returning true on success. This must - // be called before the object can be used. If plugin_path is the - // ActiveX-shim, then activex_clsid is the class id of ActiveX control, - // otherwise activex_clsid is ignored. - bool Init(const WebPluginInfo& info, - const std::string& activex_clsid, - const std::wstring& locale); + // be called before the object can be used. + bool Init(const WebPluginInfo& info, const std::wstring& locale); virtual void OnMessageReceived(const IPC::Message& msg); virtual void OnChannelConnected(int32 peer_pid); diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index ac36b16..1d767bd 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -116,8 +116,7 @@ PluginProcessHost* PluginService::FindPluginProcess( } PluginProcessHost* PluginService::FindOrStartPluginProcess( - const FilePath& plugin_path, - const std::string& clsid) { + const FilePath& plugin_path) { DCHECK(MessageLoop::current() == ChromeThread::GetMessageLoop(ChromeThread::IO)); @@ -134,7 +133,7 @@ PluginProcessHost* PluginService::FindOrStartPluginProcess( // This plugin isn't loaded by any plugin process, so create a new process. plugin_host = new PluginProcessHost(); - if (!plugin_host->Init(info, clsid, ui_locale_)) { + if (!plugin_host->Init(info, ui_locale_)) { DCHECK(false); // Init is not expected to fail delete plugin_host; return NULL; @@ -144,36 +143,34 @@ PluginProcessHost* PluginService::FindOrStartPluginProcess( } void PluginService::OpenChannelToPlugin( - ResourceMessageFilter* renderer_msg_filter, const GURL& url, - const std::string& mime_type, const std::string& clsid, - const std::wstring& locale, IPC::Message* reply_msg) { + ResourceMessageFilter* renderer_msg_filter, + const GURL& url, + const std::string& mime_type, + const std::wstring& locale, + IPC::Message* reply_msg) { DCHECK(MessageLoop::current() == ChromeThread::GetMessageLoop(ChromeThread::IO)); // We don't need a policy URL here because that was already checked by a // previous call to GetPluginPath. GURL policy_url; - FilePath plugin_path = GetPluginPath(url, policy_url, mime_type, clsid, NULL); - PluginProcessHost* plugin_host = FindOrStartPluginProcess(plugin_path, clsid); + FilePath plugin_path = GetPluginPath(url, policy_url, mime_type, NULL); + PluginProcessHost* plugin_host = FindOrStartPluginProcess(plugin_path); if (plugin_host) { plugin_host->OpenChannelToPlugin(renderer_msg_filter, mime_type, reply_msg); } else { - PluginProcessHost::ReplyToRenderer(renderer_msg_filter, - IPC::ChannelHandle(), - WebPluginInfo(), - reply_msg); + PluginProcessHost::ReplyToRenderer( + renderer_msg_filter, IPC::ChannelHandle(), WebPluginInfo(), reply_msg); } } FilePath PluginService::GetPluginPath(const GURL& url, const GURL& policy_url, const std::string& mime_type, - const std::string& clsid, std::string* actual_mime_type) { bool allow_wildcard = true; WebPluginInfo info; - if (NPAPI::PluginList::Singleton()->GetPluginInfo(url, mime_type, clsid, - allow_wildcard, &info, - actual_mime_type) && + if (NPAPI::PluginList::Singleton()->GetPluginInfo( + url, mime_type, allow_wildcard, &info, actual_mime_type) && PluginAllowedForURL(info.path, policy_url)) { return info.path; } diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h index 6933895..c9ee5a1 100644 --- a/chrome/browser/plugin_service.h +++ b/chrome/browser/plugin_service.h @@ -65,8 +65,7 @@ class PluginService // has been started by this service. This will start a process to host the // 'plugin_path' if needed. If the process fails to start, the return value // is NULL. Must be called on the IO thread. - PluginProcessHost* FindOrStartPluginProcess(const FilePath& plugin_path, - const std::string& clsid); + PluginProcessHost* FindOrStartPluginProcess(const FilePath& plugin_path); // Opens a channel to a plugin process for the given mime type, starting // a new plugin process if necessary. This must be called on the IO thread @@ -74,7 +73,6 @@ class PluginService void OpenChannelToPlugin(ResourceMessageFilter* renderer_msg_filter, const GURL& url, const std::string& mime_type, - const std::string& clsid, const std::wstring& locale, IPC::Message* reply_msg); @@ -84,7 +82,6 @@ class PluginService FilePath GetPluginPath(const GURL& url, const GURL& policy_url, const std::string& mime_type, - const std::string& clsid, std::string* actual_mime_type); // The UI thread's message loop diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 65b948a5..25bb3d4 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -327,7 +327,6 @@ bool BrowserRenderProcessHost::Init() { switches::kDisableLogging, switches::kLoggingLevel, switches::kDebugPrint, - switches::kAllowAllActiveX, switches::kMemoryProfiling, switches::kEnableWatchdog, switches::kMessageLoopHistogrammer, diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc index 53e78097..641f577 100644 --- a/chrome/browser/renderer_host/buffered_resource_handler.cc +++ b/chrome/browser/renderer_host/buffered_resource_handler.cc @@ -419,7 +419,7 @@ bool BufferedResourceHandler::ShouldDownload(bool* need_plugin_list) { WebPluginInfo info; bool allow_wildcard = false; return !NPAPI::PluginList::Singleton()->GetPluginInfo( - GURL(), type, "", allow_wildcard, &info, NULL); + GURL(), type, allow_wildcard, &info, NULL); } void BufferedResourceHandler::LoadPlugins(BufferedResourceHandler* handler, diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 059f2af..ed4a525 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -552,20 +552,18 @@ void ResourceMessageFilter::OnPluginsLoaded(IPC::Message* reply_msg) { void ResourceMessageFilter::OnGetPluginPath(const GURL& url, const GURL& policy_url, const std::string& mime_type, - const std::string& clsid, FilePath* filename, std::string* url_mime_type) { *filename = plugin_service_->GetPluginPath( - url, policy_url, mime_type, clsid, url_mime_type); + url, policy_url, mime_type, url_mime_type); } void ResourceMessageFilter::OnOpenChannelToPlugin(const GURL& url, const std::string& mime_type, - const std::string& clsid, const std::wstring& locale, IPC::Message* reply_msg) { plugin_service_->OpenChannelToPlugin( - this, url, mime_type, clsid, locale, reply_msg); + this, url, mime_type, locale, reply_msg); } void ResourceMessageFilter::OnCreateDedicatedWorker(const GURL& url, diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index 7fd7979..feb1e54 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -145,12 +145,10 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter, void OnGetPluginPath(const GURL& url, const GURL& policy_url, const std::string& mime_type, - const std::string& clsid, FilePath* filename, std::string* actual_mime_type); void OnOpenChannelToPlugin(const GURL& url, const std::string& mime_type, - const std::string& clsid, const std::wstring& locale, IPC::Message* reply_msg); void OnCreateDedicatedWorker(const GURL& url, diff --git a/chrome/browser/sandbox_policy.cc b/chrome/browser/sandbox_policy.cc index a447650..13f4ee2 100644 --- a/chrome/browser/sandbox_policy.cc +++ b/chrome/browser/sandbox_policy.cc @@ -279,9 +279,7 @@ bool ApplyPolicyForUntrustedPlugin(sandbox::TargetPolicy* policy) { } // Adds the custom policy rules for a given plugin. |trusted_plugins| contains -// the comma separate list of plugins that should not be sandboxed. The plugin -// in the list can be either the plugin dll name of the class id if it's an -// ActiveX. +// the comma separate list of plugin dll names that should not be sandboxed. bool AddPolicyForPlugin(const CommandLine* cmd_line, sandbox::TargetPolicy* policy) { std::wstring plugin_dll = cmd_line-> diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 41f420f..12f3dff 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -5393,8 +5393,6 @@ '../rlz/rlz.gyp:*', '../sandbox/sandbox.gyp:*', '../tools/memory_watcher/memory_watcher.gyp:*', - '../webkit/activex_shim/activex_shim.gyp:*', - '../webkit/activex_shim_dll/activex_shim_dll.gyp:*', '../v8/tools/gyp/v8.gyp:v8_shell', ], }, @@ -5454,33 +5452,6 @@ ], }, { - 'target_name': 'activex_test_control', - 'type': 'shared_library', - 'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC', - 'include_dirs': [ - '..', - '<(INTERMEDIATE_DIR)', - ], - 'link_settings': { - 'libraries': [ - '-lcomsuppw.lib', - ], - }, - 'sources': [ - 'test/activex_test_control/activex_test_control.cc', - 'test/activex_test_control/activex_test_control.def', - 'test/activex_test_control/activex_test_control.idl', - 'test/activex_test_control/activex_test_control.rc', - 'test/activex_test_control/activex_test_control.rgs', - 'test/activex_test_control/chrome_test_control.bmp', - 'test/activex_test_control/chrome_test_control.cc', - 'test/activex_test_control/chrome_test_control.h', - 'test/activex_test_control/chrome_test_control.rgs', - 'test/activex_test_control/chrome_test_control_cp.h', - 'test/activex_test_control/resource.h', - ], - }, - { 'target_name': 'automation', 'type': '<(library)', 'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12', diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 95e29e2..90cd98f 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -102,7 +102,7 @@ const wchar_t kDisableAltWinstation[] = L"disable-winsta"; const wchar_t kSafePlugins[] = L"safe-plugins"; // Excludes these plugins from the plugin sandbox. -// This is a comma-separated list of plugin library names and activex clsid. +// This is a comma-separated list of plugin library names. const wchar_t kTrustedPlugins[] = L"trusted-plugins"; // Runs the security test for the sandbox. @@ -266,12 +266,6 @@ const wchar_t kDebugPrint[] = L"debug-print"; // Prints the pages on the screen. const wchar_t kPrint[] = L"print"; -// Allow initialization of all activex controls. This is only to help website -// developers test their controls to see if they are compatible in Chrome. -// Note there's a duplicate value in activex_shared.cc (to avoid -// dependency on chrome module). Please change both locations at the same time. -const wchar_t kAllowAllActiveX[] = L"allow-all-activex"; - // Browser flag to disable the web inspector for all renderers. const wchar_t kDisableDevTools[] = L"disable-dev-tools"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 59cd449..959b0b3 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -91,8 +91,6 @@ extern const wchar_t kPrint[]; extern const wchar_t kDnsLogDetails[]; extern const wchar_t kDnsPrefetchDisable[]; -extern const wchar_t kAllowAllActiveX[]; - extern const wchar_t kDisableDevTools[]; extern const wchar_t kAlwaysEnableDevTools[]; extern const wchar_t kEnableExtensionTimelineApi[]; diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 9e9ac815..aad21c2 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -924,11 +924,10 @@ IPC_BEGIN_MESSAGES(ViewHost) // Returns a path to a plugin for the given url and mime type. If there's // no plugin, an empty string is returned. - IPC_SYNC_MESSAGE_CONTROL4_2(ViewHostMsg_GetPluginPath, + IPC_SYNC_MESSAGE_CONTROL3_2(ViewHostMsg_GetPluginPath, GURL /* url */, GURL /* policy_url */, std::string /* mime_type */, - std::string /* clsid */, FilePath /* filename */, std::string /* actual mime type for url */) @@ -1020,10 +1019,9 @@ IPC_BEGIN_MESSAGES(ViewHost) // create a plugin. The browser will create the plugin process if // necessary, and will return a handle to the channel on success. // On error an empty string is returned. - IPC_SYNC_MESSAGE_CONTROL4_2(ViewHostMsg_OpenChannelToPlugin, + IPC_SYNC_MESSAGE_CONTROL3_2(ViewHostMsg_OpenChannelToPlugin, GURL /* url */, std::string /* mime_type */, - std::string /* clsid */, std::wstring /* locale */, IPC::ChannelHandle /* handle to channel */, WebPluginInfo /* info */) diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 0e2a5ae..cd422f2 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2112,7 +2112,6 @@ void RenderView::didExecuteCommand(const WebString& command_name) { webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate( const GURL& url, const std::string& mime_type, - const std::string& clsid, std::string* actual_mime_type) { if (!PluginChannelHost::IsListening()) return NULL; @@ -2123,9 +2122,8 @@ webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate( policy_url = main_frame->url(); FilePath path; - render_thread_->Send( - new ViewHostMsg_GetPluginPath(url, policy_url, mime_type, clsid, &path, - actual_mime_type)); + render_thread_->Send(new ViewHostMsg_GetPluginPath( + url, policy_url, mime_type, &path, actual_mime_type)); if (path.value().empty()) return NULL; @@ -2145,7 +2143,7 @@ webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate( #endif } - return new WebPluginDelegateProxy(*mime_type_to_use, clsid, AsWeakPtr()); + return new WebPluginDelegateProxy(*mime_type_to_use, AsWeakPtr()); } void RenderView::CreatedPluginWindow(gfx::PluginWindowHandle window) { diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index b9fbee2..34d48a9 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -363,7 +363,6 @@ class RenderView : public RenderWidget, virtual webkit_glue::WebPluginDelegate* CreatePluginDelegate( const GURL& url, const std::string& mime_type, - const std::string& clsid, std::string* actual_mime_type); virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle); virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle); diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 3740eb1..2c728d7 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -160,14 +160,12 @@ class ResourceClientProxy : public webkit_glue::WebPluginResourceClient { WebPluginDelegateProxy::WebPluginDelegateProxy( const std::string& mime_type, - const std::string& clsid, const base::WeakPtr<RenderView>& render_view) : render_view_(render_view), plugin_(NULL), windowless_(false), window_(NULL), mime_type_(mime_type), - clsid_(clsid), npobject_(NULL), window_script_object_(NULL), sad_plugin_(NULL), @@ -225,7 +223,7 @@ bool WebPluginDelegateProxy::Initialize(const GURL& url, IPC::ChannelHandle channel_handle; WebPluginInfo info; if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin( - url, mime_type_, clsid_, webkit_glue::GetWebKitLocale(), + url, mime_type_, webkit_glue::GetWebKitLocale(), &channel_handle, &info))) { return false; } diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h index a9cfab8..043bdb8 100644 --- a/chrome/renderer/webplugin_delegate_proxy.h +++ b/chrome/renderer/webplugin_delegate_proxy.h @@ -43,7 +43,6 @@ class WebPluginDelegateProxy : public base::SupportsWeakPtr<WebPluginDelegateProxy> { public: WebPluginDelegateProxy(const std::string& mime_type, - const std::string& clsid, const base::WeakPtr<RenderView>& render_view); // Called to drop our pointer to the window script object. @@ -166,7 +165,6 @@ class WebPluginDelegateProxy : gfx::PluginWindowHandle window_; scoped_refptr<PluginChannelHost> channel_host_; std::string mime_type_; - std::string clsid_; int instance_id_; WebPluginInfo info_; diff --git a/chrome/test/activex_test_control/activex_test_control.cc b/chrome/test/activex_test_control/activex_test_control.cc deleted file mode 100644 index 573fad7..0000000 --- a/chrome/test/activex_test_control/activex_test_control.cc +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include <atlbase.h> -#include <atlcom.h> - -#include "activex_test_control.h" -#include "activex_test_control_i.c" -#include "chrome/test/activex_test_control/resource.h" - -class ActiveXTestControllModule - : public CAtlDllModuleT<ActiveXTestControllModule> { - public: - DECLARE_LIBID(LIBID_activex_test_controlLib) - DECLARE_REGISTRY_APPID_RESOURCEID(IDR_ACTIVEX_TEST_CONTROL, - "{CDBC0D94-AFF6-4918-90A9-7967179A77D8}") -}; - -ActiveXTestControllModule g_atlmodule; - -// DLL Entry Point -extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, - LPVOID reserved) { - return g_atlmodule.DllMain(reason, reserved); -} - -// Used to determine whether the DLL can be unloaded by OLE -STDAPI DllCanUnloadNow(void) { - return g_atlmodule.DllCanUnloadNow(); -} - -// Returns a class factory to create an object of the requested type -STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { - return g_atlmodule.DllGetClassObject(rclsid, riid, ppv); -} - -// DllRegisterServer - Adds entries to the system registry -STDAPI DllRegisterServer(void) { - // registers object, typelib and all interfaces in typelib - HRESULT hr = g_atlmodule.DllRegisterServer(); - return hr; -} - -// DllUnregisterServer - Removes entries from the system registry -STDAPI DllUnregisterServer(void) { - HRESULT hr = g_atlmodule.DllUnregisterServer(); - return hr; -} diff --git a/chrome/test/activex_test_control/activex_test_control.def b/chrome/test/activex_test_control/activex_test_control.def deleted file mode 100644 index b006b57..0000000 --- a/chrome/test/activex_test_control/activex_test_control.def +++ /dev/null @@ -1,9 +0,0 @@ -; activex_test_control.def : Declares the module parameters. - -LIBRARY "activex_test_control.DLL" - -EXPORTS - DllCanUnloadNow PRIVATE - DllGetClassObject PRIVATE - DllRegisterServer PRIVATE - DllUnregisterServer PRIVATE diff --git a/chrome/test/activex_test_control/activex_test_control.idl b/chrome/test/activex_test_control/activex_test_control.idl deleted file mode 100644 index 04a2f42..0000000 --- a/chrome/test/activex_test_control/activex_test_control.idl +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// This file will be processed by the MIDL tool to -// produce the type library (activex_test_control.tlb) and marshalling code. - -#include "olectl.h" -import "oaidl.idl"; -import "ocidl.idl"; - -[ - object, - uuid(9AC37249-E247-4B82-AC1E-0917737528E9), - dual, - nonextensible, - helpstring("IChromeTestControl Interface"), - pointer_default(unique) -] -interface IChromeTestControl : IDispatch{ - [propput, bindable, requestedit, id(DISPID_BACKCOLOR)] - HRESULT BackColor([in]OLE_COLOR clr); - [propget, bindable, requestedit, id(DISPID_BACKCOLOR)] - HRESULT BackColor([out,retval]OLE_COLOR* pclr); - [propput, bindable, requestedit, id(DISPID_BORDERCOLOR)] - HRESULT BorderColor([in]OLE_COLOR clr); - [propget, bindable, requestedit, id(DISPID_BORDERCOLOR)] - HRESULT BorderColor([out, retval]OLE_COLOR* pclr); - [propput, bindable, requestedit, id(DISPID_FORECOLOR)] - HRESULT ForeColor([in]OLE_COLOR clr); - [propget, bindable, requestedit, id(DISPID_FORECOLOR)] - HRESULT ForeColor([out,retval]OLE_COLOR* pclr); - [propput, bindable, requestedit, id(DISPID_CAPTION)] - HRESULT Caption([in]BSTR strCaption); - [propget, bindable, requestedit, id(DISPID_CAPTION)] - HRESULT Caption([out,retval]BSTR* pstrCaption); - [propget, id(1), helpstring("property StringProp")] HRESULT StringProp([out, retval] BSTR* pVal); - [propput, id(1), helpstring("property StringProp")] HRESULT StringProp([in] BSTR newVal); - [propget, id(2), helpstring("property LongProp")] HRESULT LongProp([out, retval] LONG* pVal); - [propput, id(2), helpstring("property LongProp")] HRESULT LongProp([in] LONG newVal); - [propget, id(3), helpstring("property DoubleProp")] HRESULT DoubleProp([out, retval] DOUBLE* pVal); - [propput, id(3), helpstring("property DoubleProp")] HRESULT DoubleProp([in] DOUBLE newVal); - [propget, id(4), helpstring("property BoolProp")] HRESULT BoolProp([out, retval] VARIANT_BOOL* pVal); - [propput, id(4), helpstring("property BoolProp")] HRESULT BoolProp([in] VARIANT_BOOL newVal); - [propget, id(5), helpstring("property ByteProp")] HRESULT ByteProp([out, retval] BYTE* pVal); - [propput, id(5), helpstring("property ByteProp")] HRESULT ByteProp([in] BYTE newVal); - [propget, id(6), helpstring("property FloatProp")] HRESULT FloatProp([out, retval] FLOAT* pVal); - [propput, id(6), helpstring("property FloatProp")] HRESULT FloatProp([in] FLOAT newVal); - [id(7), helpstring("method BigSetMethod")] HRESULT BigSetMethodRet([in] BSTR string_param, [in] BYTE byte_param, [in] FLOAT float_param, [in] VARIANT_BOOL bool_param, [out,retval] BSTR* ret); - [id(8), helpstring("method SetByte")] HRESULT SetByte([in] BYTE val); - [id(9), helpstring("method SetByteRet")] HRESULT SetByteRet([in] BYTE byte_param, [out,retval] BYTE* ret); - [id(10), helpstring("method SetStringRet")] HRESULT SetStringRet([in] BSTR val, [out,retval] BSTR* ret); - [id(11), helpstring("method GetCookie")] HRESULT GetCookie([out,retval] BSTR* cookie); -}; - -[ - uuid(83D767F4-5C4F-4ACA-B0E8-928C54845C33), - version(1.0), - helpstring("activex_test_control 1.0 Type Library") -] -library activex_test_controlLib -{ - importlib("stdole2.tlb"); - [ - uuid(EF88DE01-35AF-463F-9802-1BF908F48696), - helpstring("_IChromeTestControlEvents Interface") - ] - dispinterface _IChromeTestControlEvents - { - properties: - methods: - }; - [ - uuid(4E174456-5EE6-494D-B6F2-2B52898A620E), - control, - helpstring("ChromeTestControl Class") - ] - coclass ChromeTestControl - { - [default] interface IChromeTestControl; - [default, source] dispinterface _IChromeTestControlEvents; - }; -}; diff --git a/chrome/test/activex_test_control/activex_test_control.rc b/chrome/test/activex_test_control/activex_test_control.rc deleted file mode 100644 index e6046bd..0000000 --- a/chrome/test/activex_test_control/activex_test_control.rc +++ /dev/null @@ -1,128 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "1 TYPELIB ""activex_test_control.tlb""\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "Google Inc." - VALUE "FileDescription", "ActiveX Test Control" - VALUE "FileVersion", "1.0.0.1" - VALUE "LegalCopyright", "Google Inc. All rights reserved." - VALUE "InternalName", "activex_test_control.dll" - VALUE "OriginalFilename", "activex_test_control.dll" - VALUE "ProductName", "Google Chrome" - VALUE "ProductVersion", "1.0.0.1" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// REGISTRY -// - -IDR_ACTIVEX_TEST_CONTROL REGISTRY "activex_test_control.rgs" -IDR_CHROMETESTCONTROL REGISTRY "chrome_test_control.rgs" - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_CHROMETESTCONTROL BITMAP "chrome_test_control.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDS_PROJNAME "activex_test_control" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -1 TYPELIB "activex_test_control.tlb" - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/chrome/test/activex_test_control/activex_test_control.rgs b/chrome/test/activex_test_control/activex_test_control.rgs deleted file mode 100644 index 2873a48..0000000 --- a/chrome/test/activex_test_control/activex_test_control.rgs +++ /dev/null @@ -1,11 +0,0 @@ -HKCR -{ - NoRemove AppID - { - '%APPID%' = s 'activex_test_control' - 'activex_test_control.DLL' - { - val AppID = s '%APPID%' - } - } -} diff --git a/chrome/test/activex_test_control/chrome_test_control.bmp b/chrome/test/activex_test_control/chrome_test_control.bmp Binary files differdeleted file mode 100644 index 1229764..0000000 --- a/chrome/test/activex_test_control/chrome_test_control.bmp +++ /dev/null diff --git a/chrome/test/activex_test_control/chrome_test_control.cc b/chrome/test/activex_test_control/chrome_test_control.cc deleted file mode 100644 index 040e3b4..0000000 --- a/chrome/test/activex_test_control/chrome_test_control.cc +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/test/activex_test_control/chrome_test_control.h" - -// CChromeTestControl -HRESULT ChromeTestControl::OnDraw(ATL_DRAWINFO& di) { - RECT& rc = *(RECT*)di.prcBounds; - // Set Clip region to the rectangle specified by di.prcBounds - HRGN rgn_old = NULL; - if (GetClipRgn(di.hdcDraw, rgn_old) != 1) - rgn_old = NULL; - bool select_old_rgn = false; - - HRGN rgn_new = CreateRectRgn(rc.left, rc.top, rc.right, rc.bottom); - - if (rgn_new != NULL) - select_old_rgn = (SelectClipRgn(di.hdcDraw, rgn_new) != ERROR); - - Rectangle(di.hdcDraw, rc.left, rc.top, rc.right, rc.bottom); - SetTextAlign(di.hdcDraw, TA_CENTER|TA_BASELINE); - LPCTSTR pszText = _T("ATL 8.0 : ChromeTestControl"); - TextOut(di.hdcDraw, - (rc.left + rc.right) / 2, - (rc.top + rc.bottom) / 2, - pszText, - lstrlen(pszText)); - - if (select_old_rgn) - SelectClipRgn(di.hdcDraw, rgn_old); - - return S_OK; -} diff --git a/chrome/test/activex_test_control/chrome_test_control.h b/chrome/test/activex_test_control/chrome_test_control.h deleted file mode 100644 index 9b5fccc..0000000 --- a/chrome/test/activex_test_control/chrome_test_control.h +++ /dev/null @@ -1,263 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_TEST_ACTIVEX_TEST_CONTROL_CHROME_TEST_CONTROL_H__ -#define CHROME_TEST_ACTIVEX_TEST_CONTROL_CHROME_TEST_CONTROL_H__ - -#include <atlbase.h> -#include <atlcom.h> -#include <atlctl.h> -#include <comutil.h> -#include "activex_test_control.h" -#include "chrome/test/activex_test_control/chrome_test_control_cp.h" -#include "chrome/test/activex_test_control/resource.h" - -// ChromeTestControl -class ATL_NO_VTABLE ChromeTestControl - : public CComObjectRootEx<CComSingleThreadModel>, - public CStockPropImpl<ChromeTestControl, IChromeTestControl>, - public IPersistStreamInitImpl<ChromeTestControl>, - public IOleControlImpl<ChromeTestControl>, - public IOleObjectImpl<ChromeTestControl>, - public IOleInPlaceActiveObjectImpl<ChromeTestControl>, - public IViewObjectExImpl<ChromeTestControl>, - public IOleInPlaceObjectWindowlessImpl<ChromeTestControl>, - public ISupportErrorInfo, - public IConnectionPointContainerImpl<ChromeTestControl>, - public CProxy_IChromeTestControlEvents<ChromeTestControl>, - public IObjectWithSiteImpl<ChromeTestControl>, - public IServiceProviderImpl<ChromeTestControl>, - public IPersistStorageImpl<ChromeTestControl>, - public ISpecifyPropertyPagesImpl<ChromeTestControl>, - public IQuickActivateImpl<ChromeTestControl>, - public IDataObjectImpl<ChromeTestControl>, - public IProvideClassInfo2Impl<&CLSID_ChromeTestControl, - &__uuidof(_IChromeTestControlEvents), &LIBID_activex_test_controlLib>, - public IPropertyNotifySinkCP<ChromeTestControl>, - public IObjectSafetyImpl<ChromeTestControl, - INTERFACESAFE_FOR_UNTRUSTED_CALLER | - INTERFACESAFE_FOR_UNTRUSTED_DATA>, - public CComCoClass<ChromeTestControl, &CLSID_ChromeTestControl>, - public CComControl<ChromeTestControl> { - public: - ChromeTestControl() { - } - -DECLARE_OLEMISC_STATUS(OLEMISC_RECOMPOSEONRESIZE | - OLEMISC_CANTLINKINSIDE | - OLEMISC_INSIDEOUT | - OLEMISC_ACTIVATEWHENVISIBLE | - OLEMISC_SETCLIENTSITEFIRST) - -DECLARE_REGISTRY_RESOURCEID(IDR_CHROMETESTCONTROL) - -BEGIN_COM_MAP(ChromeTestControl) - COM_INTERFACE_ENTRY(IChromeTestControl) - COM_INTERFACE_ENTRY(IDispatch) - COM_INTERFACE_ENTRY(IViewObjectEx) - COM_INTERFACE_ENTRY(IViewObject2) - COM_INTERFACE_ENTRY(IViewObject) - COM_INTERFACE_ENTRY(IOleInPlaceObjectWindowless) - COM_INTERFACE_ENTRY(IOleInPlaceObject) - COM_INTERFACE_ENTRY2(IOleWindow, IOleInPlaceObjectWindowless) - COM_INTERFACE_ENTRY(IOleInPlaceActiveObject) - COM_INTERFACE_ENTRY(IOleControl) - COM_INTERFACE_ENTRY(IOleObject) - COM_INTERFACE_ENTRY(IPersistStreamInit) - COM_INTERFACE_ENTRY2(IPersist, IPersistStreamInit) - COM_INTERFACE_ENTRY(ISupportErrorInfo) - COM_INTERFACE_ENTRY(IConnectionPointContainer) - COM_INTERFACE_ENTRY(ISpecifyPropertyPages) - COM_INTERFACE_ENTRY(IQuickActivate) - COM_INTERFACE_ENTRY(IPersistStorage) - COM_INTERFACE_ENTRY(IDataObject) - COM_INTERFACE_ENTRY(IProvideClassInfo) - COM_INTERFACE_ENTRY(IProvideClassInfo2) - COM_INTERFACE_ENTRY(IObjectWithSite) - COM_INTERFACE_ENTRY(IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IObjectSafety, IObjectSafety) -END_COM_MAP() - -BEGIN_PROP_MAP(ChromeTestControl) - PROP_DATA_ENTRY("_cx", m_sizeExtent.cx, VT_UI4) - PROP_DATA_ENTRY("_cy", m_sizeExtent.cy, VT_UI4) - PROP_ENTRY_TYPE("BackColor", DISPID_BACKCOLOR, CLSID_StockColorPage, - VT_COLOR) - PROP_ENTRY_TYPE("BorderColor", DISPID_BORDERCOLOR, CLSID_StockColorPage, - VT_COLOR) - PROP_ENTRY_TYPE("Caption", DISPID_CAPTION, CLSID_NULL, VT_BSTR) - PROP_ENTRY_TYPE("ForeColor", DISPID_FORECOLOR, CLSID_StockColorPage, VT_COLOR) - // Example entries - // PROP_ENTRY("Property Description", dispid, clsid) - // PROP_PAGE(CLSID_StockColorPage) -END_PROP_MAP() - -BEGIN_CONNECTION_POINT_MAP(ChromeTestControl) - CONNECTION_POINT_ENTRY(IID_IPropertyNotifySink) - CONNECTION_POINT_ENTRY(__uuidof(_IChromeTestControlEvents)) -END_CONNECTION_POINT_MAP() - -BEGIN_MSG_MAP(ChromeTestControl) - CHAIN_MSG_MAP(CComControl<ChromeTestControl>) - DEFAULT_REFLECTION_HANDLER() -END_MSG_MAP() - - // ISupportsErrorInfo - STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid) { - static const IID* arr[] = { - &IID_IChromeTestControl, - }; - - for (int i=0; i<sizeof(arr)/sizeof(arr[0]); i++) { - if (InlineIsEqualGUID(*arr[i], riid)) - return S_OK; - } - return S_FALSE; - } - - // IViewObjectEx - DECLARE_VIEW_STATUS(VIEWSTATUS_SOLIDBKGND | VIEWSTATUS_OPAQUE) - -// IChromeTestControl - public: - HRESULT OnDraw(ATL_DRAWINFO& di); - - void OnBackColorChanged() { - ATLTRACE(_T("OnBackColorChanged\n")); - } - void OnBorderColorChanged() { - ATLTRACE(_T("OnBorderColorChanged\n")); - } - void OnCaptionChanged() { - ATLTRACE(_T("OnCaptionChanged\n")); - } - void OnForeColorChanged() { - ATLTRACE(_T("OnForeColorChanged\n")); - } - STDMETHOD(_InternalQueryService)(REFGUID guidService, REFIID riid, - void** ppvObject) { - return E_NOTIMPL; - } - - DECLARE_PROTECT_FINAL_CONSTRUCT() - - HRESULT FinalConstruct() { - return S_OK; - } - - void FinalRelease() { - } - - STDMETHOD(get_StringProp)(BSTR* val) { - *val = string_prop_.copy(); - return S_OK; - } - - STDMETHOD(put_StringProp)(BSTR val) { - string_prop_ = val; - return S_OK; - } - STDMETHOD(get_LongProp)(LONG* val) { - *val = long_prop_; - return S_OK; - } - - STDMETHOD(put_LongProp)(LONG val) { - long_prop_ = val; - return S_OK; - } - STDMETHOD(get_DoubleProp)(DOUBLE* val) { - *val = double_prop_; - return S_OK; - } - - STDMETHOD(put_DoubleProp)(DOUBLE val) { - double_prop_ = val; - return S_OK; - } - - STDMETHOD(get_BoolProp)(VARIANT_BOOL* val) { - *val = bool_prop_; - return S_OK; - } - - STDMETHOD(put_BoolProp)(VARIANT_BOOL val) { - bool_prop_ = val; - return S_OK; - } - - STDMETHOD(get_ByteProp)(BYTE* val) { - *val = byte_prop_; - return S_OK; - } - - STDMETHOD(put_ByteProp)(BYTE val) { - byte_prop_ = val; - return S_OK; - } - - STDMETHOD(get_FloatProp)(FLOAT* val) { - *val = float_prop_; - return S_OK; - } - - STDMETHOD(put_FloatProp)(FLOAT val) { - float_prop_ = val; - return S_OK; - } - - STDMETHOD(SetByte)(BYTE val) { - byte_prop_ = val; - return S_OK; - } - STDMETHOD(SetByteRet)(BYTE val, BYTE* ret) { - byte_prop_ = val; - *ret = val; - return S_OK; - } - STDMETHOD(SetStringRet)(BSTR val, BSTR* ret) { - string_prop_ = val; - *ret = string_prop_.copy(); - return S_OK; - } - STDMETHOD(BigSetMethodRet)(BSTR string_param, BYTE byte_param, - FLOAT float_param, VARIANT_BOOL bool_param, - BSTR* ret) { - string_prop_ = string_param; - byte_prop_ = byte_param; - float_prop_ = float_param; - bool_prop_ = bool_param; - *ret = SysAllocString(string_param); - return S_OK; - } - STDMETHOD(GetCookie)(BSTR* cookie) { - CComPtr<IOleContainer> container; - m_spClientSite->GetContainer(&container); - CComQIPtr<IHTMLDocument2> doc = container; - if (doc == NULL) { - *cookie = SysAllocString(L"Bad"); - return S_FALSE; - } else { - return doc->get_cookie(cookie); - } - } - - // These varialbes are used by CStockPropImpl invisibly and they have to be - // be public to be accessible. - OLE_COLOR m_clrBackColor; - OLE_COLOR m_clrBorderColor; - CComBSTR m_bstrCaption; - OLE_COLOR m_clrForeColor; - private: - _bstr_t string_prop_; - LONG long_prop_; - DOUBLE double_prop_; - VARIANT_BOOL bool_prop_; - BYTE byte_prop_; - FLOAT float_prop_; -}; - -OBJECT_ENTRY_AUTO(__uuidof(ChromeTestControl), ChromeTestControl) - -#endif // #ifndef CHROME_TEST_ACTIVEX_TEST_CONTROL_CHROME_TEST_CONTROL_H__ diff --git a/chrome/test/activex_test_control/chrome_test_control.rgs b/chrome/test/activex_test_control/chrome_test_control.rgs deleted file mode 100644 index 9e327bc..0000000 --- a/chrome/test/activex_test_control/chrome_test_control.rgs +++ /dev/null @@ -1,34 +0,0 @@ -HKCR -{ - activex_test_control.ChromeTestContro.1 = s 'ChromeTestControl Class' - { - CLSID = s '{4E174456-5EE6-494D-B6F2-2B52898A620E}' - } - activex_test_control.ChromeTestControl = s 'ChromeTestControl Class' - { - CLSID = s '{4E174456-5EE6-494D-B6F2-2B52898A620E}' - CurVer = s 'activex_test_control.ChromeTestContro.1' - } - NoRemove CLSID - { - ForceRemove {4E174456-5EE6-494D-B6F2-2B52898A620E} = s 'ChromeTestControl Class' - { - ProgID = s 'activex_test_control.ChromeTestContro.1' - VersionIndependentProgID = s 'activex_test_control.ChromeTestControl' - ForceRemove 'Programmable' - InprocServer32 = s '%MODULE%' - { - val ThreadingModel = s 'Apartment' - } - val AppID = s '%APPID%' - ForceRemove 'Control' - ForceRemove 'ToolboxBitmap32' = s '%MODULE%, 102' - 'MiscStatus' = s '0' - { - '1' = s '%OLEMISC%' - } - 'TypeLib' = s '{83D767F4-5C4F-4ACA-B0E8-928C54845C33}' - 'Version' = s '1.0' - } - } -} diff --git a/chrome/test/activex_test_control/chrome_test_control_cp.h b/chrome/test/activex_test_control/chrome_test_control_cp.h deleted file mode 100644 index 42edd95..0000000 --- a/chrome/test/activex_test_control/chrome_test_control_cp.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_TEST_ACTIVEX_TEST_CONTROL_CHROME_TEST_CONTROL_CP_H__ -#define CHROME_TEST_ACTIVEX_TEST_CONTROL_CHROME_TEST_CONTROL_CP_H__ - - -template <class T> -class CProxy_IChromeTestControlEvents - : public IConnectionPointImpl<T, &__uuidof(_IChromeTestControlEvents), - CComDynamicUnkArray> { - //Warning this class will be regenerated by the wizard. - public: -}; - -#endif // #ifndef CHROME_TEST_ACTIVEX_TEST_CONTROL_CHROME_TEST_CONTROL_CP_H__ diff --git a/chrome/test/activex_test_control/resource.h b/chrome/test/activex_test_control/resource.h deleted file mode 100644 index fc3cd4e..0000000 --- a/chrome/test/activex_test_control/resource.h +++ /dev/null @@ -1,19 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by activex_test_control.rc -// -#define IDS_PROJNAME 100 -#define IDR_ACTIVEX_TEST_CONTROL 101 -#define IDB_CHROMETESTCONTROL 102 -#define IDR_CHROMETESTCONTROL 103 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 201 -#define _APS_NEXT_COMMAND_VALUE 32768 -#define _APS_NEXT_CONTROL_VALUE 201 -#define _APS_NEXT_SYMED_VALUE 104 -#endif -#endif diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp index 63def02..f737403 100644 --- a/chrome/test/plugin/plugin_test.cpp +++ b/chrome/test/plugin/plugin_test.cpp @@ -80,13 +80,10 @@ class PluginTest : public UITest { KEY_WRITE)) { regkey.CreateKey(L"CHROME.EXE", KEY_READ); } - launch_arguments_.AppendSwitch(kNoNativeActiveXShimSwitch); - } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) { // When testing the old WMP plugin, we need to force Chrome to not load // the new plugin. launch_arguments_.AppendSwitch(kUseOldWMPPluginSwitch); - launch_arguments_.AppendSwitch(kNoNativeActiveXShimSwitch); } else if (strcmp(test_info->name(), "FlashSecurity") == 0) { launch_arguments_.AppendSwitchWithValue(switches::kTestSandbox, L"security_tests.dll"); @@ -183,131 +180,3 @@ TEST_F(PluginTest, DISABLED_Java) { TEST_F(PluginTest, Silverlight) { TestPlugin(L"silverlight.html", kShortWaitTimeout, false); } - -typedef HRESULT (__stdcall* DllRegUnregServerFunc)(); - -class ActiveXTest : public PluginTest { - public: - ActiveXTest() { - dll_registered = false; - } - protected: - void TestActiveX(const std::wstring& test_case, int timeout, bool reg_dll) { - if (reg_dll) { - RegisterTestControl(true); - dll_registered = true; - } - TestPlugin(test_case, timeout, false); - } - virtual void TearDown() { - PluginTest::TearDown(); - if (dll_registered) - RegisterTestControl(false); - } - void RegisterTestControl(bool register_server) { - std::wstring test_control_path = browser_directory_.ToWStringHack() + - L"\\activex_test_control.dll"; - HMODULE h = LoadLibrary(test_control_path.c_str()); - ASSERT_TRUE(h != NULL) << "Failed to load activex_test_control.dll"; - const char* func_name = register_server ? - "DllRegisterServer" : "DllUnregisterServer"; - DllRegUnregServerFunc func = reinterpret_cast<DllRegUnregServerFunc>( - GetProcAddress(h, func_name)); - // This should never happen actually. - ASSERT_TRUE(func != NULL) << "Failed to find reg/unreg function."; - HRESULT hr = func(); - const char* error_message = register_server ? "Failed to register dll." - : "Failed to unregister dll"; - ASSERT_TRUE(SUCCEEDED(hr)) << error_message; - FreeLibrary(h); - } - private: - bool dll_registered; -}; - -TEST_F(ActiveXTest, EmbeddedWMP) { - TestActiveX(L"activex_embedded_wmp.html", kLongWaitTimeout, false); -} - -TEST_F(ActiveXTest, WMP) { - TestActiveX(L"activex_wmp.html", kLongWaitTimeout, false); -} - -TEST_F(ActiveXTest, WMPNoEmbedMimeType) { - TestActiveX(L"activex_wmp_no_embed_mime_type.html", kLongWaitTimeout, false); -} - -TEST_F(ActiveXTest, DISABLED_CustomScripting) { - TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true); -} - -TEST_F(ActiveXTest, DISABLED_EmbeddedMP3) { - TestActiveX(L"mp3_test.html", kLongWaitTimeout, false); -} - -TEST_F(ActiveXTest, DISABLED_EmbeddedMPE) { - TestActiveX(L"mpe_test.html", kLongWaitTimeout, false); -} - -TEST_F(PluginTest, DISABLED_DefaultPluginParsingTest) { - PluginInstallerImpl plugin_installer(NP_EMBED); - NPP_t plugin_instance = {0}; - - char *arg_names[] = { - "classid", - "codebase" - }; - - char *arg_values[] = { - "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", - "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab", - }; - - bool is_activex = false; - std::string raw_activex_clsid; - std::string activex_clsid; - std::string activex_codebase; - std::string plugin_download_url; - std::string plugin_finder_url; - - ASSERT_TRUE(PluginInstallerImpl::ParseInstantiationArguments( - "application/x-shockwave-flash", - &plugin_instance, - arraysize(arg_names), - arg_names, - arg_values, - &raw_activex_clsid, - &is_activex, - &activex_clsid, - &activex_codebase, - &plugin_download_url, - &plugin_finder_url)); - - EXPECT_EQ(is_activex, false); - - - ASSERT_TRUE(PluginInstallerImpl::ParseInstantiationArguments( - "", - &plugin_instance, - arraysize(arg_names), - arg_names, - arg_values, - &raw_activex_clsid, - &is_activex, - &activex_clsid, - &activex_codebase, - &plugin_download_url, - &plugin_finder_url)); - - EXPECT_EQ(is_activex, true); - EXPECT_EQ( - activex_codebase, - "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); - - EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}"); - EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000"); - - EXPECT_EQ( - activex_codebase, - "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); -} |
