changeset in /hg/icedtea: 2008-02-23 Thomas Fitzsimmons <fitzs...
Lillian Angel
langel at redhat.com
Tue Feb 26 10:13:07 PST 2008
Are you going to include this in hg/icedtea6?
Lillian
Thomas Fitzsimmons wrote:
> changeset 705c0535c8a1 in /hg/icedtea
> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=705c0535c8a1
> description:
> 2008-02-23 Thomas Fitzsimmons <fitzsim at redhat.com>
>
> * IcedTeaPlugin.cc: New file.
> * Makefile.am: Add ENABLE_LIVECONNECT and ENABLE_PLUGIN
> conditionals.
> * Makefile.in: Regenerate.
> * README: Document --enable-liveconnect.
> * configure.ac: Define ENABLE_LIVECONNECT and ENABLE_PLUGIN
> conditionals. Add --enable-liveconnect option. Add XULRunner
> pkg-config checks.
> * configure: Regenerate.
> * .hgignore: Add IcedTeaPlugin.so.
> * patches/icedtea-liveconnect.patch: New file.
>
> diffstat:
>
> 9 files changed, 7433 insertions(+), 168 deletions(-)
> .hgignore | 1
> ChangeLog | 14
> IcedTeaPlugin.cc | 3950 +++++++++++++++++++++++++++++++++++++
> Makefile.am | 123 -
> Makefile.in | 109 -
> README | 13
> configure | 391 +++
> configure.ac | 106
> patches/icedtea-liveconnect.patch | 2894 +++++++++++++++++++++++++++
>
> diffs (truncated from 8008 to 500 lines):
>
> diff -r c08671f795d1 -r 705c0535c8a1 .hgignore
> --- a/.hgignore Wed Feb 20 10:31:33 2008 -0500
> +++ b/.hgignore Sat Feb 23 19:52:19 2008 -0500
> @@ -14,6 +14,7 @@ javac
> javac
> javap
> gcjwebplugin.so
> +IcedTeaPlugin.so
> rt-source-files.txt
> hotspot-tools-source-files.txt
> tools-source-files.txt
> diff -r c08671f795d1 -r 705c0535c8a1 ChangeLog
> --- a/ChangeLog Wed Feb 20 10:31:33 2008 -0500
> +++ b/ChangeLog Sat Feb 23 19:52:19 2008 -0500
> @@ -1,3 +1,17 @@ 2008-02-20 Joshua Sumali <jsumali at redh
> +2008-02-23 Thomas Fitzsimmons <fitzsim at redhat.com>
> +
> + * IcedTeaPlugin.cc: New file.
> + * Makefile.am: Add ENABLE_LIVECONNECT and ENABLE_PLUGIN
> + conditionals.
> + * Makefile.in: Regenerate.
> + * README: Document --enable-liveconnect.
> + * configure.ac: Define ENABLE_LIVECONNECT and ENABLE_PLUGIN
> + conditionals. Add --enable-liveconnect option. Add XULRunner
> + pkg-config checks.
> + * configure: Regenerate.
> + * .hgignore: Add IcedTeaPlugin.so.
> + * patches/icedtea-liveconnect.patch: New file.
> +
> 2008-02-20 Joshua Sumali <jsumali at redhat.com>
>
> * tools/netx/jnlp/security/CertWarningPane.java: Make run and cancel
> diff -r c08671f795d1 -r 705c0535c8a1 IcedTeaPlugin.cc
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/IcedTeaPlugin.cc Sat Feb 23 19:52:19 2008 -0500
> @@ -0,0 +1,3950 @@
> +/* IcedTeaPlugin -- implement OJI
> + Copyright (C) 2008 Red Hat
> +
> +This file is part of IcedTea.
> +
> +IcedTea 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, or (at your option)
> +any later version.
> +
> +IcedTea 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 IcedTea; see the file COPYING. If not, write to the
> +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version. */
> +
> +#include <nsStringAPI.h>
> +
> +PRThread* current_thread ();
> +
> +#if PR_BYTES_PER_LONG == 8
> +#define PLUGIN_JAVASCRIPT_TYPE jlong
> +#define PLUGIN_INITIALIZE_JAVASCRIPT_ARGUMENT(args, obj) args[0].j = obj
> +#define PLUGIN_JAVASCRIPT_SIGNATURE "(J)V"
> +#else
> +#define PLUGIN_JAVASCRIPT_TYPE jint
> +#define PLUGIN_INITIALIZE_JAVASCRIPT_ARGUMENT(args, obj) args[0].i = obj
> +#define PLUGIN_JAVASCRIPT_SIGNATURE "(I)V"
> +#endif
> +
> +// System includes.
> +#include <dlfcn.h>
> +#include <errno.h>
> +#include <libgen.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <sys/stat.h>
> +#include <sys/types.h>
> +#include <unistd.h>
> +
> +// GTK includes.
> +#include <gtk/gtk.h>
> +
> +// FIXME: Look into this:
> +// #0 nsACString_internal (this=0xbff3016c) at ../../../dist/include/string/nsTSubstring.h:522
> +// #1 0x007117c9 in nsDependentCSubstring (this=0xbff3016c, str=@0xab20d00, startPos=0, length=0) at ../../dist/include/string/nsTDependentSubstring.h:68
> +// #2 0x0076a9d9 in Substring (str=@0xab20d00, startPos=0, length=0) at ../../dist/include/string/nsTDependentSubstring.h:103
> +// #3 0x008333a7 in nsStandardURL::Hostport (this=0xab20ce8) at nsStandardURL.h:338
> +// #4 0x008299b8 in nsStandardURL::GetHostPort (this=0xab20ce8, result=@0xbff30210) at nsStandardURL.cpp:1003
> +// #5 0x0095b9dc in nsPrincipal::GetOrigin (this=0xab114e0, aOrigin=0xbff30320) at nsPrincipal.cpp:195
> +// #6 0x0154232c in nsCSecurityContext::GetOrigin (this=0xab8f410, buf=0xbff30390 "\004", buflen=256) at nsCSecurityContext.cpp:126
> +// #7 0x04db377e in CNSAdapter_SecurityContextPeer::GetOrigin () from /opt/jdk1.6.0_03/jre/plugin/i386/ns7/libjavaplugin_oji.so
> +// #8 0x05acd59f in getAndPackSecurityInfo () from /opt/jdk1.6.0_03/jre/lib/i386/libjavaplugin_nscp.so
> +// #9 0x05acc77f in jni_SecureCallMethod () from /opt/jdk1.6.0_03/jre/lib/i386/libjavaplugin_nscp.so
> +// #10 0x05aba88d in CSecureJNIEnv::CallMethod () from /opt/jdk1.6.0_03/jre/lib/i386/libjavaplugin_nscp.so
> +// #11 0x04db1be7 in CNSAdapter_SecureJNIEnv::CallMethod () from /opt/jdk1.6.0_03/jre/plugin/i386/ns7/libjavaplugin_oji.so
> +// #12 0x0153e62f in ProxyJNIEnv::InvokeMethod (env=0xa8b8040, obj=0x9dad690, method=0xa0ed070, args=0x0) at ProxyJNI.cpp:571
> +// #13 0x0153f91c in ProxyJNIEnv::InvokeMethod (env=0xa8b8040, obj=0x9dad690, method=0xa0ed070, args=0xbff3065c "\235\225$") at ProxyJNI.cpp:580
> +// #14 0x0153fdbf in ProxyJNIEnv::CallObjectMethod (env=0xa8b8040, obj=0x9dad690, methodID=0xa0ed070) at ProxyJNI.cpp:641
> +
> +#define NOT_IMPLEMENTED() \
> + printf ("NOT IMPLEMENTED: %s\n", __PRETTY_FUNCTION__)
> +
> +#define ID(object) \
> + (object == NULL ? (PRUint32) 0 : reinterpret_cast<JNIReference*> (object)->identifier)
> +
> +// Tracing.
> +class Trace
> +{
> +public:
> + Trace (char const* name, char const* function)
> + {
> + Trace::name = name;
> + Trace::function = function;
> + printf ("ICEDTEA PLUGIN: thread %p: %s%s\n", current_thread (),
> + name, function);
> + }
> +
> + ~Trace ()
> + {
> + printf ("ICEDTEA PLUGIN: thread %p: %s%s %s\n", current_thread (),
> + name, function, "return");
> + }
> +private:
> + char const* name;
> + char const* function;
> +};
> +
> +#if 0
> +// Debugging macros.
> +#define PLUGIN_DEBUG(message) \
> + printf ("ICEDTEA PLUGIN: thread %p: %s\n", current_thread (), message)
> +
> +#define PLUGIN_DEBUG_TWO(first, second) \
> + printf ("ICEDTEA PLUGIN: thread %p: %s %s\n", current_thread (), \
> + first, second)
> +
> +// Testing macro.
> +#define PLUGIN_TEST(expression, message) \
> + do \
> + { \
> + if (!(expression)) \
> + printf ("FAIL: %d: %s\n", __LINE__, \
> + message); \
> + } \
> + while (0);
> +
> +// __func__ is a variable, not a string literal, so it cannot be
> +// concatenated by the preprocessor.
> +#define PLUGIN_TRACE_JNIENV() Trace _trace ("JNIEnv::", __func__)
> +#define PLUGIN_TRACE_FACTORY() Trace _trace ("Factory::", __func__)
> +#define PLUGIN_TRACE_INSTANCE() Trace _trace ("Instance::", __func__)
> +#define PLUGIN_TRACE_EVENTSINK() Trace _trace ("EventSink::", __func__)
> +#define PLUGIN_TRACE_LISTENER() Trace _trace ("Listener::", __func__)
> +
> +// Error reporting macros.
> +#define PLUGIN_ERROR(message) \
> + fprintf (stderr, "%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__, \
> + current_thread (), message)
> +
> +#define PLUGIN_ERROR_TWO(first, second) \
> + fprintf (stderr, "%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__, \
> + current_thread (), first, second)
> +
> +#define PLUGIN_ERROR_THREE(first, second, third) \
> + fprintf (stderr, "%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__, \
> + __LINE__, current_thread (), first, second, third)
> +
> +#define PLUGIN_CHECK_RETURN(message, result) \
> + if (NS_SUCCEEDED (result)) \
> + PLUGIN_DEBUG (message); \
> + else \
> + { \
> + PLUGIN_ERROR (message); \
> + return result; \
> + }
> +
> +#define PLUGIN_CHECK(message, result) \
> + if (NS_SUCCEEDED (result)) \
> + PLUGIN_DEBUG (message); \
> + else \
> + PLUGIN_ERROR (message);
> +
> +#else
> +
> +// Debugging macros.
> +#define PLUGIN_DEBUG(message)
> +#define PLUGIN_DEBUG_TWO(first, second)
> +
> +// Testing macros.
> +#define PLUGIN_TEST(expression, message)
> +#define PLUGIN_TRACE_JNIENV()
> +#define PLUGIN_TRACE_FACTORY() Trace _trace ("Factory::", __func__)
> +//#define PLUGIN_TRACE_FACTORY()
> +#define PLUGIN_TRACE_INSTANCE()
> +#define PLUGIN_TRACE_EVENTSINK()
> +#define PLUGIN_TRACE_LISTENER()
> +
> +// Error reporting macros.
> +#define PLUGIN_ERROR(message) \
> + fprintf (stderr, "%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__, \
> + current_thread (), message)
> +
> +#define PLUGIN_ERROR_TWO(first, second) \
> + fprintf (stderr, "%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__, \
> + current_thread (), first, second)
> +
> +#define PLUGIN_ERROR_THREE(first, second, third) \
> + fprintf (stderr, "%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__, \
> + __LINE__, current_thread (), first, second, third)
> +#define PLUGIN_CHECK_RETURN(message, result)
> +#define PLUGIN_CHECK(message, result)
> +#endif
> +
> +#define PLUGIN_NAME "IcedTea Web Browser Plugin"
> +#define PLUGIN_DESCRIPTION "The " PLUGIN_NAME " executes Java applets."
> +#define PLUGIN_MIME_DESC \
> + "application/x-java-vm:class,jar:IcedTea;" \
> + "application/x-java-applet:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.1:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.1.1:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.1.2:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.1.3:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.2:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.2.1:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.2.2:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.3:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.3.1:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.4:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.4.1:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.5:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.6:class,jar:IcedTea;" \
> + "application/x-java-applet;version=1.7:class,jar:IcedTea;" \
> + "application/x-java-applet;jpi-version=1.7.0_00:class,jar:IcedTea;" \
> + "application/x-java-bean:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.1:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.1.2:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.1.3:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.2:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.2.1:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.2.2:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.3:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.3.1:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.4:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.4.1:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.5:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.6:class,jar:IcedTea;" \
> + "application/x-java-bean;version=1.7:class,jar:IcedTea;" \
> + "application/x-java-bean;jpi-version=1.7.0_00:class,jar:IcedTea;"
> +
> +#define FAILURE_MESSAGE "IcedTeaPluginFactory error: Failed to run %s." \
> + " For more detail rerun \"firefox -g\" in a terminal window."
> +
> +// Global instance counter.
> +// A global variable for reporting GLib errors. This must be free'd
> +// and set to NULL after each use.
> +static GError* channel_error = NULL;
> +// Fully-qualified appletviewer executable.
> +static char* appletviewer_executable = NULL;
> +
> +#include <nspr.h>
> +
> +#include <prtypes.h>
> +
> +// IcedTeaJNIEnv helpers.
> +class JNIReference
> +{
> +public:
> + JNIReference (PRUint32 identifier);
> + ~JNIReference ();
> + PRUint32 identifier;
> + PRUint32 count;
> +};
> +
> +JNIReference::JNIReference (PRUint32 identifier)
> + : identifier (identifier),
> + count (0)
> +{
> + printf ("JNIReference CONSTRUCT: %d %p\n", identifier, this);
> +}
> +
> +JNIReference::~JNIReference ()
> +{
> + printf ("JNIReference DECONSTRUCT: %d %p\n", identifier, this);
> +}
> +
> +class JNIID : public JNIReference
> +{
> +public:
> + JNIID (PRUint32 identifier, char const* signature);
> + ~JNIID ();
> + char const* signature;
> +};
> +
> +JNIID::JNIID (PRUint32 identifier, char const* signature)
> + : JNIReference (identifier),
> + signature (strdup (signature))
> +{
> + printf ("JNIID CONSTRUCT: %d %p\n", identifier, this);
> +}
> +
> +JNIID::~JNIID ()
> +{
> + printf ("JNIID DECONSTRUCT: %d %p\n", identifier, this);
> +}
> +
> +char* TYPES[10] = { "Object",
> + "boolean",
> + "byte",
> + "char",
> + "short",
> + "int",
> + "long",
> + "float",
> + "double",
> + "void" };
> +
> +// FIXME: create index from security context.
> +#define MESSAGE_CREATE() \
> + nsCString message ("context "); \
> + message.AppendInt (0); \
> + message += " "; \
> + message += __func__;
> +
> +#define MESSAGE_ADD_STRING(name) \
> + message += " "; \
> + message += name;
> +
> +#define MESSAGE_ADD_SIZE(size) \
> + message += " "; \
> + message.AppendInt (size);
> +
> +// Pass character value through socket as an integer.
> +#define MESSAGE_ADD_TYPE(type) \
> + message += " "; \
> + message += TYPES[type];
> +
> +#define MESSAGE_ADD_REFERENCE(clazz) \
> + message += " "; \
> + message.AppendInt (clazz ? ID (clazz) : 0);
> +
> +#define MESSAGE_ADD_ID(id) \
> + message += " "; \
> + message.AppendInt (reinterpret_cast<JNIID*> (id)->identifier);
> +
> +#define MESSAGE_ADD_ARGS(id, args) \
> + message += " "; \
> + char* expandedArgs = ExpandArgs (reinterpret_cast<JNIID*> (id), args); \
> + message += expandedArgs; \
> + free (reinterpret_cast<void*> (expandedArgs)); \
> + expandedArgs = NULL;
> +
> +
> +#define MESSAGE_ADD_VALUE(id, val) \
> + message += " "; \
> + char* expandedValues = \
> + ExpandArgs (reinterpret_cast<JNIID*> (id), &val); \
> + message += expandedValues; \
> + free (expandedValues); \
> + expandedValues = NULL;
> +
> +#define MESSAGE_ADD_STRING_UCS(pointer, length) \
> + for (int i = 0; i < length; i++) \
> + { \
> + message += " "; \
> + message.AppendInt (pointer[i]); \
> + }
> +
> +#define MESSAGE_ADD_STRING_UTF(pointer) \
> + int i = 0; \
> + while (pointer[i] != 0) \
> + { \
> + message += " "; \
> + message.AppendInt (pointer[i]); \
> + i++; \
> + }
> +
> +#define MESSAGE_SEND() \
> + factory->SendMessageToAppletViewer (message);
> +
> +#define MESSAGE_RECEIVE_REFERENCE(cast, name) \
> + PRBool processed = PR_FALSE; \
> + nsresult res = NS_OK; \
> + factory->returnIdentifier = -1; \
> + printf ("RECEIVE 1\n"); \
> + while (factory->returnIdentifier == -1) \
> + { \
> + printf ("RECEIVE 2\n"); \
> + res = factory->current->ProcessNextEvent (PR_TRUE, \
> + &processed); \
> + PLUGIN_CHECK_RETURN (__func__, res); \
> + } \
> + printf ("RECEIVE 3\n"); \
> + *name = \
> + reinterpret_cast<cast> \
> + (factory->references.ReferenceObject (factory->returnIdentifier)); \
> + printf ("RECEIVE_REFERENCE: %s result: %x = %d\n", \
> + __func__, *name, factory->returnIdentifier);
> +
> +// FIXME: track and free JNIIDs.
> +#define MESSAGE_RECEIVE_ID(cast, id, signature) \
> + PRBool processed = PR_FALSE; \
> + nsresult result = NS_OK; \
> + factory->returnIdentifier = -1; \
> + while (factory->returnIdentifier == -1) \
> + { \
> + result = factory->current->ProcessNextEvent (PR_TRUE, \
> + &processed); \
> + PLUGIN_CHECK_RETURN (__func__, result); \
> + } \
> + \
> + *id = reinterpret_cast<cast> \
> + (new JNIID (factory->returnIdentifier, signature));
> +// \
> +// printf ("RECEIVE_ID: %s result: %x = %d, %s\n", \
> +// __func__, *id, factory->returnIdentifier, \
> +// signature);
> +
> +#define MESSAGE_RECEIVE_VALUE(type, result) \
> + PRBool processed = PR_FALSE; \
> + nsresult res = NS_OK; \
> + factory->returnValue = ""; \
> + while (factory->returnValue == "") \
> + { \
> + res = factory->current->ProcessNextEvent (PR_TRUE, \
> + &processed); \
> + PLUGIN_CHECK_RETURN (__func__, res); \
> + } \
> + *result = ParseValue (type, factory->returnValue);
> +// \
> +// char* valueString = ValueString (type, *result); \
> +// printf ("RECEIVE_VALUE: %s result: %x = %s\n", \
> +// __func__, result, valueString); \
> +// free (valueString); \
> +// valueString = NULL;
> +
> +#define MESSAGE_RECEIVE_SIZE(result) \
> + PRBool processed = PR_FALSE; \
> + nsresult res = NS_OK; \
> + factory->returnValue = ""; \
> + while (factory->returnValue == "") \
> + { \
> + res = factory->current->ProcessNextEvent (PR_TRUE, \
> + &processed); \
> + PLUGIN_CHECK_RETURN (__func__, res); \
> + } \
> + nsresult conversionResult; \
> + *result = factory->returnValue.ToInteger (&conversionResult); \
> + PLUGIN_CHECK ("parse integer", conversionResult);
> +// \
> +// printf ("RECEIVE_SIZE: %s result: %x = %d\n", \
> +// __func__, result, *result);
> +
> +// strdup'd string must be freed by calling function.
> +#define MESSAGE_RECEIVE_STRING(char_type, result) \
> + PRBool processed = PR_FALSE; \
> + nsresult res = NS_OK; \
> + factory->returnValue = ""; \
> + while (factory->returnValue == "") \
> + { \
> + res = factory->current->ProcessNextEvent (PR_TRUE, \
> + &processed); \
> + PLUGIN_CHECK_RETURN (__func__, res); \
> + } \
> + *result = reinterpret_cast<char_type const*> \
> + (strdup (factory->returnValue.get ()));
> +// \
> +// printf ("RECEIVE_STRING: %s result: %x = %s\n", \
> +// __func__, result, *result);
> +
> +// strdup'd string must be freed by calling function.
> +#define MESSAGE_RECEIVE_STRING_UCS(result) \
> + PRBool processed = PR_FALSE; \
> + nsresult res = NS_OK; \
> + factory->returnValueUCS.Truncate (); \
> + while (factory->returnValueUCS.IsEmpty ()) \
> + { \
> + res = factory->current->ProcessNextEvent (PR_TRUE, \
> + &processed); \
More information about the distro-pkg-dev
mailing list