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

4.x unix plugin changes for bug 37477 r=pollmann, av

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@74034 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%netscape.com 2000-07-11 21:44:39 +00:00
parent b100308bc8
commit 61c5a61fcc
8 changed files with 220 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
View File

@ -37,40 +37,35 @@ class ns4xPluginStreamListener : public nsIPluginStreamListener {
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS
///////////////////////////////////////////////////////////////////////////
// from nsIPluginStreamListener:
///////////////////////////////////////////////////////////////////////////
// from nsIPluginStreamListener:
NS_IMETHOD
OnStartBinding(nsIPluginStreamInfo* pluginInfo);
NS_IMETHOD OnStartBinding(nsIPluginStreamInfo* pluginInfo);
NS_IMETHOD
OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input,
PRUint32 length);
NS_IMETHOD OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input,
PRUint32 length);
NS_IMETHOD
OnFileAvailable( nsIPluginStreamInfo* pluginInfo, const char* fileName);
NS_IMETHOD OnFileAvailable( nsIPluginStreamInfo* pluginInfo, const char* fileName);
NS_IMETHOD
OnStopBinding(nsIPluginStreamInfo* pluginInfo, nsresult status);
NS_IMETHOD OnStopBinding(nsIPluginStreamInfo* pluginInfo, nsresult status);
NS_IMETHOD
GetStreamType(nsPluginStreamType *result);
NS_IMETHOD GetStreamType(nsPluginStreamType *result);
///////////////////////////////////////////////////////////////////////////
// ns4xPluginStreamListener specific methods:
///////////////////////////////////////////////////////////////////////////
// ns4xPluginStreamListener specific methods:
ns4xPluginStreamListener(nsIPluginInstance* inst, void* notifyData);
virtual ~ns4xPluginStreamListener(void);
ns4xPluginStreamListener(nsIPluginInstance* inst, void* notifyData);
virtual ~ns4xPluginStreamListener(void);
protected:
void* mNotifyData;
ns4xPluginInstance* mInst;
NPStream mNPStream;
PRUint32 mPosition;
nsPluginStreamType mStreamType;
void* mNotifyData;
ns4xPluginInstance* mInst;
NPStream mNPStream;
PRUint32 mPosition;
nsPluginStreamType mStreamType;
};
@ -327,8 +322,6 @@ ns4xPluginInstance :: ns4xPluginInstance(NPPluginFuncs* callbacks)
fNPP.pdata = NULL;
fNPP.ndata = this;
fPeer = nsnull;
mWindowless = PR_FALSE;
mTransparent = PR_FALSE;
mStarted = PR_FALSE;
@ -337,57 +330,39 @@ ns4xPluginInstance :: ns4xPluginInstance(NPPluginFuncs* callbacks)
ns4xPluginInstance :: ~ns4xPluginInstance(void)
{
NS_RELEASE(fPeer);
#ifdef NS_DEBUG
printf("ns4xPluginInstance::~ns4xPluginInstance()\n");
#endif
#if defined(MOZ_WIDGET_GTK)
if (mXtBin)
gtk_widget_destroy(mXtBin);
#endif
}
////////////////////////////////////////////////////////////////////////
NS_IMPL_ADDREF(ns4xPluginInstance);
NS_IMPL_RELEASE(ns4xPluginInstance);
NS_IMPL_ISUPPORTS1(ns4xPluginInstance, nsIPluginInstance)
static NS_DEFINE_IID(kIPluginInstanceIID, NS_IPLUGININSTANCE_IID);
static NS_DEFINE_IID(kIPluginTagInfoIID, NS_IPLUGINTAGINFO_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
NS_IMETHODIMP ns4xPluginInstance :: QueryInterface(const nsIID& iid,
void** instance)
{
if (instance == NULL)
return NS_ERROR_NULL_POINTER;
if (iid.Equals(kIPluginInstanceIID))
{
*instance = (void *)(nsIPluginInstance *)this;
AddRef();
return NS_OK;
}
if (iid.Equals(kISupportsIID))
{
*instance = (void *)(nsISupports *)this;
AddRef();
return NS_OK;
}
return NS_NOINTERFACE;
}
////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP ns4xPluginInstance::Initialize(nsIPluginInstancePeer* peer)
{
#ifdef MOZ_WIDGET_GTK
xtbin = nsnull;
mXtBin = nsnull;
#endif
return InitializePlugin(peer);
}
NS_IMETHODIMP ns4xPluginInstance::GetPeer(nsIPluginInstancePeer* *resultingPeer)
{
NS_ADDREF(fPeer);
*resultingPeer = fPeer;
*resultingPeer = mPeer;
NS_IF_ADDREF(*resultingPeer);
return NS_OK;
}
@ -401,13 +376,24 @@ NS_IMETHODIMP ns4xPluginInstance::Start(void)
if(mStarted)
return NS_OK;
else
return InitializePlugin(fPeer);
return InitializePlugin(mPeer);
}
NS_IMETHODIMP ns4xPluginInstance::Stop(void)
{
NPError error;
#ifdef NS_DEBUG
printf("ns4xPluginInstance::Stop()\n");
#endif
#ifdef MOZ_WIDGET_GTK
if (mXtBin)
gtk_widget_destroy(mXtBin);
#endif
if (fCallbacks->destroy == NULL)
return NS_ERROR_FAILURE; // XXX right error?
@ -435,23 +421,21 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
const char* const* values = nsnull;
nsresult rv;
NPError error;
nsIPluginTagInfo* taginfo;
NS_ASSERTION(peer != NULL, "null peer");
fPeer = peer;
NS_ADDREF(fPeer);
mPeer = peer;
rv = fPeer->QueryInterface(kIPluginTagInfoIID, (void **)&taginfo);
nsCOMPtr<nsIPluginTagInfo> taginfo = do_QueryInterface(mPeer, &rv);
if (NS_OK == rv)
if (NS_SUCCEEDED(rv))
{
taginfo->GetAttributes(count, names, values);
NS_IF_RELEASE(taginfo);
}
if (fCallbacks->newp == NULL)
return NS_ERROR_FAILURE; // XXX right error?
return NS_ERROR_FAILURE; // XXX right error?
// XXX Note that the NPPluginType_* enums were crafted to be
// backward compatible...
@ -459,8 +443,8 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
nsPluginMode mode;
nsMIMEType mimetype;
fPeer->GetMode(&mode);
fPeer->GetMIMEType(&mimetype);
mPeer->GetMode(&mode);
mPeer->GetMIMEType(&mimetype);
#if !TARGET_CARBON
// pinkerton
@ -494,7 +478,7 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
(char**)names,
(char**)values,
NULL); // saved data
#endif // XP_PC
#endif // not XP_PC
#endif //!TARGET_CARBON
@ -525,7 +509,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
printf("Inside ns4xPluginInstance::SetWindow(%p)...\n", window);
#endif
if (window == NULL || mStarted == PR_FALSE)
if (!window || !mStarted)
return NS_OK;
NPError error;
@ -539,33 +523,58 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
// allocate a new NPSetWindowCallbackStruct structure at ws_info
window->ws_info = (NPSetWindowCallbackStruct *)PR_MALLOC(sizeof(NPSetWindowCallbackStruct));
if (!window->ws_info)
return NS_ERROR_OUT_OF_MEMORY;
superwin = (GdkSuperWin *)(window->window);
ws = (NPSetWindowCallbackStruct *)window->ws_info;
if (superwin->bin_window) {
superwin = GDK_SUPERWIN(window->window);
if (superwin->bin_window)
{
#ifdef NS_DEBUG
printf("About to create new xtbin of %i X %i from %p...\n",
window->width, window->height, superwin->bin_window);
#endif
// Initialize GtkXtBin widget to encapsulate
// the Xt toolkit within this Gtk Application
xtbin = gtk_xtbin_new(superwin->bin_window, 0);
gtk_widget_set_usize(xtbin, window->width, window->height);
#if 1
// if we destroyed the plugin when we left the page, we could remove this
// code (i believe) the problem here is that the window gets destroyed when
// its parent, etc does by changing a page the plugin instance is being
// held on to, so when we return to the page, we have a mXtBin, but it is
// in a not-so-good state.
// --
// this is lame. we shouldn't be destroying this everytime, but I can't find
// a good way to tell if we need to destroy/recreate the xtbin or not
// what if the plugin wants to change the window and not just resize it??
// (pav)
printf("About to show xtbin(%p)...\n", xtbin); fflush(NULL);
gtk_widget_show(xtbin);
printf("completed gtk_widget_show(%p)\n", xtbin); fflush(NULL);
if (mXtBin) {
gtk_widget_destroy(mXtBin);
mXtBin = NULL;
}
#endif
if (!mXtBin) {
mXtBin = gtk_xtbin_new(superwin->bin_window, 0);
}
gtk_widget_set_usize(mXtBin, window->width, window->height);
#ifdef NS_DEBUG
printf("About to show xtbin(%p)...\n", mXtBin); fflush(NULL);
#endif
gtk_widget_show(mXtBin);
#ifdef NS_DEBUG
printf("completed gtk_widget_show(%p)\n", mXtBin); fflush(NULL);
#endif
}
// fill in window info structure
ws->type = 0; // OK, that was a guess!!
ws->depth = gdk_visual_get_best_depth();
ws->display = GTK_XTBIN(xtbin)->xtdisplay;
ws->depth = gdk_rgb_get_visual()->depth;
ws->display = GTK_XTBIN(mXtBin)->xtdisplay;
ws->visual = GDK_VISUAL_XVISUAL(gdk_rgb_get_visual());
ws->colormap = GDK_COLORMAP_XCOLORMAP(gdk_window_get_colormap(superwin->bin_window));
@ -574,7 +583,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
// And now point the NPWindow structures window
// to the actual X window
window->window = (nsPluginPort *)GTK_XTBIN(xtbin)->xtwindow;
window->window = (nsPluginPort *)GTK_XTBIN(mXtBin)->xtwindow;
#endif // MOZ_WIDGET_GTK
if (fCallbacks->setwindow) {

53
mozilla/modules/plugin/base/src/ns4xPluginInstance.h
View File

@ -56,61 +56,46 @@ public:
* constructor.) If an error is returned, the caller should <i>not</i>
* continue to use the <b>ns4xPluginInstance</b> object.
*/
NS_METHOD
Initialize(nsIPluginInstancePeer* peer);
NS_METHOD Initialize(nsIPluginInstancePeer* peer);
NS_IMETHOD
GetPeer(nsIPluginInstancePeer* *resultingPeer);
NS_IMETHOD GetPeer(nsIPluginInstancePeer* *resultingPeer);
NS_IMETHOD
Start(void);
NS_IMETHOD Start(void);
NS_IMETHOD
Stop(void);
NS_IMETHOD Stop(void);
NS_IMETHOD
Destroy(void);
NS_IMETHOD Destroy(void);
NS_IMETHOD
SetWindow(nsPluginWindow* window);
NS_IMETHOD SetWindow(nsPluginWindow* window);
NS_IMETHOD
NewStream(nsIPluginStreamListener** listener);
NS_IMETHOD NewStream(nsIPluginStreamListener** listener);
NS_IMETHOD
Print(nsPluginPrint* platformPrint);
NS_IMETHOD Print(nsPluginPrint* platformPrint);
NS_IMETHOD
GetValue(nsPluginInstanceVariable variable, void *value);
NS_IMETHOD GetValue(nsPluginInstanceVariable variable, void *value);
NS_IMETHOD
HandleEvent(nsPluginEvent* event, PRBool* handled);
NS_IMETHOD HandleEvent(nsPluginEvent* event, PRBool* handled);
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// ns4xPluginInstance-specific methods
/**
* Return the 4.x-style interface object.
*/
nsresult
GetNPP(NPP * aNPP);
nsresult GetNPP(NPP * aNPP);
/**
* Return the callbacks for the plugin instance.
*/
nsresult
GetCallbacks(const NPPluginFuncs ** aCallbacks);
nsresult GetCallbacks(const NPPluginFuncs ** aCallbacks);
nsresult
SetWindowless(PRBool aWindowless);
nsresult SetWindowless(PRBool aWindowless);
nsresult
SetTransparent(PRBool aTransparent);
nsresult SetTransparent(PRBool aTransparent);
nsresult
NewNotifyStream(nsIPluginStreamListener** listener, void* notifyData);
nsresult NewNotifyStream(nsIPluginStreamListener** listener, void* notifyData);
/**
/**
* Construct a new 4.x plugin instance with the specified peer
* and callbacks.
*/
@ -126,7 +111,7 @@ protected:
/**
* The plugin instance peer for this instance.
*/
nsIPluginInstancePeer* fPeer;
nsCOMPtr<nsIPluginInstancePeer> mPeer;
/**
* A pointer to the plugin's callback functions. This information
@ -140,7 +125,7 @@ protected:
* Special GtkXtBin widget that encapsulates the Xt toolkit
* within a Gtk Application
*/
GtkWidget *xtbin;
GtkWidget *mXtBin;
#endif
/**

4
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -2146,7 +2146,7 @@ nsPluginHostImpl::IsPluginEnabledForType(const char* aMimeType)
variants = plugins->mVariants;
for (cnt = 0; cnt < variants; cnt++)
if (0 == strcmp(plugins->mMimeTypeArray[cnt], aMimeType))
if (plugins->mMimeTypeArray[cnt] && (0 == strcmp(plugins->mMimeTypeArray[cnt], aMimeType)))
return NS_OK;
if (cnt < variants)
@ -2393,7 +2393,7 @@ nsPluginHostImpl::FindPluginEnabledForType(const char* aMimeType,
variants = plugins->mVariants;
for (cnt = 0; cnt < variants; cnt++) {
if (0 == strcmp(plugins->mMimeTypeArray[cnt], aMimeType)) {
if (plugins->mMimeTypeArray[cnt] && (0 == strcmp(plugins->mMimeTypeArray[cnt], aMimeType))) {
aPlugin = plugins;
return NS_OK;
}

1
mozilla/modules/plugin/base/src/nsPluginsDirUNIX.cpp
View File

@ -32,6 +32,7 @@
#include "prlink.h"
#include "plstr.h"
#include "prmem.h"
#include "nsString.h"
#include "nsSpecialSystemDirectory.h"
/* Local helper functions */

167
mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp
View File

@ -37,40 +37,35 @@ class ns4xPluginStreamListener : public nsIPluginStreamListener {
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS
///////////////////////////////////////////////////////////////////////////
// from nsIPluginStreamListener:
///////////////////////////////////////////////////////////////////////////
// from nsIPluginStreamListener:
NS_IMETHOD
OnStartBinding(nsIPluginStreamInfo* pluginInfo);
NS_IMETHOD OnStartBinding(nsIPluginStreamInfo* pluginInfo);
NS_IMETHOD
OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input,
PRUint32 length);
NS_IMETHOD OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input,
PRUint32 length);
NS_IMETHOD
OnFileAvailable( nsIPluginStreamInfo* pluginInfo, const char* fileName);
NS_IMETHOD OnFileAvailable( nsIPluginStreamInfo* pluginInfo, const char* fileName);
NS_IMETHOD
OnStopBinding(nsIPluginStreamInfo* pluginInfo, nsresult status);
NS_IMETHOD OnStopBinding(nsIPluginStreamInfo* pluginInfo, nsresult status);
NS_IMETHOD
GetStreamType(nsPluginStreamType *result);
NS_IMETHOD GetStreamType(nsPluginStreamType *result);
///////////////////////////////////////////////////////////////////////////
// ns4xPluginStreamListener specific methods:
///////////////////////////////////////////////////////////////////////////
// ns4xPluginStreamListener specific methods:
ns4xPluginStreamListener(nsIPluginInstance* inst, void* notifyData);
virtual ~ns4xPluginStreamListener(void);
ns4xPluginStreamListener(nsIPluginInstance* inst, void* notifyData);
virtual ~ns4xPluginStreamListener(void);
protected:
void* mNotifyData;
ns4xPluginInstance* mInst;
NPStream mNPStream;
PRUint32 mPosition;
nsPluginStreamType mStreamType;
void* mNotifyData;
ns4xPluginInstance* mInst;
NPStream mNPStream;
PRUint32 mPosition;
nsPluginStreamType mStreamType;
};
@ -327,8 +322,6 @@ ns4xPluginInstance :: ns4xPluginInstance(NPPluginFuncs* callbacks)
fNPP.pdata = NULL;
fNPP.ndata = this;
fPeer = nsnull;
mWindowless = PR_FALSE;
mTransparent = PR_FALSE;
mStarted = PR_FALSE;
@ -337,57 +330,39 @@ ns4xPluginInstance :: ns4xPluginInstance(NPPluginFuncs* callbacks)
ns4xPluginInstance :: ~ns4xPluginInstance(void)
{
NS_RELEASE(fPeer);
#ifdef NS_DEBUG
printf("ns4xPluginInstance::~ns4xPluginInstance()\n");
#endif
#if defined(MOZ_WIDGET_GTK)
if (mXtBin)
gtk_widget_destroy(mXtBin);
#endif
}
////////////////////////////////////////////////////////////////////////
NS_IMPL_ADDREF(ns4xPluginInstance);
NS_IMPL_RELEASE(ns4xPluginInstance);
NS_IMPL_ISUPPORTS1(ns4xPluginInstance, nsIPluginInstance)
static NS_DEFINE_IID(kIPluginInstanceIID, NS_IPLUGININSTANCE_IID);
static NS_DEFINE_IID(kIPluginTagInfoIID, NS_IPLUGINTAGINFO_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
NS_IMETHODIMP ns4xPluginInstance :: QueryInterface(const nsIID& iid,
void** instance)
{
if (instance == NULL)
return NS_ERROR_NULL_POINTER;
if (iid.Equals(kIPluginInstanceIID))
{
*instance = (void *)(nsIPluginInstance *)this;
AddRef();
return NS_OK;
}
if (iid.Equals(kISupportsIID))
{
*instance = (void *)(nsISupports *)this;
AddRef();
return NS_OK;
}
return NS_NOINTERFACE;
}
////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP ns4xPluginInstance::Initialize(nsIPluginInstancePeer* peer)
{
#ifdef MOZ_WIDGET_GTK
xtbin = nsnull;
mXtBin = nsnull;
#endif
return InitializePlugin(peer);
}
NS_IMETHODIMP ns4xPluginInstance::GetPeer(nsIPluginInstancePeer* *resultingPeer)
{
NS_ADDREF(fPeer);
*resultingPeer = fPeer;
*resultingPeer = mPeer;
NS_IF_ADDREF(*resultingPeer);
return NS_OK;
}
@ -401,13 +376,24 @@ NS_IMETHODIMP ns4xPluginInstance::Start(void)
if(mStarted)
return NS_OK;
else
return InitializePlugin(fPeer);
return InitializePlugin(mPeer);
}
NS_IMETHODIMP ns4xPluginInstance::Stop(void)
{
NPError error;
#ifdef NS_DEBUG
printf("ns4xPluginInstance::Stop()\n");
#endif
#ifdef MOZ_WIDGET_GTK
if (mXtBin)
gtk_widget_destroy(mXtBin);
#endif
if (fCallbacks->destroy == NULL)
return NS_ERROR_FAILURE; // XXX right error?
@ -435,23 +421,21 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
const char* const* values = nsnull;
nsresult rv;
NPError error;
nsIPluginTagInfo* taginfo;
NS_ASSERTION(peer != NULL, "null peer");
fPeer = peer;
NS_ADDREF(fPeer);
mPeer = peer;
rv = fPeer->QueryInterface(kIPluginTagInfoIID, (void **)&taginfo);
nsCOMPtr<nsIPluginTagInfo> taginfo = do_QueryInterface(mPeer, &rv);
if (NS_OK == rv)
if (NS_SUCCEEDED(rv))
{
taginfo->GetAttributes(count, names, values);
NS_IF_RELEASE(taginfo);
}
if (fCallbacks->newp == NULL)
return NS_ERROR_FAILURE; // XXX right error?
return NS_ERROR_FAILURE; // XXX right error?
// XXX Note that the NPPluginType_* enums were crafted to be
// backward compatible...
@ -459,8 +443,8 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
nsPluginMode mode;
nsMIMEType mimetype;
fPeer->GetMode(&mode);
fPeer->GetMIMEType(&mimetype);
mPeer->GetMode(&mode);
mPeer->GetMIMEType(&mimetype);
#if !TARGET_CARBON
// pinkerton
@ -494,7 +478,7 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
(char**)names,
(char**)values,
NULL); // saved data
#endif // XP_PC
#endif // not XP_PC
#endif //!TARGET_CARBON
@ -525,7 +509,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
printf("Inside ns4xPluginInstance::SetWindow(%p)...\n", window);
#endif
if (window == NULL || mStarted == PR_FALSE)
if (!window || !mStarted)
return NS_OK;
NPError error;
@ -539,33 +523,58 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
// allocate a new NPSetWindowCallbackStruct structure at ws_info
window->ws_info = (NPSetWindowCallbackStruct *)PR_MALLOC(sizeof(NPSetWindowCallbackStruct));
if (!window->ws_info)
return NS_ERROR_OUT_OF_MEMORY;
superwin = (GdkSuperWin *)(window->window);
ws = (NPSetWindowCallbackStruct *)window->ws_info;
if (superwin->bin_window) {
superwin = GDK_SUPERWIN(window->window);
if (superwin->bin_window)
{
#ifdef NS_DEBUG
printf("About to create new xtbin of %i X %i from %p...\n",
window->width, window->height, superwin->bin_window);
#endif
// Initialize GtkXtBin widget to encapsulate
// the Xt toolkit within this Gtk Application
xtbin = gtk_xtbin_new(superwin->bin_window, 0);
gtk_widget_set_usize(xtbin, window->width, window->height);
#if 1
// if we destroyed the plugin when we left the page, we could remove this
// code (i believe) the problem here is that the window gets destroyed when
// its parent, etc does by changing a page the plugin instance is being
// held on to, so when we return to the page, we have a mXtBin, but it is
// in a not-so-good state.
// --
// this is lame. we shouldn't be destroying this everytime, but I can't find
// a good way to tell if we need to destroy/recreate the xtbin or not
// what if the plugin wants to change the window and not just resize it??
// (pav)
printf("About to show xtbin(%p)...\n", xtbin); fflush(NULL);
gtk_widget_show(xtbin);
printf("completed gtk_widget_show(%p)\n", xtbin); fflush(NULL);
if (mXtBin) {
gtk_widget_destroy(mXtBin);
mXtBin = NULL;
}
#endif
if (!mXtBin) {
mXtBin = gtk_xtbin_new(superwin->bin_window, 0);
}
gtk_widget_set_usize(mXtBin, window->width, window->height);
#ifdef NS_DEBUG
printf("About to show xtbin(%p)...\n", mXtBin); fflush(NULL);
#endif
gtk_widget_show(mXtBin);
#ifdef NS_DEBUG
printf("completed gtk_widget_show(%p)\n", mXtBin); fflush(NULL);
#endif
}
// fill in window info structure
ws->type = 0; // OK, that was a guess!!
ws->depth = gdk_visual_get_best_depth();
ws->display = GTK_XTBIN(xtbin)->xtdisplay;
ws->depth = gdk_rgb_get_visual()->depth;
ws->display = GTK_XTBIN(mXtBin)->xtdisplay;
ws->visual = GDK_VISUAL_XVISUAL(gdk_rgb_get_visual());
ws->colormap = GDK_COLORMAP_XCOLORMAP(gdk_window_get_colormap(superwin->bin_window));
@ -574,7 +583,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
// And now point the NPWindow structures window
// to the actual X window
window->window = (nsPluginPort *)GTK_XTBIN(xtbin)->xtwindow;
window->window = (nsPluginPort *)GTK_XTBIN(mXtBin)->xtwindow;
#endif // MOZ_WIDGET_GTK
if (fCallbacks->setwindow) {

53
mozilla/modules/plugin/nglsrc/ns4xPluginInstance.h
View File

@ -56,61 +56,46 @@ public:
* constructor.) If an error is returned, the caller should <i>not</i>
* continue to use the <b>ns4xPluginInstance</b> object.
*/
NS_METHOD
Initialize(nsIPluginInstancePeer* peer);
NS_METHOD Initialize(nsIPluginInstancePeer* peer);
NS_IMETHOD
GetPeer(nsIPluginInstancePeer* *resultingPeer);
NS_IMETHOD GetPeer(nsIPluginInstancePeer* *resultingPeer);
NS_IMETHOD
Start(void);
NS_IMETHOD Start(void);
NS_IMETHOD
Stop(void);
NS_IMETHOD Stop(void);
NS_IMETHOD
Destroy(void);
NS_IMETHOD Destroy(void);
NS_IMETHOD
SetWindow(nsPluginWindow* window);
NS_IMETHOD SetWindow(nsPluginWindow* window);
NS_IMETHOD
NewStream(nsIPluginStreamListener** listener);
NS_IMETHOD NewStream(nsIPluginStreamListener** listener);
NS_IMETHOD
Print(nsPluginPrint* platformPrint);
NS_IMETHOD Print(nsPluginPrint* platformPrint);
NS_IMETHOD
GetValue(nsPluginInstanceVariable variable, void *value);
NS_IMETHOD GetValue(nsPluginInstanceVariable variable, void *value);
NS_IMETHOD
HandleEvent(nsPluginEvent* event, PRBool* handled);
NS_IMETHOD HandleEvent(nsPluginEvent* event, PRBool* handled);
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// ns4xPluginInstance-specific methods
/**
* Return the 4.x-style interface object.
*/
nsresult
GetNPP(NPP * aNPP);
nsresult GetNPP(NPP * aNPP);
/**
* Return the callbacks for the plugin instance.
*/
nsresult
GetCallbacks(const NPPluginFuncs ** aCallbacks);
nsresult GetCallbacks(const NPPluginFuncs ** aCallbacks);
nsresult
SetWindowless(PRBool aWindowless);
nsresult SetWindowless(PRBool aWindowless);
nsresult
SetTransparent(PRBool aTransparent);
nsresult SetTransparent(PRBool aTransparent);
nsresult
NewNotifyStream(nsIPluginStreamListener** listener, void* notifyData);
nsresult NewNotifyStream(nsIPluginStreamListener** listener, void* notifyData);
/**
/**
* Construct a new 4.x plugin instance with the specified peer
* and callbacks.
*/
@ -126,7 +111,7 @@ protected:
/**
* The plugin instance peer for this instance.
*/
nsIPluginInstancePeer* fPeer;
nsCOMPtr<nsIPluginInstancePeer> mPeer;
/**
* A pointer to the plugin's callback functions. This information
@ -140,7 +125,7 @@ protected:
* Special GtkXtBin widget that encapsulates the Xt toolkit
* within a Gtk Application
*/
GtkWidget *xtbin;
GtkWidget *mXtBin;
#endif
/**

4
mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@ -2146,7 +2146,7 @@ nsPluginHostImpl::IsPluginEnabledForType(const char* aMimeType)
variants = plugins->mVariants;
for (cnt = 0; cnt < variants; cnt++)
if (0 == strcmp(plugins->mMimeTypeArray[cnt], aMimeType))
if (plugins->mMimeTypeArray[cnt] && (0 == strcmp(plugins->mMimeTypeArray[cnt], aMimeType)))
return NS_OK;
if (cnt < variants)
@ -2393,7 +2393,7 @@ nsPluginHostImpl::FindPluginEnabledForType(const char* aMimeType,
variants = plugins->mVariants;
for (cnt = 0; cnt < variants; cnt++) {
if (0 == strcmp(plugins->mMimeTypeArray[cnt], aMimeType)) {
if (plugins->mMimeTypeArray[cnt] && (0 == strcmp(plugins->mMimeTypeArray[cnt], aMimeType))) {
aPlugin = plugins;
return NS_OK;
}

1
mozilla/modules/plugin/nglsrc/nsPluginsDirUNIX.cpp
View File

@ -32,6 +32,7 @@
#include "prlink.h"
#include "plstr.h"
#include "prmem.h"
#include "nsString.h"
#include "nsSpecialSystemDirectory.h"
/* Local helper functions */