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

Fixing Plugin SDK samples, bug 112255, bug 186163, bug 185776

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@136745 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterlubczynski%netscape.com
2003-01-21 21:03:49 +00:00
parent 16ac14d8e5
commit 66d9485bca
7 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/modules/plugin/tools/sdk/Makefile.in
View File

@@ -28,6 +28,9 @@ include $(DEPTH)/config/autoconf.mk
DIRS = samples
# uncomment NSDISTMODE to make a copy, instead of symlink, all needed files from $(DIST)
# NSDISTMODE = copy
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)

31
mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp
View File

@@ -38,13 +38,14 @@
#include "plugin.h"
#define MIME_TYPES_HANDLED "application/basic-plugin"
#define PLUGIN_NAME "Basic Example Plugin for Mozilla"
#define PLUGIN_DESCRIPTION MIME_TYPES_HANDLED":bsc:"PLUGIN_NAME
#define PLUGIN_NAME "Basic Example Plug-in for Mozilla"
#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED":bsc:"PLUGIN_NAME
fine PLUGIN_DESCRIPTION PLUGIN_NAME " (Plug-ins SDK sample)"
char* NPP_GetMIMEDescription(void)
{
return(PLUGIN_DESCRIPTION);
return(MIME_TYPES_DESCRIPTION);
}
/////////////////////////////////////
@@ -59,6 +60,24 @@ void NS_PluginShutdown()
{
}
// get values per plugin
NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
{
NPError err = NPERR_NO_ERROR;
switch (aVariable) {
case NPPVpluginNameString:
*((char **)aValue) = PLUGIN_NAME;
break;
case NPPVpluginDescriptionString:
*((char **)aValue) = PLUGIN_DESCRIPTION;
break;
default:
err = NPERR_INVALID_PARAM;
break;
}
return err;
}
/////////////////////////////////////////////////////////////
//
// construction and destruction of our plugin instance object
@@ -161,15 +180,15 @@ NPError nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
NPError err = NPERR_NO_ERROR;
switch (aVariable) {
case NPPVpluginNameString:
*((char **)aValue) = PLUGIN_NAME;
break;
case NPPVpluginDescriptionString:
*((char **)aValue) = PLUGIN_DESCRIPTION;
return NS_PluginGetValue(aVariable, aValue) ;
break;
default:
err = NPERR_INVALID_PARAM;
break;
}
return err;
}
NPError nsPluginInstance::SetWindow(NPWindow* aWindow)

2
mozilla/modules/plugin/tools/sdk/samples/common/np_entry.cpp
View File

@@ -187,7 +187,7 @@ char * NP_GetMIMEDescription(void)
NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
{
return NPP_GetValue((NPP_t *)future, aVariable, aValue);
return NS_PluginGetValue(aVariable, aValue);
}
#endif //XP_UNIX

5
mozilla/modules/plugin/tools/sdk/samples/include/pluginbase.h
View File

@@ -88,4 +88,9 @@ void NS_DestroyPluginInstance(nsPluginInstanceBase * aPlugin);
NPError NS_PluginInitialize();
void NS_PluginShutdown();
#ifdef XP_UNIX
// global to get plugins name & description
NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue);
#endif
#endif // __PLUGININSTANCEBASE_H__

24
mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp
View File

@@ -46,11 +46,12 @@
#define MIME_TYPES_HANDLED "application/scriptable-plugin"
#define PLUGIN_NAME "Scriptable Example Plugin for Mozilla"
#define PLUGIN_DESCRIPTION MIME_TYPES_HANDLED":scr:"PLUGIN_NAME
#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED":scr:"PLUGIN_NAME
#define PLUGIN_DESCRIPTION PLUGIN_NAME " (Plug-ins SDK sample)"
char* NPP_GetMIMEDescription(void)
{
return(PLUGIN_DESCRIPTION);
return(MIME_TYPES_DESCRIPTION);
}
//////////////////////////////////////
@@ -66,6 +67,25 @@ void NS_PluginShutdown()
{
}
// get values per plugin
NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
{
NPError err = NPERR_NO_ERROR;
switch (aVariable) {
case NPPVpluginNameString:
*((char **)aValue) = PLUGIN_NAME;
break;
case NPPVpluginDescriptionString:
*((char **)aValue) = PLUGIN_DESCRIPTION;
break;
default:
err = NPERR_INVALID_PARAM;
break;
}
return err;
}
/////////////////////////////////////////////////////////////
//
// construction and destruction of our plugin instance object

2
mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in
View File

@@ -37,7 +37,7 @@ CPPSRCS = nsScriptablePeer.cpp \
XPIDLSRCS = nsISimplePlugin.idl
SHARED_LIBRARY_LIBS = ../common/plugingate_s.$(LIB_SUFFIX)
SHARED_LIBRARY_LIBS = ../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
ifeq ($(OS_ARCH),WINNT)
DEFFILE = npsimple.def

33
mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp
View File

@@ -48,11 +48,30 @@ nsIServiceManager * gServiceManager = NULL;
#ifdef XP_UNIX
#define MIME_TYPES_HANDLED "application/simple-plugin"
#define PLUGIN_NAME "Simple Plugin Example for Mozilla"
#define PLUGIN_DESCRIPTION MIME_TYPES_HANDLED"::"PLUGIN_NAME
#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED"::"PLUGIN_NAME
#define PLUGIN_DESCRIPTION PLUGIN_NAME " (Plug-ins SDK sample)"
char* NPP_GetMIMEDescription(void)
{
return(PLUGIN_DESCRIPTION);
return(MIME_TYPES_DESCRIPTION);
}
// get values per plugin
NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
{
NPError err = NPERR_NO_ERROR;
switch (aVariable) {
case NPPVpluginNameString:
*((char **)aValue) = PLUGIN_NAME;
break;
case NPPVpluginDescriptionString:
*((char **)aValue) = PLUGIN_DESCRIPTION;
break;
default:
err = NPERR_INVALID_PARAM;
break;
}
return err;
}
#endif //XP_UNIX
@@ -206,16 +225,6 @@ NPError nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
}
break;
#ifdef XP_UNIX
// Unix needs some additional cases
case NPPVpluginNameString:
*((char **)aValue) = PLUGIN_NAME;
break;
case NPPVpluginDescriptionString:
*((char **)aValue) = PLUGIN_DESCRIPTION;
break;
#endif //XP_UNIX
default:
break;
}