Remove old and obsolete NPAPI plugin support files.

5 files changed, 0 insertions, 2371 deletions

diff --git a/apps/mozilla/jri.h b/apps/mozilla/jri.h
deleted file mode 100644
index 1eb8b74e..00000000
--- a/apps/mozilla/jri.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* dummy jri */
-#define jref void*
-#define JRIEnv void
-#define JRIGlobalRef void*
-#define JRI_NewGlobalRef(e,c) 0
-
diff --git a/apps/mozilla/npapi.h b/apps/mozilla/npapi.h
deleted file mode 100644
index 63eb4f7f..00000000
--- a/apps/mozilla/npapi.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/* -*- Mode: C; tab-width: 4; -*- */
-/*
- *  npapi.h $Revision: 1.88 $
- *  Netscape client plug-in API spec
- */
-
-#ifndef _NPAPI_H_
-#define _NPAPI_H_
-
-#include "jri.h"                /* Java Runtime Interface */
-
-#ifdef _WINDOWS
-# ifndef XP_WIN
-#   define XP_WIN 1
-# endif /* XP_WIN */
-#endif /* _WINDOWS */
-
-#ifdef __MWERKS__
-# define _declspec __declspec
-# ifdef macintosh
-#   ifndef XP_MAC
-#     define XP_MAC 1
-#   endif /* XP_MAC */
-# endif /* macintosh */
-# ifdef __INTEL__
-#   undef NULL
-#   ifndef XP_WIN
-#     define XP_WIN 1
-#   endif /* __INTEL__ */
-# endif /* XP_PC */
-#endif /* __MWERKS__ */
-
-#ifdef XP_MAC
-  #include <Quickdraw.h>
-  #include <Events.h>
-#endif
-
-#ifdef XP_UNIX
-  #include <X11/Xlib.h>
-  #include <X11/Xutil.h>
-#endif
-
-
-/*----------------------------------------------------------------------*/
-/*         Plugin Version Constants       */
-/*----------------------------------------------------------------------*/
-
-#define NP_VERSION_MAJOR 0
-#define NP_VERSION_MINOR 11
-
-
-
-/*----------------------------------------------------------------------*/
-/*         Definition of Basic Types        */
-/*----------------------------------------------------------------------*/
-
-#ifndef _UINT16
-typedef unsigned short uint16;
-#endif
-#ifndef _UINT32
-#if defined(__alpha)
-typedef unsigned int uint32;
-#else /* __alpha */
-typedef unsigned long uint32;
-#endif /* __alpha */
-#endif
-#ifndef _INT16
-typedef short int16;
-#endif
-#ifndef _INT32
-#if defined(__alpha)
-typedef int int32;
-#else /* __alpha */
-typedef long int32;
-#endif /* __alpha */
-#endif
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-#ifndef TRUE
-#define TRUE (1)
-#endif
-#ifndef NULL
-#define NULL (0L)
-#endif
-
-typedef unsigned char NPBool;
-typedef int16     NPError;
-typedef int16     NPReason;
-typedef char*     NPMIMEType;
-
-
-
-/*----------------------------------------------------------------------*/
-/*         Structures and definitions       */
-/*----------------------------------------------------------------------*/
-
-#ifdef XP_MAC
-#pragma options align=mac68k
-#endif
-
-/*
- *  NPP is a plug-in's opaque instance handle
- */
-typedef struct _NPP
-{
-    void* pdata;      /* plug-in private data */
-    void* ndata;      /* netscape private data */
-} NPP_t;
-
-typedef NPP_t*  NPP;
-
-
-typedef struct _NPStream
-{
-    void*   pdata;    /* plug-in private data */
-    void*   ndata;    /* netscape private data */
-    const char*   url;
-    uint32    end;
-    uint32    lastmodified;
-    void*   notifyData;
-} NPStream;
-
-
-typedef struct _NPByteRange
-{
-    int32 offset;     /* negative offset means from the end */
-    uint32  length;
-    struct _NPByteRange* next;
-} NPByteRange;
-
-
-typedef struct _NPSavedData
-{
-    int32 len;
-    void* buf;
-} NPSavedData;
-
-
-typedef struct _NPRect
-{
-    uint16  top;
-    uint16  left;
-    uint16  bottom;
-    uint16  right;
-} NPRect;
-
-
-#ifdef XP_UNIX
-/*
- * Unix specific structures and definitions
- */
-
-/*
- * Callback Structures.
- *
- * These are used to pass additional platform specific information.
- */
-enum {
-  NP_SETWINDOW = 1,
-  NP_PRINT
-};
-
-typedef struct
-{
-    int32   type;
-} NPAnyCallbackStruct;
-
-typedef struct
-{
-    int32     type;
-    Display*    display;
-    Visual*     visual;
-    Colormap    colormap;
-    unsigned int  depth;
-} NPSetWindowCallbackStruct;
-
-typedef struct
-{
-    int32     type;
-    FILE*     fp;
-} NPPrintCallbackStruct;
-
-#endif /* XP_UNIX */
-
-/*
- * List of variable names for which NPP_GetValue shall be implemented
- */
-typedef enum {
-  NPPVpluginNameString = 1,
-  NPPVpluginDescriptionString,
-  NPPVpluginWindowBool,
-  NPPVpluginTransparentBool
-} NPPVariable;
-
-/*
- * List of variable names for which NPN_GetValue is implemented by Mozilla
- */
-typedef enum {
-  NPNVxDisplay = 1,
-  NPNVxtAppContext,
-    NPNVnetscapeWindow,
-  NPNVjavascriptEnabledBool,
-  NPNVasdEnabledBool,
-  NPNVisOfflineBool
-} NPNVariable;
-
-/*
- * The type of a NPWindow - it specifies the type of the data structure
- * returned in the window field.
- */
-typedef enum {
-    NPWindowTypeWindow = 1,
-    NPWindowTypeDrawable
-} NPWindowType;
-
-typedef struct _NPWindow
-{
-    void* window;   /* Platform specific window handle */
-    int32 x;      /* Position of top left corner relative */
-    int32 y;      /*  to a netscape page.         */
-    uint32  width;    /* Maximum window size */
-    uint32  height;
-    NPRect  clipRect; /* Clipping rectangle in port coordinates */
-	    /* Used by MAC only.        */
-#ifdef XP_UNIX
-    void *  ws_info;  /* Platform-dependent additonal data */
-#endif /* XP_UNIX */
-    NPWindowType type;  /* Is this a window or a drawable? */
-} NPWindow;
-
-
-typedef struct _NPFullPrint
-{
-    NPBool  pluginPrinted;  /* Set TRUE if plugin handled fullscreen */
-			    /*  printing               */
-    NPBool  printOne;   /* TRUE if plugin should print one copy  */
-			/*  to default printer           */
-    void* platformPrint;  /* Platform-specific printing info */
-} NPFullPrint;
-
-typedef struct _NPEmbedPrint
-{
-    NPWindow  window;
-    void* platformPrint;  /* Platform-specific printing info */
-} NPEmbedPrint;
-
-typedef struct _NPPrint
-{
-    uint16  mode;           /* NP_FULL or NP_EMBED */
-    union
-    {
-    NPFullPrint   fullPrint;    /* if mode is NP_FULL */
-    NPEmbedPrint  embedPrint;   /* if mode is NP_EMBED */
-    } print;
-} NPPrint;
-
-#ifdef XP_MAC
-typedef EventRecord NPEvent;
-#elif defined(XP_WIN)
-typedef struct _NPEvent
-{
-    uint16   event;
-    uint32   wParam;
-    uint32   lParam;
-} NPEvent;
-#elif defined (XP_UNIX)
-typedef XEvent NPEvent;
-#else
-typedef void*     NPEvent;
-#endif /* XP_MAC */
-
-#ifdef XP_MAC
-typedef RgnHandle NPRegion;
-#elif defined(XP_WIN)
-typedef HRGN NPRegion;
-#elif defined(XP_UNIX)
-typedef Region NPRegion;
-#else
-typedef void *NPRegion;
-#endif /* XP_MAC */
-
-#ifdef XP_MAC
-/*
- *  Mac-specific structures and definitions.
- */
-
-typedef struct NP_Port
-{
-    CGrafPtr  port;   /* Grafport */
-    int32   portx;    /* position inside the topmost window */
-    int32   porty;
-} NP_Port;
-
-/*
- *  Non-standard event types that can be passed to HandleEvent
- */
-#define getFocusEvent     (osEvt + 16)
-#define loseFocusEvent      (osEvt + 17)
-#define adjustCursorEvent   (osEvt + 18)
-
-#endif /* XP_MAC */
-
-
-/*
- * Values for mode passed to NPP_New:
- */
-#define NP_EMBED    1
-#define NP_FULL     2
-
-/*
- * Values for stream type passed to NPP_NewStream:
- */
-#define NP_NORMAL   1
-#define NP_SEEK     2
-#define NP_ASFILE   3
-#define NP_ASFILEONLY   4
-
-#define NP_MAXREADY (((unsigned)(~0)<<1)>>1)
-
-#ifdef XP_MAC
-#pragma options align=reset
-#endif
-
-
-/*----------------------------------------------------------------------*/
-/*         Error and Reason Code definitions      */
-/*----------------------------------------------------------------------*/
-
-/*
- *  Values of type NPError:
- */
-#define NPERR_BASE              0
-#define NPERR_NO_ERROR            (NPERR_BASE + 0)
-#define NPERR_GENERIC_ERROR         (NPERR_BASE + 1)
-#define NPERR_INVALID_INSTANCE_ERROR    (NPERR_BASE + 2)
-#define NPERR_INVALID_FUNCTABLE_ERROR   (NPERR_BASE + 3)
-#define NPERR_MODULE_LOAD_FAILED_ERROR    (NPERR_BASE + 4)
-#define NPERR_OUT_OF_MEMORY_ERROR     (NPERR_BASE + 5)
-#define NPERR_INVALID_PLUGIN_ERROR      (NPERR_BASE + 6)
-#define NPERR_INVALID_PLUGIN_DIR_ERROR    (NPERR_BASE + 7)
-#define NPERR_INCOMPATIBLE_VERSION_ERROR  (NPERR_BASE + 8)
-#define NPERR_INVALID_PARAM       (NPERR_BASE + 9)
-#define NPERR_INVALID_URL         (NPERR_BASE + 10)
-#define NPERR_FILE_NOT_FOUND        (NPERR_BASE + 11)
-#define NPERR_NO_DATA           (NPERR_BASE + 12)
-#define NPERR_STREAM_NOT_SEEKABLE     (NPERR_BASE + 13)
-
-/*
- *  Values of type NPReason:
- */
-#define NPRES_BASE        0
-#define NPRES_DONE          (NPRES_BASE + 0)
-#define NPRES_NETWORK_ERR     (NPRES_BASE + 1)
-#define NPRES_USER_BREAK      (NPRES_BASE + 2)
-
-/*
- *      Don't use these obsolete error codes any more.
- */
-#define NP_NOERR  NP_NOERR_is_obsolete_use_NPERR_NO_ERROR
-#define NP_EINVAL NP_EINVAL_is_obsolete_use_NPERR_GENERIC_ERROR
-#define NP_EABORT NP_EABORT_is_obsolete_use_NPRES_USER_BREAK
-
-/*
- * Version feature information
- */
-#define NPVERS_HAS_STREAMOUTPUT   8
-#define NPVERS_HAS_NOTIFICATION   9
-#define NPVERS_HAS_LIVECONNECT    9
-#define NPVERS_WIN16_HAS_LIVECONNECT  9
-#define NPVERS_68K_HAS_LIVECONNECT  11
-#define NPVERS_HAS_WINDOWLESS       11
-
-
-/*----------------------------------------------------------------------*/
-/*         Function Prototypes        */
-/*----------------------------------------------------------------------*/
-
-#if defined(_WINDOWS) && !defined(WIN32)
-#define NP_LOADDS  _loadds
-#else
-#define NP_LOADDS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * NPP_* functions are provided by the plugin and called by the navigator.
- */
-
-#ifdef XP_UNIX
-char*         NPP_GetMIMEDescription(void);
-#endif /* XP_UNIX */
-
-NPError    NPP_Initialize(void);
-void       NPP_Shutdown(void);
-NPError     NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
-		uint16 mode, int16 argc, char* argn[],
-		char* argv[], NPSavedData* saved);
-NPError     NP_LOADDS NPP_Destroy(NPP instance, NPSavedData** save);
-NPError     NP_LOADDS NPP_SetWindow(NPP instance, NPWindow* window);
-NPError     NP_LOADDS NPP_NewStream(NPP instance, NPMIMEType type,
-		NPStream* stream, NPBool seekable,
-		uint16* stype);
-NPError     NP_LOADDS NPP_DestroyStream(NPP instance, NPStream* stream,
-		NPReason reason);
-int32     NP_LOADDS NPP_WriteReady(NPP instance, NPStream* stream);
-int32     NP_LOADDS NPP_Write(NPP instance, NPStream* stream, int32 offset,
-		int32 len, void* buffer);
-void      NP_LOADDS NPP_StreamAsFile(NPP instance, NPStream* stream,
-		const char* fname);
-void      NP_LOADDS NPP_Print(NPP instance, NPPrint* platformPrint);
-int16     NPP_HandleEvent(NPP instance, void* event);
-void      NP_LOADDS NPP_URLNotify(NPP instance, const char* url,
-		NPReason reason, void* notifyData);
-jref      NP_LOADDS     NPP_GetJavaClass(void);
-NPError         NPP_GetValue(void *instance, NPPVariable variable,
-		void *value);
-NPError         NPP_SetValue(void *instance, NPNVariable variable,
-		void *value);
-
-/*
- * NPN_* functions are provided by the navigator and called by the plugin.
- */
-
-void    NPN_Version(int* plugin_major, int* plugin_minor,
-		int* netscape_major, int* netscape_minor);
-NPError   NPN_GetURLNotify(NPP instance, const char* url,
-		const char* target, void* notifyData);
-NPError   NPN_GetURL(NPP instance, const char* url,
-		const char* target);
-NPError   NPN_PostURLNotify(NPP instance, const char* url,
-		const char* target, uint32 len,
-		const char* buf, NPBool file,
-		void* notifyData);
-NPError   NPN_PostURL(NPP instance, const char* url,
-		const char* target, uint32 len,
-		const char* buf, NPBool file);
-NPError   NPN_RequestRead(NPStream* stream, NPByteRange* rangeList);
-NPError   NPN_NewStream(NPP instance, NPMIMEType type,
-		const char* target, NPStream** stream);
-int32   NPN_Write(NPP instance, NPStream* stream, int32 len,
-		void* buffer);
-NPError     NPN_DestroyStream(NPP instance, NPStream* stream,
-		NPReason reason);
-void    NPN_Status(NPP instance, const char* message);
-const char* NPN_UserAgent(NPP instance);
-void*   NPN_MemAlloc(uint32 size);
-void    NPN_MemFree(void* ptr);
-uint32    NPN_MemFlush(uint32 size);
-void      NPN_ReloadPlugins(NPBool reloadPages);
-JRIEnv*     NPN_GetJavaEnv(void);
-jref      NPN_GetJavaPeer(NPP instance);
-NPError     NPN_GetValue(NPP instance, NPNVariable variable,
-		void *value);
-NPError     NPN_SetValue(NPP instance, NPPVariable variable,
-		void *value);
-void    NPN_InvalidateRect(NPP instance, NPRect *invalidRect);
-void    NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion);
-void    NPN_ForceRedraw(NPP instance);
-
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
-
-#endif /* _NPAPI_H_ */
-
diff --git a/apps/mozilla/npunix.c b/apps/mozilla/npunix.c
deleted file mode 100644
index f705a5f1..00000000
--- a/apps/mozilla/npunix.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * npunix.c
- *
- * Netscape Client Plugin API
- * - Wrapper function to interface with the Netscape Navigator
- *
- * dp Suresh <dp@netscape.com>
- *
- *----------------------------------------------------------------------
- * PLUGIN DEVELOPERS:
- *	YOU WILL NOT NEED TO EDIT THIS FILE.
- *----------------------------------------------------------------------
- */
-
-#define XP_UNIX 1
-
-#include <stdio.h>
-#include "npapi.h"
-#include "npupp.h"
-
-/*
- * Define PLUGIN_TRACE to have the wrapper functions print
- * messages to stderr whenever they are called.
- */
-
-#ifdef PLUGIN_TRACE
-#include <stdio.h>
-#define PLUGINDEBUGSTR(msg)	fprintf(stderr, "%s\n", msg)
-#else
-#define PLUGINDEBUGSTR(msg)
-#endif
-
-
-/***********************************************************************
- *
- * Globals
- *
- ***********************************************************************/
-
-static NPNetscapeFuncs   gNetscapeFuncs;	/* Netscape Function table */
-
-
-/***********************************************************************
- *
- * Wrapper functions : plugin calling Netscape Navigator
- *
- * These functions let the plugin developer just call the APIs
- * as documented and defined in npapi.h, without needing to know
- * about the function table and call macros in npupp.h.
- *
- ***********************************************************************/
-
-void
-NPN_Version(int* plugin_major, int* plugin_minor,
-	     int* netscape_major, int* netscape_minor)
-{
-	*plugin_major = NP_VERSION_MAJOR;
-	*plugin_minor = NP_VERSION_MINOR;
-
-	/* Major version is in high byte */
-	*netscape_major = gNetscapeFuncs.version >> 8;
-	/* Minor version is in low byte */
-	*netscape_minor = gNetscapeFuncs.version & 0xFF;
-}
-
-NPError
-NPN_GetValue(NPP instance, NPNVariable variable, void *r_value)
-{
-	return CallNPN_GetValueProc(gNetscapeFuncs.getvalue,
-					instance, variable, r_value);
-}
-
-NPError
-NPN_GetURL(NPP instance, const char* url, const char* window)
-{
-	return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window);
-}
-
-NPError
-NPN_PostURL(NPP instance, const char* url, const char* window,
-	     uint32 len, const char* buf, NPBool file)
-{
-	return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
-					url, window, len, buf, file);
-}
-
-NPError
-NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
-{
-	return CallNPN_RequestReadProc(gNetscapeFuncs.requestread,
-					stream, rangeList);
-}
-
-NPError
-NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
-	      NPStream** stream_ptr)
-{
-	return CallNPN_NewStreamProc(gNetscapeFuncs.newstream, instance,
-					type, window, stream_ptr);
-}
-
-int32
-NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
-{
-	return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
-					stream, len, buffer);
-}
-
-NPError
-NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
-{
-	return CallNPN_DestroyStreamProc(gNetscapeFuncs.destroystream,
-						instance, stream, reason);
-}
-
-void
-NPN_Status(NPP instance, const char* message)
-{
-	CallNPN_StatusProc(gNetscapeFuncs.status, instance, message);
-}
-
-const char*
-NPN_UserAgent(NPP instance)
-{
-	return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
-}
-
-void*
-NPN_MemAlloc(uint32 size)
-{
-	return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
-}
-
-void NPN_MemFree(void* ptr)
-{
-	CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
-}
-
-uint32 NPN_MemFlush(uint32 size)
-{
-	return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
-}
-
-void NPN_ReloadPlugins(NPBool reloadPages)
-{
-	CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages);
-}
-
-JRIEnv* NPN_GetJavaEnv()
-{
-	return CallNPN_GetJavaEnvProc(gNetscapeFuncs.getJavaEnv);
-}
-
-jref NPN_GetJavaPeer(NPP instance)
-{
-	return CallNPN_GetJavaPeerProc(gNetscapeFuncs.getJavaPeer,
-				       instance);
-}
-
-
-/***********************************************************************
- *
- * Wrapper functions : Netscape Navigator -> plugin
- *
- * These functions let the plugin developer just create the APIs
- * as documented and defined in npapi.h, without needing to
- * install those functions in the function table or worry about
- * setting up globals for 68K plugins.
- *
- ***********************************************************************/
-
-NPError
-Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
-		int16 argc, char* argn[], char* argv[], NPSavedData* saved)
-{
-	NPError ret;
-	PLUGINDEBUGSTR("New");
-	ret = NPP_New(pluginType, instance, mode, argc, argn, argv, saved);
-	return ret;
-}
-
-NPError
-Private_Destroy(NPP instance, NPSavedData** save)
-{
-	PLUGINDEBUGSTR("Destroy");
-	return NPP_Destroy(instance, save);
-}
-
-NPError
-Private_SetWindow(NPP instance, NPWindow* window)
-{
-	NPError err;
-	PLUGINDEBUGSTR("SetWindow");
-	err = NPP_SetWindow(instance, window);
-	return err;
-}
-
-NPError
-Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
-			NPBool seekable, uint16* stype)
-{
-	NPError err;
-	PLUGINDEBUGSTR("NewStream");
-	err = NPP_NewStream(instance, type, stream, seekable, stype);
-	return err;
-}
-
-int32
-Private_WriteReady(NPP instance, NPStream* stream)
-{
-	unsigned int result;
-	PLUGINDEBUGSTR("WriteReady");
-	result = NPP_WriteReady(instance, stream);
-	return result;
-}
-
-int32
-Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
-		void* buffer)
-{
-	unsigned int result;
-	PLUGINDEBUGSTR("Write");
-	result = NPP_Write(instance, stream, offset, len, buffer);
-	return result;
-}
-
-void
-Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname)
-{
-	PLUGINDEBUGSTR("StreamAsFile");
-	NPP_StreamAsFile(instance, stream, fname);
-}
-
-
-NPError
-Private_DestroyStream(NPP instance, NPStream* stream, NPError reason)
-{
-	NPError err;
-	PLUGINDEBUGSTR("DestroyStream");
-	err = NPP_DestroyStream(instance, stream, reason);
-	return err;
-}
-
-
-void
-Private_Print(NPP instance, NPPrint* platformPrint)
-{
-	PLUGINDEBUGSTR("Print");
-	NPP_Print(instance, platformPrint);
-}
-
-JRIGlobalRef
-Private_GetJavaClass(void)
-{
-    jref clazz = NPP_GetJavaClass();
-    if (clazz) {
-	JRIEnv* env = NPN_GetJavaEnv();
-	return JRI_NewGlobalRef(env, clazz);
-    }
-    return NULL;
-}
-
-/***********************************************************************
- *
- * These functions are located automagically by netscape.
- *
- ***********************************************************************/
-
-/*
- * NP_GetMIMEDescription
- *	- Netscape needs to know about this symbol
- *	- Netscape uses the return value to identify when an object instance
- *	  of this plugin should be created.
- */
-char *
-NP_GetMIMEDescription(void)
-{
-	return NPP_GetMIMEDescription();
-}
-
-/*
- * NP_GetValue [optional]
- *	- Netscape needs to know about this symbol.
- *	- Interfaces with plugin to get values for predefined variables
- *	  that the navigator needs.
- */
-NPError
-NP_GetValue(void *future, NPPVariable variable, void *value)
-{
-	return NPP_GetValue(future, variable, value);
-}
-
-/*
- * NP_Initialize
- *	- Netscape needs to know about this symbol.
- *	- It calls this function after looking up its symbol before it
- *	  is about to create the first ever object of this kind.
- *
- * PARAMETERS
- *    nsTable	- The netscape function table. If developers just use these
- *		  wrappers, they dont need to worry about all these function
- *		  tables.
- * RETURN
- *    pluginFuncs
- *		- This functions needs to fill the plugin function table
- *		  pluginFuncs and return it. Netscape Navigator plugin
- *		  library will use this function table to call the plugin.
- *
- */
-NPError
-NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
-{
-	NPError err = NPERR_NO_ERROR;
-
-	PLUGINDEBUGSTR("NP_Initialize");
-
-	/* validate input parameters */
-
-	if ((nsTable == NULL) || (pluginFuncs == NULL))
-		err = NPERR_INVALID_FUNCTABLE_ERROR;
-
-	/*
-	 * Check the major version passed in Netscape's function table.
-	 * We won't load if the major version is newer than what we expect.
-	 * Also check that the function tables passed in are big enough for
-	 * all the functions we need (they could be bigger, if Netscape added
-	 * new APIs, but that's OK with us -- we'll just ignore them).
-	 *
-	 */
-
-	if (err == NPERR_NO_ERROR) {
-		if ((nsTable->version >> 8) > NP_VERSION_MAJOR)
-			err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-		if (nsTable->size < sizeof(NPNetscapeFuncs))
-			err = NPERR_INVALID_FUNCTABLE_ERROR;
-		if (pluginFuncs->size < sizeof(NPPluginFuncs))
-			err = NPERR_INVALID_FUNCTABLE_ERROR;
-	}
-
-
-	if (err == NPERR_NO_ERROR) {
-		/*
-		 * Copy all the fields of Netscape function table into our
-		 * copy so we can call back into Netscape later.  Note that
-		 * we need to copy the fields one by one, rather than assigning
-		 * the whole structure, because the Netscape function table
-		 * could actually be bigger than what we expect.
-		 */
-		gNetscapeFuncs.version       = nsTable->version;
-		gNetscapeFuncs.size          = nsTable->size;
-		gNetscapeFuncs.posturl       = nsTable->posturl;
-		gNetscapeFuncs.geturl        = nsTable->geturl;
-		gNetscapeFuncs.requestread   = nsTable->requestread;
-		gNetscapeFuncs.newstream     = nsTable->newstream;
-		gNetscapeFuncs.write         = nsTable->write;
-		gNetscapeFuncs.destroystream = nsTable->destroystream;
-		gNetscapeFuncs.status        = nsTable->status;
-		gNetscapeFuncs.uagent        = nsTable->uagent;
-		gNetscapeFuncs.memalloc      = nsTable->memalloc;
-		gNetscapeFuncs.memfree       = nsTable->memfree;
-		gNetscapeFuncs.memflush      = nsTable->memflush;
-		gNetscapeFuncs.reloadplugins = nsTable->reloadplugins;
-		gNetscapeFuncs.getJavaEnv    = nsTable->getJavaEnv;
-		gNetscapeFuncs.getJavaPeer   = nsTable->getJavaPeer;
-		gNetscapeFuncs.getvalue      = nsTable->getvalue;
-
-		/*
-		 * Set up the plugin function table that Netscape will use to
-		 * call us.  Netscape needs to know about our version and size
-		 * and have a UniversalProcPointer for every function we
-		 * implement.
-		 */
-		pluginFuncs->version    = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-		pluginFuncs->size       = sizeof(NPPluginFuncs);
-		pluginFuncs->newp       = NewNPP_NewProc(Private_New);
-		pluginFuncs->destroy    = NewNPP_DestroyProc(Private_Destroy);
-		pluginFuncs->setwindow  = NewNPP_SetWindowProc(Private_SetWindow);
-		pluginFuncs->newstream  = NewNPP_NewStreamProc(Private_NewStream);
-		pluginFuncs->destroystream = NewNPP_DestroyStreamProc(Private_DestroyStream);
-		pluginFuncs->asfile     = NewNPP_StreamAsFileProc(Private_StreamAsFile);
-		pluginFuncs->writeready = NewNPP_WriteReadyProc(Private_WriteReady);
-		pluginFuncs->write      = NewNPP_WriteProc(Private_Write);
-		pluginFuncs->print      = NewNPP_PrintProc(Private_Print);
-		pluginFuncs->event      = NULL;
-		pluginFuncs->javaClass	= Private_GetJavaClass();
-
-		err = NPP_Initialize();
-	}
-
-	return err;
-}
-
-/*
- * NP_Shutdown [optional]
- *	- Netscape needs to know about this symbol.
- *	- It calls this function after looking up its symbol after
- *	  the last object of this kind has been destroyed.
- *
- */
-NPError
-NP_Shutdown(void)
-{
-	PLUGINDEBUGSTR("NP_Shutdown");
-	NPP_Shutdown();
-	return NPERR_NO_ERROR;
-}
-
diff --git a/apps/mozilla/npupp.h b/apps/mozilla/npupp.h
deleted file mode 100644
index 203bfc77..00000000
--- a/apps/mozilla/npupp.h
+++ /dev/null
@@ -1,1161 +0,0 @@
-/* -*- Mode: C; tab-width: 4; -*- */
-/*
- *  npupp.h $Revision: 1.41 $
- *  function call mecahnics needed by platform specific glue code.
- */
-
-
-#ifndef _NPUPP_H_
-#define _NPUPP_H_
-
-#ifndef GENERATINGCFM
-#define GENERATINGCFM 0
-#endif
-
-#ifndef _NPAPI_H_
-#include "npapi.h"
-#endif
-
-#include "jri.h"
-
-/******************************************************************************************
-   plug-in function table macros
-	    for each function in and out of the plugin API we define
-		    typedef NPP_FooUPP
-	    #define NewNPP_FooProc
-	    #define CallNPP_FooProc
-      for mac, define the UPP magic for PPC/68K calling
- *******************************************************************************************/
-
-
-/* NPP_Initialize */
-
-#if GENERATINGCFM
-typedef UniversalProcPtr NPP_InitializeUPP;
-
-enum {
-  uppNPP_InitializeProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
-    | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#define NewNPP_InitializeProc(FUNC)   \
-    (NPP_InitializeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_InitializeProcInfo, GetCurrentArchitecture())
-#define CallNPP_InitializeProc(FUNC)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_InitializeProcInfo)
-
-#else
-
-typedef void (*NPP_InitializeUPP)(void);
-#define NewNPP_InitializeProc(FUNC)   \
-    ((NPP_InitializeUPP) (FUNC))
-#define CallNPP_InitializeProc(FUNC)    \
-    (*(FUNC))()
-
-#endif
-
-
-/* NPP_Shutdown */
-
-#if GENERATINGCFM
-typedef UniversalProcPtr NPP_ShutdownUPP;
-
-enum {
-  uppNPP_ShutdownProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
-    | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#define NewNPP_ShutdownProc(FUNC)   \
-    (NPP_ShutdownUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_ShutdownProcInfo, GetCurrentArchitecture())
-#define CallNPP_ShutdownProc(FUNC)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_ShutdownProcInfo)
-
-#else
-
-typedef void (*NPP_ShutdownUPP)(void);
-#define NewNPP_ShutdownProc(FUNC)   \
-    ((NPP_ShutdownUPP) (FUNC))
-#define CallNPP_ShutdownProc(FUNC)    \
-    (*(FUNC))()
-
-#endif
-
-
-/* NPP_New */
-
-#if GENERATINGCFM
-typedef UniversalProcPtr NPP_NewUPP;
-
-enum {
-  uppNPP_NewProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPMIMEType)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(uint16)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(int16)))
-    | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(char **)))
-    | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(char **)))
-    | STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(NPSavedData *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-
-#define NewNPP_NewProc(FUNC)    \
-    (NPP_NewUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewProcInfo, GetCurrentArchitecture())
-#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewProcInfo, \
-		    (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
-#else
-
-typedef NPError (*NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
-#define NewNPP_NewProc(FUNC)    \
-    ((NPP_NewUPP) (FUNC))
-#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7)   \
-    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
-
-#endif
-
-
-/* NPP_Destroy */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_DestroyUPP;
-enum {
-  uppNPP_DestroyProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPSavedData **)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_DestroyProc(FUNC)    \
-    (NPP_DestroyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyProcInfo, GetCurrentArchitecture())
-#define CallNPP_DestroyProc(FUNC, ARG1, ARG2)   \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_DestroyProcInfo, (ARG1), (ARG2))
-#else
-
-typedef NPError (*NPP_DestroyUPP)(NPP instance, NPSavedData** save);
-#define NewNPP_DestroyProc(FUNC)    \
-    ((NPP_DestroyUPP) (FUNC))
-#define CallNPP_DestroyProc(FUNC, ARG1, ARG2)   \
-    (*(FUNC))((ARG1), (ARG2))
-
-#endif
-
-
-/* NPP_SetWindow */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_SetWindowUPP;
-enum {
-  uppNPP_SetWindowProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPWindow *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_SetWindowProc(FUNC)    \
-    (NPP_SetWindowUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetWindowProcInfo, GetCurrentArchitecture())
-#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2)   \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_SetWindowProcInfo, (ARG1), (ARG2))
-
-#else
-
-typedef NPError (*NPP_SetWindowUPP)(NPP instance, NPWindow* window);
-#define NewNPP_SetWindowProc(FUNC)    \
-    ((NPP_SetWindowUPP) (FUNC))
-#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2)   \
-    (*(FUNC))((ARG1), (ARG2))
-
-#endif
-
-
-/* NPP_NewStream */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_NewStreamUPP;
-enum {
-  uppNPP_NewStreamProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPMIMEType)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPStream *)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(NPBool)))
-    | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(uint16 *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_NewStreamProc(FUNC)    \
-    (NPP_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewStreamProcInfo, GetCurrentArchitecture())
-#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5)   \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewStreamProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
-#else
-
-typedef NPError (*NPP_NewStreamUPP)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
-#define NewNPP_NewStreamProc(FUNC)    \
-    ((NPP_NewStreamUPP) (FUNC))
-#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5) \
-    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
-#endif
-
-
-/* NPP_DestroyStream */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_DestroyStreamUPP;
-enum {
-  uppNPP_DestroyStreamProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_DestroyStreamProc(FUNC)    \
-    (NPP_DestroyStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyStreamProcInfo, GetCurrentArchitecture())
-#define CallNPP_DestroyStreamProc(FUNC,  NPParg, NPStreamPtr, NPReasonArg)    \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_DestroyStreamProcInfo, (NPParg), (NPStreamPtr), (NPReasonArg))
-
-#else
-
-typedef NPError (*NPP_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
-#define NewNPP_DestroyStreamProc(FUNC)    \
-    ((NPP_DestroyStreamUPP) (FUNC))
-#define CallNPP_DestroyStreamProc(FUNC,  NPParg, NPStreamPtr, NPReasonArg)    \
-    (*(FUNC))((NPParg), (NPStreamPtr), (NPReasonArg))
-
-#endif
-
-
-/* NPP_WriteReady */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_WriteReadyUPP;
-enum {
-  uppNPP_WriteReadyProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
-};
-#define NewNPP_WriteReadyProc(FUNC)   \
-    (NPP_WriteReadyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_WriteReadyProcInfo, GetCurrentArchitecture())
-#define CallNPP_WriteReadyProc(FUNC,  NPParg, NPStreamPtr)    \
-    (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_WriteReadyProcInfo, (NPParg), (NPStreamPtr))
-
-#else
-
-typedef int32 (*NPP_WriteReadyUPP)(NPP instance, NPStream* stream);
-#define NewNPP_WriteReadyProc(FUNC)   \
-    ((NPP_WriteReadyUPP) (FUNC))
-#define CallNPP_WriteReadyProc(FUNC,  NPParg, NPStreamPtr)    \
-    (*(FUNC))((NPParg), (NPStreamPtr))
-
-#endif
-
-
-/* NPP_Write */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_WriteUPP;
-enum {
-  uppNPP_WriteProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(int32)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(int32)))
-    | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(void*)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
-};
-#define NewNPP_WriteProc(FUNC)    \
-    (NPP_WriteUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_WriteProcInfo, GetCurrentArchitecture())
-#define CallNPP_WriteProc(FUNC,  NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr)   \
-    (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_WriteProcInfo, (NPParg), (NPStreamPtr), (offsetArg), (lenArg), (bufferPtr))
-
-#else
-
-typedef int32 (*NPP_WriteUPP)(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
-#define NewNPP_WriteProc(FUNC)    \
-    ((NPP_WriteUPP) (FUNC))
-#define CallNPP_WriteProc(FUNC,  NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr)   \
-    (*(FUNC))((NPParg), (NPStreamPtr), (offsetArg), (lenArg), (bufferPtr))
-
-#endif
-
-
-/* NPP_StreamAsFile */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_StreamAsFileUPP;
-enum {
-  uppNPP_StreamAsFileProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char *)))
-    | RESULT_SIZE(SIZE_CODE(0))
-};
-#define NewNPP_StreamAsFileProc(FUNC)   \
-    (NPP_StreamAsFileUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_StreamAsFileProcInfo, GetCurrentArchitecture())
-#define CallNPP_StreamAsFileProc(FUNC, ARG1, ARG2, ARG3)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_StreamAsFileProcInfo, (ARG1), (ARG2), (ARG3))
-
-#else
-
-typedef void (*NPP_StreamAsFileUPP)(NPP instance, NPStream* stream, const char* fname);
-#define NewNPP_StreamAsFileProc(FUNC)   \
-    ((NPP_StreamAsFileUPP) (FUNC))
-#define CallNPP_StreamAsFileProc(FUNC,  ARG1, ARG2, ARG3)   \
-    (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPP_Print */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_PrintUPP;
-enum {
-  uppNPP_PrintProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPrint *)))
-    | RESULT_SIZE(SIZE_CODE(0))
-};
-#define NewNPP_PrintProc(FUNC)    \
-    (NPP_PrintUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_PrintProcInfo, GetCurrentArchitecture())
-#define CallNPP_PrintProc(FUNC,  NPParg, voidPtr)   \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_PrintProcInfo, (NPParg), (voidPtr))
-
-#else
-
-typedef void (*NPP_PrintUPP)(NPP instance, NPPrint* platformPrint);
-#define NewNPP_PrintProc(FUNC)    \
-    ((NPP_PrintUPP) (FUNC))
-#define CallNPP_PrintProc(FUNC,  NPParg, NPPrintArg)    \
-    (*(FUNC))((NPParg), (NPPrintArg))
-
-#endif
-
-
-/* NPP_HandleEvent */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_HandleEventUPP;
-enum {
-  uppNPP_HandleEventProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(void *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(int16)))
-};
-#define NewNPP_HandleEventProc(FUNC)    \
-    (NPP_HandleEventUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_HandleEventProcInfo, GetCurrentArchitecture())
-#define CallNPP_HandleEventProc(FUNC,  NPParg, voidPtr)   \
-    (int16)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_HandleEventProcInfo, (NPParg), (voidPtr))
-
-#else
-
-typedef int16 (*NPP_HandleEventUPP)(NPP instance, void* event);
-#define NewNPP_HandleEventProc(FUNC)    \
-    ((NPP_HandleEventUPP) (FUNC))
-#define CallNPP_HandleEventProc(FUNC,  NPParg, voidPtr)   \
-    (*(FUNC))((NPParg), (voidPtr))
-
-#endif
-
-
-/* NPP_URLNotify */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_URLNotifyUPP;
-enum {
-  uppNPP_URLNotifyProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
-    | RESULT_SIZE(SIZE_CODE(SIZE_CODE(0)))
-};
-#define NewNPP_URLNotifyProc(FUNC)    \
-    (NPP_URLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_URLNotifyProcInfo, GetCurrentArchitecture())
-#define CallNPP_URLNotifyProc(FUNC,  ARG1, ARG2, ARG3, ARG4)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_URLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4))
-
-#else
-
-typedef void (*NPP_URLNotifyUPP)(NPP instance, const char* url, NPReason reason, void* notifyData);
-#define NewNPP_URLNotifyProc(FUNC)    \
-    ((NPP_URLNotifyUPP) (FUNC))
-#define CallNPP_URLNotifyProc(FUNC,  ARG1, ARG2, ARG3, ARG4)    \
-    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
-
-#endif
-
-
-/* NPP_GetValue */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_GetValueUPP;
-enum {
-  uppNPP_GetValueProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPVariable)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_GetValueProc(FUNC)   \
-    (NPP_GetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_GetValueProcInfo, GetCurrentArchitecture())
-#define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_GetValueProcInfo, (ARG1), (ARG2), (ARG3))
-#else
-
-typedef NPError (*NPP_GetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
-#define NewNPP_GetValueProc(FUNC)   \
-    ((NPP_GetValueUPP) (FUNC))
-#define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3)    \
-    (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPP_SetValue */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_SetValueUPP;
-enum {
-  uppNPP_SetValueProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPNVariable)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_SetValueProc(FUNC)   \
-    (NPP_SetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetValueProcInfo, GetCurrentArchitecture())
-#define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_SetValueProcInfo, (ARG1), (ARG2), (ARG3))
-#else
-
-typedef NPError (*NPP_SetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
-#define NewNPP_SetValueProc(FUNC)   \
-    ((NPP_SetValueUPP) (FUNC))
-#define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3)    \
-    (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-
-
-/*
- *  Netscape entry points
- */
-
-
-/* NPN_GetValue */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_GetValueUPP;
-enum {
-  uppNPN_GetValueProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPNVariable)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_GetValueProc(FUNC)   \
-    (NPN_GetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetValueProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetValueProcInfo, (ARG1), (ARG2), (ARG3))
-#else
-
-typedef NPError (*NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
-#define NewNPN_GetValueProc(FUNC)   \
-    ((NPN_GetValueUPP) (FUNC))
-#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3)    \
-    (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPN_SetValue */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_SetValueUPP;
-enum {
-  uppNPN_SetValueProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPVariable)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_SetValueProc(FUNC)   \
-    (NPN_SetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_SetValueProcInfo, GetCurrentArchitecture())
-#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_SetValueProcInfo, (ARG1), (ARG2), (ARG3))
-#else
-
-typedef NPError (*NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
-#define NewNPN_SetValueProc(FUNC)   \
-    ((NPN_SetValueUPP) (FUNC))
-#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3)    \
-    (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPN_GetUrlNotify */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_GetURLNotifyUPP;
-enum {
-  uppNPN_GetURLNotifyProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_GetURLNotifyProc(FUNC)   \
-    (NPN_GetURLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetURLNotifyProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetURLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4))
-#else
-
-typedef NPError (*NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData);
-#define NewNPN_GetURLNotifyProc(FUNC)   \
-    ((NPN_GetURLNotifyUPP) (FUNC))
-#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4)    \
-    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
-#endif
-
-
-/* NPN_PostUrlNotify */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_PostURLNotifyUPP;
-enum {
-  uppNPN_PostURLNotifyProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(uint32)))
-    | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(NPBool)))
-    | STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(void*)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_PostURLNotifyProc(FUNC)    \
-    (NPN_PostURLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_PostURLNotifyProcInfo, GetCurrentArchitecture())
-#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_PostURLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
-#else
-
-typedef NPError (*NPN_PostURLNotifyUPP)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData);
-#define NewNPN_PostURLNotifyProc(FUNC)    \
-    ((NPN_PostURLNotifyUPP) (FUNC))
-#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
-    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
-#endif
-
-
-/* NPN_GetUrl */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_GetURLUPP;
-enum {
-  uppNPN_GetURLProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_GetURLProc(FUNC)   \
-    (NPN_GetURLUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetURLProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetURLProcInfo, (ARG1), (ARG2), (ARG3))
-#else
-
-typedef NPError (*NPN_GetURLUPP)(NPP instance, const char* url, const char* window);
-#define NewNPN_GetURLProc(FUNC)   \
-    ((NPN_GetURLUPP) (FUNC))
-#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3)    \
-    (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPN_PostUrl */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_PostURLUPP;
-enum {
-  uppNPN_PostURLProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(uint32)))
-    | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(const char*)))
-    | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(NPBool)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_PostURLProc(FUNC)    \
-    (NPN_PostURLUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_PostURLProcInfo, GetCurrentArchitecture())
-#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_PostURLProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
-#else
-
-typedef NPError (*NPN_PostURLUPP)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file);
-#define NewNPN_PostURLProc(FUNC)    \
-    ((NPN_PostURLUPP) (FUNC))
-#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
-    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
-#endif
-
-
-/* NPN_RequestRead */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_RequestReadUPP;
-enum {
-  uppNPN_RequestReadProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPStream *)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPByteRange *)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_RequestReadProc(FUNC)    \
-    (NPN_RequestReadUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_RequestReadProcInfo, GetCurrentArchitecture())
-#define CallNPN_RequestReadProc(FUNC,  stream, range)   \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_RequestReadProcInfo, (stream), (range))
-
-#else
-
-typedef NPError (*NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList);
-#define NewNPN_RequestReadProc(FUNC)    \
-    ((NPN_RequestReadUPP) (FUNC))
-#define CallNPN_RequestReadProc(FUNC, stream, range)    \
-    (*(FUNC))((stream), (range))
-
-#endif
-
-
-/* NPN_NewStream */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_NewStreamUPP;
-enum {
-  uppNPN_NewStreamProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPMIMEType)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char *)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(NPStream **)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_NewStreamProc(FUNC)    \
-    (NPN_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_NewStreamProcInfo, GetCurrentArchitecture())
-#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream)    \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_NewStreamProcInfo, (npp), (type), (window), (stream))
-
-#else
-
-typedef NPError (*NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
-#define NewNPN_NewStreamProc(FUNC)    \
-    ((NPN_NewStreamUPP) (FUNC))
-#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream)    \
-    (*(FUNC))((npp), (type), (window), (stream))
-
-#endif
-
-
-/* NPN_Write */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_WriteUPP;
-enum {
-  uppNPN_WriteProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(int32)))
-    | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
-};
-#define NewNPN_WriteProc(FUNC)    \
-    (NPN_WriteUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_WriteProcInfo, GetCurrentArchitecture())
-#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)   \
-    (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_WriteProcInfo, (npp), (stream), (len), (buffer))
-
-#else
-
-typedef int32 (*NPN_WriteUPP)(NPP instance, NPStream* stream, int32 len, void* buffer);
-#define NewNPN_WriteProc(FUNC)    \
-    ((NPN_WriteUPP) (FUNC))
-#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)   \
-    (*(FUNC))((npp), (stream), (len), (buffer))
-
-#endif
-
-
-/* NPN_DestroyStream */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_DestroyStreamUPP;
-enum {
-  uppNPN_DestroyStreamProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP )))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_DestroyStreamProc(FUNC)    \
-    (NPN_DestroyStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, GetCurrentArchitecture())
-#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)    \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, (npp), (stream), (reason))
-
-#else
-
-typedef NPError (*NPN_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
-#define NewNPN_DestroyStreamProc(FUNC)    \
-    ((NPN_DestroyStreamUPP) (FUNC))
-#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)    \
-    (*(FUNC))((npp), (stream), (reason))
-
-#endif
-
-
-/* NPN_Status */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_StatusUPP;
-enum {
-  uppNPN_StatusProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
-};
-
-#define NewNPN_StatusProc(FUNC)   \
-    (NPN_StatusUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_StatusProcInfo, GetCurrentArchitecture())
-#define CallNPN_StatusProc(FUNC, npp, msg)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg))
-
-#else
-
-typedef void (*NPN_StatusUPP)(NPP instance, const char* message);
-#define NewNPN_StatusProc(FUNC)   \
-    ((NPN_StatusUPP) (FUNC))
-#define CallNPN_StatusProc(FUNC, npp, msg)    \
-    (*(FUNC))((npp), (msg))
-
-#endif
-
-
-/* NPN_UserAgent */
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_UserAgentUPP;
-enum {
-	uppNPN_UserAgentProcInfo = kThinkCStackBased
-		| STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-		| RESULT_SIZE(SIZE_CODE(sizeof(const char *)))
-};
-
-#define NewNPN_UserAgentProc(FUNC)              \
-		(NPN_UserAgentUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_UserAgentProcInfo, GetCurrentArchitecture())
-#define CallNPN_UserAgentProc(FUNC, ARG1)               \
-		(const char*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_UserAgentProcInfo, (ARG1))
-
-#else
-
-typedef const char* (*NPN_UserAgentUPP)(NPP instance);
-#define NewNPN_UserAgentProc(FUNC)              \
-		((NPN_UserAgentUPP) (FUNC))
-#define CallNPN_UserAgentProc(FUNC, ARG1)               \
-		(*(FUNC))((ARG1))
-
-#endif
-
-
-/* NPN_MemAlloc */
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_MemAllocUPP;
-enum {
-  uppNPN_MemAllocProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(uint32)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(void *)))
-};
-
-#define NewNPN_MemAllocProc(FUNC)   \
-    (NPN_MemAllocUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemAllocProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemAllocProc(FUNC, ARG1)    \
-    (void*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemAllocProcInfo, (ARG1))
-
-#else
-
-typedef void* (*NPN_MemAllocUPP)(uint32 size);
-#define NewNPN_MemAllocProc(FUNC)   \
-    ((NPN_MemAllocUPP) (FUNC))
-#define CallNPN_MemAllocProc(FUNC, ARG1)    \
-    (*(FUNC))((ARG1))
-
-#endif
-
-
-/* NPN__MemFree */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_MemFreeUPP;
-enum {
-  uppNPN_MemFreeProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(void *)))
-};
-
-#define NewNPN_MemFreeProc(FUNC)    \
-    (NPN_MemFreeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFreeProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemFreeProc(FUNC, ARG1)   \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFreeProcInfo, (ARG1))
-
-#else
-
-typedef void (*NPN_MemFreeUPP)(void* ptr);
-#define NewNPN_MemFreeProc(FUNC)    \
-    ((NPN_MemFreeUPP) (FUNC))
-#define CallNPN_MemFreeProc(FUNC, ARG1)   \
-    (*(FUNC))((ARG1))
-
-#endif
-
-
-/* NPN_MemFlush */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_MemFlushUPP;
-enum {
-  uppNPN_MemFlushProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(uint32)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(uint32)))
-};
-
-#define NewNPN_MemFlushProc(FUNC)   \
-    (NPN_MemFlushUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFlushProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemFlushProc(FUNC, ARG1)    \
-    (uint32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFlushProcInfo, (ARG1))
-
-#else
-
-typedef uint32 (*NPN_MemFlushUPP)(uint32 size);
-#define NewNPN_MemFlushProc(FUNC)   \
-    ((NPN_MemFlushUPP) (FUNC))
-#define CallNPN_MemFlushProc(FUNC, ARG1)    \
-    (*(FUNC))((ARG1))
-
-#endif
-
-
-
-/* NPN_ReloadPlugins */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_ReloadPluginsUPP;
-enum {
-  uppNPN_ReloadPluginsProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPBool)))
-    | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#define NewNPN_ReloadPluginsProc(FUNC)    \
-    (NPN_ReloadPluginsUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, GetCurrentArchitecture())
-#define CallNPN_ReloadPluginsProc(FUNC, ARG1)   \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, (ARG1))
-
-#else
-
-typedef void (*NPN_ReloadPluginsUPP)(NPBool reloadPages);
-#define NewNPN_ReloadPluginsProc(FUNC)    \
-    ((NPN_ReloadPluginsUPP) (FUNC))
-#define CallNPN_ReloadPluginsProc(FUNC, ARG1)   \
-    (*(FUNC))((ARG1))
-
-#endif
-
-
-/* NPN_GetJavaEnv */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_GetJavaEnvUPP;
-enum {
-  uppNPN_GetJavaEnvProcInfo = kThinkCStackBased
-    | RESULT_SIZE(SIZE_CODE(sizeof(JRIEnv*)))
-};
-
-#define NewNPN_GetJavaEnvProc(FUNC)   \
-    (NPN_GetJavaEnvUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetJavaEnvProc(FUNC)    \
-    (JRIEnv*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo)
-
-#else
-
-typedef JRIEnv* (*NPN_GetJavaEnvUPP)(void);
-#define NewNPN_GetJavaEnvProc(FUNC)   \
-    ((NPN_GetJavaEnvUPP) (FUNC))
-#define CallNPN_GetJavaEnvProc(FUNC)    \
-    (*(FUNC))()
-
-#endif
-
-
-/* NPN_GetJavaPeer */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_GetJavaPeerUPP;
-enum {
-  uppNPN_GetJavaPeerProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(jref)))
-};
-
-#define NewNPN_GetJavaPeerProc(FUNC)    \
-    (NPN_GetJavaPeerUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetJavaPeerProc(FUNC, ARG1)   \
-    (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, (ARG1))
-
-#else
-
-typedef jref (*NPN_GetJavaPeerUPP)(NPP instance);
-#define NewNPN_GetJavaPeerProc(FUNC)    \
-    ((NPN_GetJavaPeerUPP) (FUNC))
-#define CallNPN_GetJavaPeerProc(FUNC, ARG1)   \
-    (*(FUNC))((ARG1))
-
-#endif
-
-
-/* NPN_InvalidateRect */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_InvalidateRectUPP;
-enum {
-  uppNPN_InvalidateRectProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPRect *)))
-    | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#define NewNPN_InvalidateRectProc(FUNC)   \
-    (NPN_InvalidateRectUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, GetCurrentArchitecture())
-#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, (ARG1), (ARG2))
-
-#else
-
-typedef void (*NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
-#define NewNPN_InvalidateRectProc(FUNC)   \
-    ((NPN_InvalidateRectUPP) (FUNC))
-#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)    \
-    (*(FUNC))((ARG1), (ARG2))
-
-#endif
-
-
-/* NPN_InvalidateRegion */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_InvalidateRegionUPP;
-enum {
-  uppNPN_InvalidateRegionProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPRegion)))
-    | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#define NewNPN_InvalidateRegionProc(FUNC)   \
-    (NPN_InvalidateRegionUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, GetCurrentArchitecture())
-#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, (ARG1), (ARG2))
-
-#else
-
-typedef void (*NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
-#define NewNPN_InvalidateRegionProc(FUNC)   \
-    ((NPN_InvalidateRegionUPP) (FUNC))
-#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)    \
-    (*(FUNC))((ARG1), (ARG2))
-
-#endif
-
-/* NPN_ForceRedraw */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPN_ForceRedrawUPP;
-enum {
-  uppNPN_ForceRedrawProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(0)))
-};
-
-#define NewNPN_ForceRedrawProc(FUNC)    \
-    (NPN_ForceRedrawUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, GetCurrentArchitecture())
-#define CallNPN_ForceRedrawProc(FUNC, ARG1)   \
-    (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, (ARG1))
-
-#else
-
-typedef void (*NPN_ForceRedrawUPP)(NPP instance);
-#define NewNPN_ForceRedrawProc(FUNC)    \
-    ((NPN_ForceRedrawUPP) (FUNC))
-#define CallNPN_ForceRedrawProc(FUNC, ARG1)   \
-    (*(FUNC))((ARG1))
-
-#endif
-
-
-/******************************************************************************************
- * The actual plugin function table definitions
- *******************************************************************************************/
-
-#ifdef XP_MAC
-#pragma align=mac68k
-#endif
-
-typedef struct _NPPluginFuncs {
-    uint16 size;
-    uint16 version;
-    NPP_NewUPP newp;
-    NPP_DestroyUPP destroy;
-    NPP_SetWindowUPP setwindow;
-    NPP_NewStreamUPP newstream;
-    NPP_DestroyStreamUPP destroystream;
-    NPP_StreamAsFileUPP asfile;
-    NPP_WriteReadyUPP writeready;
-    NPP_WriteUPP write;
-    NPP_PrintUPP print;
-    NPP_HandleEventUPP event;
-    NPP_URLNotifyUPP urlnotify;
-    JRIGlobalRef javaClass;
-    NPP_GetValueUPP getvalue;
-    NPP_SetValueUPP setvalue;
-} NPPluginFuncs;
-
-typedef struct _NPNetscapeFuncs {
-    uint16 size;
-    uint16 version;
-    NPN_GetURLUPP geturl;
-    NPN_PostURLUPP posturl;
-    NPN_RequestReadUPP requestread;
-    NPN_NewStreamUPP newstream;
-    NPN_WriteUPP write;
-    NPN_DestroyStreamUPP destroystream;
-    NPN_StatusUPP status;
-    NPN_UserAgentUPP uagent;
-    NPN_MemAllocUPP memalloc;
-    NPN_MemFreeUPP memfree;
-    NPN_MemFlushUPP memflush;
-    NPN_ReloadPluginsUPP reloadplugins;
-    NPN_GetJavaEnvUPP getJavaEnv;
-    NPN_GetJavaPeerUPP getJavaPeer;
-    NPN_GetURLNotifyUPP geturlnotify;
-    NPN_PostURLNotifyUPP posturlnotify;
-    NPN_GetValueUPP getvalue;
-    NPN_SetValueUPP setvalue;
-    NPN_InvalidateRectUPP invalidaterect;
-    NPN_InvalidateRegionUPP invalidateregion;
-    NPN_ForceRedrawUPP forceredraw;
-} NPNetscapeFuncs;
-
-#ifdef XP_MAC
-#pragma align=reset
-#endif
-
-
-#ifdef XP_MAC
-/******************************************************************************************
- * Mac platform-specific plugin glue stuff
- *******************************************************************************************/
-
-/*
- * Main entry point of the plugin.
- * This routine will be called when the plugin is loaded. The function
- * tables are passed in and the plugin fills in the NPPluginFuncs table
- * and NPPShutdownUPP for Netscape's use.
- */
-
-#if GENERATINGCFM
-
-typedef UniversalProcPtr NPP_MainEntryUPP;
-enum {
-  uppNPP_MainEntryProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPNetscapeFuncs*)))
-    | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPluginFuncs*)))
-    | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPP_ShutdownUPP*)))
-    | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_MainEntryProc(FUNC)    \
-    (NPP_MainEntryUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_MainEntryProcInfo, GetCurrentArchitecture())
-#define CallNPP_MainEntryProc(FUNC,  netscapeFunc, pluginFunc, shutdownUPP)   \
-    CallUniversalProc((UniversalProcPtr)(FUNC), (ProcInfoType)uppNPP_MainEntryProcInfo, (netscapeFunc), (pluginFunc), (shutdownUPP))
-
-#else
-
-typedef NPError (*NPP_MainEntryUPP)(NPNetscapeFuncs*, NPPluginFuncs*, NPP_ShutdownUPP*);
-#define NewNPP_MainEntryProc(FUNC)    \
-    ((NPP_MainEntryUPP) (FUNC))
-#define CallNPP_MainEntryProc(FUNC,  netscapeFunc, pluginFunc, shutdownUPP)   \
-    (*(FUNC))((netscapeFunc), (pluginFunc), (shutdownUPP))
-
-#endif
-#endif /* MAC */
-
-
-#ifdef _WINDOWS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* plugin meta member functions */
-
-NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* pFuncs);
-
-NPError WINAPI NP_Initialize(NPNetscapeFuncs* pFuncs);
-
-NPError WINAPI NP_Shutdown();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _WINDOWS */
-
-#ifdef XP_UNIX
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* plugin meta member functions */
-
-char* NP_GetMIMEDescription(void);
-NPError NP_Initialize(NPNetscapeFuncs*, NPPluginFuncs*);
-NPError NP_Shutdown(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* XP_UNIX */
-
-#endif /* _NPUPP_H_ */
-
diff --git a/apps/mozilla/npwin.c b/apps/mozilla/npwin.c
deleted file mode 100644
index 718ded73..00000000
--- a/apps/mozilla/npwin.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/* npwin.cpp */
-
-//\\// INCLUDE
-//#include "StdAfx.h"
-
-// TOR
-#include <windows.h>
-
-
-// netscape
-#ifndef _NPAPI_H_
-#include "npapi.h"
-#endif
-#ifndef _NPUPP_H_
-#include "npupp.h"
-#endif
-
-//\\// DEFINE
-#ifdef WIN32
-    #define NP_EXPORT
-#else
-    #define NP_EXPORT _export
-#endif
-
-//\\// GLOBAL DATA
-NPNetscapeFuncs* g_pNavigatorFuncs = 0;
-JRIGlobalRef Private_GetJavaClass(void);
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// Private_GetJavaClass (global function)
-//
-//	Given a Java class reference (thru NPP_GetJavaClass) inform JRT
-//	of this class existence
-//
-JRIGlobalRef
-Private_GetJavaClass(void)
-{
-    jref clazz = NPP_GetJavaClass();
-    if (clazz) {
-	JRIEnv* env = NPN_GetJavaEnv();
-	return JRI_NewGlobalRef(env, clazz);
-    }
-    return NULL;
-}
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-//						PLUGIN DLL entry points
-//
-// These are the Windows specific DLL entry points. They must be exoprted
-//
-
-// we need these to be global since we have to fill one of its field
-// with a data (class) which requires knowlwdge of the navigator
-// jump-table. This jump table is known at Initialize time (NP_Initialize)
-// which is called after NP_GetEntryPoint
-static NPPluginFuncs* g_pluginFuncs;
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// NP_GetEntryPoints
-//
-//	fills in the func table used by Navigator to call entry points in
-//  plugin DLL.  Note that these entry points ensure that DS is loaded
-//  by using the NP_LOADDS macro, when compiling for Win16
-//
-NPError WINAPI NP_EXPORT
-NP_GetEntryPoints(NPPluginFuncs* pFuncs)
-{
-    // trap a NULL ptr
-    if(pFuncs == NULL)
-	return NPERR_INVALID_FUNCTABLE_ERROR;
-
-    // if the plugin's function table is smaller than the plugin expects,
-    // then they are incompatible, and should return an error
-
-    pFuncs->version       = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
-    pFuncs->newp          = NPP_New;
-    pFuncs->destroy       = NPP_Destroy;
-    pFuncs->setwindow     = NPP_SetWindow;
-    pFuncs->newstream     = NPP_NewStream;
-    pFuncs->destroystream = NPP_DestroyStream;
-    pFuncs->asfile        = NPP_StreamAsFile;
-    pFuncs->writeready    = NPP_WriteReady;
-    pFuncs->write         = NPP_Write;
-    pFuncs->print         = NPP_Print;
-    pFuncs->event         = 0;       /// reserved
-
-    g_pluginFuncs		  = pFuncs;
-
-    return NPERR_NO_ERROR;
-}
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// NP_Initialize
-//
-//	called immediately after the plugin DLL is loaded
-//
-NPError WINAPI NP_EXPORT
-NP_Initialize(NPNetscapeFuncs* pFuncs)
-{
-    // trap a NULL ptr
-    if(pFuncs == NULL)
-	return NPERR_INVALID_FUNCTABLE_ERROR;
-
-    g_pNavigatorFuncs = pFuncs; // save it for future reference
-
-    // if the plugin's major ver level is lower than the Navigator's,
-    // then they are incompatible, and should return an error
-    if(HIBYTE(pFuncs->version) > NP_VERSION_MAJOR)
-	return NPERR_INCOMPATIBLE_VERSION_ERROR;
-
-    // We have to defer these assignments until g_pNavigatorFuncs is set
-    int navMinorVers = g_pNavigatorFuncs->version & 0xFF;
-
-    if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) {
-	g_pluginFuncs->urlnotify = NPP_URLNotify;
-    }
-
-#ifdef WIN32 // An ugly hack, because Win16 lags behind in Java
-    if( navMinorVers >= NPVERS_HAS_LIVECONNECT ) {
-#else
-    if( navMinorVers >= NPVERS_WIN16_HAS_LIVECONNECT ) {
-#endif // WIN32
-	g_pluginFuncs->javaClass = Private_GetJavaClass();
-    }
-
-    // NPP_Initialize is a standard (cross-platform) initialize function.
-    return NPP_Initialize();
-}
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// NP_Shutdown
-//
-//	called immediately before the plugin DLL is unloaded.
-//	This functio shuold check for some ref count on the dll to see if it is
-//	unloadable or it needs to stay in memory.
-//
-NPError WINAPI NP_EXPORT
-NP_Shutdown()
-{
-    NPP_Shutdown();
-    g_pNavigatorFuncs = NULL;
-    return NPERR_NO_ERROR;
-}
-
-//						END - PLUGIN DLL entry points
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-
-/*    NAVIGATOR Entry points    */
-
-/* These entry points expect to be called from within the plugin.  The
-   noteworthy assumption is that DS has already been set to point to the
-   plugin's DLL data segment.  Don't call these functions from outside
-   the plugin without ensuring DS is set to the DLLs data segment first,
-   typically using the NP_LOADDS macro
-*/
-
-// TOR
-void NPN_InvalidateRect(NPP instance, NPRect *rect)
-{
-    return g_pNavigatorFuncs->invalidaterect(instance, rect);
-}
-
-/* returns the major/minor version numbers of the Plugin API for the plugin
-   and the Navigator
-*/
-void NPN_Version(int* plugin_major, int* plugin_minor, int* netscape_major, int* netscape_minor)
-{
-    *plugin_major   = NP_VERSION_MAJOR;
-    *plugin_minor   = NP_VERSION_MINOR;
-    *netscape_major = HIBYTE(g_pNavigatorFuncs->version);
-    *netscape_minor = LOBYTE(g_pNavigatorFuncs->version);
-}
-
-/* causes the specified URL to be fetched and streamed in
-*/
-NPError NPN_GetURLNotify(NPP instance, const char *url, const char *target, void* notifyData)
-{
-    int navMinorVers = g_pNavigatorFuncs->version & 0xFF;
-    NPError err;
-    if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) {
-	err = g_pNavigatorFuncs->geturlnotify(instance, url, target, notifyData);
-    }
-    else {
-	err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-    return err;
-}
-
-
-NPError NPN_GetURL(NPP instance, const char *url, const char *target)
-{
-    return g_pNavigatorFuncs->geturl(instance, url, target);
-}
-
-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData)
-{
-    int navMinorVers = g_pNavigatorFuncs->version & 0xFF;
-    NPError err;
-    if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) {
-	err = g_pNavigatorFuncs->posturlnotify(instance, url, window, len, buf, file, notifyData);
-    }
-    else {
-	err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-    return err;
-}
-
-
-NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file)
-{
-    return g_pNavigatorFuncs->posturl(instance, url, window, len, buf, file);
-}
-
-/* Requests that a number of bytes be provided on a stream.  Typically
-   this would be used if a stream was in "pull" mode.  An optional
-   position can be provided for streams which are seekable.
-*/
-NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
-{
-    return g_pNavigatorFuncs->requestread(stream, rangeList);
-}
-
-/* Creates a new stream of data from the plug-in to be interpreted
-   by Netscape in the current window.
- */
-NPError NPN_NewStream(NPP instance, NPMIMEType type,
-	const char* target, NPStream** stream)
-{
-    int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
-    NPError err;
-
-    if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) {
-	err = g_pNavigatorFuncs->newstream(instance, type, target, stream);
-    }
-    else {
-	err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-    return err;
-}
-
-/* Provides len bytes of data.
-*/
-int32 NPN_Write(NPP instance, NPStream *stream, int32 len, void *buffer)
-{
-    int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
-    int32 result;
-
-    if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) {
-	result = g_pNavigatorFuncs->write(instance, stream, len, buffer);
-    }
-    else {
-	result = -1;
-    }
-    return result;
-}
-
-/* Closes a stream object.
-reason indicates why the stream was closed.
-*/
-NPError NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
-{
-    int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
-    NPError err;
-
-    if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) {
-	err = g_pNavigatorFuncs->destroystream(instance, stream, reason);
-    }
-    else {
-	err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-    return err;
-}
-
-/* Provides a text status message in the Netscape client user interface
-*/
-void NPN_Status(NPP instance, const char *message)
-{
-    g_pNavigatorFuncs->status(instance, message);
-}
-
-/* returns the user agent string of Navigator, which contains version info
-*/
-const char* NPN_UserAgent(NPP instance)
-{
-    return g_pNavigatorFuncs->uagent(instance);
-}
-
-/* allocates memory from the Navigator's memory space.  Necessary so that
-   saved instance data may be freed by Navigator when exiting.
-*/
-
-
-void* NPN_MemAlloc(uint32 size)
-{
-    return g_pNavigatorFuncs->memalloc(size);
-}
-
-/* reciprocal of MemAlloc() above
-*/
-void NPN_MemFree(void* ptr)
-{
-    g_pNavigatorFuncs->memfree(ptr);
-}
-
-/* private function to Netscape.  do not use!
- */
-void NPN_ReloadPlugins(NPBool reloadPages)
-{
-    g_pNavigatorFuncs->reloadplugins(reloadPages);
-}
-
-JRIEnv* NPN_GetJavaEnv(void)
-{
-    return g_pNavigatorFuncs->getJavaEnv();
-}
-
-jref NPN_GetJavaPeer(NPP instance)
-{
-    return g_pNavigatorFuncs->getJavaPeer(instance);
-}
-