Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to reflect changes in plugin api

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@20695 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
locka%iol.ie
1999-02-14 13:18:42 +00:00
parent 0890c9fce8
commit 74455c95c4
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/webshell/embed/ActiveX/ActiveXPlugin.cpp
View File

@@ -23,7 +23,7 @@ static NS_DEFINE_IID(kIPluginIID, NS_IPLUGIN_IID);
static CActiveXPlugin *gpFactory = NULL;
extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsISupports* serviceMgr, nsIFactory **aFactory)
{
if (aClass.Equals(kIPluginIID))
{
@@ -137,12 +137,11 @@ NS_IMETHODIMP CActiveXPlugin::LockFactory(PRBool aLock)
///////////////////////////////////////////////////////////////////////////////
// nsIPlugin overrides
static char *gpszMime = "application/x-activex-plugin:smp:Mozilla ActiveX Control Plug-in";
static char *gpszPluginName = "Mozilla ActiveX Control Plug-in";
static char *gpszPluginDesc = "Hosts ActiveX controls";
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::Initialize(nsISupports* browserInterfaces)
NS_IMETHODIMP CActiveXPlugin::Initialize()
{
return NS_OK;
}
@@ -166,11 +165,11 @@ NS_IMETHODIMP CActiveXPlugin::GetValue(nsPluginVariable variable, void *value)
nsresult err = NS_OK;
if (variable == nsPluginVariable_NameString)
{
*((char **)value) = gpszPluginName;
*((char **)value) = const_cast<char *>(gpszPluginName);
}
else if (variable == nsPluginVariable_DescriptionString)
{
*((char **)value) = gpszPluginDesc;
*((char **)value) = const_cast<char *>(gpszPluginDesc);
}
else
{

2
mozilla/webshell/embed/ActiveX/ActiveXPlugin.h
View File

@@ -17,7 +17,7 @@ public:
NS_IMETHOD LockFactory(PRBool aLock);
// nsIPlugin overrides
NS_IMETHOD Initialize(nsISupports* browserInterfaces);
NS_IMETHOD Initialize();
NS_IMETHOD Shutdown(void);
NS_IMETHOD GetMIMEDescription(const char* *resultingDesc);
NS_IMETHOD GetValue(nsPluginVariable variable, void *value);

7
mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.cpp
View File

@@ -120,7 +120,12 @@ NS_IMETHODIMP CActiveXPluginInstance::SetWindow(nsPluginWindow* window)
return NS_OK;
}
#ifndef NEW_PLUGIN_STREAM_API
#ifdef NEW_PLUGIN_STREAM_API
NS_IMETHODIMP CActiveXPluginInstance::NewStream(nsIPluginStreamListener** listener)
{
return NS_OK;
}
#else
NS_IMETHODIMP CActiveXPluginInstance::NewStream(nsIPluginStreamPeer* peer, nsIPluginStream* *result)
{
return NS_OK;

6
mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.h
View File

@@ -7,7 +7,7 @@ protected:
virtual ~CActiveXPluginInstance();
CControlSite *mControlSite;
nsPluginWindow mPluginWindow;
nsPluginWindow mPluginWindow;
public:
CActiveXPluginInstance();
@@ -25,7 +25,9 @@ public:
NS_IMETHOD Stop(void);
NS_IMETHOD Destroy(void);
NS_IMETHOD SetWindow(nsPluginWindow* window);
#ifndef NEW_PLUGIN_STREAM_API
#ifdef NEW_PLUGIN_STREAM_API
NS_IMETHOD NewStream(nsIPluginStreamListener** listener);
#else
NS_IMETHOD NewStream(nsIPluginStreamPeer* peer, nsIPluginStream* *result);
#endif
NS_IMETHOD Print(nsPluginPrint* platformPrint);