]> git.sesse.net Git - vlc/blobdiff - projects/mozilla/support/npunix.c
Mozilla plugin event listeners.
[vlc] / projects / mozilla / support / npunix.c
index 26c6736de049f9f5681e74ae2cfe1378c24a6ae4..52096bc908f948d826e7e740b2e6929fac62c364 100644 (file)
@@ -1,24 +1,32 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * Mozilla/Firefox plugin for VLC
+ * Copyright (C) 2009, Jean-Paul Saman <jpsaman@videolan.org>
  *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- * Stephen Mak <smak@sun.com>
+ *   Stephen Mak <smak@sun.com>
+ *
  */
 
 /*
  *----------------------------------------------------------------------
  * PLUGIN DEVELOPERS:
  *  YOU WILL NOT NEED TO EDIT THIS FILE.
- * TO NETSCAPE DEVELOPERS:
- *  OF COURSE I WILL NEED TO EDIT THIS FILE, YOU BORKED IT ALL AROUND YOU
- *  IGNORANT FOOLS -- sam
  *----------------------------------------------------------------------
  */
 
+#include "config.h"
+
 #define XP_UNIX 1
 #define OJI 1
 
-#include <stdio.h>
 #include <npapi.h>
+#ifdef HAVE_NPFUNCTIONS_H
+#include <npfunctions.h>
+#else
 #include <npupp.h>
+#endif
+
+#include "../vlcshell.h"
 
 /*
  * Define PLUGIN_TRACE to have the wrapper functions print
@@ -65,7 +77,6 @@
 
 static NPNetscapeFuncs   gNetscapeFuncs;    /* Netscape Function table */
 
-
 /***********************************************************************
  *
  * Wrapper functions : plugin calling Netscape Navigator
@@ -89,347 +100,556 @@ NPN_Version(int* plugin_major, int* plugin_minor,
     *netscape_minor = gNetscapeFuncs.version & 0xFF;
 }
 
+void
+NPN_PluginThreadAsyncCall(NPP plugin,
+                          void (*func)(void *),
+                          void *userData)
+{
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) >= 20)
+    return (*gNetscapeFuncs.pluginthreadasynccall)(plugin, func, userData);
+#endif
+}
+
 NPError
 NPN_GetValue(NPP instance, NPNVariable variable, void *r_value)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_GetValueProc(gNetscapeFuncs.getvalue,
                     instance, variable, r_value);
+#else
+    return (*gNetscapeFuncs.getvalue)(instance, variable, r_value);
+#endif
 }
 
 NPError
 NPN_SetValue(NPP instance, NPPVariable variable, void *value)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_SetValueProc(gNetscapeFuncs.setvalue,
                     instance, variable, value);
+#else
+    return (*gNetscapeFuncs.setvalue)(instance, variable, value);
+#endif
 }
 
 NPError
 NPN_GetURL(NPP instance, const char* url, const char* window)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window);
+#else
+    return (*gNetscapeFuncs.geturl)(instance, url, window);
+#endif
 }
 
 NPError
 NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notifyData)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_GetURLNotifyProc(gNetscapeFuncs.geturlnotify, instance, url, window, notifyData);
+#else
+    return (*gNetscapeFuncs.geturlnotify)(instance, url, window, notifyData);
+#endif
 }
 
 NPError
 NPN_PostURL(NPP instance, const char* url, const char* window,
-         uint32 len, const char* buf, NPBool file)
+         uint32_t len, const char* buf, NPBool file)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
                     url, window, len, buf, file);
+#else
+    return (*gNetscapeFuncs.posturl)(instance, url, window, len, buf, file);
+#endif
 }
 
 NPError
-NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len,
+NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len,
                   const char* buf, NPBool file, void* notifyData)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
             instance, url, window, len, buf, file, notifyData);
+#else
+    return (*gNetscapeFuncs.posturlnotify)(instance, url, window, len, buf, file, notifyData);
+
+#endif
 }
 
 NPError
 NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_RequestReadProc(gNetscapeFuncs.requestread,
                     stream, rangeList);
+#else
+    return (*gNetscapeFuncs.requestread)(stream, rangeList);
+#endif
 }
 
 NPError
 NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
           NPStream** stream_ptr)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_NewStreamProc(gNetscapeFuncs.newstream, instance,
                     type, window, stream_ptr);
+#else
+    return (*gNetscapeFuncs.newstream)(instance, type, window, stream_ptr);
+#endif
 }
 
-int32
-NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
+int32_t
+NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
                     stream, len, buffer);
+#else
+    return (*gNetscapeFuncs.write)(instance, stream, len, buffer);
+#endif
 }
 
 NPError
 NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_DestroyStreamProc(gNetscapeFuncs.destroystream,
                         instance, stream, reason);
+#else
+    return (*gNetscapeFuncs.destroystream)(instance, stream, reason);
+#endif
 }
 
 void
 NPN_Status(NPP instance, const char* message)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     CallNPN_StatusProc(gNetscapeFuncs.status, instance, message);
+#else
+    (*gNetscapeFuncs.status)(instance, message);
+#endif
 }
 
 const char*
 NPN_UserAgent(NPP instance)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
+#else
+    return (*gNetscapeFuncs.uagent)(instance);
+#endif
 }
 
-void*
-NPN_MemAlloc(uint32 size)
+void *NPN_MemAlloc(uint32_t size)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
+#else
+    return (*gNetscapeFuncs.memalloc)(size);
+#endif
 }
 
 void NPN_MemFree(void* ptr)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
+#else
+    (*gNetscapeFuncs.memfree)(ptr);
+#endif
 }
 
-uint32 NPN_MemFlush(uint32 size)
+uint32_t NPN_MemFlush(uint32_t size)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
+#else
+    return (*gNetscapeFuncs.memflush)(size);
+#endif
 }
 
 void NPN_ReloadPlugins(NPBool reloadPages)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages);
+#else
+    (*gNetscapeFuncs.reloadplugins)(reloadPages);
+#endif
 }
 
+#ifdef OJI
 JRIEnv* NPN_GetJavaEnv()
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_GetJavaEnvProc(gNetscapeFuncs.getJavaEnv);
+#else
+    return (*gNetscapeFuncs.getJavaEnv);
+#endif
 }
 
 jref NPN_GetJavaPeer(NPP instance)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     return CallNPN_GetJavaPeerProc(gNetscapeFuncs.getJavaPeer,
                        instance);
+#else
+    return (*gNetscapeFuncs.getJavaPeer)(instance);
+#endif
 }
+#endif
 
 void
 NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     CallNPN_InvalidateRectProc(gNetscapeFuncs.invalidaterect, instance,
         invalidRect);
+#else
+    (*gNetscapeFuncs.invalidaterect)(instance, invalidRect);
+#endif
 }
 
 void
 NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     CallNPN_InvalidateRegionProc(gNetscapeFuncs.invalidateregion, instance,
         invalidRegion);
+#else
+    (*gNetscapeFuncs.invalidateregion)(instance, invalidRegion);
+#endif
 }
 
 void
 NPN_ForceRedraw(NPP instance)
 {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance);
+#else
+    (*gNetscapeFuncs.forceredraw)(instance);
+#endif
+}
+
+void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
+{
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+    CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate,
+        instance, enabled);
+#else
+    (*gNetscapeFuncs.pushpopupsenabledstate)(instance, enabled);
+#endif
+}
+
+void NPN_PopPopupsEnabledState(NPP instance)
+{
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+    CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate,
+        instance);
+#else
+    (*gNetscapeFuncs.poppopupsenabledstate)(instance);
+#endif
 }
 
 NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
     {
-        return CallNPN_GetStringIdentifierProc( gNetscapeFuncs.getstringidentifier, name);
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_GetStringIdentifierProc(
+                        gNetscapeFuncs.getstringidentifier, name);
+#else
+        return (*gNetscapeFuncs.getstringidentifier)(name);
+#endif
     }
     return NULL;
 }
 
-void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount, NPIdentifier *identifiers)
+void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
+                              NPIdentifier *identifiers)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
     {
-        CallNPN_GetStringIdentifiersProc( gNetscapeFuncs.getstringidentifiers, names, nameCount, identifiers);
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        CallNPN_GetStringIdentifiersProc(gNetscapeFuncs.getstringidentifiers,
+                                         names, nameCount, identifiers);
+#else
+        (*gNetscapeFuncs.getstringidentifiers)(names, nameCount, identifiers);
+#endif
     }
 }
 
 NPIdentifier NPN_GetIntIdentifier(int32_t intid)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
     {
-        return CallNPN_GetIntIdentifierProc( gNetscapeFuncs.getintidentifier, intid);
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_GetIntIdentifierProc(gNetscapeFuncs.getintidentifier, intid);
+#else
+        return (*gNetscapeFuncs.getintidentifier)(intid);
+#endif
     }
     return NULL;
 }
 
 bool NPN_IdentifierIsString(NPIdentifier identifier)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
     {
-        return CallNPN_IdentifierIsStringProc( gNetscapeFuncs.identifierisstring, identifier);
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_IdentifierIsStringProc(
+                        gNetscapeFuncs.identifierisstring,
+                        identifier);
+#else
+        return (*gNetscapeFuncs.identifierisstring)(identifier);
+#endif
     }
     return false;
 }
 
 NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
     {
-        return CallNPN_UTF8FromIdentifierProc( gNetscapeFuncs.utf8fromidentifier, identifier);
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_UTF8FromIdentifierProc(
+                            gNetscapeFuncs.utf8fromidentifier,
+                            identifier);
+#else
+        return (*gNetscapeFuncs.utf8fromidentifier)(identifier);
+#endif
     }
     return NULL;
 }
 
 int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
     {
-        return CallNPN_IntFromIdentifierProc( gNetscapeFuncs.intfromidentifier, identifier);
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_IntFromIdentifierProc(
+                        gNetscapeFuncs.intfromidentifier,
+                        identifier);
+#else
+        return (*gNetscapeFuncs.intfromidentifier)(identifier);
+#endif
     }
     return 0;
 }
 
-NPObject *NPN_CreateObject(NPP instance, NPClass *aClass)
+NPObject *NPN_CreateObject(NPP npp, NPClass *aClass)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_CreateObjectProc( gNetscapeFuncs.createobject, instance, aClass);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_CreateObjectProc(gNetscapeFuncs.createobject, npp, aClass);
+#else
+        return (*gNetscapeFuncs.createobject)(npp, aClass);
+#endif
     return NULL;
 }
 
-NPObject *NPN_RetainObject(NPObject *npobj)
+NPObject *NPN_RetainObject(NPObject *obj)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_RetainObjectProc( gNetscapeFuncs.retainobject, npobj);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_RetainObjectProc(gNetscapeFuncs.retainobject, obj);
+#else
+        return (*gNetscapeFuncs.retainobject)(obj);
+#endif
     return NULL;
 }
 
-void NPN_ReleaseObject(NPObject *npobj)
+void NPN_ReleaseObject(NPObject *obj)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        CallNPN_ReleaseObjectProc( gNetscapeFuncs.releaseobject, npobj);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        CallNPN_ReleaseObjectProc(gNetscapeFuncs.releaseobject, obj);
+#else
+        (*gNetscapeFuncs.releaseobject)(obj);
+#endif
 }
 
-bool NPN_Invoke(NPP instance, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result)
+bool NPN_Invoke(NPP npp, NPObject* obj, NPIdentifier methodName,
+                const NPVariant *args, uint32_t argCount, NPVariant *result)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_InvokeProc( gNetscapeFuncs.invoke, instance, npobj, methodName, args, argCount, result);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_InvokeProc(gNetscapeFuncs.invoke, npp, obj, methodName,
+                                  args, argCount, result);
+#else
+        return (*gNetscapeFuncs.invoke)(npp, obj, methodName, args, argCount, result);
+#endif
     return false;
 }
 
-bool NPN_InvokeDefault(NPP instance, NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
+bool NPN_InvokeDefault(NPP npp, NPObject* obj, const NPVariant *args,
+                       uint32_t argCount, NPVariant *result)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_InvokeDefaultProc( gNetscapeFuncs.invokeDefault, instance, npobj, args, argCount, result);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_InvokeDefaultProc(gNetscapeFuncs.invokeDefault, npp, obj,
+                                         args, argCount, result);
+#else
+        return (*gNetscapeFuncs.invokeDefault)(npp, obj, args, argCount, result);
+#endif
     return false;
 }
 
-bool NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result)
+bool NPN_Evaluate(NPP npp, NPObject* obj, NPString *script,
+                  NPVariant *result)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_EvaluateProc( gNetscapeFuncs.evaluate, instance, npobj, script, result);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_EvaluateProc(gNetscapeFuncs.evaluate, npp, obj,
+                                    script, result);
+#else
+        return (*gNetscapeFuncs.evaluate)(npp, obj, script, result);
+#endif
     return false;
 }
 
-bool NPN_GetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, NPVariant *result)
+bool NPN_GetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
+                     NPVariant *result)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_GetPropertyProc( gNetscapeFuncs.getproperty, instance, npobj, propertyName, result);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_GetPropertyProc(gNetscapeFuncs.getproperty, npp, obj,
+                                       propertyName, result);
+#else
+        return (*gNetscapeFuncs.getproperty)(npp, obj, propertyName, result);
+#endif
     return false;
 }
 
-bool NPN_SetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, const NPVariant *value)
+bool NPN_SetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
+                     const NPVariant *value)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_SetPropertyProc( gNetscapeFuncs.setproperty, instance, npobj, propertyName, value);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_SetPropertyProc(gNetscapeFuncs.setproperty, npp, obj,
+                                       propertyName, value);
+#else
+        return (*gNetscapeFuncs.setproperty)(npp, obj, propertyName, value);
+#endif
     return false;
 }
 
-bool NPN_RemoveProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName)
+bool NPN_RemoveProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_RemovePropertyProc( gNetscapeFuncs.removeproperty, instance, npobj, propertyName);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_RemovePropertyProc(gNetscapeFuncs.removeproperty, npp, obj,
+                                          propertyName);
+#else
+        return (*gNetscapeFuncs.removeproperty)(npp, obj, propertyName);
+#endif
     return false;
 }
 
-bool NPN_HasProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName)
+bool NPN_HasProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_HasPropertyProc( gNetscapeFuncs.hasproperty, instance, npobj, propertyName);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_HasPropertyProc(gNetscapeFuncs.hasproperty, npp, obj,
+                                       propertyName);
+#else
+        return (*gNetscapeFuncs.hasproperty)(npp, obj, propertyName);
+#endif
     return false;
 }
 
-bool NPN_HasMethod(NPP instance, NPObject *npobj, NPIdentifier methodName)
+bool NPN_HasMethod(NPP npp, NPObject* obj, NPIdentifier methodName)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        return CallNPN_HasMethodProc( gNetscapeFuncs.hasmethod, instance, npobj, methodName);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        return CallNPN_HasMethodProc(gNetscapeFuncs.hasmethod, npp,
+                                     obj, methodName);
+#else
+        return (*gNetscapeFuncs.hasmethod)(npp, obj, methodName);
+#endif
     return false;
 }
 
 void NPN_ReleaseVariantValue(NPVariant *variant)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        CallNPN_ReleaseVariantValueProc( gNetscapeFuncs.releasevariantvalue, variant);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        CallNPN_ReleaseVariantValueProc(gNetscapeFuncs.releasevariantvalue, variant);
+#else
+        (*gNetscapeFuncs.releasevariantvalue)(variant);
+#endif
 }
 
-void NPN_SetException(NPObject *npobj, const NPUTF8 *message)
+void NPN_SetException(NPObjectobj, const NPUTF8 *message)
 {
-    int navMinorVers = gNetscapeFuncs.version & 0xFF;
-    if( navMinorVers >= 14 )
-    {
-        CallNPN_SetExceptionProc( gNetscapeFuncs.setexception, npobj, message);
-    }
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+        CallNPN_SetExceptionProc(gNetscapeFuncs.setexception, obj, message);
+#else
+        (*gNetscapeFuncs.setexception)(obj, message);
+#endif
 }
 
-
 /***********************************************************************
  *
  * 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
+ * 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.
  *
  ***********************************************************************/
 
+/* Function prototypes */
+NPError Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
+        int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
+NPError Private_Destroy(NPP instance, NPSavedData** save);
+NPError Private_SetWindow(NPP instance, NPWindow* window);
+NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
+                          NPBool seekable, uint16_t* stype);
+int32_t Private_WriteReady(NPP instance, NPStream* stream);
+int32_t Private_Write(NPP instance, NPStream* stream, int32_t offset,
+                    int32_t len, void* buffer);
+void Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
+NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason);
+void Private_URLNotify(NPP instance, const char* url,
+                       NPReason reason, void* notifyData);
+void Private_Print(NPP instance, NPPrint* platformPrint);
+NPError Private_GetValue(NPP instance, NPPVariable variable, void *r_value);
+NPError Private_SetValue(NPP instance, NPPVariable variable, void *r_value);
+#ifdef OJI
+JRIGlobalRef Private_GetJavaClass(void);
+#endif
+
+/* function implementations */
 NPError
-Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
-        int16 argc, char* argn[], char* argv[], NPSavedData* saved)
+Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
+        int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
 {
     NPError ret;
     PLUGINDEBUGSTR("New");
     ret = NPP_New(pluginType, instance, mode, argc, argn, argv, saved);
-    return ret;
+    return ret; 
 }
 
 NPError
@@ -450,7 +670,7 @@ Private_SetWindow(NPP instance, NPWindow* window)
 
 NPError
 Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
-            NPBool seekable, uint16* stype)
+            NPBool seekable, uint16_t* stype)
 {
     NPError err;
     PLUGINDEBUGSTR("NewStream");
@@ -458,7 +678,7 @@ Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
     return err;
 }
 
-int32
+int32_t
 Private_WriteReady(NPP instance, NPStream* stream)
 {
     unsigned int result;
@@ -467,8 +687,8 @@ Private_WriteReady(NPP instance, NPStream* stream)
     return result;
 }
 
-int32
-Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
+int32_t
+Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
         void* buffer)
 {
     unsigned int result;
@@ -497,14 +717,11 @@ Private_DestroyStream(NPP instance, NPStream* stream, NPError reason)
 void
 Private_URLNotify(NPP instance, const char* url,
                 NPReason reason, void* notifyData)
 {
     PLUGINDEBUGSTR("URLNotify");
     NPP_URLNotify(instance, url, reason, notifyData);
 }
 
-
-
 void
 Private_Print(NPP instance, NPPrint* platformPrint)
 {
@@ -526,18 +743,20 @@ Private_SetValue(NPP instance, NPPVariable variable, void *r_value)
     return NPP_SetValue(instance, variable, r_value);
 }
 
+#ifdef OJI
 JRIGlobalRef
 Private_GetJavaClass(void)
 {
     jref clazz = NPP_GetJavaClass();
     if (clazz) {
-        JRIEnv* env = NPN_GetJavaEnv();
-        return JRI_NewGlobalRef(env, clazz);
+    JRIEnv* env = NPN_GetJavaEnv();
+    return JRI_NewGlobalRef(env, clazz);
     }
     return NULL;
 }
+#endif
 
-/***********************************************************************
+/*********************************************************************** 
  *
  * These functions are located automagically by netscape.
  *
@@ -562,7 +781,7 @@ NP_GetMIMEDescription(void)
  *    that the navigator needs.
  */
 NPError
-NP_GetValue(void *future, NPPVariable variable, void *value)
+NP_GetValue(voidfuture, NPPVariable variable, void *value)
 {
     return NPP_GetValue(future, variable, value);
 }
@@ -575,7 +794,7 @@ NP_GetValue(void *future, NPPVariable variable, void *value)
  *
  * PARAMETERS
  *    nsTable   - The netscape function table. If developers just use these
- *        wrappers, they dont need to worry about all these function
+ *        wrappers, they don't need to worry about all these function
  *        tables.
  * RETURN
  *    pluginFuncs
@@ -590,12 +809,11 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
     NPError err = NPERR_NO_ERROR;
 
     PLUGINDEBUGSTR("NP_Initialize");
-    /* validate input parameters */
 
+    /* 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.
@@ -604,17 +822,17 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
      * 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))
+        if (nsTable->size < ((char *)&nsTable->posturlnotify - (char *)nsTable))
             err = NPERR_INVALID_FUNCTABLE_ERROR;
         if (pluginFuncs->size < sizeof(NPPluginFuncs))
             err = NPERR_INVALID_FUNCTABLE_ERROR;
     }
-    if (err == NPERR_NO_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
@@ -622,7 +840,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
          * the whole structure, because the Netscape function table
          * could actually be bigger than what we expect.
          */
-        int navMinorVers = nsTable->version & 0xFF;
+        int minor = nsTable->version & 0xFF;
 
         gNetscapeFuncs.version       = nsTable->version;
         gNetscapeFuncs.size          = nsTable->size;
@@ -638,43 +856,89 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
         gNetscapeFuncs.memfree       = nsTable->memfree;
         gNetscapeFuncs.memflush      = nsTable->memflush;
         gNetscapeFuncs.reloadplugins = nsTable->reloadplugins;
-        if( navMinorVers >= NPVERS_HAS_LIVECONNECT )
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) >= 20)
+        gNetscapeFuncs.pluginthreadasynccall =
+            nsTable->pluginthreadasynccall;
+#endif
+#ifdef OJI
+        if( minor >= NPVERS_HAS_LIVECONNECT )
         {
-            gNetscapeFuncs.getJavaEnv   = nsTable->getJavaEnv;
-            gNetscapeFuncs.getJavaPeer  = nsTable->getJavaPeer;
+            gNetscapeFuncs.getJavaEnv    = nsTable->getJavaEnv;
+            gNetscapeFuncs.getJavaPeer   = nsTable->getJavaPeer;
         }
-        if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
+#endif
+        gNetscapeFuncs.getvalue      = nsTable->getvalue;
+        gNetscapeFuncs.setvalue      = nsTable->setvalue;
+
+        if( minor >= NPVERS_HAS_NOTIFICATION )
         {
             gNetscapeFuncs.geturlnotify  = nsTable->geturlnotify;
             gNetscapeFuncs.posturlnotify = nsTable->posturlnotify;
         }
-        gNetscapeFuncs.getvalue         = nsTable->getvalue;
-        gNetscapeFuncs.setvalue         = nsTable->setvalue;
-        gNetscapeFuncs.invalidaterect   = nsTable->invalidaterect;
-        gNetscapeFuncs.invalidateregion = nsTable->invalidateregion;
-        gNetscapeFuncs.forceredraw      = nsTable->forceredraw;
-        if( navMinorVers >= 14 )
+
+        if (nsTable->size >= ((char *)&nsTable->setexception - (char *)nsTable))
+        {
+            gNetscapeFuncs.invalidaterect = nsTable->invalidaterect;
+            gNetscapeFuncs.invalidateregion = nsTable->invalidateregion;
+            gNetscapeFuncs.forceredraw = nsTable->forceredraw;
+            /* npruntime support */
+            if (minor >= 14)
+            {
+                gNetscapeFuncs.getstringidentifier = nsTable->getstringidentifier;
+                gNetscapeFuncs.getstringidentifiers = nsTable->getstringidentifiers;
+                gNetscapeFuncs.getintidentifier = nsTable->getintidentifier;
+                gNetscapeFuncs.identifierisstring = nsTable->identifierisstring;
+                gNetscapeFuncs.utf8fromidentifier = nsTable->utf8fromidentifier;
+                gNetscapeFuncs.intfromidentifier = nsTable->intfromidentifier;
+                gNetscapeFuncs.createobject = nsTable->createobject;
+                gNetscapeFuncs.retainobject = nsTable->retainobject;
+                gNetscapeFuncs.releaseobject = nsTable->releaseobject;
+                gNetscapeFuncs.invoke = nsTable->invoke;
+                gNetscapeFuncs.invokeDefault = nsTable->invokeDefault;
+                gNetscapeFuncs.evaluate = nsTable->evaluate;
+                gNetscapeFuncs.getproperty = nsTable->getproperty;
+                gNetscapeFuncs.setproperty = nsTable->setproperty;
+                gNetscapeFuncs.removeproperty = nsTable->removeproperty;
+                gNetscapeFuncs.hasproperty = nsTable->hasproperty;
+                gNetscapeFuncs.hasmethod = nsTable->hasmethod;
+                gNetscapeFuncs.releasevariantvalue = nsTable->releasevariantvalue;
+                gNetscapeFuncs.setexception = nsTable->setexception;
+            }
+        }
+        else
+        {
+            gNetscapeFuncs.invalidaterect = NULL;
+            gNetscapeFuncs.invalidateregion = NULL;
+            gNetscapeFuncs.forceredraw = NULL;
+            gNetscapeFuncs.getstringidentifier = NULL;
+            gNetscapeFuncs.getstringidentifiers = NULL;
+            gNetscapeFuncs.getintidentifier = NULL;
+            gNetscapeFuncs.identifierisstring = NULL;
+            gNetscapeFuncs.utf8fromidentifier = NULL;
+            gNetscapeFuncs.intfromidentifier = NULL;
+            gNetscapeFuncs.createobject = NULL;
+            gNetscapeFuncs.retainobject = NULL;
+            gNetscapeFuncs.releaseobject = NULL;
+            gNetscapeFuncs.invoke = NULL;
+            gNetscapeFuncs.invokeDefault = NULL;
+            gNetscapeFuncs.evaluate = NULL;
+            gNetscapeFuncs.getproperty = NULL;
+            gNetscapeFuncs.setproperty = NULL;
+            gNetscapeFuncs.removeproperty = NULL;
+            gNetscapeFuncs.hasproperty = NULL;
+            gNetscapeFuncs.releasevariantvalue = NULL;
+            gNetscapeFuncs.setexception = NULL;
+        }
+        if (nsTable->size >=
+            ((char *)&nsTable->poppopupsenabledstate - (char *)nsTable))
+        {
+            gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate;
+            gNetscapeFuncs.poppopupsenabledstate  = nsTable->poppopupsenabledstate;
+        }
+        else
         {
-            // NPRuntime support
-            gNetscapeFuncs.getstringidentifier  = nsTable->getstringidentifier;
-            gNetscapeFuncs.getstringidentifiers = nsTable->getstringidentifiers;
-            gNetscapeFuncs.getintidentifier     = nsTable->getintidentifier;
-            gNetscapeFuncs.identifierisstring   = nsTable->identifierisstring;
-            gNetscapeFuncs.utf8fromidentifier   = nsTable->utf8fromidentifier;
-            gNetscapeFuncs.intfromidentifier    = nsTable->intfromidentifier;
-            gNetscapeFuncs.createobject         = nsTable->createobject;
-            gNetscapeFuncs.retainobject         = nsTable->retainobject;
-            gNetscapeFuncs.releaseobject        = nsTable->releaseobject;
-            gNetscapeFuncs.invoke               = nsTable->invoke;
-            gNetscapeFuncs.invokeDefault        = nsTable->invokeDefault;
-            gNetscapeFuncs.evaluate             = nsTable->evaluate;
-            gNetscapeFuncs.getproperty          = nsTable->getproperty;
-            gNetscapeFuncs.setproperty          = nsTable->setproperty;
-            gNetscapeFuncs.removeproperty       = nsTable->removeproperty;
-            gNetscapeFuncs.hasproperty          = nsTable->hasproperty;
-            gNetscapeFuncs.hasmethod            = nsTable->hasmethod;
-            gNetscapeFuncs.releasevariantvalue  = nsTable->releasevariantvalue;
-            gNetscapeFuncs.setexception         = nsTable->setexception;
+            gNetscapeFuncs.pushpopupsenabledstate = NULL;
+            gNetscapeFuncs.poppopupsenabledstate  = NULL;
         }
 
         /*
@@ -685,6 +949,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
          */
         pluginFuncs->version    = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
         pluginFuncs->size       = sizeof(NPPluginFuncs);
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
         pluginFuncs->newp       = NewNPP_NewProc(Private_New);
         pluginFuncs->destroy    = NewNPP_DestroyProc(Private_Destroy);
         pluginFuncs->setwindow  = NewNPP_SetWindowProc(Private_SetWindow);
@@ -694,25 +959,42 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
         pluginFuncs->writeready = NewNPP_WriteReadyProc(Private_WriteReady);
         pluginFuncs->write      = NewNPP_WriteProc(Private_Write);
         pluginFuncs->print      = NewNPP_PrintProc(Private_Print);
-        pluginFuncs->event      = NULL;
         pluginFuncs->getvalue   = NewNPP_GetValueProc(Private_GetValue);
         pluginFuncs->setvalue   = NewNPP_SetValueProc(Private_SetValue);
-        if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
+#else
+        pluginFuncs->newp       = (NPP_NewProcPtr)(Private_New);
+        pluginFuncs->destroy    = (NPP_DestroyProcPtr)(Private_Destroy);
+        pluginFuncs->setwindow  = (NPP_SetWindowProcPtr)(Private_SetWindow);
+        pluginFuncs->newstream  = (NPP_NewStreamProcPtr)(Private_NewStream);
+        pluginFuncs->destroystream = (NPP_DestroyStreamProcPtr)(Private_DestroyStream);
+        pluginFuncs->asfile     = (NPP_StreamAsFileProcPtr)(Private_StreamAsFile);
+        pluginFuncs->writeready = (NPP_WriteReadyProcPtr)(Private_WriteReady);
+        pluginFuncs->write      = (NPP_WriteProcPtr)(Private_Write);
+        pluginFuncs->print      = (NPP_PrintProcPtr)(Private_Print);
+        pluginFuncs->getvalue   = (NPP_GetValueProcPtr)(Private_GetValue);
+        pluginFuncs->setvalue   = (NPP_SetValueProcPtr)(Private_SetValue);
+#endif
+        pluginFuncs->event      = NULL;
+        if( minor >= NPVERS_HAS_NOTIFICATION )
         {
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
             pluginFuncs->urlnotify = NewNPP_URLNotifyProc(Private_URLNotify);
+#else
+            pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(Private_URLNotify);
+#endif
         }
 #ifdef OJI
-        if( navMinorVers >= NPVERS_HAS_LIVECONNECT )
-        {
-            pluginFuncs->javaClass  = (JRIGlobalRef) Private_GetJavaClass();
-        }
+        if( minor >= NPVERS_HAS_LIVECONNECT )
+            pluginFuncs->javaClass  = Private_GetJavaClass();
+        else
+            pluginFuncs->javaClass = NULL;
 #else
         pluginFuncs->javaClass = NULL;
 #endif
+
         err = NPP_Initialize();
     }
+
     return err;
 }