From: Jean-Paul Saman Date: Fri, 13 Mar 2009 15:13:04 +0000 (+0100) Subject: mozilla: rewrite and license npunix.c/npwin.cpp under LGPLv2.1 (or later) X-Git-Tag: 1.0.0-pre1~60 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d99719c4e600d34ae9972d349fda599d87fac82b;p=vlc mozilla: rewrite and license npunix.c/npwin.cpp under LGPLv2.1 (or later) --- diff --git a/projects/mozilla/COPYING b/projects/mozilla/COPYING new file mode 100644 index 0000000000..5ab7695ab8 --- /dev/null +++ b/projects/mozilla/COPYING @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am index 111d92e0c2..742f4047a3 100644 --- a/projects/mozilla/Makefile.am +++ b/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 \ diff --git a/projects/mozilla/support/npmac.cpp b/projects/mozilla/support/npmac.cpp index d5901bfc7b..015ceb4500 100644 --- a/projects/mozilla/support/npmac.cpp +++ b/projects/mozilla/support/npmac.cpp @@ -62,6 +62,8 @@ #include "npupp.h" #endif +#include "../vlcshell.h" + #ifdef __MWERKS__ #ifndef powerc #pragma pointers_in_A0 @@ -99,7 +101,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 diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c index ab959f2410..7cabe6654b 100644 --- a/projects/mozilla/support/npunix.c +++ b/projects/mozilla/support/npunix.c @@ -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 * - * 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. * @@ -23,19 +27,7 @@ * Contributor(s): * Stephen Mak * - * 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 @@ -51,11 +43,19 @@ *---------------------------------------------------------------------- */ +#include "config.h" + #define XP_UNIX 1 +#define OJI 1 -#include -#include "npapi.h" -#include "npupp.h" +#include +#ifdef HAVE_NPFUNCTIONS_H +#include +#else +#include +#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; } diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp index 9b6a3ef0b7..f802c2e396 100644 --- a/projects/mozilla/support/npwin.cpp +++ b/projects/mozilla/support/npwin.cpp @@ -1,16 +1,21 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * - * 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 * - * 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 Communicator client code. * @@ -19,36 +24,35 @@ * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either 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 ***** */ + */ + +#include "config.h" + +//#define OJI 1 + +#ifdef HAVE_MOZILLA_CONFIG_H +# include +#endif #ifndef _NPAPI_H_ -#include "npapi.h" +# include "npapi.h" #endif -#ifndef _NPUPP_H_ -#include "npupp.h" +#ifdef HAVE_NPFUNCTIONS_H +# include "npfunctions.h" +#else +# ifndef _NPUPP_H_ +# include "npupp.h" +# endif #endif -#include "nsDefaultPlugin.h" +#include "../vlcshell.h" //\\// DEFINE #define NP_EXPORT //\\// GLOBAL DATA NPNetscapeFuncs* g_pNavigatorFuncs = 0; + #ifdef OJI JRIGlobalRef Private_GetJavaClass(void); @@ -64,12 +68,13 @@ 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 /* OJI */ + //\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\. ////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//. // PLUGIN DLL entry points @@ -91,7 +96,11 @@ static NPPluginFuncs* g_pluginFuncs; // plugin DLL. Note that these entry points ensure that DS is loaded // by using the NP_LOADDS macro, when compiling for Win16 // +#ifdef __MINGW32__ +extern "C" __declspec(dllexport) NPError WINAPI +#else NPError WINAPI NP_EXPORT +#endif NP_GetEntryPoints(NPPluginFuncs* pFuncs) { // trap a NULL ptr @@ -111,9 +120,11 @@ NP_GetEntryPoints(NPPluginFuncs* pFuncs) pFuncs->writeready = NPP_WriteReady; pFuncs->write = NPP_Write; pFuncs->print = NPP_Print; - pFuncs->event = 0; /// reserved + pFuncs->event = 0; /// reserved + pFuncs->getvalue = NPP_GetValue; + pFuncs->setvalue = NPP_SetValue; - g_pluginFuncs = pFuncs; + g_pluginFuncs = pFuncs; return NPERR_NO_ERROR; } @@ -124,7 +135,11 @@ NP_GetEntryPoints(NPPluginFuncs* pFuncs) // // called immediately after the plugin DLL is loaded // -NPError WINAPI NP_EXPORT +#ifdef __MINGW32__ +extern "C" __declspec(dllexport) NPError WINAPI +#else +NPError WINAPI NP_EXPORT +#endif NP_Initialize(NPNetscapeFuncs* pFuncs) { // trap a NULL ptr @@ -138,18 +153,18 @@ NP_Initialize(NPNetscapeFuncs* pFuncs) if(HIBYTE(pFuncs->version) > NP_VERSION_MAJOR) return NPERR_INCOMPATIBLE_VERSION_ERROR; - // We have to defer these assignments until g_pNavigatorFuncs is set + // 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; - } + if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) { + g_pluginFuncs->urlnotify = NPP_URLNotify; + } #ifdef OJI - if( navMinorVers >= NPVERS_HAS_LIVECONNECT ) { - g_pluginFuncs->javaClass = Private_GetJavaClass(); - } + if( navMinorVers >= NPVERS_HAS_LIVECONNECT ) { + g_pluginFuncs->javaClass = Private_GetJavaClass(); + } #endif - // NPP_Initialize is a standard (cross-platform) initialize function. + // NPP_Initialize is a standard (cross-platform) initialize function. return NPP_Initialize(); } @@ -161,7 +176,11 @@ NP_Initialize(NPNetscapeFuncs* pFuncs) // This function should check for some ref count on the dll to see if it is // unloadable or it needs to stay in memory. // +#ifdef __MINGW32__ +extern "C" __declspec(dllexport) NPError WINAPI +#else NPError WINAPI NP_EXPORT +#endif NP_Shutdown() { NPP_Shutdown(); @@ -171,8 +190,7 @@ NP_Shutdown() char * NP_GetMIMEDescription() { - static char mimetype[] = NS_PLUGIN_DEFAULT_MIME_DESCRIPTION; - return mimetype; + return NPP_GetMIMEDescription(); } // END - PLUGIN DLL entry points @@ -186,11 +204,11 @@ char * NP_GetMIMEDescription() 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 -*/ + */ /* 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; @@ -204,24 +222,228 @@ NPError NPN_GetValue(NPP instance, NPNVariable variable, void *result) return g_pNavigatorFuncs->getvalue(instance, variable, result); } +NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value) +{ + return g_pNavigatorFuncs->setvalue(instance, variable, value); +} + +void NPN_InvalidateRect(NPP instance, NPRect *rect) +{ + g_pNavigatorFuncs->invalidaterect(instance, rect); +} + +void NPN_InvalidateRegion(NPP instance, NPRegion region) +{ + g_pNavigatorFuncs->invalidateregion(instance, region); +} + +void NPN_ForceRedraw(NPP instance) +{ + g_pNavigatorFuncs->forceredraw(instance); +} + +NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->getstringidentifier(name); + } + return NULL; +} + +void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount, NPIdentifier *identifiers) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + g_pNavigatorFuncs->getstringidentifiers(names, nameCount, identifiers); + } +} + +NPIdentifier NPN_GetIntIdentifier(int32_t intid) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->getintidentifier(intid); + } + return NULL; +} + +bool NPN_IdentifierIsString(NPIdentifier identifier) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->identifierisstring(identifier); + } + return false; +} + +NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->utf8fromidentifier(identifier); + } + return NULL; +} + +int32_t NPN_IntFromIdentifier(NPIdentifier identifier) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->intfromidentifier(identifier); + } + return 0; +} + +NPObject *NPN_CreateObject(NPP instance, NPClass *aClass) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->createobject(instance, aClass); + } + return NULL; +} + +NPObject *NPN_RetainObject(NPObject *npobj) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->retainobject(npobj); + } + return NULL; +} + +void NPN_ReleaseObject(NPObject *npobj) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + g_pNavigatorFuncs->releaseobject(npobj); + } +} + +bool NPN_Invoke(NPP instance, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->invoke(instance, npobj, methodName, args, argCount, result); + } + return false; +} + +bool NPN_InvokeDefault(NPP instance, NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->invokeDefault(instance, npobj, args, argCount, result); + } + return false; +} + +bool NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->evaluate(instance, npobj, script, result); + } + return false; +} + +bool NPN_GetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, NPVariant *result) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->getproperty(instance, npobj, propertyName, result); + } + return false; +} + +bool NPN_SetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, const NPVariant *value) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->setproperty(instance, npobj, propertyName, value); + } + return false; +} + +bool NPN_RemoveProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->removeproperty(instance, npobj, propertyName); + } + return false; +} + +bool NPN_HasProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->hasproperty(instance, npobj, propertyName); + } + return false; +} + +bool NPN_HasMethod(NPP instance, NPObject *npobj, NPIdentifier methodName) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + return g_pNavigatorFuncs->hasmethod(instance, npobj, methodName); + } + return false; +} + +void NPN_ReleaseVariantValue(NPVariant *variant) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + g_pNavigatorFuncs->releasevariantvalue(variant); + } +} + +void NPN_SetException(NPObject *npobj, const NPUTF8 *message) +{ + int navMinorVers = g_pNavigatorFuncs->version & 0xFF; + if( navMinorVers >= 14 ) + { + g_pNavigatorFuncs->setexception(npobj, message); + } +} /* 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; + 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); @@ -229,15 +451,15 @@ NPError NPN_GetURL(NPP instance, const char *url, const char *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; + 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; } @@ -249,97 +471,96 @@ NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 le /* 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. -*/ + * by Netscape in the current window. + */ NPError NPN_NewStream(NPP instance, NPMIMEType type, - const char* target, NPStream** stream) + const char* target, NPStream** stream) { - int navMinorVersion = g_pNavigatorFuncs->version & 0xFF; - NPError err; + 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; + 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; + 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; + 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. -*/ +/* 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; + 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; + 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. -*/ - - + * 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); } + #ifdef OJI /* private function to Netscape. do not use! -*/ + */ void NPN_ReloadPlugins(NPBool reloadPages) { g_pNavigatorFuncs->reloadplugins(reloadPages); @@ -347,12 +568,11 @@ void NPN_ReloadPlugins(NPBool reloadPages) JRIEnv* NPN_GetJavaEnv(void) { - return g_pNavigatorFuncs->getJavaEnv(); + return g_pNavigatorFuncs->getJavaEnv(); } jref NPN_GetJavaPeer(NPP instance) { - return g_pNavigatorFuncs->getJavaPeer(instance); + return g_pNavigatorFuncs->getJavaPeer(instance); } #endif - diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp index abf61eb5a9..850bcfc3b5 100644 --- a/projects/mozilla/vlcshell.cpp +++ b/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: @@ -604,7 +606,6 @@ int32 NPP_WriteReady( NPP instance, NPStream *stream ) return 8*1024; } - int32 NPP_Write( NPP instance, NPStream *stream, int32 offset, int32 len, void *buffer ) { @@ -612,7 +613,6 @@ int32 NPP_Write( NPP instance, NPStream *stream, int32 offset, return len; } - NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason ) { if( instance == NULL ) @@ -622,7 +622,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 ) @@ -645,7 +644,6 @@ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname ) } } - void NPP_URLNotify( NPP instance, const char* url, NPReason reason, void* notifyData ) { diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h new file mode 100644 index 0000000000..6dd156158f --- /dev/null +++ b/projects/mozilla/vlcshell.h @@ -0,0 +1,59 @@ +/***************************************************************************** + * vlcshell.hp: + ***************************************************************************** + * Copyright (C) 2009 the VideoLAN team + * $Id$ + * + * Authors: Jean-Paul Saman + * + * 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