From fcbad721af4be9f2e8d159d1b4f4b4c195e27357 Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Tue, 23 Oct 2001 12:41:56 +0000 Subject: [PATCH] NOT PART OF BUILD. Removed implementation of the "new" Moz plugin APIs in favour of the NS API --- .../activex/src/plugin/ActiveXPlugin.cpp | 205 ------------------ .../activex/src/plugin/ActiveXPlugin.h | 64 ------ .../src/plugin/ActiveXPluginInstance.cpp | 141 ------------ .../src/plugin/ActiveXPluginInstance.h | 69 ------ 4 files changed, 479 deletions(-) delete mode 100644 embedding/browser/activex/src/plugin/ActiveXPlugin.cpp delete mode 100644 embedding/browser/activex/src/plugin/ActiveXPlugin.h delete mode 100644 embedding/browser/activex/src/plugin/ActiveXPluginInstance.cpp delete mode 100644 embedding/browser/activex/src/plugin/ActiveXPluginInstance.h diff --git a/embedding/browser/activex/src/plugin/ActiveXPlugin.cpp b/embedding/browser/activex/src/plugin/ActiveXPlugin.cpp deleted file mode 100644 index a83ad957f331..000000000000 --- a/embedding/browser/activex/src/plugin/ActiveXPlugin.cpp +++ /dev/null @@ -1,205 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#include "stdafx.h" - -static CActiveXPlugin *gpFactory = NULL; - -extern "C" NS_EXPORT nsresult -NSGetFactory(nsISupports* serviceMgr, - const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFactory **aFactory) -{ - if (aClass.Equals(kIPluginIID)) - { - if (gpFactory) - { - gpFactory->AddRef(); - *aFactory = (nsIFactory *) gpFactory; - return NS_OK; - } - - CActiveXPlugin *pFactory = new CActiveXPlugin(); - if (pFactory == NULL) - { - return NS_ERROR_OUT_OF_MEMORY; - } - pFactory->AddRef(); - gpFactory = pFactory; - *aFactory = pFactory; - return NS_OK; - } - - return NS_ERROR_FAILURE; -} - -extern "C" NS_EXPORT PRBool NSCanUnload(nsISupports* serviceMgr) -{ - return (_Module.GetLockCount() == 0); -} - -/////////////////////////////////////////////////////////////////////////////// - -CActiveXPlugin::CActiveXPlugin() -{ - NS_INIT_REFCNT(); -} - - -CActiveXPlugin::~CActiveXPlugin() -{ -} - -/////////////////////////////////////////////////////////////////////////////// -// nsISupports implementation - - -NS_IMPL_ADDREF(CActiveXPlugin) -NS_IMPL_RELEASE(CActiveXPlugin) - -nsresult CActiveXPlugin::QueryInterface(const nsIID& aIID, void** aInstancePtrResult) -{ - NS_PRECONDITION(nsnull != aInstancePtrResult, "null pointer"); - if (nsnull == aInstancePtrResult) - { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtrResult = NULL; - - if (aIID.Equals(kISupportsIID)) - { - *aInstancePtrResult = (void*) ((nsIPlugin*)this); - AddRef(); - return NS_OK; - } - - if (aIID.Equals(kIFactoryIID)) - { - *aInstancePtrResult = (void*) ((nsIPlugin*)this); - AddRef(); - return NS_OK; - } - - if (aIID.Equals(kIPluginIID)) - { - *aInstancePtrResult = (void*) ((nsIPlugin*)this); - AddRef(); - return NS_OK; - } - - return NS_NOINTERFACE; -} - -/////////////////////////////////////////////////////////////////////////////// -// nsIFactory overrides - -NS_IMETHODIMP CActiveXPlugin::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult) -{ - CActiveXPluginInstance *pInst = new CActiveXPluginInstance(); - if (pInst == NULL) - { - return NS_ERROR_OUT_OF_MEMORY; - } - pInst->AddRef(); - *aResult = pInst; - return NS_OK; -} - -NS_IMETHODIMP CActiveXPlugin::LockFactory(PRBool aLock) -{ - if (aLock) - { - _Module.Lock(); - } - else - { - _Module.Unlock(); - } - return NS_OK; -} - -/////////////////////////////////////////////////////////////////////////////// -// nsIPlugin overrides - -static const char *gpszMime = "application/x-oleobject:smp:Mozilla ActiveX Control Plug-in"; -static const char *gpszPluginName = "Mozilla ActiveX Control Plug-in"; -static const char *gpszPluginDesc = "ActiveX control host"; - -NS_IMETHODIMP CActiveXPlugin::CreatePluginInstance(nsISupports *aOuter, REFNSIID aIID, const char* aPluginMIMEType, void **aResult) -{ - return CreateInstance(aOuter, aIID, aResult); -} - -NS_IMETHODIMP CActiveXPlugin::Initialize() -{ - return NS_OK; -} - - -NS_IMETHODIMP CActiveXPlugin::Shutdown(void) -{ - return NS_OK; -} - - -NS_IMETHODIMP CActiveXPlugin::GetMIMEDescription(const char* *resultingDesc) -{ - *resultingDesc = gpszMime; - return NS_OK; -} - - -NS_IMETHODIMP CActiveXPlugin::GetValue(nsPluginVariable variable, void *value) -{ - nsresult err = NS_OK; - if (variable == nsPluginVariable_NameString) - { - *((char **)value) = const_cast(gpszPluginName); - } - else if (variable == nsPluginVariable_DescriptionString) - { - *((char **)value) = const_cast(gpszPluginDesc); - } - else - { - err = NS_ERROR_FAILURE; - } - return err; -} diff --git a/embedding/browser/activex/src/plugin/ActiveXPlugin.h b/embedding/browser/activex/src/plugin/ActiveXPlugin.h deleted file mode 100644 index 5e437fa40573..000000000000 --- a/embedding/browser/activex/src/plugin/ActiveXPlugin.h +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#ifndef ACTIVEXPLUGIN_H -#define ACTIVEXPLUGIN_H - -class CActiveXPlugin : public nsIPlugin -{ -protected: - virtual ~CActiveXPlugin(); - -public: - CActiveXPlugin(); - - // nsISupports overrides - NS_DECL_ISUPPORTS - - // nsIFactory overrides - NS_IMETHOD CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult); - NS_IMETHOD LockFactory(PRBool aLock); - - // nsIPlugin overrides - NS_IMETHOD CreatePluginInstance(nsISupports *aOuter, REFNSIID aIID, const char* aPluginMIMEType, void **aResult); - NS_IMETHOD Initialize(); - NS_IMETHOD Shutdown(void); - NS_IMETHOD GetMIMEDescription(const char* *resultingDesc); - NS_IMETHOD GetValue(nsPluginVariable variable, void *value); -}; - -#endif \ No newline at end of file diff --git a/embedding/browser/activex/src/plugin/ActiveXPluginInstance.cpp b/embedding/browser/activex/src/plugin/ActiveXPluginInstance.cpp deleted file mode 100644 index fc45d4f9d9ee..000000000000 --- a/embedding/browser/activex/src/plugin/ActiveXPluginInstance.cpp +++ /dev/null @@ -1,141 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#include "stdafx.h" - -/////////////////////////////////////////////////////////////////////////////// - -CActiveXPluginInstance::CActiveXPluginInstance() -{ - NS_INIT_REFCNT(); - mControlSite = NULL; -} - - -CActiveXPluginInstance::~CActiveXPluginInstance() -{ -} - -/////////////////////////////////////////////////////////////////////////////// -// nsISupports implementation - -NS_IMPL_ADDREF(CActiveXPluginInstance) -NS_IMPL_RELEASE(CActiveXPluginInstance) - -nsresult CActiveXPluginInstance::QueryInterface(const nsIID& aIID, void** aInstancePtrResult) -{ - NS_PRECONDITION(nsnull != aInstancePtrResult, "null pointer"); - if (nsnull == aInstancePtrResult) - { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtrResult = NULL; - - if (aIID.Equals(kISupportsIID)) - { - *aInstancePtrResult = (void*) ((nsIPluginInstance*)this); - AddRef(); - return NS_OK; - } - - if (aIID.Equals(kIPluginInstanceIID)) - { - *aInstancePtrResult = (void*) ((nsIPluginInstance*)this); - AddRef(); - return NS_OK; - } - - return NS_NOINTERFACE; -} - -/////////////////////////////////////////////////////////////////////////////// -// nsIPluginInstance overrides - -NS_IMETHODIMP CActiveXPluginInstance::Initialize(nsIPluginInstancePeer* peer) -{ - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::GetPeer(nsIPluginInstancePeer* *resultingPeer) -{ - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::Start(void) -{ - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::Stop(void) -{ - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::Destroy(void) -{ - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::SetWindow(nsPluginWindow* window) -{ - if (window) - { - mPluginWindow = *window; - } - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::NewStream(nsIPluginStreamListener** listener) -{ - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::Print(nsPluginPrint* platformPrint) -{ - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::GetValue(nsPluginInstanceVariable variable, void *value) -{ - return NS_OK; -} - -NS_IMETHODIMP CActiveXPluginInstance::HandleEvent(nsPluginEvent* event, PRBool* handled) -{ - return NS_OK; -} diff --git a/embedding/browser/activex/src/plugin/ActiveXPluginInstance.h b/embedding/browser/activex/src/plugin/ActiveXPluginInstance.h deleted file mode 100644 index 4d254cb17015..000000000000 --- a/embedding/browser/activex/src/plugin/ActiveXPluginInstance.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#ifndef ACTIVEXPLUGININSTANCE_H -#define ACTIVEXPLUGININSTANCE_H - -class CActiveXPluginInstance : public nsIPluginInstance -{ -protected: - virtual ~CActiveXPluginInstance(); - - CControlSite *mControlSite; - nsPluginWindow mPluginWindow; - -public: - CActiveXPluginInstance(); - - // nsISupports overrides - NS_DECL_ISUPPORTS - - // nsIPluginInstance overrides - NS_IMETHOD Initialize(nsIPluginInstancePeer* peer); - NS_IMETHOD GetPeer(nsIPluginInstancePeer* *resultingPeer); - NS_IMETHOD Start(void); - NS_IMETHOD Stop(void); - NS_IMETHOD Destroy(void); - NS_IMETHOD SetWindow(nsPluginWindow* window); - NS_IMETHOD NewStream(nsIPluginStreamListener** listener); - NS_IMETHOD Print(nsPluginPrint* platformPrint); - NS_IMETHOD GetValue(nsPluginInstanceVariable variable, void *value); - NS_IMETHOD HandleEvent(nsPluginEvent* event, PRBool* handled); -}; - - -#endif \ No newline at end of file