mozilla: rewrite and license npunix.c/npwin.cpp under LGPLv2.1 (or later)

projects/mozilla/Makefile.am

@@ -4,10 +4,11 @@
 
 MOSTLYCLEANFILES = 
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(DIST_sources) install.js npvlc_rc.rc.in vlc.r
+EXTRA_DIST = $(DIST_sources) install.js npvlc_rc.rc.in vlc.r COPYING
 
 SOURCES_mozilla_common = \
 	vlcshell.cpp \
+	vlcshell.h \
 	vlcplugin.cpp \
 	vlcplugin.h \
 	control/npolibvlc.cpp \

projects/mozilla/support/npmac.cpp

@@ -56,6 +56,8 @@
 
 #include "npupp.h"
 
+#include "../vlcshell.h"
+
 #ifdef __MWERKS__
 #ifndef powerc
 #pragma pointers_in_A0
@@ -93,7 +95,6 @@
 #define PLUGINDEBUGSTR(msg) {}
 #endif
 
-
 #if defined(XP_MACOSX) && defined(__POWERPC__) && (!defined(TARGET_RT_MAC_CFM))
 
 // glue for mapping outgoing Macho function pointers to TVectors

projects/mozilla/vlcshell.cpp

@@ -42,6 +42,7 @@
 #endif
 
 #include "vlcplugin.h"
+#include "vlcshell.h"
 
 /* Enable/disable debugging printf's for X11 resizing */
 #undef X11_RESIZE_DEBUG
@@ -79,19 +80,20 @@ static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpa
  *****************************************************************************/
 char * NPP_GetMIMEDescription( void )
 {
-    return PLUGIN_MIMETYPES;
+    static char mimetype[] = PLUGIN_MIMETYPES;
+    return mimetype;
 }
 
 NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value )
 {
-
+    static char psz_name[] = PLUGIN_NAME;
     static char psz_desc[1000];
 
     /* plugin class variables */
     switch( variable )
     {
         case NPPVpluginNameString:
-            *((char **)value) = PLUGIN_NAME;
+            *((char **)value) = psz_name;
             return NPERR_NO_ERROR;
 
         case NPPVpluginDescriptionString:
@@ -625,7 +627,6 @@ int32 NPP_WriteReady( NPP instance, NPStream *stream )
     return 8*1024;
 }
 
-
 int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
                  int32 len, void *buffer )
 {
@@ -633,7 +634,6 @@ int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
     return len;
 }
 
-
 NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason )
 {
     if( instance == NULL )
@@ -643,7 +643,6 @@ NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason )
     return NPERR_NO_ERROR;
 }
 
-
 void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname )
 {
     if( instance == NULL )
@@ -667,7 +666,6 @@ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname )
     }
 }
 
-
 void NPP_URLNotify( NPP instance, const char* url,
                     NPReason reason, void* notifyData )
 {

projects/mozilla/vlcshell.h

+/*****************************************************************************
+ * vlcshell.hp:
+ *****************************************************************************
+ * Copyright (C) 2009 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Jean-Paul Saman <jpsaman@videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef __VLCSHELL_H__
+#define __VLCSHELL_H__
+
+char * NPP_GetMIMEDescription( void );
+
+NPError NPP_Initialize( void );
+jref NPP_GetJavaClass( void );
+void NPP_Shutdown( void );
+
+NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
+                 char* argn[], char* argv[], NPSavedData* saved );
+NPError NPP_Destroy( NPP instance, NPSavedData** save );
+
+NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value );
+NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value );
+
+NPError NPP_SetWindow( NPP instance, NPWindow* window );
+
+NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+                       NPBool seekable, uint16 *stype );
+NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason );
+void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname );
+
+int32 NPP_WriteReady( NPP instance, NPStream *stream );
+int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+                 int32 len, void *buffer );
+
+void NPP_URLNotify( NPP instance, const char* url,
+                    NPReason reason, void* notifyData );
+void NPP_Print( NPP instance, NPPrint* printInfo );
+
+#ifdef XP_MACOSX
+int16 NPP_HandleEvent( NPP instance, void * event );
+#endif
+
+#endif