]> git.sesse.net Git - vlc/blobdiff - projects/mozilla/support/npunix.c
mozilla: rewrite and license npunix.c/npwin.cpp under LGPLv2.1 (or later)
[vlc] / projects / mozilla / support / npunix.c
index ab959f24109b28b6942ccc82eb5719006e2c50a0..7cabe6654bfd726737f6f375279b774c993951fe 100644 (file)
@@ -1,17 +1,21 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Mozilla/Firefox plugin for VLC
+ * Copyright (C) 2009, Jean-Paul Saman <jpsaman@videolan.org>
  *
- * 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/
+ * 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.
  *
- * 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 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.
  *
  * Contributor(s):
  *   Stephen Mak <smak@sun.com>
  *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ */
 
 /*
  * npunix.c
  *----------------------------------------------------------------------
  */
 
+#include "config.h"
+
 #define XP_UNIX 1
+#define OJI 1
 
-#include <stdio.h>
-#include "npapi.h"
-#include "npupp.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
@@ -69,7 +69,6 @@
 #define PLUGINDEBUGSTR(msg)
 #endif
 
-
 /***********************************************************************
  *
  * Globals
@@ -78,7 +77,6 @@
 
 static NPNetscapeFuncs   gNetscapeFuncs;    /* Netscape Function table */
 
-
 /***********************************************************************
  *
  * Wrapper functions : plugin calling Netscape Navigator
@@ -253,117 +251,186 @@ void NPN_PopPopupsEnabledState(NPP instance)
 
 NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
 {
-    return CallNPN_GetStringIdentifierProc(gNetscapeFuncs.getstringidentifier,
-                                           name);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+    {
+        return CallNPN_GetStringIdentifierProc(
+                        gNetscapeFuncs.getstringidentifier, name);
+    }
+    return NULL;
 }
 
 void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
                               NPIdentifier *identifiers)
 {
-    CallNPN_GetStringIdentifiersProc(gNetscapeFuncs.getstringidentifiers,
-        names, nameCount, identifiers);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+    {
+        CallNPN_GetStringIdentifiersProc(gNetscapeFuncs.getstringidentifiers,
+                                         names, nameCount, identifiers);
+    }
 }
 
 NPIdentifier NPN_GetIntIdentifier(int32_t intid)
 {
-    return CallNPN_GetIntIdentifierProc(gNetscapeFuncs.getintidentifier, intid);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+    {
+        return CallNPN_GetIntIdentifierProc(gNetscapeFuncs.getintidentifier, intid);
+    }
+    return NULL;
 }
 
 bool NPN_IdentifierIsString(NPIdentifier identifier)
 {
-    return CallNPN_IdentifierIsStringProc(gNetscapeFuncs.identifierisstring,
-        identifier);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+    {
+        return CallNPN_IdentifierIsStringProc(
+                        gNetscapeFuncs.identifierisstring,
+                        identifier);
+    }
+    return false;
 }
 
 NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier)
 {
-    return CallNPN_UTF8FromIdentifierProc(gNetscapeFuncs.utf8fromidentifier,
-        identifier);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+    {
+        return CallNPN_UTF8FromIdentifierProc(
+                            gNetscapeFuncs.utf8fromidentifier,
+                            identifier);
+    }
+    return NULL;
 }
 
 int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
 {
-    return CallNPN_IntFromIdentifierProc(gNetscapeFuncs.intfromidentifier,
-        identifier);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+    {
+        return CallNPN_IntFromIdentifierProc(
+                        gNetscapeFuncs.intfromidentifier,
+                        identifier);
+    }
+    return 0;
 }
 
 NPObject *NPN_CreateObject(NPP npp, NPClass *aClass)
 {
-    return CallNPN_CreateObjectProc(gNetscapeFuncs.createobject, npp, aClass);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_CreateObjectProc(gNetscapeFuncs.createobject, npp, aClass);
+    return NULL;
 }
 
 NPObject *NPN_RetainObject(NPObject *obj)
 {
-    return CallNPN_RetainObjectProc(gNetscapeFuncs.retainobject, obj);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_RetainObjectProc(gNetscapeFuncs.retainobject, obj);
+    return NULL;
 }
 
 void NPN_ReleaseObject(NPObject *obj)
 {
-    CallNPN_ReleaseObjectProc(gNetscapeFuncs.releaseobject, obj);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        CallNPN_ReleaseObjectProc(gNetscapeFuncs.releaseobject, obj);
 }
 
 bool NPN_Invoke(NPP npp, NPObject* obj, NPIdentifier methodName,
                 const NPVariant *args, uint32_t argCount, NPVariant *result)
 {
-    return CallNPN_InvokeProc(gNetscapeFuncs.invoke, npp, obj, methodName,
-        args, argCount, result);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_InvokeProc(gNetscapeFuncs.invoke, npp, obj, methodName,
+                                  args, argCount, result);
+    return false;
 }
 
 bool NPN_InvokeDefault(NPP npp, NPObject* obj, const NPVariant *args,
                        uint32_t argCount, NPVariant *result)
 {
-    return CallNPN_InvokeDefaultProc(gNetscapeFuncs.invokeDefault, npp, obj,
-        args, argCount, result);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_InvokeDefaultProc(gNetscapeFuncs.invokeDefault, npp, obj,
+                                         args, argCount, result);
+    return false;
 }
 
 bool NPN_Evaluate(NPP npp, NPObject* obj, NPString *script,
                   NPVariant *result)
 {
-    return CallNPN_EvaluateProc(gNetscapeFuncs.evaluate, npp, obj, script, result);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_EvaluateProc(gNetscapeFuncs.evaluate, npp, obj,
+                                    script, result);
+    return false;
 }
 
 bool NPN_GetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
                      NPVariant *result)
 {
-    return CallNPN_GetPropertyProc(gNetscapeFuncs.getproperty, npp, obj,
-        propertyName, result);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_GetPropertyProc(gNetscapeFuncs.getproperty, npp, obj,
+                                       propertyName, result);
+    return false;
 }
 
 bool NPN_SetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
                      const NPVariant *value)
 {
-    return CallNPN_SetPropertyProc(gNetscapeFuncs.setproperty, npp, obj,
-        propertyName, value);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_SetPropertyProc(gNetscapeFuncs.setproperty, npp, obj,
+                                       propertyName, value);
+    return false;
 }
 
 bool NPN_RemoveProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
 {
-    return CallNPN_RemovePropertyProc(gNetscapeFuncs.removeproperty, npp, obj,
-        propertyName);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_RemovePropertyProc(gNetscapeFuncs.removeproperty, npp, obj,
+                                          propertyName);
+    return false;
 }
 
 bool NPN_HasProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
 {
-    return CallNPN_HasPropertyProc(gNetscapeFuncs.hasproperty, npp, obj,
-        propertyName);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_HasPropertyProc(gNetscapeFuncs.hasproperty, npp, obj,
+                                       propertyName);
+    return false;
 }
 
 bool NPN_HasMethod(NPP npp, NPObject* obj, NPIdentifier methodName)
 {
-    return CallNPN_HasMethodProc(gNetscapeFuncs.hasmethod, npp, obj, methodName);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        return CallNPN_HasMethodProc(gNetscapeFuncs.hasmethod, npp,
+                                     obj, methodName);
+    return false;
 }
 
 void NPN_ReleaseVariantValue(NPVariant *variant)
 {
-    CallNPN_ReleaseVariantValueProc(gNetscapeFuncs.releasevariantvalue, variant);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        CallNPN_ReleaseVariantValueProc(gNetscapeFuncs.releasevariantvalue, variant);
 }
 
 void NPN_SetException(NPObject* obj, const NPUTF8 *message)
 {
-    CallNPN_SetExceptionProc(gNetscapeFuncs.setexception, obj, message);
+    int minor = gNetscapeFuncs.version & 0xFF;
+    if( minor >= 14 )
+        CallNPN_SetExceptionProc(gNetscapeFuncs.setexception, obj, message);
 }
 
-
 /***********************************************************************
  *
  * Wrapper functions : Netscape Navigator -> plugin
@@ -375,6 +442,28 @@ void NPN_SetException(NPObject* obj, const NPUTF8 *message)
  *
  ***********************************************************************/
 
+/* Function prototypes */
+NPError Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
+        int16 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* stype);
+int32 Private_WriteReady(NPP instance, NPStream* stream);
+int32 Private_Write(NPP instance, NPStream* stream, int32 offset,
+                    int32 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)
@@ -450,14 +539,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)
 {
@@ -465,6 +551,20 @@ Private_Print(NPP instance, NPPrint* platformPrint)
     NPP_Print(instance, platformPrint);
 }
 
+NPError
+Private_GetValue(NPP instance, NPPVariable variable, void *r_value)
+{
+    PLUGINDEBUGSTR("GetValue");
+    return NPP_GetValue(instance, variable, r_value);
+}
+
+NPError
+Private_SetValue(NPP instance, NPPVariable variable, void *r_value)
+{
+    PLUGINDEBUGSTR("SetValue");
+    return NPP_SetValue(instance, variable, r_value);
+}
+
 #ifdef OJI
 JRIGlobalRef
 Private_GetJavaClass(void)
@@ -531,12 +631,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.
@@ -545,18 +644,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 < ((char *)&nsTable->posturlnotify - (char *)nsTable))
             err = NPERR_INVALID_FUNCTABLE_ERROR;
-        if (pluginFuncs->size < sizeof(NPPluginFuncs))      
+        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
@@ -564,11 +662,12 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
          * the whole structure, because the Netscape function table
          * could actually be bigger than what we expect.
          */
+        int minor = nsTable->version & 0xFF;
+
         gNetscapeFuncs.version       = nsTable->version;
         gNetscapeFuncs.size          = nsTable->size;
         gNetscapeFuncs.posturl       = nsTable->posturl;
         gNetscapeFuncs.geturl        = nsTable->geturl;
-        gNetscapeFuncs.geturlnotify  = nsTable->geturlnotify;
         gNetscapeFuncs.requestread   = nsTable->requestread;
         gNetscapeFuncs.newstream     = nsTable->newstream;
         gNetscapeFuncs.write         = nsTable->write;
@@ -580,72 +679,84 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
         gNetscapeFuncs.memflush      = nsTable->memflush;
         gNetscapeFuncs.reloadplugins = nsTable->reloadplugins;
 #ifdef OJI
-        gNetscapeFuncs.getJavaEnv    = nsTable->getJavaEnv;
-        gNetscapeFuncs.getJavaPeer   = nsTable->getJavaPeer;
+        if( minor >= NPVERS_HAS_LIVECONNECT )
+        {
+            gNetscapeFuncs.getJavaEnv    = nsTable->getJavaEnv;
+            gNetscapeFuncs.getJavaPeer   = nsTable->getJavaPeer;
+        }
 #endif
         gNetscapeFuncs.getvalue      = nsTable->getvalue;
         gNetscapeFuncs.setvalue      = nsTable->setvalue;
-        gNetscapeFuncs.posturlnotify = nsTable->posturlnotify;
+
+        if( minor >= NPVERS_HAS_NOTIFICATION )
+        {
+            gNetscapeFuncs.geturlnotify  = nsTable->geturlnotify;
+            gNetscapeFuncs.posturlnotify = nsTable->posturlnotify;
+        }
 
         if (nsTable->size >= ((char *)&nsTable->setexception - (char *)nsTable))
         {
-          gNetscapeFuncs.invalidaterect = nsTable->invalidaterect;
-          gNetscapeFuncs.invalidateregion = nsTable->invalidateregion;
-          gNetscapeFuncs.forceredraw = nsTable->forceredraw;
-          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.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
+        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;
+            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;
+            gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate;
+            gNetscapeFuncs.poppopupsenabledstate  = nsTable->poppopupsenabledstate;
         }
-         else
+        else
         {
-          gNetscapeFuncs.pushpopupsenabledstate = NULL;
-          gNetscapeFuncs.poppopupsenabledstate  = NULL;
+            gNetscapeFuncs.pushpopupsenabledstate = NULL;
+            gNetscapeFuncs.poppopupsenabledstate  = NULL;
         }
 
         /*
@@ -665,18 +776,26 @@ 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->urlnotify  = NewNPP_URLNotifyProc(Private_URLNotify);
+        pluginFuncs->getvalue   = NewNPP_GetValueProc(Private_GetValue);
+        pluginFuncs->setvalue   = NewNPP_SetValueProc(Private_SetValue);
+
         pluginFuncs->event      = NULL;
+        if( minor >= NPVERS_HAS_NOTIFICATION )
+        {
+            pluginFuncs->urlnotify = NewNPP_URLNotifyProc(Private_URLNotify);
+        }
 #ifdef OJI
-        pluginFuncs->javaClass  = Private_GetJavaClass();
+        if( minor >= NPVERS_HAS_LIVECONNECT )
+            pluginFuncs->javaClass  = Private_GetJavaClass();
+        else
+            pluginFuncs->javaClass = NULL;
+#else
+        pluginFuncs->javaClass = NULL;
 #endif
-        // This function is supposedly loaded magically, but that doesn't
-        // seem to be true.
-        pluginFuncs->getvalue      = NewNPP_GetValueProc(NP_GetValue);
 
         err = NPP_Initialize();
     }
-    
+
     return err;
 }