This commit was manufactured by cvs2svn to create tag 'BeforeMac'.

git-svn-id: svn://10.0.0.236/tags/BeforeMac@4227 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/js/ref/liveconnect/LiveConnect.dsp

@@ -0,0 +1,140 @@
+# Microsoft Developer Studio Project File - Name="LiveConnect" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=LiveConnect - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "LiveConnect.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "LiveConnect.mak" CFG="LiveConnect - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "LiveConnect - Win32 Release" (based on\
+ "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "LiveConnect - Win32 Debug" (based on\
+ "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "LiveConnect - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I ".." /I "$(JDK)\include" /I "$(JDK)\include\win32" /D "NDEBUG" /D "XP_PC" /D "JSFILE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\Release\js32.lib $(JDK)\lib\javai.lib /nologo /subsystem:windows /dll /debug /machine:I386
+
+!ELSEIF  "$(CFG)" == "LiveConnect - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "$(JDK)\include" /I "$(JDK)\include\win32" /D "_DEBUG" /D "_CONSOLE" /D "DEBUG" /D "XP_PC" /D "JSFILE" /D "WIN32" /D "_WINDOWS" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\Debug\js32.lib $(JDK)\lib\javai_g.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/LiveConnect_g.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "LiveConnect - Win32 Release"
+# Name "LiveConnect - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\liveconnect\jsj.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\liveconnect\jsj_array.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\liveconnect\jsj_class.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\liveconnect\jsj_convert.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\liveconnect\jsj_field.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsj_JavaArray.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsj_JavaClass.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsj_JavaObject.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsj_JavaPackage.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsj_JSObject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\liveconnect\jsj_method.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\liveconnect\jsj_utils.c
+# End Source File
+# End Target
+# End Project

mozilla/js/ref/liveconnect/LiveConnectShell.dsp

@@ -0,0 +1,106 @@
+# Microsoft Developer Studio Project File - Name="LiveConnectShell" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=LiveConnectShell - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "LiveConnectShell.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "LiveConnectShell.mak" CFG="LiveConnectShell - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "LiveConnectShell - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "LiveConnectShell - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "LiveConnectShell - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "LiveConnectShell_"
+# PROP BASE Intermediate_Dir "LiveConnectShell_"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "$(JDK)\include" /I "$(JDK)\include\win32" /I "." /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "XP_PC" /D "_WINDOWS" /D "JSFILE" /D "LIVECONNECT" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release/lcshell.exe"
+# Begin Special Build Tool
+SOURCE=$(InputPath)
+PostBuild_Desc=Copy DLL(s) to build directory
+PostBuild_Cmds=COPY ..\Release\js32.dll .\Release
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "LiveConnectShell - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "LiveConnectShell0"
+# PROP BASE Intermediate_Dir "LiveConnectShell0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "$(JDK)\include" /I "$(JDK)\include\win32" /I "." /D "LIVECONNECT" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "XP_PC" /D "_WINDOWS" /D "JSFILE" /FR /YX /FD /c
+# SUBTRACT CPP /u
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/lcshell.exe" /pdbtype:sept
+# Begin Special Build Tool
+SOURCE=$(InputPath)
+PostBuild_Desc=Copy DLL(s) to build directory
+PostBuild_Cmds=COPY ..\Debug\js32.dll .\Debug
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "LiveConnectShell - Win32 Release"
+# Name "LiveConnectShell - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\js.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\Debug\js32.lib
+# End Source File
+# End Target
+# End Project

mozilla/js/ref/liveconnect/LiveConnectShell.dsw

@@ -0,0 +1,44 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "LiveConnect"=.\LiveConnect.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "LiveConnectShell"=.\LiveConnectShell.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name LiveConnect
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

mozilla/js/ref/liveconnect/README.html

@@ -0,0 +1,301 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="Author" CONTENT="Scott Furman">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en] (WinNT; I) [Netscape]">
+   <TITLE>README for LiveConnect</TITLE>
+</HEAD>
+<BODY>
+
+<CENTER>
+<H2>
+<FONT COLOR="#CC0000"><FONT SIZE=+3>WARNING:</FONT></FONT></H2></CENTER>
+
+<CENTER>
+<H2>
+<FONT COLOR="#CC0000">This document is a skeleton, still&nbsp;<BR>
+very much under construction.</FONT></H2></CENTER>
+
+<H2>
+Introduction</H2>
+This is the README file for the JavaScript LiveConnect implementation.&nbsp;
+It consists of build conventions and instructions, source code conventions,
+a design walk-through, and a brief file-by-file description of the source.
+
+<P>This document assumes basic familiarity with JSRef, the reference implementation
+of JavaScript, and with the LiveConnect technology&nbsp; (LiveConnect allows
+JavaScript and Java virtual machines to be connected.&nbsp; It enables
+JavaScript to access Java fields, invoke Java methods and makes it possible
+for Java to access JavaScript object properties and evaluate JavaScript.&nbsp;
+More information on LiveConnect can be found by searching the index on
+Netscape's <A HREF="http://developer.netscape.com">DevEdge site</A>.)
+
+<P>JSRef builds a library or DLL containing the JavaScript runtime (compiler,
+interpreter, decompiler, garbage collector, atom manager, standard classes).&nbsp;
+The LiveConnect project/makefiles build a library that links both with
+JSRef and with a Java Virtual Machine (JVM) that implements the Java Native
+Interface (JNI), as specified by JavaSoft.&nbsp; It then compiles a small
+"shell" program and links that with the library to make an interpreter
+that can be used interactively and with test scripts.
+
+<P><I>Scott Furman, 4/8/98</I>
+<H2>
+Build conventions</H2>
+Update your JVM's <TT><FONT SIZE=+1>CLASSPATH</FONT></TT> to point to the
+<TT><FONT SIZE=+1>liveconnect/classes</FONT></TT> subdirectory.&nbsp; If
+you do not, LiveConnect will still operate but with the limitation that
+JS objects may not be passed as arguments of Java methods and it will not
+be possible to call from Java into JavaScript, i.e. the <I>netscape.javascript.JSObject</I>
+class will be inaccessible.&nbsp; If your <TT><FONT SIZE=+1>CLASSPATH</FONT></TT>
+is set improperly, you will see a message like, "<TT><FONT SIZE=+1>initialization
+error: Can't load class netscape/javascript/JSObject</FONT></TT>" when
+starting a LiveConnect debug build.
+
+<P>To enable multi-threaded execution, define the <TT><FONT SIZE=+1>JS_THREADSAFE</FONT></TT>
+cpp macro and flesh out the stubs and required headers in jslock.c/.h.&nbsp;
+See the JS API docs for more.&nbsp; JSRef must also be built with <TT><FONT SIZE=+1>JS_THREADSAFE</FONT></TT>.
+<BR>&nbsp;
+<UL><B>Windows</B>
+<UL>
+<LI>
+Use MSDEV5.0 with the <TT><FONT SIZE=+1>LiveConnectShell.dsw</FONT></TT>
+project file.</LI>
+
+<LI>
+You must first build the JS runtime, js32.dll, by using the normal JSRef
+build procedure.</LI>
+
+<LI>
+Identify the JVM that you are linking against by setting the <TT><FONT SIZE=+1>JDK</FONT></TT>
+environment variable to point to the top-level JDK directory, e.g. <TT><FONT SIZE=+1>D:\jdk1.1.5</FONT></TT>.&nbsp;
+This is used to establish paths for header file inclusion, linking and
+execution.&nbsp; If you are not using Sun's JVM, the project files may
+require manual tweaking to set these paths correctly.</LI>
+
+<LI>
+The output files (DLLs and executables) are placed in the <TT><FONT SIZE=+1>js/ref/liveconnect/Debug</FONT></TT>
+or <TT><FONT SIZE=+1>js/ref/liveconnect/Release</FONT></TT> directories.</LI>
+
+<LI>
+The LiveConnect-enabled shell is named <TT><FONT SIZE=+1>lcshell.exe</FONT></TT>
+and appears in the output directory.</LI>
+
+<LI>
+You must have the JVM DLL in your <TT><FONT SIZE=+1>PATH</FONT></TT> environment
+variable in order to run.&nbsp; If you are using the Sun JDK, the DLL appears
+in the JDK's bin directory.<BR>
+<BR></LI>
+</UL>
+<B>Mac</B>
+<UL>
+<LI>
+<FONT COLOR="#FF0000">LiveConnect is known to build on the Mac, but no
+project files created yet</FONT></LI>
+
+<LI>
+Use CodeWarrior 1.x (???.prj.hqx) or 2 (???.prj2.hqx).<BR>
+<BR></LI>
+</UL>
+<B>Unix</B>
+<UL>
+<LI>
+<FONT COLOR="#FF0000">No Makefiles created yet</FONT></LI>
+
+<LI>
+Use vendor cc or gcc (ftp://prep.ai.mit.edu/pub/gnu) for compiling,&nbsp;
+and use gmake for building.</LI>
+
+<LI>
+To compile optimized code, set BUILD_OPT=1 on the nmake/gmake command line
+or preset it in the environment or makefile.&nbsp; The C preprocessor macro
+DEBUG&nbsp; will be undefined, and NDEBUG (archaic Unix-ism for "No Debugging")
+will be defined.&nbsp; Without BUILD_OPT, DEBUG is predefined and NDEBUG
+is undefined.</LI>
+
+<LI>
+Your own debug flag, DEBUG_$USER, will be defined or undefined as BUILD_OPT
+is unset or set.</LI>
+
+<LI>
+To add C compiler options from the make command line, set XCFLAGS=-Dfoo.</LI>
+
+<LI>
+To predefine -D or -U options in the makefile, set DEFINES.</LI>
+
+<LI>
+To predefine -I options in the makefile, set INCLUDES.</LI>
+</UL>
+</UL>
+
+<H2>
+Naming and coding conventions:</H2>
+
+<UL>
+<LI>
+Public function names begin with JSJ_ followed by capitalized "intercaps",&nbsp;
+e.g. JSJ_ConnectToJavaVM.</LI>
+
+<LI>
+Extern but library-private function names use a jsj_ prefix and mixed case,
+e.g. jsj_LookupSymbol.</LI>
+
+<LI>
+Most static function names have unprefixed, underscore-separated names:
+get_char.</LI>
+
+<LI>
+But static native methods of JS objects have intercaps names, e.g., JavaObject_getProperty().</LI>
+
+<LI>
+And library-private and static data use underscores, not intercaps (but
+library-private data do use a js_ prefix).</LI>
+
+<LI>
+Scalar type names are lowercase and js-prefixed: jsdouble.</LI>
+
+<LI>
+Aggregate type names are JS-prefixed and mixed-case: JSObject.</LI>
+
+<LI>
+Macros are generally ALL_CAPS and underscored, to call out potential side
+effects, multiple uses of a formal argument, etc.</LI>
+
+<LI>
+Four spaces of indentation per statement nesting level.&nbsp; The files
+are space-filled, so adjusting of your tab setting should be unnecessary.</LI>
+
+<LI>
+DLL entry points have their return type expanded within a PR_PUBLIC_API()&nbsp;
+macro call, to get the right Windows secret type qualifiers in the right
+places for both 16- and 32-bit builds.</LI>
+
+<LI>
+Callback functions that might be called from a DLL are similarly macroized
+with PR_STATIC_CALLBACK (if the function otherwise would be static to hide
+its name) or PR_CALLBACK (this macro takes no type argument; it should
+be used after the return type and before the function name).</LI>
+</UL>
+
+<H2>
+The LiveConnect API</H2>
+All public LiveConnect entry points and callbacks are documented in jsjava.h,
+the header file that exports those functions.
+<H2>
+Design walk-through</H2>
+&nbsp;
+<BR>&nbsp;
+<H2>
+File walk-through</H2>
+&nbsp;
+<TABLE BORDER=3 CELLSPACING=0 CELLPADDING=4 >
+<TR>
+<TD>jsjava.h</TD>
+
+<TD>LiveConnect's only public header file.&nbsp; Defines all public API
+entry points, callbacks and types.&nbsp;</TD>
+</TR>
+
+<TR>
+<TD>jsj_private.h</TD>
+
+<TD>LiveConnect internal header file for intra-module sharing of functions
+and types</TD>
+</TR>
+
+<TR>
+<TD>jsj.c</TD>
+
+<TD>Public LiveConnect API entry points and initialization code</TD>
+</TR>
+
+<TR>
+<TD>jsj_array.c</TD>
+
+<TD>Read and write elements of a Java array, performing needed conversions
+to/from JS types.</TD>
+</TR>
+
+<TR>
+<TD>jsj_class.c</TD>
+
+<TD>Construct and manipulate JavaClassDescriptor structs, which are the
+native representation for Java classes.&nbsp; JavaClassDescriptors are
+used to describe the methods and fields of a class, including their type
+signatures, and include a reference to the peer <I>java.lang.Class</I>
+object.&nbsp; Since each Java object has a class, there is a JavaClassDescriptor
+associated with the JavaScript reflection of each Java Object.</TD>
+</TR>
+
+<TR>
+<TD>jsj_convert.c</TD>
+
+<TD>Convert between Java and JavaScript values of all types, which may
+require calling routines in other files to wrap JS objects as Java objects
+and vice-versa.</TD>
+</TR>
+
+<TR>
+<TD>jsj_field.c</TD>
+
+<TD>Reflect Java fields as properties of JavaObject objects and implement
+getter/setter access to those fields.</TD>
+</TR>
+
+<TR>
+<TD>jsj_JavaArray.c</TD>
+
+<TD>Implementation of the JavaScript JavaArray class.&nbsp; Instances of
+JavaArray are used to reflect Java arrays.</TD>
+</TR>
+
+<TR>
+<TD>jsj_JavaClass.c</TD>
+
+<TD>Implementation of the JavaScript JavaClass class.&nbsp;&nbsp; Instances
+of JavaClass are used to reflect Java classes.</TD>
+</TR>
+
+<TR>
+<TD>jsj_JavaObject.c</TD>
+
+<TD>Implementation of the JavaScript JavaObject class.&nbsp;&nbsp; Instances
+of JavaObject are used to reflect Java objects, except for Java arrays,
+although some of the code in this file is used by the JavaArray code.</TD>
+</TR>
+
+<TR>
+<TD>jsj_JavaPackage.c</TD>
+
+<TD>Implementation of the JavaScript JavaPackage class.&nbsp;&nbsp; Instances
+of JavaPackage are used to reflect Java packages.&nbsp; The JS properties
+of a JavaPackage are either nested JavaPackage objects or a JavaClass object.</TD>
+</TR>
+
+<TR>
+<TD>jsj_JSObject.c</TD>
+
+<TD>Implementation of the native methods for the&nbsp; <I>netscape.javascript.JSObject</I>
+Java class, which are used for calling into JavaScript from Java.&nbsp;
+It also contains the code that wraps JS objects as instances of&nbsp; <I>netscape.javascript.JSObject
+</I>and the code that handles propagation of exceptions both into and out
+of Java.</TD>
+</TR>
+
+<TR>
+<TD>jsj_method.c</TD>
+
+<TD>Reflect Java methods as properties of JavaObject objects and make it
+possible to invoke those methods.&nbsp; Includes overloaded method resolution
+and argument/return-value conversion code.</TD>
+</TR>
+
+<TR>
+<TD>jsj_utils.c</TD>
+
+<TD>Low-level utility code fo reporting errors, etc.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<BR>&nbsp;
+</BODY>
+</HTML>

mozilla/js/ref/liveconnect/classes/netscape/javascript/JSException.java

@@ -0,0 +1,56 @@
+/* Insert copyright and license here 19** */
+
+package netscape.javascript;
+
+/**
+ * JSException is an exception which is thrown when JavaScript code
+ * returns an error.
+ */
+
+public
+class JSException extends Exception {
+    String filename;
+    int lineno;
+    String source;
+    int tokenIndex;
+
+    /**
+     * Constructs a JSException without a detail message.
+     * A detail message is a String that describes this particular exception.
+     */
+    public JSException() {
+	super();
+        filename = "unknown";
+        lineno = 0;
+        source = "";
+        tokenIndex = 0;
+    }
+
+    /**
+     * Constructs a JSException with a detail message.
+     * A detail message is a String that describes this particular exception.
+     * @param s the detail message
+     */
+    public JSException(String s) {
+	super(s);
+        filename = "unknown";
+        lineno = 0;
+        source = "";
+        tokenIndex = 0;
+    }
+
+    /**
+     * Constructs a JSException with a detail message and all the
+     * other info that usually comes with a JavaScript error.
+     * @param s the detail message
+     */
+    public JSException(String s, String filename, int lineno,
+                       String source, int tokenIndex) {
+	super(s);
+        this.filename = filename;
+        this.lineno = lineno;
+        this.source = source;
+        this.tokenIndex = tokenIndex;
+    }
+}
+

mozilla/js/ref/liveconnect/classes/netscape/javascript/JSObject.java

@@ -0,0 +1,131 @@
+/* -*- Mode: C; tab-width: 4; -*- */
+
+/* Insert copyright and license here 19** */
+
+/* more doc todo:
+ *  threads
+ *  gc
+ *  
+ *
+ */
+
+package netscape.javascript;
+
+import java.applet.Applet;
+
+/**
+ * JSObject allows Java to manipulate objects that are
+ * defined in JavaScript.
+ * Values passed from Java to JavaScript are converted as
+ * follows:<ul>
+ * <li>JSObject is converted to the original JavaScript object
+ * <li>Any other Java object is converted to a JavaScript wrapper,
+ *   which can be used to access methods and fields of the java object.
+ *   Converting this wrapper to a string will call the toString method
+ *   on the original object, converting to a number will call the
+ *   floatValue method if possible and fail otherwise.  Converting
+ *   to a boolean will try to call the booleanValue method in the
+ *   same way.
+ * <li>Java arrays are wrapped with a JavaScript object that understands
+ *   array.length and array[index]
+ * <li>A Java boolean is converted to a JavaScript boolean
+ * <li>Java byte, char, short, int, long, float, and double are converted
+ *   to JavaScript numbers
+ * </ul>
+ * Values passed from JavaScript to Java are converted as follows:<ul>
+ * <li>objects which are wrappers around java objects are unwrapped
+ * <li>other objects are wrapped with a JSObject
+ * <li>strings, numbers and booleans are converted to String, Float,
+ *   and Boolean objects respectively
+ * </ul>
+ * This means that all JavaScript values show up as some kind
+ * of java.lang.Object in Java.  In order to make much use of them,
+ * you will have to cast them to the appropriate subclass of Object,
+ * e.g. <code>(String) window.getMember("name");</code> or
+ * <code>(JSObject) window.getMember("document");</code>.
+ */
+public final class JSObject {
+    /* the internal object data */
+    private int                               internal;
+
+    /**
+     * initialize
+     */
+    private static native void initClass();
+    static {
+	System.loadLibrary("LiveConnect");
+        initClass();
+    }
+
+    /**
+     * it is illegal to construct a JSObject manually
+     */
+    private                          JSObject(int jsobj_addr) {internal = jsobj_addr;}
+
+    /**
+     * Retrieves a named member of a JavaScript object. 
+     * Equivalent to "this.<i>name</i>" in JavaScript.
+     */
+    public native Object	getMember(String name);
+
+    /**
+     * Retrieves an indexed member of a JavaScript object.
+     * Equivalent to "this[<i>index</i>]" in JavaScript.
+     */
+//    public Object		getMember(int index) { return getSlot(index); }
+    public native Object	getSlot(int index);
+
+    /**
+     * Sets a named member of a JavaScript object. 
+     * Equivalent to "this.<i>name</i> = <i>value</i>" in JavaScript.
+     */
+    public native void 		setMember(String name, Object value);
+
+    /**
+     * Sets an indexed member of a JavaScript object. 
+     * Equivalent to "this[<i>index</i>] = <i>value</i>" in JavaScript.
+     */
+//    public void 		setMember(int index, Object value) {
+//        setSlot(index, value);
+//    }
+    public native void 		setSlot(int index, Object value);
+
+    /**
+     * Removes a named member of a JavaScript object.
+     */
+    public native void 		removeMember(String name);
+
+    /**
+     * Calls a JavaScript method.
+     * Equivalent to "this.<i>methodName</i>(<i>args</i>[0], <i>args</i>[1], ...)" in JavaScript.
+     */
+    public native Object	call(String methodName, Object args[]);
+
+    /**
+     * Evaluates a JavaScript expression. The expression is a string 
+     * of JavaScript source code which will be evaluated in the context
+     * given by "this".
+     */
+    public native Object	eval(String s);
+
+    /**
+     * Converts a JSObject to a String.
+     */
+    public native String        toString();
+
+    // should use some sort of identifier rather than String
+    // is "property" the right word?
+  //    native String[]                         listProperties();
+
+
+    /**
+     * get a JSObject for the window containing the given applet
+     */
+    public static native JSObject	getWindow(Applet applet);
+
+    /**
+     * Finalization decrements the reference count on the corresponding
+     * JavaScript object.
+     */
+    protected native void	finalize();
+}

mozilla/js/ref/liveconnect/classes/netscape/javascript/JSProxy.java

@@ -0,0 +1,37 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* ** */
+/**
+ * The JSProxy interface allows applets and plugins to
+ * share javascript contexts.
+ */
+
+package netscape.javascript;
+import java.applet.Applet;
+
+public interface JSProxy {
+    Object  getMember(JSObject jso, String name);
+    Object  getSlot(JSObject jso, int index);
+    void    setMember(JSObject jso, String name, Object value);
+    void    setSlot(JSObject jso, int index, Object value);
+    void    removeMember(JSObject jso, String name);
+    Object  call(JSObject jso, String methodName, Object args[]);
+    Object  eval(JSObject jso, String s);
+    String      toString(JSObject jso);
+    JSObject    getWindow(Applet applet);
+}

mozilla/js/ref/liveconnect/classes/netscape/javascript/JSUtil.java

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
@@ -15,11 +15,24 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
+/* ** */
 
-#ifndef __NS_JSWINPROTOTYPE_H__
-#define __NS_JSWINPROTOTYPE_H__
+package netscape.javascript;
+import java.io.*;
 
-PRInt32
-InitWinProfilePrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
+public class JSUtil {
 
-#endif
+    /* Return the stack trace of an exception or error as a String */
+    public static String getStackTrace(Throwable t) {
+	ByteArrayOutputStream captureStream;
+	PrintStream p;
+	
+	captureStream = new ByteArrayOutputStream();
+	p = new PrintStream(captureStream);
+
+	t.printStackTrace(p);
+	p.flush();
+
+	return captureStream.toString();
+    }
+}

mozilla/js/ref/liveconnect/jsj.c

@@ -0,0 +1,737 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+ 
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the top-level initialization code and the implementation of the
+ * public API.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "prtypes.h"
+#include "prassert.h"
+#include "prprintf.h"
+
+#include "jsj_private.h"        /* LiveConnect internals */
+#include "jsjava.h"             /* LiveConnect external API */
+
+/* FIXME - The JNI environment should not be a global.  It needs to be in thread-local storage. */
+JNIEnv *jENV;
+
+/*
+ * At certain times during initialization, there may be no JavaScript context
+ * available to direct error reports to, in which case the error messages
+ * are sent to this function.  The caller is responsible for free'ing
+ * the js_error_msg argument.
+ */
+static void
+report_java_initialization_error(JNIEnv *jEnv, const char *js_error_msg)
+{
+    const char *error_msg, *java_error_msg;
+
+    java_error_msg = NULL;
+
+    if (jEnv) {
+        java_error_msg = jsj_GetJavaErrorMessage(jEnv);
+        (*jEnv)->ExceptionClear(jEnv);
+    }
+
+    if (java_error_msg) {
+        error_msg = PR_smprintf("initialization error: %s (%s)\n",
+                                js_error_msg, java_error_msg);
+        free((void*)java_error_msg);
+    } else {
+        error_msg = PR_smprintf("initialization error: %s\n",
+                                js_error_msg);
+    }
+
+    jsj_LogError(error_msg);
+}
+
+/*
+ * Opaque JVM handles to Java classes and methods required for Java reflection.
+ * These are computed and cached at initialization.
+ */
+
+jclass jlObject;                        /* java.lang.Object */
+jclass jlrMethod;                       /* java.lang.reflect.Method */
+jclass jlrField;                        /* java.lang.reflect.Field */
+jclass jlVoid;                          /* java.lang.Void */
+jclass jlrConstructor;                  /* java.lang.reflect.Constructor */
+jclass jlThrowable;                     /* java.lang.Throwable */
+jclass jlSystem;                        /* java.lang.System */
+jclass jlClass;                         /* java.lang.Class */
+jclass jlBoolean;                       /* java.lang.Boolean */
+jclass jlDouble;                        /* java.lang.Double */
+jclass jlString;                        /* java.lang.String */
+jclass njJSObject;                      /* netscape.javascript.JSObject */
+jclass njJSException;                   /* netscape.javascript.JSException */
+jclass njJSUtil;                        /* netscape.javascript.JSUtil */
+
+jmethodID jlClass_getMethods;           /* java.lang.Class.getMethods() */
+jmethodID jlClass_getConstructors;      /* java.lang.Class.getConstructors() */
+jmethodID jlClass_getFields;            /* java.lang.Class.getFields() */
+jmethodID jlClass_getName;              /* java.lang.Class.getName() */
+jmethodID jlClass_getComponentType;     /* java.lang.Class.getComponentType() */
+jmethodID jlClass_getModifiers;         /* java.lang.Class.getModifiers() */
+jmethodID jlClass_isArray;              /* java.lang.Class.isArray() */
+
+jmethodID jlrMethod_getName;            /* java.lang.reflect.Method.getName() */
+jmethodID jlrMethod_getParameterTypes;  /* java.lang.reflect.Method.getParameterTypes() */
+jmethodID jlrMethod_getReturnType;      /* java.lang.reflect.Method.getReturnType() */
+jmethodID jlrMethod_getModifiers;       /* java.lang.reflect.Method.getModifiers() */
+
+jmethodID jlrConstructor_getParameterTypes; /* java.lang.reflect.Constructor.getParameterTypes() */
+jmethodID jlrConstructor_getModifiers;  /* java.lang.reflect.Constructor.getModifiers() */
+
+jmethodID jlrField_getName;             /* java.lang.reflect.Field.getName() */
+jmethodID jlrField_getType;             /* java.lang.reflect.Field.getType() */
+jmethodID jlrField_getModifiers;        /* java.lang.reflect.Field.getModifiers() */
+
+jmethodID jlBoolean_Boolean;            /* java.lang.Boolean constructor */
+jmethodID jlBoolean_booleanValue;       /* java.lang.Boolean.booleanValue() */
+jmethodID jlDouble_Double;              /* java.lang.Double constructor */
+jmethodID jlDouble_doubleValue;         /* java.lang.Double.doubleValue() */
+
+jmethodID jlThrowable_toString;         /* java.lang.Throwable.toString() */
+jmethodID jlThrowable_getMessage;       /* java.lang.Throwable.getMessage() */
+
+jmethodID jlSystem_identityHashCode;    /* java.lang.System.identityHashCode() */
+
+jobject jlVoid_TYPE;                    /* java.lang.Void.TYPE value */
+
+jmethodID njJSException_JSException;    /* netscape.javascript.JSexception constructor */
+jmethodID njJSObject_JSObject;          /* netscape.javascript.JSObject constructor */
+jmethodID njJSUtil_getStackTrace;       /* netscape.javascript.JSUtil.getStackTrace() */
+jfieldID njJSObject_internal;           /* netscape.javascript.JSObject.internal */
+jfieldID njJSException_lineno;          /* netscape.javascript.JSException.lineno */
+jfieldID njJSException_tokenIndex;      /* netscape.javascript.JSException.tokenIndex */
+jfieldID njJSException_source;          /* netscape.javascript.JSException.source */
+jfieldID njJSException_filename;        /* netscape.javascript.JSException.filename */
+
+/* Obtain a reference to a Java class */
+#define LOAD_CLASS(qualified_name, class)                                    \
+    {                                                                        \
+        jclass _##class = (*jEnv)->FindClass(jEnv, #qualified_name);         \
+        if (_##class == 0) {                                                 \
+            report_java_initialization_error(jEnv,                           \
+                "Can't load class " #qualified_name);                        \
+            return JS_FALSE;                                                 \
+        }                                                                    \
+        class = (*jEnv)->NewGlobalRef(jEnv, _##class);                       \
+    }
+
+/* Obtain a methodID reference to a Java method or constructor */
+#define _LOAD_METHOD(qualified_class, method, mvar, signature, class, is_static)\
+    if (is_static) {                                                         \
+        class##_##mvar =                                                     \
+            (*jEnv)->GetStaticMethodID(jEnv, class, #method, signature);     \
+    } else {                                                                 \
+        class##_##mvar =                                                     \
+            (*jEnv)->GetMethodID(jEnv, class, #method, signature);           \
+    }                                                                        \
+    if (class##_##mvar == 0) {                                               \
+        report_java_initialization_error(jEnv,                               \
+               "Can't get mid for " #qualified_class "." #method "()");      \
+        return JS_FALSE;                                                     \
+    }
+
+/* Obtain a methodID reference to a Java instance method */
+#define LOAD_METHOD(qualified_class, method, signature, class)               \
+    _LOAD_METHOD(qualified_class, method, method, signature, class, JS_FALSE)
+
+/* Obtain a methodID reference to a Java static method */
+#define LOAD_STATIC_METHOD(qualified_class, method, signature, class)        \
+    _LOAD_METHOD(qualified_class, method, method, signature, class, JS_TRUE)
+
+/* Obtain a methodID reference to a Java constructor */
+#define LOAD_CONSTRUCTOR(qualified_class, method, signature, class)          \
+    _LOAD_METHOD(qualified_class,<init>, method, signature, class, JS_FALSE)
+
+/* Obtain a fieldID reference to a Java instance or static field */
+#define _LOAD_FIELDID(qualified_class, field, signature, class, is_static)   \
+    if (is_static) {                                                         \
+        class##_##field = (*jEnv)->GetStaticFieldID(jEnv, class, #field, signature);\
+    } else {                                                                 \
+        class##_##field = (*jEnv)->GetFieldID(jEnv, class, #field, signature);\
+    }                                                                        \
+    if (class##_##field == 0) {                                              \
+        report_java_initialization_error(jEnv,                               \
+                "Can't get fid for " #qualified_class "." #field);           \
+        return JS_FALSE;                                                     \
+    }
+
+/* Obtain a fieldID reference to a Java instance field */
+#define LOAD_FIELDID(qualified_class, field, signature, class)               \
+    _LOAD_FIELDID(qualified_class, field, signature, class, JS_FALSE)
+
+/* Obtain the value of a static field in a Java class */
+#define LOAD_FIELD_VAL(qualified_class, field, signature, class, type)       \
+    {                                                                        \
+        jfieldID field_id;                                                   \
+        field_id = (*jEnv)->GetStaticFieldID(jEnv, class, #field, signature);\
+        if (field_id == 0) {                                                 \
+            report_java_initialization_error(jEnv,                           \
+                "Can't get fid for " #qualified_class "." #field);           \
+            return JS_FALSE;                                                 \
+        }                                                                    \
+        class##_##field =                                                    \
+            (*jEnv)->GetStatic##type##Field(jEnv, class, field_id);          \
+        if (class##_##field == 0) {                                          \
+            report_java_initialization_error(jEnv,                           \
+                "Can't read static field " #qualified_class "." #field);     \
+            return JS_FALSE;                                                 \
+        }                                                                    \
+    }
+
+/* Obtain the value of a static field in a Java class, which is known to
+   contain an object value. */
+#define LOAD_FIELD_OBJ(qualified_class, field, signature, class)             \
+    LOAD_FIELD_VAL(qualified_class, field, signature, class, Object);        \
+    class##_##field = (*jEnv)->NewGlobalRef(jEnv, class##_##field);
+
+/*
+ * Load the Java classes, and the method and field descriptors required for Java reflection.
+ * Returns JS_TRUE on success, JS_FALSE on failure.
+ */
+static JSBool
+init_java_VM_reflection(JSJavaVM *jsjava_vm, JNIEnv *jEnv)
+{
+    /* Load Java system classes and method, including java.lang.reflect classes */
+    LOAD_CLASS(java/lang/Object,                jlObject);
+    LOAD_CLASS(java/lang/Class,                 jlClass);
+    LOAD_CLASS(java/lang/reflect/Method,        jlrMethod);
+    LOAD_CLASS(java/lang/reflect/Constructor,   jlrConstructor);
+    LOAD_CLASS(java/lang/reflect/Field,         jlrField);
+    LOAD_CLASS(java/lang/Throwable,             jlThrowable);
+    LOAD_CLASS(java/lang/System,                jlSystem);
+    LOAD_CLASS(java/lang/Boolean,               jlBoolean);
+    LOAD_CLASS(java/lang/Double,                jlDouble);
+    LOAD_CLASS(java/lang/String,                jlString);
+    LOAD_CLASS(java/lang/Void,                  jlVoid);
+
+    LOAD_METHOD(java.lang.Class,            getMethods,         "()[Ljava/lang/reflect/Method;",jlClass);
+    LOAD_METHOD(java.lang.Class,            getConstructors,    "()[Ljava/lang/reflect/Constructor;",jlClass);
+    LOAD_METHOD(java.lang.Class,            getFields,          "()[Ljava/lang/reflect/Field;", jlClass);
+    LOAD_METHOD(java.lang.Class,            getName,            "()Ljava/lang/String;",         jlClass);
+    LOAD_METHOD(java.lang.Class,            isArray,            "()Z",                          jlClass);
+    LOAD_METHOD(java.lang.Class,            getComponentType,   "()Ljava/lang/Class;",          jlClass);
+    LOAD_METHOD(java.lang.Class,            getModifiers,       "()I",                          jlClass);
+
+    LOAD_METHOD(java.lang.reflect.Method,   getName,            "()Ljava/lang/String;",         jlrMethod);
+    LOAD_METHOD(java.lang.reflect.Method,   getParameterTypes,  "()[Ljava/lang/Class;",         jlrMethod);
+    LOAD_METHOD(java.lang.reflect.Method,   getReturnType,      "()Ljava/lang/Class;",          jlrMethod);
+    LOAD_METHOD(java.lang.reflect.Method,   getModifiers,       "()I",                          jlrMethod);
+
+    LOAD_METHOD(java.lang.reflect.Constructor,  getParameterTypes,  "()[Ljava/lang/Class;",     jlrConstructor);
+    LOAD_METHOD(java.lang.reflect.Constructor,  getModifiers,       "()I",                      jlrConstructor);
+    
+    LOAD_METHOD(java.lang.reflect.Field,    getName,            "()Ljava/lang/String;",         jlrField);
+    LOAD_METHOD(java.lang.reflect.Field,    getType,            "()Ljava/lang/Class;",          jlrField);
+    LOAD_METHOD(java.lang.reflect.Field,    getModifiers,       "()I",                          jlrField);
+
+    LOAD_METHOD(java.lang.Throwable,        toString,           "()Ljava/lang/String;",         jlThrowable);
+    LOAD_METHOD(java.lang.Throwable,        getMessage,         "()Ljava/lang/String;",         jlThrowable);
+
+    LOAD_METHOD(java.lang.Double,           doubleValue,        "()D",                          jlDouble);
+
+    LOAD_METHOD(java.lang.Boolean,          booleanValue,       "()Z",                          jlBoolean);
+    
+    LOAD_STATIC_METHOD(java.lang.System,    identityHashCode,   "(Ljava/lang/Object;)I",        jlSystem);
+
+    LOAD_CONSTRUCTOR(java.lang.Boolean,     Boolean,            "(Z)V",                         jlBoolean);
+    LOAD_CONSTRUCTOR(java.lang.Double,      Double,             "(D)V",                         jlDouble);
+
+    LOAD_FIELD_OBJ(java.lang.Void,          TYPE,               "Ljava/lang/Class;",            jlVoid);
+  
+}
+
+/* Load Netscape-specific Java extension classes, methods, and fields */
+static JSBool
+init_netscape_java_classes(JSJavaVM *jsjava_vm, JNIEnv *jEnv)
+{
+    LOAD_CLASS(netscape/javascript/JSObject,    njJSObject);
+    LOAD_CLASS(netscape/javascript/JSException, njJSException);
+    LOAD_CLASS(netscape/javascript/JSUtil,      njJSUtil);
+
+    LOAD_CONSTRUCTOR(netscape.javascript.JSObject,
+                                            JSObject,           "(I)V",                         njJSObject);
+    LOAD_CONSTRUCTOR(netscape.javascript.JSException,
+                                            JSException,        "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;I)V",
+                                                                                                njJSException);
+    LOAD_FIELDID(netscape.javascript.JSObject,  
+                                            internal,           "I",                            njJSObject);
+    LOAD_FIELDID(netscape.javascript.JSException,  
+                                            lineno,             "I",                            njJSException);
+    LOAD_FIELDID(netscape.javascript.JSException,  
+                                            tokenIndex,         "I",                            njJSException);
+    LOAD_FIELDID(netscape.javascript.JSException,  
+                                            source,             "Ljava/lang/String;",           njJSException);
+    LOAD_FIELDID(netscape.javascript.JSException,  
+                                            filename,           "Ljava/lang/String;",           njJSException);
+
+    LOAD_STATIC_METHOD(netscape.javascript.JSUtil,
+                                            getStackTrace,      "(Ljava/lang/Throwable;)Ljava/lang/String;",
+                                                                                                njJSUtil);
+
+    return JS_TRUE;
+}
+
+JSJavaVM *jsjava_vm_list = NULL;
+
+/*
+ * Called once per Java VM, this function initializes the classes, fields, and
+ * methods required for Java reflection.  If java_vm is NULL, a new Java VM is
+ * created, using the provided classpath in addition to any default classpath.
+ * The classpath argument is ignored, however, if java_vm_arg is non-NULL.
+ */
+JSJavaVM *
+JSJ_ConnectToJavaVM(JavaVM *java_vm_arg, const char *user_classpath)
+{
+    JavaVM *java_vm;
+    JSJavaVM *jsjava_vm;
+    const char *full_classpath;
+
+    jsjava_vm = (JSJavaVM*)malloc(sizeof(JSJavaVM));
+    if (!jsjava_vm)
+        return NULL;
+    memset(jsjava_vm, 0, sizeof(JSJavaVM));
+
+    java_vm = java_vm_arg;
+
+    /* If a Java VM was passed in, try to attach to it on the current thread. */
+    if (java_vm) {
+        if ((*java_vm)->AttachCurrentThread(java_vm, &jENV, NULL) < 0) {
+            jsj_LogError("Failed to attach to Java VM thread\n");
+            free(jsjava_vm);
+            return NULL;
+        }
+    } else {
+        /* No Java VM supplied, so create our own */
+        JDK1_1InitArgs vm_args;
+        
+        /* Magic constant indicates JRE version 1.1 */
+        vm_args.version = 0x00010001;
+        JNI_GetDefaultJavaVMInitArgs(&vm_args);
+        
+        /* Prepend the classpath argument to the default JVM classpath */
+        if (user_classpath) {
+            full_classpath = PR_smprintf("%s;%s", user_classpath, vm_args.classpath);
+            if (!full_classpath) {
+                free(jsjava_vm);
+                return NULL;
+            }
+            vm_args.classpath = (char*)full_classpath;
+        }
+
+        /* Attempt to create our own VM */
+        if (JNI_CreateJavaVM(&java_vm, &jENV, &vm_args) < 0) {
+            jsj_LogError("Failed to create Java VM\n");
+            free(jsjava_vm);
+            return NULL;
+        }
+
+        /* Remember that we created the VM so that we know to destroy it later */
+        jsjava_vm->jsj_created_java_vm = JS_TRUE;
+    }
+    jsjava_vm->java_vm = java_vm;
+    jsjava_vm->main_thread_env = jENV;
+    
+    /* Load the Java classes, and the method and field descriptors required for
+       Java reflection. */
+    if (!init_java_VM_reflection(jsjava_vm, jENV)) {
+        JSJ_DisconnectFromJavaVM(jsjava_vm);
+        return NULL;
+    }
+
+    /*
+     * JVM initialization for netscape.javascript.JSObject is performed
+     * independently of the other classes that are initialized in
+     * init_java_VM_reflection, because we allow it to fail.  In the case
+     * of failure, LiveConnect is still operative, but only when calling
+     * from JS to Java and not vice-versa.
+     */
+    init_netscape_java_classes(jsjava_vm, jENV);
+
+    /* Put this VM on the list of all created VMs */
+    jsjava_vm->next = jsjava_vm_list;
+    jsjava_vm_list = jsjava_vm;
+
+    return jsjava_vm;
+}
+
+JSJCallbacks *JSJ_callbacks = NULL;
+
+/* Called once to set up callbacks for all instances of LiveConnect */
+void
+JSJ_Init(JSJCallbacks *callbacks)
+{
+    PR_ASSERT(callbacks);
+    JSJ_callbacks = callbacks;
+}
+
+/*
+ * Initialize the provided JSContext by setting up the JS classes necessary for
+ * reflection and by defining JavaPackage objects for the default Java packages
+ * as properties of global_obj.  Additional packages may be pre-defined by
+ * setting the predefined_packages argument.  (Pre-defining a Java package at
+ * initialization time is not necessary, but it will make package lookup faster
+ * and, more importantly, will avoid unnecessary network accesses if classes
+ * are being loaded over the network.)
+ */
+JSJ_InitJSContext(JSContext *cx, JSObject *global_obj,
+                  JavaPackageDef *predefined_packages)
+{
+    /* Initialize the JavaScript classes used for reflection */
+    if (!jsj_init_JavaObject(cx, global_obj))
+        return JS_FALSE;
+    
+/*    if (!jsj_init_JavaMember(cx, global_obj))
+        return JS_FALSE; */
+    
+    if (!jsj_init_JavaPackage(cx, global_obj, predefined_packages))
+        return JS_FALSE;
+
+    if (!jsj_init_JavaClass(cx, global_obj))
+        return JS_FALSE;
+
+    if (!jsj_init_JavaArray(cx, global_obj))
+        return JS_FALSE;
+
+    return JS_TRUE;
+}
+
+/* Obtain a reference to a Java class */
+#define UNLOAD_CLASS(qualified_name, class)                                  \
+    if (class) {                                                             \
+        (*jENV)->DeleteGlobalRef(jENV, class);                               \
+        class = NULL;                                                        \
+    }
+
+/*
+ * This routine severs the connection to a Java VM, freeing all related resources.
+ * It shouldn't be called until the global scope has been cleared in all related
+ * JSContexts (so that all LiveConnect objects are finalized) and a JavaScript
+ * GC is performed.  Otherwise, accessed to free'ed memory could result.
+ */
+void
+JSJ_DisconnectFromJavaVM(JSJavaVM *jsjava_vm)
+{
+    /* FIXME - Clean up the various hash tables */
+
+    if (jsjava_vm->jsj_created_java_vm) {
+        JavaVM *java_vm = jsjava_vm->java_vm;
+        (*java_vm)->DestroyJavaVM(java_vm);
+    } else {
+        UNLOAD_CLASS(java/lang/Object,                jlObject);
+        UNLOAD_CLASS(java/lang/Class,                 jlClass);
+        UNLOAD_CLASS(java/lang/reflect/Method,        jlrMethod);
+        UNLOAD_CLASS(java/lang/reflect/Constructor,   jlrConstructor);
+        UNLOAD_CLASS(java/lang/reflect/Field,         jlrField);
+        UNLOAD_CLASS(java/lang/Throwable,             jlThrowable);
+        UNLOAD_CLASS(java/lang/System,                jlSystem);
+        UNLOAD_CLASS(java/lang/Boolean,               jlBoolean);
+        UNLOAD_CLASS(java/lang/Double,                jlDouble);
+        UNLOAD_CLASS(java/lang/String,                jlString);
+        UNLOAD_CLASS(java/lang/Void,                  jlVoid);
+        UNLOAD_CLASS(netscape/javascript/JSObject,    njJSObject);
+        UNLOAD_CLASS(netscape/javascript/JSException, njJSException);
+        UNLOAD_CLASS(netscape/javascript/JSUtil,      njJSUtil);
+    }
+}
+
+static JSJavaThreadState *thread_list = NULL;
+
+static JSJavaThreadState *
+new_jsjava_thread_state(JSJavaVM *jsjava_vm, const char *thread_name, JNIEnv *jEnv)
+{
+    JSJavaThreadState *jsj_env;
+
+    jsj_env = (JSJavaThreadState *)malloc(sizeof(JSJavaThreadState));
+    if (!jsj_env)
+        return NULL;
+    memset(jsj_env, 0, sizeof(JSJavaThreadState));
+
+    jsj_env->jEnv = jEnv;
+    jsj_env->jsjava_vm = jsjava_vm;
+    if (thread_name)
+        jsj_env->name = strdup(thread_name);
+
+    /* FIXME - need to protect against races */
+    jsj_env->next = thread_list;
+    thread_list = jsj_env;
+
+    return jsj_env;
+}
+
+static JSJavaThreadState *
+find_jsjava_thread(JNIEnv *jEnv)
+{
+    JSJavaThreadState *e, **p, *jsj_env;
+    jsj_env = NULL;
+
+    /* FIXME - need to protect against races in manipulating the thread list */
+
+    /* Search for the thread state among the list of all created
+       LiveConnect threads */
+    for (p=&thread_list; e = *p; p = &(e->next)) {
+        if (e->jEnv == jEnv) {
+            jsj_env = e;
+            *p = jsj_env->next;
+            break;
+        }
+    }
+
+    /* Move a found thread to head of list for faster search next time. */
+    if (jsj_env)
+        thread_list = jsj_env;
+    
+    return jsj_env;
+}
+
+PR_PUBLIC_API(JSJavaThreadState *)
+JSJ_AttachCurrentThreadToJava(JSJavaVM *jsjava_vm, const char *name, JNIEnv **java_envp)
+{
+    JNIEnv *jEnv;
+    JavaVM *java_vm;
+    JSJavaThreadState *jsj_env;
+
+    /* Try to attach a Java thread to the current native thread */
+    java_vm = jsjava_vm->java_vm;
+    if ((*java_vm)->AttachCurrentThread(java_vm, &jEnv, NULL) < 0)
+        return NULL;
+
+    /* If we found an existing thread state, just return it. */
+    jsj_env = find_jsjava_thread(jEnv);
+    if (jsj_env)
+        return jsj_env;
+
+    /* Create a new wrapper around the thread/VM state */
+    jsj_env = new_jsjava_thread_state(jsjava_vm, name, jEnv);
+
+    if (java_envp)
+        *java_envp = jEnv;
+    return jsj_env;
+}
+
+static JSJavaVM *
+map_java_vm_to_jsjava_vm(JavaVM *java_vm)
+{
+    JSJavaVM *v;
+    for (v = jsjava_vm_list; v; v = v->next) {
+        if (v->java_vm == java_vm)
+            return v;
+    }
+    return NULL;
+}
+
+/*
+ * Unfortunately, there's no standard means to associate any private data with
+ * a JNI thread environment, so we need to use the Java environment pointer as
+ * the key in a lookup table that maps it to a JSJavaThreadState structure, 
+ * where we store all our per-thread private data.  If no existing thread state
+ * is found, a new one is created.
+ *
+ * If an error occurs, returns NULL and sets the errp argument to an error
+ * message, which the caller is responsible for free'ing.
+ */
+JSJavaThreadState *
+jsj_MapJavaThreadToJSJavaThreadState(JNIEnv *jEnv, char **errp)
+{
+    JSJavaThreadState *jsj_env;
+    JavaVM *java_vm;
+    JSJavaVM *jsjava_vm;
+
+    /* If we found an existing thread state, just return it. */
+    jsj_env = find_jsjava_thread(jEnv);
+    if (jsj_env)
+        return jsj_env;
+
+    /* No one set up a LiveConnect thread state for a given Java thread.
+       Invoke the callback to create one on-the-fly. */
+
+    /* First, figure out which Java VM is calling us */
+    if ((*jEnv)->GetJavaVM(jEnv, &java_vm) < 0)
+        return NULL;
+
+    /* Get our private JavaVM data */
+    jsjava_vm = map_java_vm_to_jsjava_vm(java_vm);
+    if (!jsjava_vm) {
+        *errp = PR_smprintf("Total weirdness:   No JSJavaVM wrapper ever created "
+                            "for JavaVM 0x%08x", java_vm);
+        return NULL;
+    }
+
+    jsj_env = new_jsjava_thread_state(jsjava_vm, NULL, jEnv);
+    if (!jsj_env)
+        return NULL;
+
+    return jsj_env;
+}
+
+/*
+ * This function is used to specify a particular JSContext as *the* JavaScript
+ * execution environment to be used when LiveConnect is accessed from the given
+ * Java thread, i.e. by using one of the methods of netscape.javascript.JSObject.
+ * (There can only be one such JS context for a given Java thread.  To
+ * multiplex JSContexts among a single thread, this function must be called
+ * before Java is invoked on that thread.)  The return value is the previous
+ * context associated with the given Java thread.
+ */
+PR_PUBLIC_API(JSContext *)
+JSJ_SetDefaultJSContextForJavaThread(JSContext *cx, JSJavaThreadState *jsj_env)
+{
+    JSContext *old_context;
+    old_context = jsj_env->cx;
+    jsj_env->cx = cx;
+    return old_context;
+}
+
+PR_PUBLIC_API(JSBool)
+JSJ_DetachCurrentThreadFromJava(JSJavaThreadState *jsj_env)
+{
+    JavaVM *java_vm;
+    JSJavaThreadState *e, **p;
+
+    /* Disassociate the current native thread from its corresponding Java thread */
+    java_vm = jsj_env->jsjava_vm->java_vm;
+    if ((*java_vm)->DetachCurrentThread(java_vm) < 0)
+        return JS_FALSE;
+
+    /* Destroy the LiveConnect execution environment passed in */
+    jsj_ClearPendingJSErrors(jsj_env);
+
+    /* FIXME - need to protect against races */
+    for (p=&thread_list; e = *p; p = &(e->next)) {
+        if (e == jsj_env) {
+            *p = jsj_env->next;
+            break;
+        }
+    }
+
+    free(jsj_env);
+    return JS_TRUE;
+}
+
+JSBool
+JSJ_ConvertJavaObjectToJSValue(JSContext *cx, jobject java_obj, jsval *vp)
+{
+    JNIEnv *jEnv;
+            
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    jsj_ConvertJavaObjectToJSValue(cx, jEnv, java_obj, vp);
+}
+
+/*===========================================================================*/
+
+/* The convenience functions below present a complete, but simplified
+   LiveConnect API which is designed to handle the special case of a single 
+   Java-VM, single-threaded operation, and use of only one JSContext. */
+
+/* We can get away with global variables in our single-threaded,
+   single-JSContext case. */
+static JSJavaVM *           the_jsj_vm = NULL;
+static JSContext *          the_cx = NULL;
+static JSJavaThreadState *  the_jsj_thread = NULL;
+static JSObject *           the_global_js_obj = NULL;
+
+/* Trivial implementation of callback function */
+static JSJavaThreadState *
+default_map_js_context_to_jsj_thread(JSContext *cx, char **errp)
+{
+    return the_jsj_thread;
+}
+
+/* Trivial implementation of callback function */
+static JSContext *
+default_map_jsj_thread_to_js_context(JSJavaThreadState *jsj_env, char **errp)
+{
+    return the_cx;
+}
+
+/* Trivial implementation of callback function */
+JSObject *
+default_map_java_object_to_js_object(JNIEnv *jEnv, jobject hint, char **errp)
+{
+    return the_global_js_obj;
+}
+
+/* Trivial implementations of callback functions */
+JSJCallbacks jsj_default_callbacks = {
+    default_map_jsj_thread_to_js_context,
+    default_map_js_context_to_jsj_thread,
+    default_map_java_object_to_js_object
+};
+
+/*
+ * Initialize the provided JSContext by setting up the JS classes necessary for
+ * reflection and by defining JavaPackage objects for the default Java packages
+ * as properties of global_obj.  If java_vm is NULL, a new Java VM is
+ * created, using the provided classpath in addition to any default classpath.
+ * The classpath argument is ignored, however, if java_vm is non-NULL.
+ */
+JSBool
+JSJ_SimpleInit(JSContext *cx, JSObject *global_obj, JavaVM *java_vm, const char *classpath)
+{
+    PR_ASSERT(!the_jsj_vm);
+
+    the_jsj_vm = JSJ_ConnectToJavaVM(java_vm, classpath);
+    if (!the_jsj_vm)
+        return JS_FALSE;
+
+    JSJ_Init(&jsj_default_callbacks);
+
+    if (!JSJ_InitJSContext(cx, global_obj, NULL))
+        goto error;
+    the_cx = cx;
+    the_global_js_obj = global_obj;
+
+    the_jsj_thread = JSJ_AttachCurrentThreadToJava(the_jsj_vm, "main thread", &jENV);
+    if (!the_jsj_thread)
+        goto error;
+
+    return JS_TRUE;
+
+error:
+    JSJ_SimpleShutdown();
+    return JS_FALSE;
+}
+
+/*
+ * Free up all LiveConnect resources.  Destroy the Java VM if it was
+ * created by LiveConnect.
+ */
+PR_PUBLIC_API(void)
+JSJ_SimpleShutdown()
+{
+    PR_ASSERT(the_jsj_vm);
+    JSJ_DisconnectFromJavaVM(the_jsj_vm);
+    the_jsj_vm = NULL;
+    the_cx = NULL;
+    the_global_js_obj = NULL;
+    the_jsj_thread = NULL;
+}
+

mozilla/js/ref/liveconnect/jsj_JavaArray.c

@@ -0,0 +1,341 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the definition of the JavaScript JavaArray class.
+ * Instances of JavaArray are used to reflect Java arrays.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "prassert.h"
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+static JSBool
+access_java_array_element(JSContext *cx,
+                          JNIEnv *jEnv,
+                          JSObject *obj,
+                          jsid id,
+                          jsval *vp,
+                          JSBool do_assignment)
+{
+    jsval idval;
+    jarray java_array;
+    JavaClassDescriptor *class_descriptor;
+    JavaObjectWrapper *java_wrapper;
+    jsize array_length, index;
+    JavaSignature *array_component_signature;
+    
+    /* printf("In JavaArray_getProperty\n"); */
+    
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper) {
+        const char *property_name;
+        if (JS_IdToValue(cx, id, &idval) && JSVAL_IS_STRING(idval) &&
+            (property_name = JS_GetStringBytes(JSVAL_TO_STRING(idval)))) {
+            if (!strcmp(property_name, "constructor")) {
+                *vp = JSVAL_VOID;
+                return JS_TRUE;
+            }
+        }
+        JS_ReportError(cx, "illegal operation on JavaArray prototype object");
+        return JS_FALSE;
+    }
+    class_descriptor = java_wrapper->class_descriptor;
+    java_array = java_wrapper->java_obj;
+    
+    PR_ASSERT(class_descriptor->type == JAVA_SIGNATURE_ARRAY);
+
+    JS_IdToValue(cx, id, &idval);
+
+    if (!JSVAL_IS_INT(idval)) {
+        /*
+         * Usually, properties of JavaArray objects are indexed by integers, but
+         * Java arrays also inherit all the methods of java.lang.Object, so a
+         * string-valued property is also possible.
+         */
+        if (JSVAL_IS_STRING(idval)) {
+            const char *member_name;
+            
+            member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+            
+            if (do_assignment) {
+                JS_ReportError(cx, "Attempt to write to invalid Java array "
+                    "element \"%s\"", member_name);
+                return JS_FALSE;
+            } else {
+                if (!strcmp(member_name, "length")) {
+                    array_length = jsj_GetJavaArrayLength(cx, jEnv, java_array);
+                    if (array_length < 0)
+                        return JS_FALSE;
+                    if (vp)
+                        *vp = INT_TO_JSVAL(array_length);
+                    return JS_TRUE;
+                }
+
+                /* Check to see if we're reflecting a Java array method */
+                return JavaObject_getPropertyById(cx, obj, id, vp);
+            }
+        }
+
+        JS_ReportError(cx, "invalid Java array index expression");
+        return JS_FALSE;
+    }
+    
+    index = JSVAL_TO_INT(idval);
+
+#if 0
+    array_length = jsj_GetJavaArrayLength(cx, jEnv, java_array);
+    if (array_length < 0)
+        return JS_FALSE;
+
+    /* Just let Java throw an exception instead of checking array bounds here */
+    if (index < 0 || index >= array_length) {
+        JS_ReportError(cx, "Java array index %d out of range", index);
+        return JS_FALSE;
+    }
+#endif
+
+    array_component_signature = class_descriptor->array_component_signature;
+
+    if (!vp)
+        return JS_TRUE;
+
+    if (do_assignment) {
+        return jsj_SetJavaArrayElement(cx, jEnv, java_array, index,
+                                       array_component_signature, *vp);
+    } else {
+        return jsj_GetJavaArrayElement(cx, jEnv, java_array, index,
+                                       array_component_signature, vp);
+    }
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaArray_getPropertyById(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JNIEnv *jEnv;
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+    return access_java_array_element(cx, jEnv, obj, id, vp, JS_FALSE);
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaArray_setPropertyById(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JNIEnv *jEnv;
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+    return access_java_array_element(cx, jEnv, obj, id, vp, JS_TRUE);
+}
+
+static JSBool
+JavaArray_lookupProperty(JSContext *cx, JSObject *obj, jsid id,
+                         JSObject **objp, JSProperty **propp
+#if defined JS_THREADSAFE && defined DEBUG
+                            , const char *file, uintN line
+#endif
+                            )
+{
+    JNIEnv *jEnv;
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    return access_java_array_element(cx, jEnv, obj, id, NULL, JS_FALSE);
+}
+
+static JSBool
+JavaArray_defineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
+                         JSPropertyOp getter, JSPropertyOp setter,
+                         uintN attrs, JSProperty **propp)
+{
+    JS_ReportError(cx, "Elements of JavaArray objects may not be deleted");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaArray_getAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    *attrsp = JSPROP_PERMANENT|JSPROP_ENUMERATE;
+    return JS_FALSE;
+}
+
+static JSBool
+JavaArray_setAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    if (*attrsp != JSPROP_PERMANENT|JSPROP_ENUMERATE) {
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+
+    /* Silently ignore all setAttribute attempts */
+    return JS_TRUE;
+}
+
+static JSBool
+JavaArray_deleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    JS_ReportError(cx, "Elements of JavaArray objects may not be deleted");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaArray_defaultValue(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    /* printf("In JavaArray_defaultValue()\n"); */
+    return JavaObject_convert(cx, obj, JSTYPE_STRING, vp);
+}
+
+static JSBool
+JavaArray_newEnumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
+                       jsval *statep, jsid *idp)
+{
+    JavaObjectWrapper *java_wrapper;
+    JNIEnv *jEnv;
+    jsize array_length, index;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    /* Check for prototype object */
+    if (!java_wrapper) {
+        *statep = JSVAL_NULL;
+        if (idp)
+            *idp = INT_TO_JSVAL(0);
+        return JS_TRUE;
+    }
+        
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    array_length = jsj_GetJavaArrayLength(cx, jEnv, java_wrapper->java_obj);
+    if (array_length < 0)
+        return JS_FALSE;
+
+    switch(enum_op) {
+    case JSENUMERATE_INIT:
+        *statep = INT_TO_JSVAL(0);
+
+        if (idp)
+            *idp = INT_TO_JSVAL(array_length);
+        return JS_TRUE;
+        
+    case JSENUMERATE_NEXT:
+        index = JSVAL_TO_INT(*statep);
+        if (index < array_length) {
+            JS_ValueToId(cx, INT_TO_JSVAL(index), idp);
+            index++;
+            *statep = INT_TO_JSVAL(index);
+            return JS_TRUE;
+        }
+
+        /* Fall through ... */
+
+    case JSENUMERATE_DESTROY:
+        *statep = JSVAL_NULL;
+        return JS_TRUE;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+static JSBool
+JavaArray_checkAccess(JSContext *cx, JSObject *obj, jsid id,
+                      JSAccessMode mode, jsval *vp, uintN *attrsp)
+{
+    switch (mode) {
+    case JSACC_WATCH:
+        JS_ReportError(cx, "Cannot place watchpoints on JavaArray object properties");
+        return JS_FALSE;
+
+    case JSACC_IMPORT:
+        JS_ReportError(cx, "Cannot export a JavaArray object's properties");
+        return JS_FALSE;
+
+    default:
+        return JS_TRUE;
+    }
+}
+
+JSObjectOps JavaArray_ops = {
+    /* Mandatory non-null function pointer members. */
+    NULL,                       /* newObjectMap */
+    NULL,                       /* destroyObjectMap */
+    JavaArray_lookupProperty,
+    JavaArray_defineProperty,
+    JavaArray_getPropertyById,  /* getProperty */
+    JavaArray_setPropertyById,  /* setProperty */
+    JavaArray_getAttributes,
+    JavaArray_setAttributes,
+    JavaArray_deleteProperty,
+    JavaArray_defaultValue,
+    JavaArray_newEnumerate,
+    JavaArray_checkAccess,
+
+    /* Optionally non-null members start here. */
+    NULL,                       /* thisObject */
+    NULL,                       /* dropProperty */
+    NULL,                       /* call */
+    NULL,                       /* construct */
+    NULL,                       /* xdrObject */
+    NULL                        /* hasInstance */
+};
+
+JSObjectOps *
+JavaArray_getObjectOps(JSContext *cx, JSClass *clazz)
+{
+    return &JavaArray_ops;
+}
+
+JSClass JavaArray_class = {
+    "JavaArray", JSCLASS_HAS_PRIVATE,
+    NULL, NULL, NULL, NULL,
+    NULL, NULL, JavaObject_convert, JavaObject_finalize,
+    JavaArray_getObjectOps,
+};
+
+extern PR_IMPORT_DATA(JSObjectOps) js_ObjectOps;
+
+
+/* Initialize the JS JavaArray class */
+JSBool
+jsj_init_JavaArray(JSContext *cx, JSObject *global_obj)
+{
+    JavaArray_ops.newObjectMap = js_ObjectOps.newObjectMap;
+    JavaArray_ops.destroyObjectMap = js_ObjectOps.destroyObjectMap;
+
+    if (!JS_InitClass(cx, global_obj, 
+        0, &JavaArray_class, 0, 0,
+        0, 0, 0, 0))
+        return JS_FALSE;
+    
+    return JS_TRUE;
+}
+

mozilla/js/ref/liveconnect/jsj_JavaClass.c

@@ -0,0 +1,572 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the native code implementation of JS's JavaClass class.
+ *
+ * A JavaClass is JavaScript's representation of a Java class.
+ * Its parent JS object is always a JavaPackage object.  A JavaClass is not an
+ * exact reflection of Java's corresponding java.lang.Class object.  Rather,
+ * the properties of a JavaClass are the static methods and properties of the
+ * corresponding Java class.
+ *
+ * Note that there is no runtime equivalent to the JavaClass class in Java.
+ * (Although there are instances of java.lang.String and there are static
+ * methods of java.lang.String that can be invoked, there's no such thing as
+ * a first-class object that can be referenced simply as "java.lang.String".)
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "prtypes.h"
+#include "prprintf.h"
+#include "prassert.h"
+
+#include "jsj_private.h"        /* LiveConnect internals */
+
+static JSBool
+JavaClass_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    char *name;
+    JSString *str;
+
+    JavaClassDescriptor *class_descriptor;
+    
+    class_descriptor = JS_GetPrivate(cx, obj);
+    if (!class_descriptor)
+        return JS_FALSE;
+
+    switch(type) {
+
+
+    case JSTYPE_STRING:
+        /* Convert '/' to '.' so that it looks like Java language syntax. */
+        if (!class_descriptor->name)
+            break;
+        name = PR_smprintf("[JavaClass %s]", class_descriptor->name);
+        if (!name) {
+            JS_ReportOutOfMemory(cx);
+            return JS_FALSE;
+        }
+
+        str = JS_NewString(cx, name, strlen(name));
+        if (!str) {
+            free(name);
+            /* It's not necessary to call JS_ReportOutOfMemory(), as
+               JS_NewString() will do so on failure. */
+            return JS_FALSE;
+        }
+
+        *vp = STRING_TO_JSVAL(str);
+        return JS_TRUE;
+
+    default:
+        return JS_TRUE;
+    }
+}
+
+static JSBool
+lookup_static_member_by_id(JSContext *cx, JNIEnv *jEnv, JSObject *obj,
+                           JavaClassDescriptor **class_descriptorp,
+                           jsid id, JavaMemberDescriptor **memberp)
+{
+    jsval idval;
+    JavaMemberDescriptor *member_descriptor;
+    const char *member_name;
+    JavaClassDescriptor *class_descriptor;
+
+    class_descriptor = JS_GetPrivate(cx, obj);
+    if (!class_descriptor) {
+        *class_descriptorp = NULL;
+        *memberp = NULL;
+        return JS_TRUE;
+    }
+    
+    if (class_descriptorp)
+        *class_descriptorp = class_descriptor;
+    
+    member_descriptor = jsj_LookupJavaStaticMemberDescriptorById(cx, jEnv, class_descriptor, id);
+    if (!member_descriptor) {
+        JS_IdToValue(cx, id, &idval);
+        if (!JSVAL_IS_STRING(idval)) {
+            JS_ReportError(cx, "invalid JavaClass property expression. "
+                "(methods and fields of a JavaClass object can only be identified by their name)");
+            return JS_FALSE;
+        }
+
+        member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+
+        /* Why do we have to do this ? */
+        if (!strcmp(member_name, "prototype")) {
+            *memberp = NULL;
+            return JS_TRUE;
+        }
+
+        JS_ReportError(cx, "Java class %s has no public static field or method named \"%s\"",
+                       class_descriptor->name, member_name);
+        return JS_FALSE;
+    }
+    if (memberp)
+        *memberp = member_descriptor;
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaClass_getPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    jsval idval;
+    jclass java_class;
+    const char *member_name;
+    JavaClassDescriptor *class_descriptor;
+    JavaMemberDescriptor *member_descriptor;
+    JNIEnv *jEnv;
+
+    /* printf("In JavaClass_getProperty\n"); */
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    if (!lookup_static_member_by_id(cx, jEnv, obj, &class_descriptor, id, &member_descriptor))
+        return JS_FALSE;
+    if (!member_descriptor) {
+        *vp = JSVAL_VOID;
+        return JS_TRUE;
+    }
+
+    java_class = class_descriptor->java_class;
+
+    if (member_descriptor->field) {
+        if (!member_descriptor->methods) {
+            return jsj_GetJavaFieldValue(cx, jEnv, member_descriptor->field, java_class, vp);
+        } else {
+            PR_ASSERT(0);
+        }
+    } else {
+        JSFunction *function;
+        
+        /* FIXME - eliminate JSFUN_BOUND_METHOD */
+        JS_IdToValue(cx, id, &idval);
+        member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+        function = JS_NewFunction(cx, jsj_JavaStaticMethodWrapper, 0,
+                                  JSFUN_BOUND_METHOD, obj, member_name);
+        if (!function)
+            return JS_FALSE;
+
+        *vp = OBJECT_TO_JSVAL(JS_GetFunctionObject(function));
+        return JS_TRUE;
+    }
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaClass_setPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    jclass java_class;
+    const char *member_name;
+    JavaClassDescriptor *class_descriptor;
+    JavaMemberDescriptor *member_descriptor;
+    jsval idval;
+    JNIEnv *jEnv;
+
+    /* printf("In JavaClass_setProperty\n"); */
+
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+    
+    if (!lookup_static_member_by_id(cx, jEnv, obj, &class_descriptor, id, &member_descriptor))
+        return JS_FALSE;
+
+    /* Check for the case where there is a method with the given name, but no field
+       with that name */
+    if (!member_descriptor->field)
+        goto no_such_field;
+
+    /* Silently fail if field value is final (immutable), as required by ECMA spec */
+    if (member_descriptor->field->modifiers & ACC_FINAL)
+        return JS_TRUE;
+
+    java_class = class_descriptor->java_class;
+    return jsj_SetJavaFieldValue(cx, jEnv, member_descriptor->field, java_class, *vp);
+
+no_such_field:
+    JS_IdToValue(cx, id, &idval);
+    member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+    JS_ReportError(cx, "No static field named \"%s\" in Java class %s",
+                   member_name, class_descriptor->name);
+    return JS_FALSE;
+}
+
+/*
+ * Free the private native data associated with the JavaPackage object.
+ */
+PR_STATIC_CALLBACK(void)
+JavaClass_finalize(JSContext *cx, JSObject *obj)
+{
+    JNIEnv *jEnv;
+
+    JavaClassDescriptor *class_descriptor = JS_GetPrivate(cx, obj);
+    if (!class_descriptor)
+        return;
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return;
+
+    printf("Finalizing %s\n", class_descriptor->name);
+    jsj_ReleaseJavaClassDescriptor(cx, jEnv, class_descriptor);
+}
+
+
+static JSBool
+JavaClass_lookupProperty(JSContext *cx, JSObject *obj, jsid id,
+                         JSObject **objp, JSProperty **propp
+#if defined JS_THREADSAFE && defined DEBUG
+                            , const char *file, uintN line
+#endif
+                            )
+{
+    JNIEnv *jEnv;
+
+    /* printf("In JavaClass_lookupProperty()\n"); */
+
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    if (!lookup_static_member_by_id(cx, jEnv, obj, NULL, id, NULL))
+        return JS_FALSE;
+    *objp = obj;
+    *propp = (JSProperty*)1;
+    return JS_TRUE;
+}
+
+static JSBool
+JavaClass_defineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
+                         JSPropertyOp getter, JSPropertyOp setter,
+                         uintN attrs, JSProperty **propp)
+{
+    JS_ReportError(cx, "Properties of JavaClass objects may not be deleted");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaClass_getAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    *attrsp = JSPROP_PERMANENT|JSPROP_ENUMERATE;
+    return JS_FALSE;
+}
+
+static JSBool
+JavaClass_setAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    if (*attrsp != JSPROP_PERMANENT|JSPROP_ENUMERATE) {
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+
+    /* Silently ignore all setAttribute attempts */
+    return JS_TRUE;
+}
+
+static JSBool
+JavaClass_deleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    JS_ReportError(cx, "Properties of JavaClass objects may not be deleted");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaClass_defaultValue(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    /* printf("In JavaClass_defaultValue()\n"); */
+    return JavaClass_convert(cx, obj, JSTYPE_STRING, vp);
+}
+
+static JSBool
+JavaClass_newEnumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
+                       jsval *statep, jsid *idp)
+{
+    JavaMemberDescriptor *member_descriptor;
+    JavaClassDescriptor *class_descriptor;
+    JNIEnv *jEnv;
+    
+    class_descriptor = JS_GetPrivate(cx, obj);
+
+    /* Check for prototype JavaClass object */
+    if (!class_descriptor) {
+        *statep = JSVAL_NULL;
+        if (idp)
+            *idp = INT_TO_JSVAL(0);
+        return JS_TRUE;
+    }
+    
+    switch(enum_op) {
+    case JSENUMERATE_INIT:
+        /* Get the Java per-thread environment pointer for this JSContext */
+        jsj_MapJSContextToJSJThread(cx, &jEnv);
+        if (!jEnv)
+            return JS_FALSE;
+        member_descriptor = jsj_GetClassInstanceMembers(cx, jEnv, class_descriptor);
+        *statep = PRIVATE_TO_JSVAL(member_descriptor);
+        if (idp)
+            *idp = INT_TO_JSVAL(class_descriptor->num_instance_members);
+        return JS_TRUE;
+        
+    case JSENUMERATE_NEXT:
+        member_descriptor = JSVAL_TO_PRIVATE(*statep);
+        if (member_descriptor) {
+            *idp = member_descriptor->id;
+            *statep = PRIVATE_TO_JSVAL(member_descriptor->next);
+            return JS_TRUE;
+        }
+        /* Fall through ... */
+
+    case JSENUMERATE_DESTROY:
+        *statep = JSVAL_NULL;
+        return JS_TRUE;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+static JSBool
+JavaClass_checkAccess(JSContext *cx, JSObject *obj, jsid id,
+                      JSAccessMode mode, jsval *vp, uintN *attrsp)
+{
+    switch (mode) {
+    case JSACC_WATCH:
+        JS_ReportError(cx, "Cannot place watchpoints on JavaClass object properties");
+        return JS_FALSE;
+
+    case JSACC_IMPORT:
+        JS_ReportError(cx, "Cannot export a JavaClass object's properties");
+        return JS_FALSE;
+
+    default:
+        return JS_TRUE;
+    }
+}
+
+/*
+ * Implement the JavaScript instanceof operator for JavaClass objects by using
+ * the equivalent Java instanceof operation.
+ */
+static JSBool
+JavaClass_hasInstance(JSContext *cx, JSObject *obj, jsval candidate_jsval,
+                      JSBool *has_instancep)
+{
+    JavaClassDescriptor *class_descriptor;
+    JavaObjectWrapper *java_wrapper;
+    JSClass *js_class;
+    JSBool has_instance;
+    JSObject *candidate_obj;
+    jclass java_class;
+    jobject java_obj;
+    JNIEnv *jEnv;
+    
+    has_instance = JS_FALSE;
+    class_descriptor = JS_GetPrivate(cx, obj);
+    if (!class_descriptor) {
+        JS_ReportError(cx, "illegal operation on JavaClass prototype object");
+        return JS_FALSE;
+    }
+
+    /*
+     * Make sure that the thing to the left of the instanceof operator is a
+     * Java object.
+     */
+    if (!JSVAL_IS_OBJECT(candidate_jsval))
+        goto done;
+    candidate_obj = JSVAL_TO_OBJECT(candidate_jsval);
+    js_class = JS_GetClass(candidate_obj);
+    if ((js_class != &JavaObject_class) && (js_class != &JavaArray_class))
+        goto done;
+
+    java_class = class_descriptor->java_class;
+    java_wrapper = JS_GetPrivate(cx, candidate_obj);
+    if (!java_wrapper) {
+        JS_ReportError(cx, "illegal operation on prototype object");
+        return JS_FALSE;
+    }
+    java_obj = java_wrapper->java_obj;
+    /* Get JNI pointer */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    has_instance = (*jEnv)->IsInstanceOf(jEnv, java_obj, java_class);
+
+done:
+    *has_instancep = has_instance;
+    return JS_TRUE;
+}
+
+JSObjectOps JavaClass_ops = {
+    /* Mandatory non-null function pointer members. */
+    NULL,                       /* newObjectMap */
+    NULL,                       /* destroyObjectMap */
+    JavaClass_lookupProperty,
+    JavaClass_defineProperty,
+    JavaClass_getPropertyById,  /* getProperty */
+    JavaClass_setPropertyById,  /* setProperty */
+    JavaClass_getAttributes,
+    JavaClass_setAttributes,
+    JavaClass_deleteProperty,
+    JavaClass_defaultValue,
+    JavaClass_newEnumerate,
+    JavaClass_checkAccess,
+
+    /* Optionally non-null members start here. */
+    NULL,                       /* thisObject */
+    NULL,                       /* dropProperty */
+    jsj_JavaConstructorWrapper, /* call */
+    jsj_JavaConstructorWrapper, /* construct */
+    NULL,                       /* xdrObject */
+    JavaClass_hasInstance,      /* hasInstance */
+};
+
+JSObjectOps *
+JavaClass_getObjectOps(JSContext *cx, JSClass *clazz)
+{
+    return &JavaClass_ops;
+}
+
+JSClass JavaClass_class = {
+    "JavaClass", JSCLASS_HAS_PRIVATE,
+    NULL, NULL, NULL, NULL,
+    NULL, NULL, JavaClass_convert, JavaClass_finalize,
+    JavaClass_getObjectOps,
+};
+
+JSObject *
+jsj_new_JavaClass(JSContext *cx, JNIEnv *jEnv, JSObject* parent_obj,
+                  JavaClassDescriptor *class_descriptor)
+{
+    JSObject *JavaClass_obj;
+
+    JavaClass_obj = JS_NewObject(cx, &JavaClass_class, 0, parent_obj);
+    if (!JavaClass_obj)
+        return NULL;
+
+    JS_SetPrivate(cx, JavaClass_obj, (void *)class_descriptor);
+
+#ifdef DEBUG
+    /*    printf("JavaClass \'%s\' created\n", class_descriptor->name); */
+#endif
+
+    return JavaClass_obj;
+}
+
+JSObject *
+jsj_define_JavaClass(JSContext *cx, JNIEnv *jEnv, JSObject* parent_obj,
+                     const char *simple_class_name,
+                     jclass java_class)
+{
+    JavaClassDescriptor *class_descriptor;
+    JSObject *JavaClass_obj;
+
+    class_descriptor = jsj_GetJavaClassDescriptor(cx, jEnv, java_class);
+    if (!class_descriptor)
+        return NULL;
+
+    JavaClass_obj = jsj_new_JavaClass(cx, jEnv, parent_obj, class_descriptor);
+    if (!JavaClass_obj)
+        return NULL;
+
+    if (!JS_DefineProperty(cx, parent_obj, simple_class_name,
+                           OBJECT_TO_JSVAL(JavaClass_obj), 0, 0,
+                           JSPROP_PERMANENT|JSPROP_READONLY|JSPROP_ENUMERATE))
+        return NULL;
+    return JavaClass_obj;
+}
+
+
+/*
+ * The getClass() native JS method is defined as a property of the global
+ * object.  Given a JavaObject it returns the corresponding JavaClass.  This
+ * is useful for accessing static methods and fields.
+ *
+ *    js> getClass(new java.lang.String("foo"))
+ *    [JavaClass java.lang.String]
+ */
+static JSBool
+getClass(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    JSObject *obj_arg, *JavaClass_obj;
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    JNIEnv *jEnv;
+
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    if (argc != 1 ||
+	!JSVAL_IS_OBJECT(argv[0]) ||
+	!(obj_arg = JSVAL_TO_OBJECT(argv[0])) ||
+	(!JS_InstanceOf(cx, obj_arg, &JavaObject_class, 0) &&
+         !JS_InstanceOf(cx, obj_arg, &JavaArray_class, 0))) {
+        JS_ReportError(cx, "getClass expects a Java object argument");
+	return JS_FALSE;
+    }
+
+    java_wrapper = JS_GetPrivate(cx, obj_arg);
+    if (!java_wrapper) {
+        JS_ReportError(cx, "getClass called on prototype object");
+        return JS_FALSE;
+    }
+
+    class_descriptor = java_wrapper->class_descriptor;
+
+    JavaClass_obj = jsj_new_JavaClass(cx, jEnv, NULL, class_descriptor);
+    if (!JavaClass_obj)
+        return JS_FALSE;
+    *rval = OBJECT_TO_JSVAL(JavaClass_obj);
+    return JS_TRUE;
+}
+
+extern PR_IMPORT_DATA(JSObjectOps) js_ObjectOps;
+
+JSBool
+jsj_init_JavaClass(JSContext *cx, JSObject *global_obj)
+{
+    JavaClass_ops.newObjectMap = js_ObjectOps.newObjectMap;
+    JavaClass_ops.destroyObjectMap = js_ObjectOps.destroyObjectMap;
+    
+    /* Define JavaClass class */
+    if (!JS_InitClass(cx, global_obj, 0, &JavaClass_class, 0, 0, 0, 0, 0, 0))
+        return JS_FALSE;
+
+    if (!JS_DefineFunction(cx, global_obj, "getClass", getClass, 0,
+                           JSPROP_READONLY))
+        return JS_FALSE;
+
+    return jsj_InitJavaClassReflectionsTable();
+}
+

mozilla/js/ref/liveconnect/jsj_JavaObject.c

@@ -0,0 +1,695 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the native code implementation of JS's JavaObject class.
+ *
+ * An instance of JavaObject is the JavaScript reflection of a Java object.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "prassert.h"
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+
+/*
+ * This is a hash table that maps from Java objects to JS objects.
+ * It is used to ensure that the same JS object is obtained when a Java
+ * object is reflected more than once, so that JS object equality tests
+ * work in the expected manner, i.e. the "==" and "===" operators.
+ *
+ * The table entry keys are Java objects (of type jobject) and the entry values
+ * are JSObject pointers.  Because the jobject type is an opaque handle and
+ * not necessarily a pointer, the hashing and key comparison functions must
+ * invoke the appropriate JVM functions.
+ *
+ * When the corresponding JS object instance is finalized, the entry is
+ * removed from the table, and a Java GC root for the Java object is removed.
+ */
+static PRHashTable *java_obj_reflections = NULL;
+
+#ifdef JS_THREADSAFE
+static PRMonitor *java_obj_reflections_monitor = NULL;
+#endif
+
+static JSBool
+init_java_obj_reflections_table()
+{
+    java_obj_reflections =
+        PR_NewHashTable(512, jsj_HashJavaObject, jsj_JavaObjectComparator,
+                        NULL, NULL, NULL);
+    if (!java_obj_reflections)
+        return JS_FALSE;
+
+#ifdef JS_THREADSAFE
+    java_obj_reflections_monitor = PR_NewNamedMonitor("java_obj_reflections");
+    if (!java_obj_reflections_monitor) {
+        PR_HashTableDestroy(java_obj_reflections);
+        return JS_FALSE;
+    }
+#endif
+
+    return JS_TRUE;
+}
+
+JSObject *
+jsj_WrapJavaObject(JSContext *cx,
+                   JNIEnv *jEnv,
+                   jobject java_obj,
+                   jclass java_class)
+{
+    prhashcode hash_code;
+    JSClass *js_class;
+    JSObject *js_wrapper_obj;
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    PRHashEntry *he, **hep;
+
+    js_wrapper_obj = NULL;
+
+    hash_code = jsj_HashJavaObject((void*)java_obj);
+
+#ifdef JS_THREADSAFE
+    PR_EnterMonitor(java_obj_reflections_monitor);
+#endif
+    
+    hep = PR_HashTableRawLookup(java_obj_reflections,
+                                hash_code, java_obj);
+    he = *hep;
+    if (he) {
+        js_wrapper_obj = (JSObject *)he->value;
+        if (js_wrapper_obj)
+            goto done;
+    }
+
+    /* No existing reflection found.  Construct a new one */
+    class_descriptor = jsj_GetJavaClassDescriptor(cx, jEnv, java_class);
+    if (!class_descriptor)
+        goto done;
+    if (class_descriptor->type == JAVA_SIGNATURE_ARRAY) {
+        js_class = &JavaArray_class;
+    } else {
+        PR_ASSERT(class_descriptor->type == JAVA_SIGNATURE_CLASS);
+        js_class = &JavaObject_class;
+    }
+    
+    /* Create new JS object to reflect Java object */
+    js_wrapper_obj = JS_NewObject(cx, js_class, NULL, NULL);
+    if (!js_wrapper_obj)
+        goto done;
+
+    /* Create private, native portion of JavaObject */
+    java_wrapper =
+        (JavaObjectWrapper *)JS_malloc(cx, sizeof(JavaObjectWrapper));
+    if (!java_wrapper) {
+        jsj_ReleaseJavaClassDescriptor(cx, jEnv, class_descriptor);
+        goto done;
+    }
+    JS_SetPrivate(cx, js_wrapper_obj, java_wrapper);
+    java_wrapper->class_descriptor = class_descriptor;
+    java_wrapper->members = NULL;
+
+    /* Add the JavaObject to the hash table */
+    he = PR_HashTableRawAdd(java_obj_reflections, hep, hash_code,
+                            java_obj, js_wrapper_obj);
+    if (he) {
+        java_wrapper->java_obj = (*jEnv)->NewGlobalRef(jEnv, java_obj);
+        if (!java_wrapper->java_obj)
+            goto out_of_memory;
+    } else {
+        goto out_of_memory;
+    } 
+
+done:
+#ifdef JS_THREADSAFE
+        PR_ExitMonitor(java_obj_reflections_monitor);
+#endif
+        
+    return js_wrapper_obj;
+
+out_of_memory:
+    /* No need to free js_wrapper_obj, as it will be finalized by GC. */
+    JS_ReportOutOfMemory(cx);
+    js_wrapper_obj = NULL;
+    goto done;
+}
+
+static void
+remove_java_obj_reflection_from_hashtable(jobject java_obj)
+{
+    prhashcode hash_code;
+    PRHashEntry *he, **hep;
+
+    hash_code = jsj_HashJavaObject((void*)java_obj);
+
+#ifdef JS_THREADSAFE
+    PR_EnterMonitor(java_obj_reflections_monitor);
+#endif
+
+    hep = PR_HashTableRawLookup(java_obj_reflections, hash_code, java_obj);
+    he = *hep;
+
+    PR_ASSERT(he);
+    if (he)
+        PR_HashTableRawRemove(java_obj_reflections, hep, he);
+
+#ifdef JS_THREADSAFE
+    PR_ExitMonitor(java_obj_reflections_monitor);
+#endif
+}
+
+void
+JavaObject_finalize(JSContext *cx, JSObject *obj)
+{
+    JavaObjectWrapper *java_wrapper;
+    jobject java_obj;
+    JNIEnv *jEnv;
+
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper)
+        return;
+    java_obj = java_wrapper->java_obj;
+
+    remove_java_obj_reflection_from_hashtable(java_obj);
+
+    (*jEnv)->DeleteGlobalRef(jEnv, java_obj);
+    jsj_ReleaseJavaClassDescriptor(cx, jEnv, java_wrapper->class_descriptor);
+    /* FIXME - Delete JavaMemberValues */
+    /* if (java_wrapper->invoke_java_method_func_obj)
+        JS_RemoveRoot(cx, &java_wrapper->invoke_java_method_func_obj); */
+    JS_free(cx, java_wrapper);
+}
+
+/*
+static JSBool
+JavaObject_toString(JSContext *cx, JSObject *obj,
+                    uintN argc, jsval *argv, jsval *vp)
+{
+    jobject java_obj;
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper) {
+        JS_ReportError(cx, "illegal operation on JavaObject prototype object");
+        return JS_FALSE;
+    }
+    class_descriptor = java_wrapper->class_descriptor;
+    java_obj = java_wrapper->java_obj;
+    
+    return jsj_ConvertJavaObjectToJSString(cx, class_descriptor, java_obj, vp);
+}
+*/
+PR_CALLBACK JSBool
+JavaObject_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    jobject java_obj;
+    JNIEnv *jEnv;
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+        
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper) {
+        if (type == JSTYPE_OBJECT) {
+            *vp = OBJECT_TO_JSVAL(obj);
+            return JS_TRUE;
+        }
+        
+        JS_ReportError(cx, "illegal operation on JavaObject prototype object");
+        return JS_FALSE;
+    }
+
+    java_obj = java_wrapper->java_obj;
+    class_descriptor = java_wrapper->class_descriptor;
+
+    switch (type) {
+    case JSTYPE_OBJECT:
+        *vp = OBJECT_TO_JSVAL(obj);
+        return JS_TRUE;
+
+    case JSTYPE_FUNCTION:
+        JS_ReportError(cx, "can't convert Java object to function");
+        return JS_FALSE;
+
+    case JSTYPE_VOID:
+    case JSTYPE_STRING:
+        /* Either extract a C-string from the java.lang.String object
+           or call the Java toString() method */
+        return jsj_ConvertJavaObjectToJSString(cx, jEnv, class_descriptor, java_obj, vp);
+
+    case JSTYPE_NUMBER:
+        /* Call Java doubleValue() method, if applicable */
+        return jsj_ConvertJavaObjectToJSNumber(cx, jEnv, java_obj, vp);
+
+    case JSTYPE_BOOLEAN:
+        /* Call booleanValue() method, if applicable */
+        return jsj_ConvertJavaObjectToJSBoolean(cx, jEnv, java_obj, vp);
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+static JSBool
+lookup_member_by_id(JSContext *cx, JNIEnv *jEnv, JSObject *obj,
+                    JavaObjectWrapper **java_wrapperp,
+                    jsid id, JavaMemberVal **memberp,
+                    JavaMemberDescriptor **member_descriptorp)
+{
+    jsval idval;
+    JavaMemberVal *member, **prev_memberp;
+    JavaObjectWrapper *java_wrapper;
+    JavaMemberDescriptor *member_descriptor;
+    const char *member_name, *property_name;
+    JavaClassDescriptor *class_descriptor;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper) {
+        if (JS_IdToValue(cx, id, &idval) && JSVAL_IS_STRING(idval) &&
+            (property_name = JS_GetStringBytes(JSVAL_TO_STRING(idval)))) {
+            if (!strcmp(property_name, "constructor")) {
+                *java_wrapperp = NULL;
+                *member_descriptorp = NULL;
+                return JS_TRUE;
+            }
+        }
+        JS_ReportError(cx, "illegal operation on JavaObject prototype object");
+        return JS_FALSE;
+    }
+
+    class_descriptor = java_wrapper->class_descriptor;
+    PR_ASSERT(class_descriptor->type == JAVA_SIGNATURE_CLASS ||
+              class_descriptor->type == JAVA_SIGNATURE_ARRAY);
+
+    /* FIXME - not thread-safe */
+    prev_memberp = &java_wrapper->members;
+    for (member = *prev_memberp; member; member = member->next) {
+        member_descriptor = member->descriptor;
+        if (member_descriptor->id == id) {
+            *prev_memberp = member->next;
+            member->next = java_wrapper->members;
+            break;
+        }
+    }
+    if (!member) {
+        JSFunction *function;
+        JSObject *function_obj;
+
+        member_descriptor = jsj_LookupJavaMemberDescriptorById(cx, jEnv, class_descriptor, id);
+        if (member_descriptor && member_descriptor->methods) {
+            member = (JavaMemberVal*)JS_malloc(cx, sizeof(JavaMemberVal));
+            if (!member)
+                return JS_FALSE;
+            JS_IdToValue(cx, id, &idval);
+            member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+            
+            /* printf("Adding %s\n", member_name); */
+
+            /* FIXME - eliminate JSFUN_BOUND_METHOD */
+            /* TODO - Use JS_CloneFunction() to save memory */
+            function = JS_NewFunction(cx, jsj_JavaInstanceMethodWrapper, 0,
+                                      JSFUN_BOUND_METHOD, obj, member_name);
+            if (!function) {
+                JS_free(cx, member);
+                return JS_FALSE;
+            }
+            function_obj = JS_GetFunctionObject(function);        
+            member->invoke_method_func_val = OBJECT_TO_JSVAL(function_obj);
+            member->descriptor = member_descriptor;
+            member->next = NULL;
+            JS_AddRoot(cx, &member->invoke_method_func_val);
+        }
+    }
+
+    /* Place member at head of list of members for faster access next time */
+    if (member) {
+        member->next = java_wrapper->members;
+        java_wrapper->members = member;
+    }
+
+    if (!member_descriptor) {
+        JS_IdToValue(cx, id, &idval);
+        if (!JSVAL_IS_STRING(idval)) {
+            JS_ReportError(cx, "invalid JavaObject property expression. "
+                "(methods and field properties of a JavaObject object can only be strings)");
+            return JS_FALSE;
+        }
+
+        member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+
+        JS_ReportError(cx, "Java class %s has no public instance field or "
+                           "method named \"%s\"",
+                       class_descriptor->name, member_name);
+        return JS_FALSE;
+    }
+
+    /* Success.  Handle the multiple return values */
+    if (java_wrapperp)
+        *java_wrapperp = java_wrapper;
+    if (memberp)
+        *memberp = member;
+    if (member_descriptorp)
+        *member_descriptorp = member_descriptor;
+    return JS_TRUE;
+}
+
+PR_CALLBACK JSBool
+JavaObject_getPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    jobject java_obj;
+    JavaMemberDescriptor *member_descriptor;
+    JavaMemberVal *member;
+    JavaObjectWrapper *java_wrapper;
+    JNIEnv *jEnv;
+
+    /* printf("In JavaObject_getProperty\n"); */
+
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+        
+    if (!lookup_member_by_id(cx, jEnv, obj, &java_wrapper, id, &member, &member_descriptor))
+        return JS_FALSE;
+
+    /* Handle access to "constructor" property of prototype object with
+       silent failure. */
+    if (!member_descriptor) {
+        *vp = JSVAL_VOID;
+        return JS_TRUE;
+    }
+
+    java_obj = java_wrapper->java_obj;
+    if (member_descriptor->field) {
+        if (!member_descriptor->methods) {
+            return jsj_GetJavaFieldValue(cx, jEnv, member_descriptor->field, java_obj, vp);
+        } else {
+            PR_ASSERT(0);
+        }
+    } else {
+        *vp = member->invoke_method_func_val;
+        return JS_TRUE;
+    }
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaObject_setPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    jobject java_obj;
+    const char *member_name;
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    JavaMemberDescriptor *member_descriptor;
+    jsval idval;
+    JNIEnv *jEnv;
+
+    /* printf("In JavaObject_setProperty\n"); */
+
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+    
+    if (!lookup_member_by_id(cx, jEnv, obj, &java_wrapper, id, NULL, &member_descriptor))
+        return JS_FALSE;
+
+    /* Check for the case where there is a method with the give name, but no field
+       with that name */
+    if (!member_descriptor->field)
+        goto no_such_field;
+
+    /* Silently fail if field value is final (immutable), as required by ECMA spec */
+    if (member_descriptor->field->modifiers & ACC_FINAL)
+        return JS_TRUE;
+    
+    java_obj = java_wrapper->java_obj;
+    return jsj_SetJavaFieldValue(cx, jEnv, member_descriptor->field, java_obj, *vp);
+
+no_such_field:
+        JS_IdToValue(cx, id, &idval);
+        member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+        class_descriptor = java_wrapper->class_descriptor;
+        JS_ReportError(cx, "No instance field named \"%s\" in Java class %s",
+                       member_name, class_descriptor->name);
+        return JS_FALSE;
+}
+
+PR_CALLBACK JSBool
+JavaObject_enumerate(JSContext *cx, JSObject *obj)
+{
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    JavaMemberDescriptor *member_descriptor;
+    JNIEnv *jEnv;
+    
+/*    printf("In JavaObject_enumerate\n"); */
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+
+    /* Check if this is the prototype object */
+    if (!java_wrapper)
+        return JS_TRUE;
+
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    class_descriptor = java_wrapper->class_descriptor;
+    member_descriptor = jsj_GetClassInstanceMembers(cx, jEnv, class_descriptor);
+    while (member_descriptor) {
+        JS_DefineProperty(cx, obj, member_descriptor->name, JSVAL_VOID, 0, 0,
+                          JSPROP_PERMANENT|JSPROP_ENUMERATE);
+        member_descriptor = member_descriptor->next;
+    }
+    return JS_TRUE;
+}
+
+
+static JSBool
+JavaObject_lookupProperty(JSContext *cx, JSObject *obj, jsid id,
+                         JSObject **objp, JSProperty **propp
+#if defined JS_THREADSAFE && defined DEBUG
+                            , const char *file, uintN line
+#endif
+                            )
+{
+    JNIEnv *jEnv;
+
+    /* printf("In JavaObject_lookupProperty()\n"); */
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    if (!lookup_member_by_id(cx, jEnv, obj, NULL, id, NULL, NULL))
+        return JS_FALSE;
+    *objp = obj;
+    *propp = (JSProperty*)1;
+    return JS_TRUE;
+}
+
+static JSBool
+JavaObject_defineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
+                         JSPropertyOp getter, JSPropertyOp setter,
+                         uintN attrs, JSProperty **propp)
+{
+    JS_ReportError(cx, "Properties of JavaObject objects may not be deleted");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaObject_getAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    *attrsp = JSPROP_PERMANENT|JSPROP_ENUMERATE;
+    return JS_FALSE;
+}
+
+static JSBool
+JavaObject_setAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    if (*attrsp != JSPROP_PERMANENT|JSPROP_ENUMERATE) {
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+
+    /* Silently ignore all setAttribute attempts */
+    return JS_TRUE;
+}
+
+static JSBool
+JavaObject_deleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    JS_ReportError(cx, "Properties of JavaObject objects may not be deleted");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaObject_defaultValue(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    /* printf("In JavaObject_defaultValue()\n"); */
+    return JavaObject_convert(cx, obj, JSTYPE_STRING, vp);
+}
+
+static JSBool
+JavaObject_newEnumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
+                        jsval *statep, jsid *idp)
+{
+    JavaObjectWrapper *java_wrapper;
+    JavaMemberDescriptor *member_descriptor;
+    JavaClassDescriptor *class_descriptor;
+    JNIEnv *jEnv;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    /* Check for prototype object */
+    if (!java_wrapper) {
+        *statep = JSVAL_NULL;
+        if (idp)
+            *idp = INT_TO_JSVAL(0);
+        return JS_TRUE;
+    }
+
+    class_descriptor = java_wrapper->class_descriptor;
+
+    switch(enum_op) {
+    case JSENUMERATE_INIT:
+        
+        /* Get the Java per-thread environment pointer for this JSContext */
+        jsj_MapJSContextToJSJThread(cx, &jEnv);
+        if (!jEnv)
+            return JS_FALSE;
+
+        member_descriptor = jsj_GetClassInstanceMembers(cx, jEnv, class_descriptor);
+        *statep = PRIVATE_TO_JSVAL(member_descriptor);
+        if (idp)
+            *idp = INT_TO_JSVAL(class_descriptor->num_instance_members);
+        return JS_TRUE;
+        
+    case JSENUMERATE_NEXT:
+        member_descriptor = JSVAL_TO_PRIVATE(*statep);
+        if (member_descriptor) {
+            *idp = member_descriptor->id;
+            *statep = PRIVATE_TO_JSVAL(member_descriptor->next);
+            return JS_TRUE;
+        }
+
+        /* Fall through ... */
+
+    case JSENUMERATE_DESTROY:
+        *statep = JSVAL_NULL;
+        return JS_TRUE;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+static JSBool
+JavaObject_checkAccess(JSContext *cx, JSObject *obj, jsid id,
+                      JSAccessMode mode, jsval *vp, uintN *attrsp)
+{
+    switch (mode) {
+    case JSACC_WATCH:
+        JS_ReportError(cx, "Cannot place watchpoints on JavaObject object properties");
+        return JS_FALSE;
+
+    case JSACC_IMPORT:
+        JS_ReportError(cx, "Cannot export a JavaObject object's properties");
+        return JS_FALSE;
+
+    default:
+        return JS_TRUE;
+    }
+}
+
+JSObjectOps JavaObject_ops = {
+    /* Mandatory non-null function pointer members. */
+    NULL,                       /* newObjectMap */
+    NULL,                       /* destroyObjectMap */
+    JavaObject_lookupProperty,
+    JavaObject_defineProperty,
+    JavaObject_getPropertyById, /* getProperty */
+    JavaObject_setPropertyById, /* setProperty */
+    JavaObject_getAttributes,
+    JavaObject_setAttributes,
+    JavaObject_deleteProperty,
+    JavaObject_defaultValue,
+    JavaObject_newEnumerate,
+    JavaObject_checkAccess,
+
+    /* Optionally non-null members start here. */
+    NULL,                       /* thisObject */
+    NULL,                       /* dropProperty */
+    NULL,                       /* call */
+    NULL,                       /* construct */
+    NULL,                       /* xdrObject */
+    NULL,                       /* hasInstance */
+};
+
+JSObjectOps *
+JavaObject_getObjectOps(JSContext *cx, JSClass *clazz)
+{
+    return &JavaObject_ops;
+}
+
+JSClass JavaObject_class = {
+    "JavaObject", JSCLASS_HAS_PRIVATE,
+    NULL, NULL, NULL, NULL,
+    NULL, NULL, JavaObject_convert, JavaObject_finalize,
+    JavaObject_getObjectOps,
+};
+
+extern PR_IMPORT_DATA(JSObjectOps) js_ObjectOps;
+
+
+JSBool
+jsj_init_JavaObject(JSContext *cx, JSObject *global_obj)
+{
+    JavaObject_ops.newObjectMap = js_ObjectOps.newObjectMap;
+    JavaObject_ops.destroyObjectMap = js_ObjectOps.destroyObjectMap;
+
+    if (!JS_InitClass(cx, global_obj, 
+        0, &JavaObject_class, 0, 0,
+        0, 0,
+        0, 0))
+        return JS_FALSE;
+
+    return init_java_obj_reflections_table();
+}

mozilla/js/ref/liveconnect/jsj_JavaPackage.c

@@ -0,0 +1,438 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the native code implementation of the JavaPackage class.
+ *
+ * A JavaPackage is JavaScript's representation of a Java package.  The
+ * JavaPackage object contains only a string, which is the path to the package,
+ * e.g. "java/lang".  The JS properties of a JavaPackage are either nested packages
+ * or a JavaClass object, which represents the path to a Java class.
+ *
+ * Note that there is no equivalent to a JavaPackage object in Java.  Example:
+ * Although there are instances of java.lang.String and there are static methods
+ * of java.lang.String that can be invoked, there's no such thing as a java.lang
+ * object in Java that exists at run time.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "prtypes.h"
+#include "prprintf.h"
+
+#include "jsj_private.h"        /* LiveConnect internals */
+#include "jsjava.h"
+
+
+JSClass JavaPackage_class;      /* Forward declaration */
+
+/*
+ * The native part of a JavaPackage object.  It gets stored in the object's
+ * private slot.
+ */
+typedef struct {
+    const char * path;          /* e.g. "java/lang" or NULL if top level package */
+    int flags;                  /* e.g. PKG_SYSTEM, PKG_CLASS */
+} JavaPackage_Private;
+
+JSObject *
+define_JavaPackage(JSContext *cx, JSObject *parent_obj,
+                   const char *obj_name, const char *path, int flags)
+{
+    JSObject *package_obj;
+    JavaPackage_Private *package;
+
+    package_obj = JS_DefineObject(cx, parent_obj, obj_name, &JavaPackage_class, 0,
+                                  JSPROP_PERMANENT | JSPROP_READONLY);
+    if (!package_obj)
+        return NULL;
+    
+    /* Attach private, native data to the JS object */
+    package = (JavaPackage_Private *)JS_malloc(cx, sizeof(JavaPackage_Private));
+    JS_SetPrivate(cx, package_obj, (void *)package);
+    if (path)
+        package->path = JS_strdup(cx, path);
+    else
+        package->path = "";
+
+    package->flags = flags;
+
+    /* Check for OOM */
+    if (!package->path) {
+        JS_DeleteProperty(cx, parent_obj, obj_name);
+        JS_free(cx, package);
+        return NULL;
+    }
+
+    return package_obj;
+}
+
+/* JavaPackage uses standard JS getProperty */
+
+/*
+ * Don't allow user-defined properties to be set on Java package objects, e.g.
+ * it is illegal to write "java.lang.myProperty = 4".  We probably could relax
+ * this restriction, but it's potentially confusing and not clearly useful.
+ */
+static JSBool
+JavaPackage_setProperty(JSContext *cx, JSObject *obj, jsval slot, jsval *vp)
+{
+    JavaPackage_Private *package = JS_GetPrivate(cx, obj);
+    if (!package) {
+        JS_ReportError(cx, "illegal attempt to add property to "
+                           "JavaPackage prototype object");
+        return JS_FALSE;
+    }
+    JS_ReportError(cx, "You may not add properties to %s, "
+                       "as it is not a JavaScript object", package->path);
+    return JS_FALSE;
+}
+
+static JSBool quiet_resolve_failure;
+
+/*
+ * Resolve a component name to be either the name of a class or a package.
+ */
+static JSBool
+JavaPackage_resolve(JSContext *cx, JSObject *obj, jsval id)
+{
+    JavaPackage_Private *package;
+    JSBool ok = JS_TRUE;
+    jclass jclazz;
+    char *subPath, *newPath;
+    const char *path;
+    JNIEnv *jEnv;
+    
+    package = (JavaPackage_Private *)JS_GetPrivate(cx, obj);
+    if (!package) {
+        fprintf(stderr, "JavaPackage_resolve: no private data!\n");
+        return JS_FALSE;
+    }
+    path = package->path;
+    subPath = JS_GetStringBytes(JSVAL_TO_STRING(id));
+
+    newPath = PR_smprintf("%s%s%s", path, (path[0] ? "/" : ""), subPath);
+    if (!newPath) {
+        JS_ReportOutOfMemory(cx);
+        return JS_FALSE;
+    }
+
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    /*
+        Unfortunately, Java provides no way to find out whether a particular
+        name is a package or not.  The only way to tell is to try to load the
+        name as a class file and, if that fails, assume it's a package.  This
+        makes things work as expected for the most part, but it has three
+        noticeable problems that keep coming up:
+
+        - You can refer to a package like java.lang.i.buried.paul without
+          generating a complaint.  Of course, you'll never be able to refer to
+          any classes through it.
+
+        - An annoying consequence of the above is that misspelling a class name
+          results in a cryptic error about packages.
+
+        - In a browser context, i.e. where applets are involved, figuring out
+          whether something is a class may require looking for it over the net
+          using the current classloader.  This means that the first time you
+          refer to java.lang.System in a js context, there will be an attempt
+          to search for [[DOCBASE]]/java.class on the server.
+    
+        A solution is to explicitly tell jsjava the names of all the (local)
+        packages on the CLASSPATH.  (Not implemented yet.)
+
+    */
+    jclazz = (*jEnv)->FindClass(jEnv, newPath);
+    if (jclazz) {
+        JSObject *newClass;
+
+        newClass = jsj_define_JavaClass(cx, jEnv, obj, subPath, jclazz);
+        if (!newClass) {
+            ok = JS_FALSE;
+            goto out;
+        }
+    } else {
+
+        /*
+         * If there's no class of the given name, then we must be referring to
+         * a package.  However, don't allow bogus sub-packages of pre-defined
+         * system packages to be created.
+         */
+        if (JS_InstanceOf(cx, obj, &JavaPackage_class, NULL)) {
+            JavaPackage_Private *package;
+
+            package = JS_GetPrivate(cx, obj);
+            if (package->flags & PKG_SYSTEM) {
+                char *msg, *cp;
+
+                /* Painful hack for pre_define_java_packages() */
+                if (quiet_resolve_failure)
+                    return JS_FALSE;
+
+                msg = PR_smprintf("No Java system package with name \"%s\" was identified "
+                                  "at initialization time and no Java class "
+                                  "with that name exists either", newPath);
+
+                /* Check for OOM */
+                if (msg) {
+                    /* Convert package of form "java/lang" to "java.lang" */
+                    for (cp = msg; *cp != '\0'; cp++)
+                        if (*cp == '/')
+                            *cp = '.';
+                    JS_ReportError(cx, msg);
+                    free((char*)msg);
+                }
+                               
+                return JS_FALSE;
+            }
+        }
+        if (!define_JavaPackage(cx, obj, subPath, newPath, 0)) {
+            ok = JS_FALSE;
+            goto out;
+        }
+        
+#ifdef DEBUG
+        printf("JavaPackage \'%s/%s\' created\n", subPath, newPath);
+#endif
+
+    }
+    
+out:
+    free(newPath);
+    return ok;
+}
+
+static JSBool
+JavaPackage_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    JSString *str;
+    char *name, *cp;
+
+    JavaPackage_Private *package = JS_GetPrivate(cx, obj);
+    if (!package) {
+        fprintf(stderr, "JavaPackage_resolve: no private data!\n");
+        return JS_FALSE;
+    }
+
+    switch (type) {
+
+    /* Pretty-printing of JavaPackage */
+    case JSTYPE_STRING:
+        /* Convert '/' to '.' so that it looks like Java language syntax. */
+        if (!package->path)
+            break;
+        name = PR_smprintf("[JavaPackage %s]", package->path);
+        if (!name) {
+            JS_ReportOutOfMemory(cx);
+            return JS_FALSE;
+        }
+        for (cp = name; *cp != '\0'; cp++)
+            if (*cp == '/')
+                *cp = '.';
+        str = JS_NewString(cx, name, strlen(name));
+        if (!str) {
+            free(name);
+            /* It's not necessary to call JS_ReportOutOfMemory(), as
+               JS_NewString() will do so on failure. */
+            return JS_FALSE;
+        }
+
+        *vp = STRING_TO_JSVAL(str);
+        break;
+
+    case JSTYPE_OBJECT:
+        *vp = OBJECT_TO_JSVAL(obj);
+        break;
+
+    default:
+        break;
+    }
+    return JS_TRUE;
+}
+
+/*
+ * Free the private native data associated with the JavaPackage object.
+ */
+static void
+JavaPackage_finalize(JSContext *cx, JSObject *obj)
+{
+    JavaPackage_Private *package = JS_GetPrivate(cx, obj);
+    if (!package)
+        return;
+
+    if (package->path)
+        JS_free(cx, (char *)package->path);
+    JS_free(cx, package);
+}
+
+/*
+ * The definition of the JavaPackage class
+ */
+JSClass JavaPackage_class = {
+    "JavaPackage", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JavaPackage_setProperty,
+    JS_EnumerateStub, JavaPackage_resolve,
+    JavaPackage_convert, JavaPackage_finalize
+};
+
+JavaPackageDef
+standard_java_packages[] = {
+    {"java",                NULL,   PKG_SYSTEM},
+    {"java.awt",            NULL,   PKG_SYSTEM},
+    {"java.awt.event",      NULL,   PKG_SYSTEM},
+    {"java.awt.image",      NULL,   PKG_SYSTEM},
+    {"java.awt.peer",       NULL,   PKG_SYSTEM},
+    {"java.beans",          NULL,   PKG_SYSTEM},
+    {"java.io",             NULL,   PKG_SYSTEM},
+    {"java.lang",           NULL,   PKG_SYSTEM},
+    {"java.lang.reflect",   NULL,   PKG_SYSTEM},
+    {"java.math",           NULL,   PKG_SYSTEM},
+    {"java.net",            NULL,   PKG_SYSTEM},
+    {"java.text",           NULL,   PKG_SYSTEM},
+    {"java.util",           NULL,   PKG_SYSTEM},
+    {"java.util.zip",       NULL,   PKG_SYSTEM},
+    {"netscape",            NULL,   PKG_SYSTEM},
+    {"netscape.javascript", NULL,   PKG_SYSTEM},
+    {"sun",                 NULL,   PKG_USER},
+    {"Packages",            "",     PKG_USER},
+    0
+};
+
+/*
+ * Pre-define a hierarchy of JavaPackage objects.
+ * Pre-defining a Java package at initialization time is not necessary, but
+ * it will make package lookup faster and, more importantly, will avoid
+ * unnecessary network accesses if classes are being loaded over the network.
+ */
+static JSBool
+pre_define_java_packages(JSContext *cx, JSObject *global_obj,
+                         JavaPackageDef *predefined_packages)
+{
+    JSBool package_exists;
+    JSObject *parent_obj;
+    JavaPackageDef *package_def;
+    char *simple_name, *cp, *package_name, *path;
+    int flags;
+
+    if (!predefined_packages)
+        return JS_TRUE;
+
+    /* Iterate over all pre-defined Java packages */
+    for (package_def = predefined_packages; package_def->name; package_def++) {
+        package_name = path = NULL;
+
+        parent_obj = global_obj;
+        package_name = strdup(package_def->name);
+        if (!package_name)
+            goto out_of_memory;
+
+        /* Walk the chain of JavaPackage objects to get to the parent of the
+           rightmost sub-package in the fully-qualified package name. */
+        for (simple_name = strtok(package_name, "."); 1; simple_name = strtok(NULL, ".")) {
+            jsval v;
+
+            if (!simple_name) {
+                JS_ReportError(cx, "Package %s defined twice ?", package_name);
+                goto error;
+            }
+
+            /* Check to see if the sub-package already exists */
+            quiet_resolve_failure = JS_TRUE;
+            package_exists = JS_LookupProperty(cx, parent_obj, simple_name, &v) && JSVAL_IS_OBJECT(v);
+            quiet_resolve_failure = JS_FALSE;
+
+            if (package_exists) {
+                    parent_obj = JSVAL_TO_OBJECT(v);
+                    continue;
+            } else {
+                /* New package objects should only be created at the terminal
+                   sub-package in a fully-qualified package-name */
+                if (strtok(NULL, ".")) {
+                    JS_ReportError(cx, "Illegal predefined package definition for %s",
+                                   package_def->name);
+                    goto error;
+                }
+                
+                if (package_def->path) {
+                    path = strdup(package_def->path);
+                    if (!path)
+                        goto out_of_memory;
+                } else {
+
+                    /*
+                     * The default path is specified, so create it from the
+                     * fully-qualified package name.
+                     */
+                    path = strdup(package_def->name);
+                    if (!path)
+                        goto out_of_memory;
+                    /* Transform package name, e.g. "java.lang" ==> "java/lang" */
+                    for (cp = path; *cp != '\0'; cp++) {
+                        if (*cp == '.')
+                             *cp = '/';
+                    }
+                }
+                flags = package_def->flags;
+                parent_obj = define_JavaPackage(cx, parent_obj, simple_name, path, flags);
+                if (!parent_obj)
+                    goto error;
+     
+                free(path);
+                break;
+            }
+        }
+        free(package_name);
+    }
+    return JS_TRUE;
+
+out_of_memory:
+    JS_ReportOutOfMemory(cx);
+
+error:
+    JS_FREE_IF(cx, package_name);
+    JS_FREE_IF(cx, path);
+    return JS_FALSE;
+}
+
+/*
+ * One-time initialization for the JavaPackage class.  (This is not
+ * run once per thread, rather it's run once for a given JSContext.)
+ */
+JSBool
+jsj_init_JavaPackage(JSContext *cx, JSObject *global_obj,
+                     JavaPackageDef *additional_predefined_packages) {
+
+    /* Define JavaPackage class */
+    if (!JS_InitClass(cx, global_obj, 0, &JavaPackage_class, 0, 0, 0, 0, 0, 0))
+        return JS_FALSE;
+
+    /* Add top-level packages, e.g. : java, netscape, sun */
+    if (!pre_define_java_packages(cx, global_obj, standard_java_packages))
+        return JS_FALSE;
+    if (!pre_define_java_packages(cx, global_obj, additional_predefined_packages))
+        return JS_FALSE;
+    
+    return JS_TRUE;
+}

mozilla/js/ref/liveconnect/jsj_array.c

@@ -0,0 +1,180 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+ 
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the code for reading and writing elements of a Java array.
+ */
+
+#include "prtypes.h"
+#include "prassert.h"
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+/*
+ * Read the Java value at a given index into a Java array and convert it
+ * to a JS value.  The array_component_signature describes the type of
+ * the resulting Java value, which can be a primitive type or an object type.
+ * More specifically it can be an array type in the case of multidimensional
+ * arrays.
+ */
+JSBool
+jsj_GetJavaArrayElement(JSContext *cx, JNIEnv *jEnv, jarray java_array, jsize index,
+                        JavaSignature *array_component_signature,
+                        jsval *vp)
+{
+    jvalue java_value;
+    JavaSignatureChar component_type;
+
+#define GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Type,member)                   \
+    (*jEnv)->Get##Type##ArrayRegion(jEnv, java_array, index, 1,              \
+                                    &java_value.member);                     \
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {                                  \
+        jsj_ReportJavaError(cx, jEnv, "Error reading element of "            \
+                                      "Java primitive array");               \
+        return JS_FALSE;                                                     \
+    }
+
+    component_type = array_component_signature->type;
+    switch(component_type) {
+    case JAVA_SIGNATURE_BYTE:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Byte,b);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Char,c);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Short,s);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Int,i);
+        break;
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Boolean,z);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Long,j);
+        break;
+  
+    case JAVA_SIGNATURE_FLOAT:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Float,f);
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Double,d);
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        java_value.l = (*jEnv)->GetObjectArrayElement(jEnv, java_array, index);
+        if ((*jEnv)->ExceptionOccurred(jEnv)) {
+            jsj_ReportJavaError(cx, jEnv, "Error reading Java object array");
+            return JS_FALSE;
+        }
+        break;
+
+#undef GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY
+    default:
+        PR_ASSERT(0);        /* Unknown java type signature */
+        return JS_FALSE;
+    }
+
+    return jsj_ConvertJavaValueToJSValue(cx, jEnv, array_component_signature, &java_value, vp);
+}
+
+JSBool
+jsj_SetJavaArrayElement(JSContext *cx, JNIEnv *jEnv, jarray java_array, jsize index,
+                        JavaSignature *array_component_signature,
+                        jsval js_val)
+{
+    int dummy_cost;
+    jvalue java_value;
+    JavaSignatureChar component_type;
+
+    if (!jsj_ConvertJSValueToJavaValue(cx, jEnv, js_val, array_component_signature,
+                                       &dummy_cost, &java_value))
+        return JS_FALSE;
+
+#define SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Type,member)                   \
+    (*jEnv)->Set##Type##ArrayRegion(jEnv, java_array, index, 1,              \
+                                    &java_value.member);                     \
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {                                  \
+        jsj_ReportJavaError(cx, jEnv, "Error assigning to element of "       \
+                                      "Java primitive array");               \
+        return JS_FALSE;                                                     \
+    }
+
+    component_type = array_component_signature->type;
+    switch(component_type) {
+    case JAVA_SIGNATURE_BYTE:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Byte,b);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Char,c);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Short,s);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Int,i);
+        break;
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Boolean,z);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Long,j);
+        break;
+  
+    case JAVA_SIGNATURE_FLOAT:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Float,f);
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Double,d);
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        (*jEnv)->SetObjectArrayElement(jEnv, java_array, index, java_value.l);
+        if ((*jEnv)->ExceptionOccurred(jEnv)) {
+            jsj_ReportJavaError(cx, jEnv, "Error assigning to Java object array");
+            return JS_FALSE;
+        }
+        break;
+
+#undef SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY
+    default:
+        PR_ASSERT(0);        /* Unknown java type signature */
+        return JS_FALSE;
+    }
+
+    return JS_TRUE;
+}
+

mozilla/js/ref/liveconnect/jsj_class.c

@@ -0,0 +1,572 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the code that constructs and manipulates JavaClassDescriptor
+ * structs, which are the native wrappers for Java classes.
+ * JavaClassDescriptors are used to describe the signatures of methods and
+ * fields.  There is a JavaClassDescriptor associated with the reflection of
+ * each Java Object.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "prtypes.h"
+#include "prprintf.h"
+#include "prassert.h"
+
+#include "jsj_private.h"        /* LiveConnect internals */
+
+#include "prhash.h"             /* Hash tables */
+
+/* A one-to-one mapping between all referenced java.lang.Class objects and
+   their corresponding JavaClassDescriptor objects */
+static PRHashTable *java_class_reflections;
+
+/*
+ * Given a JVM handle to a java.lang.Class object, malloc a C-string
+ * containing the UTF8 encoding of the fully qualified name of the class.
+ * It's the caller's responsibility to free the returned string.
+ *
+ * If an error occurs, NULL is returned and the error reporter called.
+ */
+const char *
+jsj_GetJavaClassName(JSContext *cx, JNIEnv *jEnv, jclass java_class)
+{
+    jstring java_class_name_jstr;
+    const char *java_class_name;
+
+    /* Get java.lang.String object containing class name */
+    java_class_name_jstr =
+        (*jEnv)->CallObjectMethod(jEnv, java_class, jlClass_getName);
+
+
+    if (!java_class_name_jstr)
+        goto error;
+
+    /* Convert to UTF8 encoding and copy */
+    java_class_name = jsj_DupJavaStringUTF(cx, jEnv, java_class_name_jstr);
+    if (!java_class_name)
+        return NULL;
+
+    return java_class_name;
+
+error:
+    jsj_UnexpectedJavaError(cx, jEnv, "Can't get Java class name using"
+                                      "java.lang.Class.getName()");
+    return NULL;
+}
+
+/*
+ * Convert in-place a string of the form "java.lang.String" into "java/lang/String".
+ * Though the former style is conventionally used by Java programmers, the latter is
+ * what the JNI functions require.
+ */
+void
+jsj_MakeJNIClassname(char * class_name)
+{
+    char * c;
+    for (c = class_name; *c; c++)
+        if (*c == '.')
+            *c = '/';
+}
+
+/*
+ * Classify an instance of java.lang.Class as either one of the primitive
+ * types, e.g. int, char, etc., as an array type or as a non-array object type
+ * (subclass of java.lang.Object) by returning the appropriate enum member.
+ *
+ */
+static JavaSignatureChar
+get_signature_type(JSContext *cx, JavaClassDescriptor *class_descriptor)
+{
+    JavaSignatureChar type;
+    const char *java_class_name;
+
+    /* Get UTF8 encoding of class name */
+    java_class_name = class_descriptor->name;
+    PR_ASSERT(java_class_name);
+    if (!java_class_name)
+        return JAVA_SIGNATURE_UNKNOWN;
+
+    if (!strcmp(java_class_name, "byte"))
+        type = JAVA_SIGNATURE_BYTE;
+    else if (!strcmp(java_class_name, "char"))
+        type = JAVA_SIGNATURE_CHAR;
+    else if (!strcmp(java_class_name, "float"))
+        type = JAVA_SIGNATURE_FLOAT;
+    else if (!strcmp(java_class_name, "double"))
+        type = JAVA_SIGNATURE_DOUBLE;
+    else if (!strcmp(java_class_name, "int"))
+        type = JAVA_SIGNATURE_INT;
+    else if (!strcmp(java_class_name, "long"))
+        type = JAVA_SIGNATURE_LONG;
+    else if (!strcmp(java_class_name, "short"))
+        type = JAVA_SIGNATURE_SHORT;
+    else if (!strcmp(java_class_name, "boolean"))
+        type = JAVA_SIGNATURE_BOOLEAN;
+    else if (!strcmp(java_class_name, "void"))
+        type = JAVA_SIGNATURE_VOID;
+    else
+        /* Well, I guess it's a Java class, then. */
+        type = JAVA_SIGNATURE_CLASS;
+    
+    return type;
+}
+
+static JSBool
+is_java_array_class(JNIEnv *jEnv, jclass java_class)
+{
+    return (*jEnv)->CallBooleanMethod(jEnv, java_class, jlClass_isArray);
+}
+
+/*
+ * Return the class of a Java array's component type.  This is not the same
+ * as the array's element type.  For example, the component type of an array
+ * of type SomeType[][][] is SomeType[][], but its element type is SomeType.
+ *
+ * If an error occurs, NULL is returned and an error reported.
+ */
+static jclass
+get_java_array_component_class(JSContext *cx, JNIEnv *jEnv, jclass java_class)
+{
+    jclass result;
+    result = (*jEnv)->CallObjectMethod(jEnv, java_class, jlClass_getComponentType);
+    if (!result) {
+        jsj_UnexpectedJavaError(cx, jEnv,
+                                "Can't get Java array component class using "
+                                "java.lang.Class.getComponentType()");
+        return NULL;
+    }
+    return result;
+}
+
+/*
+ * Given a Java class, fill in the signature structure that describes the class.
+ * If an error occurs, JS_FALSE is returned and the error reporter called.
+ */
+static JSBool
+compute_java_class_signature(JSContext *cx, JNIEnv *jEnv, JavaSignature *signature)
+{
+    jclass java_class = signature->java_class;
+
+    if (is_java_array_class(jEnv, java_class)) {
+        jclass component_class;
+        
+        signature->type = JAVA_SIGNATURE_ARRAY;
+
+        component_class = get_java_array_component_class(cx, jEnv, java_class);
+        if (!component_class)
+            return JS_FALSE;
+
+        signature->array_component_signature =
+            jsj_GetJavaClassDescriptor(cx, jEnv, component_class);
+        if (!signature->array_component_signature)
+            return JS_FALSE;
+    } else {
+        signature->type = get_signature_type(cx, signature);
+    }
+    return JS_TRUE;
+}
+
+/*
+ * Convert a JavaSignature object into a string format as used by
+ * the JNI functions, e.g. java.lang.Object ==> "Ljava/lang/Object;"
+ * The caller is responsible for freeing the resulting string.
+ *
+ * If an error is encountered, NULL is returned and an error reported.
+ */
+const char *
+jsj_ConvertJavaSignatureToString(JSContext *cx, JavaSignature *signature)
+{
+    char *sig;
+
+    if (signature->type == JAVA_SIGNATURE_CLASS) {
+        /* A non-array object class */
+        sig = PR_smprintf("L%s;", signature->name);
+        if (sig)
+            jsj_MakeJNIClassname(sig);
+
+    } else if (signature->type == JAVA_SIGNATURE_ARRAY) {
+        /* An array class */
+        const char *component_signature_string;
+
+        component_signature_string =
+            jsj_ConvertJavaSignatureToString(cx, signature->array_component_signature);
+        if (!component_signature_string)
+            return NULL;
+        sig = PR_smprintf("[%s", component_signature_string);
+        JS_free(cx, (char*)component_signature_string);
+
+    } else {
+        /* A primitive class */
+        sig = PR_smprintf("%c", (char)signature->type);
+    }
+
+    if (!sig) {
+        JS_ReportOutOfMemory(cx);
+        return NULL;
+    }
+    return sig;
+}
+
+/*
+ * Convert a JavaSignature object into a human-readable string format as seen
+ * in Java source files, e.g. "byte", or "int[][]" or "java.lang.String".
+ * The caller is responsible for freeing the resulting string.
+ *
+ * If an error is encountered, NULL is returned and an error reported.
+ */
+const char *
+jsj_ConvertJavaSignatureToHRString(JSContext *cx,
+                                   JavaSignature *signature)
+{
+    char *sig;
+    JavaSignature *acs;
+
+    if (signature->type == JAVA_SIGNATURE_ARRAY) {
+        /* An array class */
+        const char *component_signature_string;
+        acs = signature->array_component_signature;
+        component_signature_string =
+            jsj_ConvertJavaSignatureToHRString(cx, acs);
+        if (!component_signature_string)
+            return NULL;
+        sig = PR_smprintf("%s[]", component_signature_string);
+        JS_free(cx, (char*)component_signature_string);
+
+    } else {
+        /* A primitive class or a non-array object class */
+        sig = JS_strdup(cx, signature->name);
+    }
+
+    if (!sig) {
+        JS_ReportOutOfMemory(cx);
+        return NULL;
+    }
+    return sig;
+}
+
+static void
+destroy_java_member_descriptor(JSContext *cx, JNIEnv *jEnv, JavaMemberDescriptor *member_descriptor)
+{
+    JavaMethodSpec *method, *next_method;
+    if (member_descriptor->field)
+        jsj_DestroyFieldSpec(cx, jEnv, member_descriptor->field);
+
+    method = member_descriptor->methods;
+    while (method) {
+        next_method = method->next;
+        jsj_DestroyMethodSpec(cx, jEnv, method);
+        method = next_method;
+    }
+}
+
+static void
+destroy_class_member_descriptors(JSContext *cx, JNIEnv *jEnv, JavaMemberDescriptor *member_descriptor)
+{
+    JavaMemberDescriptor *next_member;
+    
+    while (member_descriptor) {
+        next_member = member_descriptor->next;
+        destroy_java_member_descriptor(cx, jEnv, member_descriptor);
+        member_descriptor = next_member;
+    }
+}
+
+static void
+destroy_class_descriptor(JSContext *cx, JNIEnv *jEnv, JavaClassDescriptor *class_descriptor)
+{
+    JS_FREE_IF(cx, (char *)class_descriptor->name);
+    if (class_descriptor->java_class) {
+        (*jEnv)->DeleteGlobalRef(jEnv, class_descriptor->java_class);
+        PR_HashTableRemove(java_class_reflections, class_descriptor->java_class);
+    }
+
+    if (class_descriptor->array_component_signature)
+        jsj_ReleaseJavaClassDescriptor(cx, jEnv, class_descriptor->array_component_signature);
+
+    destroy_class_member_descriptors(cx, jEnv, class_descriptor->instance_members);
+    destroy_class_member_descriptors(cx, jEnv, class_descriptor->static_members);
+    destroy_class_member_descriptors(cx, jEnv, class_descriptor->constructors);
+    JS_free(cx, class_descriptor);
+}
+
+static JavaClassDescriptor *
+new_class_descriptor(JSContext *cx, JNIEnv *jEnv, jclass java_class)
+{
+    JavaClassDescriptor *class_descriptor;
+
+    class_descriptor = (JavaClassDescriptor *)JS_malloc(cx, sizeof(JavaClassDescriptor));
+    if (!class_descriptor)
+        return NULL;
+    memset(class_descriptor, 0, sizeof(JavaClassDescriptor));
+
+    class_descriptor->name = jsj_GetJavaClassName(cx, jEnv, java_class);
+    if (!class_descriptor->name)
+        goto error;
+
+    java_class = (*jEnv)->NewGlobalRef(jEnv, java_class);
+    if (!java_class) {
+        jsj_ReportJavaError(cx, jEnv, "Unable to reference Java class");
+        goto error;
+    }
+    class_descriptor->java_class = java_class;
+
+    if (!compute_java_class_signature(cx, jEnv, class_descriptor))
+        goto error;
+
+    class_descriptor->modifiers =
+        (*jEnv)->CallIntMethod(jEnv, java_class, jlClass_getModifiers);
+    class_descriptor->ref_count = 1;
+
+    if (!PR_HashTableAdd(java_class_reflections, java_class, class_descriptor))
+        goto error;
+
+    return class_descriptor;
+
+error:
+    destroy_class_descriptor(cx, jEnv, class_descriptor);
+    return NULL;
+}
+
+extern JavaClassDescriptor *
+jsj_GetJavaClassDescriptor(JSContext *cx, JNIEnv *jEnv, jclass java_class)
+{
+    JavaClassDescriptor *class_descriptor;
+    class_descriptor = PR_HashTableLookup(java_class_reflections,
+                                          (const void *)java_class);
+    if (!class_descriptor)
+        return new_class_descriptor(cx, jEnv, java_class);
+
+    PR_ASSERT(class_descriptor->ref_count > 0);
+    class_descriptor->ref_count++;
+    return class_descriptor;
+}
+
+void
+jsj_ReleaseJavaClassDescriptor(JSContext *cx, JNIEnv *jEnv, JavaClassDescriptor *class_descriptor)
+{
+    if (!--class_descriptor->ref_count)
+        destroy_class_descriptor(cx, jEnv, class_descriptor);
+}
+
+static JSBool
+reflect_java_methods_and_fields(JSContext *cx,
+                                JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor,
+                                JSBool reflect_statics_only)
+{
+    JavaMemberDescriptor *member_descriptor;
+
+    if (reflect_statics_only)
+        class_descriptor->static_members_reflected = JS_TRUE;
+    else
+        class_descriptor->instance_members_reflected = JS_TRUE;
+    
+    if (!jsj_ReflectJavaMethods(cx, jEnv, class_descriptor, reflect_statics_only))
+        return JS_FALSE;
+    if (!jsj_ReflectJavaFields(cx, jEnv, class_descriptor, reflect_statics_only))
+        return JS_FALSE;
+
+    if (reflect_statics_only) {
+        member_descriptor = class_descriptor->static_members;
+        while (member_descriptor) {
+            class_descriptor->num_static_members++;
+            member_descriptor = member_descriptor->next;
+        }
+    } else {
+        member_descriptor = class_descriptor->instance_members;
+        while (member_descriptor) {
+            class_descriptor->num_instance_members++;
+            member_descriptor = member_descriptor->next;
+        }
+    }
+    return JS_TRUE;
+}
+
+JavaMemberDescriptor *
+jsj_GetClassStaticMembers(JSContext *cx,
+                          JNIEnv *jEnv,
+                          JavaClassDescriptor *class_descriptor)
+{
+    if (!class_descriptor->static_members_reflected)
+        reflect_java_methods_and_fields(cx, jEnv, class_descriptor, JS_TRUE);
+    return class_descriptor->static_members;
+}
+
+JavaMemberDescriptor *
+jsj_GetClassInstanceMembers(JSContext *cx,
+                            JNIEnv *jEnv,
+                            JavaClassDescriptor *class_descriptor)
+{
+    if (!class_descriptor->instance_members_reflected)
+        reflect_java_methods_and_fields(cx, jEnv, class_descriptor, JS_FALSE);
+    return class_descriptor->instance_members;
+}
+
+JavaMemberDescriptor *
+jsj_LookupJavaStaticMemberDescriptorById(JSContext *cx,
+                                         JNIEnv *jEnv,
+                                         JavaClassDescriptor *class_descriptor,
+                                         jsid id)
+{
+    JavaMemberDescriptor *member_descriptor;
+
+    member_descriptor = jsj_GetClassStaticMembers(cx, jEnv, class_descriptor);
+    while (member_descriptor) {
+        if (id == member_descriptor->id)
+            return member_descriptor;
+        member_descriptor = member_descriptor->next;
+    }
+    return NULL;
+}
+
+JavaMemberDescriptor *
+jsj_GetJavaStaticMemberDescriptor(JSContext *cx,
+                                  JNIEnv *jEnv, 
+                                  JavaClassDescriptor *class_descriptor,
+                                  jstring member_name_jstr)
+{
+    JavaMemberDescriptor *member_descriptor;
+    jsid id;
+
+    if (!JavaStringToId(cx, jEnv, member_name_jstr, &id))
+        return NULL;
+
+    member_descriptor = jsj_LookupJavaStaticMemberDescriptorById(cx, jEnv, class_descriptor, id);
+    if (member_descriptor)
+        return member_descriptor;
+
+    member_descriptor = JS_malloc(cx, sizeof(JavaMemberDescriptor));
+    if (!member_descriptor)
+        return NULL;
+    memset(member_descriptor, 0, sizeof(JavaMemberDescriptor));
+
+    member_descriptor->name = jsj_DupJavaStringUTF(cx, jEnv, member_name_jstr);
+    if (!member_descriptor->name) {
+        JS_free(cx, member_descriptor);
+        return NULL;
+    }
+    member_descriptor->id = id;
+
+    member_descriptor->next = class_descriptor->static_members;
+    class_descriptor->static_members = member_descriptor;
+
+    return member_descriptor;
+}
+
+JavaMemberDescriptor *
+jsj_GetJavaClassConstructors(JSContext *cx,
+                             JavaClassDescriptor *class_descriptor)
+{
+    JavaMemberDescriptor *member_descriptor;
+
+    if (class_descriptor->constructors)
+        return class_descriptor->constructors;
+
+    member_descriptor = JS_malloc(cx, sizeof(JavaMemberDescriptor));
+    if (!member_descriptor)
+        return NULL;
+    memset(member_descriptor, 0, sizeof(JavaMemberDescriptor));
+
+    member_descriptor->name = JS_strdup(cx, "<init>");
+    if (!member_descriptor->name) {
+        JS_free(cx, member_descriptor);
+        return NULL;
+    }
+
+    class_descriptor->constructors = member_descriptor;
+
+    return member_descriptor;
+}
+
+JavaMemberDescriptor *
+jsj_LookupJavaClassConstructors(JSContext *cx, JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor)
+{
+    if (!class_descriptor->static_members_reflected)
+        reflect_java_methods_and_fields(cx, jEnv, class_descriptor, JS_TRUE);
+    return class_descriptor->constructors;
+}
+
+JavaMemberDescriptor *
+jsj_LookupJavaMemberDescriptorById(JSContext *cx, JNIEnv *jEnv,
+                                   JavaClassDescriptor *class_descriptor,
+                                   jsid id)
+{
+    JavaMemberDescriptor *member_descriptor;
+
+    member_descriptor = jsj_GetClassInstanceMembers(cx, jEnv, class_descriptor);
+    while (member_descriptor) {
+        if (id == member_descriptor->id)
+            return member_descriptor;
+        member_descriptor = member_descriptor->next;
+    }
+    return NULL;
+}
+
+JavaMemberDescriptor *
+jsj_GetJavaMemberDescriptor(JSContext *cx,
+                            JNIEnv *jEnv, 
+                            JavaClassDescriptor *class_descriptor,
+                            jstring member_name_jstr)
+{
+    JavaMemberDescriptor *member_descriptor;
+    jsid id;
+
+    if (!JavaStringToId(cx, jEnv, member_name_jstr, &id))
+        return NULL;
+
+    member_descriptor = jsj_LookupJavaMemberDescriptorById(cx, jEnv, class_descriptor, id);
+    if (member_descriptor)
+        return member_descriptor;
+
+    member_descriptor = JS_malloc(cx, sizeof(JavaMemberDescriptor));
+    if (!member_descriptor)
+        return NULL;
+    memset(member_descriptor, 0, sizeof(JavaMemberDescriptor));
+
+    member_descriptor->name = jsj_DupJavaStringUTF(cx, jEnv, member_name_jstr);
+    if (!member_descriptor->name) {
+        JS_free(cx, member_descriptor);
+        return NULL;
+    }
+    member_descriptor->id = id;
+
+    member_descriptor->next = class_descriptor->instance_members;
+    class_descriptor->instance_members = member_descriptor;
+
+    return member_descriptor;
+}
+
+JSBool
+jsj_InitJavaClassReflectionsTable()
+{
+    java_class_reflections =
+        PR_NewHashTable(64, jsj_HashJavaObject, jsj_JavaObjectComparator,
+                        NULL, NULL, NULL);
+
+    if (!java_class_reflections)
+        return JS_FALSE;
+    return JS_TRUE;
+}

mozilla/js/ref/liveconnect/jsj_convert.c

@@ -0,0 +1,658 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * Below is the code that converts between Java and JavaScript values of all
+ * types.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "prtypes.h"
+#include "prprintf.h"
+#include "prassert.h"
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+
+static JSBool
+convert_js_obj_to_JSObject_wrapper(JSContext *cx, JNIEnv *jEnv, JSObject *js_obj,
+                                   JavaSignature *signature,
+                                   int *cost, jobject *java_value)
+{
+    if (!njJSObject) {
+        if (java_value)
+            JS_ReportError(cx, "Couldn't convert JavaScript object to an "
+                               "instance of netscape.javascript.JSObject "
+                               "because that class could not be loaded.");
+        return JS_FALSE;
+    }
+
+    if (!(*jEnv)->IsAssignableFrom(jEnv, njJSObject, signature->java_class))
+        return JS_FALSE;
+
+    if (!java_value)
+        return JS_TRUE;
+
+    *java_value = jsj_WrapJSObject(cx, jEnv, js_obj);
+
+    return (*java_value != NULL);   
+}
+
+jstring
+jsj_ConvertJSStringToJavaString(JSContext *cx, JNIEnv *jEnv, JSString *js_str)
+{
+    jstring result;
+    result = (*jEnv)->NewString(jEnv, JS_GetStringChars(js_str),
+                                JS_GetStringLength(js_str));
+    if (!result) {
+        jsj_UnexpectedJavaError(cx, jEnv, "Couldn't construct instance "
+                                          "of java.lang.String");
+    }
+    return result;
+}
+
+/*
+ * Convert a JS value to an instance of java.lang.Object or one of its subclasses, 
+ * performing any necessary type coercion.  If non-trivial coercion is required,
+ * the cost value is incremented.  If the java_value pass-by-reference argument
+ * is non-NULL, the resulting Java value is stored there.
+ *
+ * Returns JS_TRUE if the conversion is possible, JS_FALSE otherwise
+ */
+JSBool
+jsj_ConvertJSValueToJavaObject(JSContext *cx, JNIEnv *jEnv, jsval v, JavaSignature *signature,
+                               int *cost, jobject *java_value)
+{
+    JSString *jsstr;
+    jclass target_java_class;
+    
+    PR_ASSERT(signature->type == JAVA_SIGNATURE_CLASS ||
+        signature->type == JAVA_SIGNATURE_ARRAY);
+    
+    /* Get the Java type of the target value */
+    target_java_class = signature->java_class;
+    
+    if (JSVAL_IS_OBJECT(v)) {
+        JSObject *js_obj = JSVAL_TO_OBJECT(v);
+        
+        /* JS null is always assignable to a Java object */
+        if (!js_obj) {
+            if (java_value)
+                *java_value = NULL;
+            return JS_TRUE;
+        }
+        
+        if (JS_InstanceOf(cx, js_obj, &JavaObject_class, 0) ||
+            JS_InstanceOf(cx, js_obj, &JavaArray_class, 0)) {
+            
+            /* The source value is a Java object wrapped inside a JavaScript
+               object.  Unwrap the JS object and return the original Java
+               object if it's class makes it assignment-compatible with the
+               target class using Java's assignability rules. */
+            JavaObjectWrapper *java_wrapper = JS_GetPrivate(cx, js_obj);
+            jobject java_obj = java_wrapper->java_obj;
+            
+            if ((*jEnv)->IsInstanceOf(jEnv, java_obj, target_java_class)) {
+                if (java_value)
+                    *java_value = java_obj;
+                return JS_TRUE;
+            }
+            
+#ifdef LIVECONNECT_IMPROVEMENTS
+            /* Don't allow wrapped Java objects to be converted to strings */
+            goto conversion_error;
+#else
+            /* Fall through, to attempt conversion to a Java string */
+#endif
+            
+        } else if (JS_InstanceOf(cx, js_obj, &JavaClass_class, 0)) {
+            /* We're dealing with the reflection of a Java class */
+            JavaClassDescriptor *java_class_descriptor = JS_GetPrivate(cx, js_obj);
+            
+            /* Check if target type is java.lang.Class class */
+            if ((*jEnv)->IsAssignableFrom(jEnv, jlClass, target_java_class)) {
+                if (java_value)
+                    *java_value = java_class_descriptor->java_class;
+                return JS_TRUE;
+            }
+            
+            /* Check if target type is netscape.javascript.JSObject wrapper class */
+            if (convert_js_obj_to_JSObject_wrapper(cx, jEnv, js_obj, signature, cost, java_value))
+                return JS_TRUE;
+            
+            /* Fall through, to attempt conversion to a Java string */
+            
+        } else if (JS_TypeOfValue(cx, v) == JSTYPE_FUNCTION) {
+            /* JS functions can be wrapped as a netscape.javascript.JSObject */
+            if (convert_js_obj_to_JSObject_wrapper(cx, jEnv, js_obj, signature, cost, java_value))
+                return JS_TRUE;
+            
+            /* That didn't work, so fall through, to attempt conversion to
+               a java.lang.String ... */
+            
+            /* Check for a Java object wrapped inside a JS object */
+        } else {
+            /* Otherwise, see if the target type is the  netscape.javascript.JSObject
+               wrapper class or one of its subclasses, in which case a
+               reference is passed to the original JS object by wrapping it
+               inside an instance of netscape.javascript.JSObject */
+            if (convert_js_obj_to_JSObject_wrapper(cx, jEnv, js_obj, signature, cost, java_value))
+                return JS_TRUE;
+            
+            /* Fall through, to attempt conversion to a Java string */
+        }
+        
+    } else if (JSVAL_IS_NUMBER(v)) {
+        /* JS numbers, integral or not, can be converted to instances of java.lang.Double */
+        if ((*jEnv)->IsAssignableFrom(jEnv, jlDouble, target_java_class)) {
+            if (java_value) {
+                jsdouble d;
+                if (!JS_ValueToNumber(cx, v, &d))
+                    goto conversion_error;
+                *java_value = (*jEnv)->NewObject(jEnv, jlDouble, jlDouble_Double, d);
+                if (!*java_value) {
+                    jsj_UnexpectedJavaError(cx, jEnv,
+                        "Couldn't construct instance of java.lang.Double");
+                    return JS_FALSE;
+                }
+            }
+#ifdef LIVECONNECT_IMPROVEMENTS
+            (*cost)++;
+#endif
+            return JS_TRUE;
+        }
+        /* Fall through, to attempt conversion to a java.lang.String ... */
+        
+    } else if (JSVAL_IS_BOOLEAN(v)) {
+        /* JS boolean values can be converted to instances of java.lang.Boolean */
+        if ((*jEnv)->IsAssignableFrom(jEnv, jlBoolean, target_java_class)) {
+            if (java_value) {
+                JSBool b;
+                if (!JS_ValueToBoolean(cx, v, &b))
+                    goto conversion_error;
+                *java_value =
+                    (*jEnv)->NewObject(jEnv, jlBoolean, jlBoolean_Boolean, b);
+                if (!*java_value) {
+                    jsj_UnexpectedJavaError(cx, jEnv, "Couldn't construct instance " 
+                        "of java.lang.Boolean");
+                    return JS_FALSE;
+                }
+            }
+#ifdef LIVECONNECT_IMPROVEMENTS
+            (*cost)++;
+#endif
+            return JS_TRUE;
+        }
+        /* Fall through, to attempt conversion to a java.lang.String ... */
+    }
+    
+    /* If no other conversion is possible, see if the target type is java.lang.String */
+    if ((*jEnv)->IsAssignableFrom(jEnv, jlString, target_java_class)) {
+        JSBool is_string = JSVAL_IS_STRING(v);
+        
+        /* Convert to JS string, if necessary, and then to a Java Unicode string */
+        jsstr = JS_ValueToString(cx, v);
+        if (jsstr) {
+            if (java_value) {
+                *java_value = jsj_ConvertJSStringToJavaString(cx, jEnv, jsstr);
+                if (!*java_value)
+                    return JS_FALSE;
+            }
+#ifdef LIVECONNECT_IMPROVEMENTS
+            if (!is_string)
+                (*cost)++;
+#endif
+            return JS_TRUE;
+        }
+    }
+    
+conversion_error:
+    return JS_FALSE;
+}
+
+/* Utility macro for jsj_ConvertJSValueToJavaValue(), below */
+#define JSVAL_TO_INTEGRAL_JVALUE(type_name, member_name, member_type, jsval, java_value) \
+if (!JSVAL_IS_NUMBER(v)) {                                               \
+        if (!JS_ConvertValue(cx, v, JSTYPE_NUMBER, &v))                  \
+            goto conversion_error;                                       \
+        (*cost)++;                                                       \
+    }                                                                    \
+    {                                                                    \
+        member_type member_name;                                         \
+                                                                         \
+        if (JSVAL_IS_INT(v)) {                                           \
+            jsint ival = JSVAL_TO_INT(v);                                \
+            member_name = (member_type) ival;                            \
+                                                                         \
+            /* Check to see if the jsval's magnitude is too large to be  \
+               representable in the target java type */                  \
+            if (member_name != ival)                                     \
+                goto conversion_error;                                   \
+        } else {                                                         \
+            jdouble dval = *JSVAL_TO_DOUBLE(v);                          \
+            member_name = (member_type) dval;                            \
+                                                                         \
+            /* Don't allow a non-integral number */                      \
+            /* FIXME - should this be an error ? */                      \
+            if ((jdouble)member_name != dval)                            \
+                (*cost)++;                                               \
+        }                                                                \
+        if (java_value)                                                  \
+            java_value->member_name = member_name;                       \
+    }
+
+/*
+ * Convert a JS value to a Java value of the given type signature.  The cost
+ * variable is incremented if coercion is required, e.g. the source value is
+ * a string, but the target type is a boolean.
+ *
+ * Returns JS_FALSE if no conversion is possible, either because the jsval has
+ * a type that is wholly incompatible with the Java value, or because a scalar
+ * jsval can't be represented in a variable of the target type without loss of
+ * precision, e.g. the source value is "4.2" but the destination type is byte.
+ * If conversion is not possible and java_value is non-NULL, the JS error
+ * reporter is called with an appropriate message.
+ */  
+JSBool
+jsj_ConvertJSValueToJavaValue(JSContext *cx, JNIEnv *jEnv, jsval v,
+                              JavaSignature *signature,
+                              int *cost, jvalue *java_value)
+{
+    JavaSignatureChar type = signature->type;
+
+    switch (type) {
+    case JAVA_SIGNATURE_BOOLEAN:
+        if (!JSVAL_IS_BOOLEAN(v)) {
+            if (!JS_ConvertValue(cx, v, JSTYPE_BOOLEAN, &v))
+                goto conversion_error;
+            (*cost)++;
+        }
+        if (java_value)
+            java_value->z = (jboolean)(JSVAL_TO_BOOLEAN(v) == JS_TRUE);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        JSVAL_TO_INTEGRAL_JVALUE(short, s, jshort, v, java_value);
+        break;
+
+    case JAVA_SIGNATURE_BYTE:
+        JSVAL_TO_INTEGRAL_JVALUE(byte, b, jbyte, v, java_value);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        /* A one-character string can be converted into a character */
+        if (JSVAL_IS_STRING(v) && (JS_GetStringLength(JSVAL_TO_STRING(v)) == 1)) {
+            v = INT_TO_JSVAL(*JS_GetStringChars(JSVAL_TO_STRING(v)));
+        }
+        JSVAL_TO_INTEGRAL_JVALUE(char, c, jchar, v, java_value);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        JSVAL_TO_INTEGRAL_JVALUE(int, i, jint, v, java_value);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        JSVAL_TO_INTEGRAL_JVALUE(long, j, jlong, v, java_value);
+        break;
+    
+    case JAVA_SIGNATURE_FLOAT:
+        if (!JSVAL_IS_NUMBER(v)) {
+            if (!JS_ConvertValue(cx, v, JSTYPE_NUMBER, &v))
+                goto conversion_error;
+            (*cost)++;
+        }
+        if (java_value) {
+            if (JSVAL_IS_INT(v))
+                java_value->f = (jfloat) JSVAL_TO_INT(v);
+            else
+                java_value->f = (jfloat) *JSVAL_TO_DOUBLE(v);
+        }
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        if (!JSVAL_IS_NUMBER(v)) {
+            if (!JS_ConvertValue(cx, v, JSTYPE_NUMBER, &v))
+                goto conversion_error;
+            (*cost)++;
+        }
+        if (java_value) {
+            if (JSVAL_IS_INT(v))
+                java_value->d = (jdouble) JSVAL_TO_INT(v);
+            else
+                java_value->d = (jdouble) *JSVAL_TO_DOUBLE(v);
+        }
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        if (!jsj_ConvertJSValueToJavaObject(cx, jEnv, v, signature, cost, &java_value->l))
+            goto conversion_error;
+        break;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+
+    /* Success */
+    return JS_TRUE;
+
+conversion_error:
+
+    if (java_value) {
+        const char *jsval_string;
+        JSString *jsstr;
+
+        jsval_string = NULL;
+        jsstr = JS_ValueToString(cx, v);
+        if (jsstr)
+            jsval_string = JS_GetStringBytes(jsstr);
+        if (!jsval_string)
+            jsval_string = "";
+        
+        JS_ReportError(cx, "Unable to convert JavaScript value %s to "
+                           "Java value of type %s",
+                       jsval_string, signature->name);
+    }
+    return JS_FALSE;
+}
+
+/*
+ * A utility routine to create a JavaScript Unicode string from a
+ * java.lang.String (Unicode) string.
+ */
+JSString *
+jsj_ConvertJavaStringToJSString(JSContext *cx, JNIEnv *jEnv, jstring java_str)
+{
+    JSString *js_str;
+    jboolean is_copy;
+    const jchar *ucs2_str;
+    jchar *copy_ucs2_str;
+    jsize ucs2_str_len, num_bytes;
+
+    ucs2_str_len = (*jEnv)->GetStringLength(jEnv, java_str);
+    ucs2_str = (*jEnv)->GetStringChars(jEnv, java_str, &is_copy);
+    if (!ucs2_str) {
+        jsj_UnexpectedJavaError(cx, jEnv,
+                                "Unable to extract native Unicode from Java string");
+        return NULL;
+    }
+
+    js_str = NULL;
+
+    /* Unlike JS_NewString(), the string data passed into JS_NewUCString() is
+       not copied, so make a copy of the Unicode character vector. */
+    num_bytes = ucs2_str_len * sizeof(jchar);
+    copy_ucs2_str = (jchar*)JS_malloc(cx, num_bytes);
+    if (!copy_ucs2_str)
+        goto done;
+    memcpy(copy_ucs2_str, ucs2_str, num_bytes);
+
+    js_str = JS_NewUCString(cx, (jschar*)copy_ucs2_str, ucs2_str_len);
+
+done:
+    (*jEnv)->ReleaseStringChars(jEnv, java_str, ucs2_str);
+    return js_str;
+}
+
+/*
+ * Attempt to obtain a JS string representation of a Java object.
+ * The java_obj argument must be of type java.lang.Object or a subclass.
+ * If java_obj is a Java string, it's value is simply extracted and
+ * copied into a JS string.  Otherwise, the toString() method is called
+ * on java_obj.
+ */
+JSBool
+jsj_ConvertJavaObjectToJSString(JSContext *cx,
+                                JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor,
+                                jobject java_obj, jsval *vp)
+{
+    JSString *js_str;
+    jstring java_str;
+    jmethodID toString;
+    
+    /* Create a Java string, unless java_obj is already a java.lang.String */
+    if ((*jEnv)->IsInstanceOf(jEnv, java_obj, jlString)) {
+        java_str = java_obj;
+    } else {
+        jclass java_class;
+
+        java_class = class_descriptor->java_class;
+        toString = (*jEnv)->GetMethodID(jEnv, java_class, "toString",
+                                        "()Ljava/lang/String;");
+        if (!toString) {
+            /* All Java objects have a toString method */
+            jsj_UnexpectedJavaError(cx, jEnv, "No toString() method for class %s!",
+                                    class_descriptor->name);
+            return JS_FALSE;
+        }
+        java_str = (*jEnv)->CallObjectMethod(jEnv, java_obj, toString);
+        if (!java_str) {
+            jsj_ReportJavaError(cx, jEnv, "toString() method failed");
+            return JS_FALSE;
+        }
+    }
+
+    /* Extract Unicode from java.lang.String instance and convert to JS string */
+    js_str = jsj_ConvertJavaStringToJSString(cx, jEnv, java_str);
+    if (!js_str)
+        return JS_FALSE;
+
+    *vp = STRING_TO_JSVAL(js_str);
+    return JS_TRUE;
+}
+
+/*
+ * Convert a Java object to a number by attempting to call the
+ * doubleValue() method on a Java object to get a double result.
+ * This usually only works on instances of java.lang.Double, but the code
+ * is generalized to work with any Java object that supports this method.
+ *
+ * Returns JS_TRUE if the call was successful.
+ * Returns JS_FALSE if conversion is not possible or an error occurs.
+ */
+JSBool
+jsj_ConvertJavaObjectToJSNumber(JSContext *cx, JNIEnv *jEnv,
+                                jobject java_obj, jsval *vp)
+{
+    jdouble d;
+    jmethodID doubleValue;
+
+#ifndef SUN_VM_IS_NOT_GARBAGE
+    /* Late breaking news: calling GetMethodID() on an object that doesn't
+       contain the given method may cause the Sun VM to crash.  So we only
+       call the method on instances of java.lang.Double */
+    JSBool is_Double;
+    
+    /* Make sure that we have a java.lang.Double */
+    is_Double = (*jEnv)->IsInstanceOf(jEnv, java_obj, jlDouble);
+    if (!is_Double)
+        return JS_FALSE;
+    doubleValue = jlDouble_doubleValue;
+#else
+    doubleValue = (*jEnv)->GetMethodID(jEnv, java_obj, "doubleValue", "()D");
+    if (!doubleValue)
+        return JS_FALSE;
+#endif
+
+    d = (*jEnv)->CallDoubleMethod(jEnv, java_obj, doubleValue);
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {
+        jsj_UnexpectedJavaError(cx, jEnv, "doubleValue() method failed");
+        return JS_FALSE;
+    }
+    return JS_NewDoubleValue(cx, d, vp);
+}
+
+/*
+ * Convert a Java object to a boolean by attempting to call the
+ * booleanValue() method on a Java object to get a boolean result.
+ * This usually only works on instances of java.lang.Boolean, but the code
+ * is generalized to work with any Java object that supports this method.
+ *
+ * Returns JS_TRUE if the call was successful.
+ * Returns JS_FALSE if conversion is not possible or an error occurs.
+ */
+extern JSBool
+jsj_ConvertJavaObjectToJSBoolean(JSContext *cx, JNIEnv *jEnv,
+                                 jobject java_obj, jsval *vp)
+{
+    jboolean b;
+    jmethodID booleanValue;
+    
+#ifndef SUN_VM_IS_NOT_GARBAGE
+    /* Late breaking news: calling GetMethodID() on an object that doesn't
+       contain the given method may cause the Sun VM to crash.  So we only
+       call the method on instances of java.lang.Boolean */
+    
+    JSBool is_Boolean;
+
+    /* Make sure that we have a java.lang.Boolean */
+    is_Boolean = (*jEnv)->IsInstanceOf(jEnv, java_obj, jlBoolean);
+    if (!is_Boolean)
+        return JS_FALSE;
+    booleanValue = jlBoolean_booleanValue;
+#else
+    booleanValue = (*jEnv)->GetMethodID(jEnv, java_obj, "booleanValue", "()Z");
+    if (!booleanValue)
+        return JS_FALSE;
+#endif
+
+    b = (*jEnv)->CallBooleanMethod(jEnv, java_obj, booleanValue);
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {
+        jsj_UnexpectedJavaError(cx, jEnv, "booleanValue() method failed");
+        return JS_FALSE;
+    }
+    *vp = BOOLEAN_TO_JSVAL(b);
+    return JS_TRUE;
+}
+
+/*
+ * Reflect a Java object into a JS value.  The source object, java_obj, must
+ * be of type java.lang.Object or a subclass and may, therefore, be an array.
+ */
+JSBool
+jsj_ConvertJavaObjectToJSValue(JSContext *cx, JNIEnv *jEnv,
+                               jobject java_obj, jsval *vp)
+{
+    jclass java_class;
+    JSObject *js_obj;
+
+    /* A null in Java-land is also null in JS */
+    if (!java_obj) {
+        *vp = JSVAL_NULL;
+        return JS_TRUE;
+    }
+
+    java_class = (*jEnv)->GetObjectClass(jEnv, java_obj);
+
+    /*
+     * If it's an instance of netscape.javascript.JSObject, i.e. a wrapper
+     * around a JS object that has been passed into the Java world, unwrap
+     * it to obtain the original JS object.
+     */
+     if (njJSObject && (*jEnv)->IsInstanceOf(jEnv, java_obj, njJSObject)) {
+        js_obj = (JSObject *)((*jEnv)->GetIntField(jEnv, java_obj, njJSObject_internal));
+        PR_ASSERT(js_obj);
+        if (!js_obj)
+            return JS_FALSE;
+        *vp = OBJECT_TO_JSVAL(js_obj);
+        return JS_TRUE;
+     }
+
+    /*
+     * Instances of java.lang.String are wrapped so we can call methods on
+     * them, but they convert to a JS string if used in a string context.
+     */
+    /* TODO - let's get rid of this annoying "feature" */
+
+    /* otherwise, wrap it inside a JavaObject */
+    js_obj = jsj_WrapJavaObject(cx, jEnv, java_obj, java_class);
+    if (!js_obj)
+        return JS_FALSE;
+    *vp = OBJECT_TO_JSVAL(js_obj);
+    return JS_TRUE;
+}
+
+/*
+ * Convert a Java value (primitive or object) to a JS value.
+ *
+ * This is usually an infallible operation, but JS_FALSE is returned
+ * on an out-of-memory condition and the error reporter is called.
+ */
+JSBool
+jsj_ConvertJavaValueToJSValue(JSContext *cx, JNIEnv *jEnv,
+                              JavaSignature *signature,
+                              jvalue *java_value,
+                              jsval *vp)
+{
+    int32 ival32;
+
+    switch (signature->type) {
+    case JAVA_SIGNATURE_VOID:
+        *vp = JSVAL_VOID;
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_BYTE:
+        *vp = INT_TO_JSVAL((jsint)java_value->b);
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_CHAR:
+        *vp = INT_TO_JSVAL((jsint)java_value->c);
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_SHORT:
+        *vp = INT_TO_JSVAL((jsint)java_value->s);
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_INT:
+        ival32 = java_value->i;
+        if (INT_FITS_IN_JSVAL(ival32)) {
+            *vp = INT_TO_JSVAL((jsint) ival32);
+            return JS_TRUE;
+        } else {
+            return JS_NewDoubleValue(cx, ival32, vp);
+        }
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        *vp = BOOLEAN_TO_JSVAL((JSBool) java_value->z);
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_LONG:
+        return JS_NewDoubleValue(cx, (jsdouble)java_value->j, vp);
+  
+    case JAVA_SIGNATURE_FLOAT:
+        return JS_NewDoubleValue(cx, java_value->f, vp);
+
+    case JAVA_SIGNATURE_DOUBLE:
+        return JS_NewDoubleValue(cx, java_value->d, vp);
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        return jsj_ConvertJavaObjectToJSValue(cx, jEnv, java_value->l, vp);
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+

mozilla/js/ref/liveconnect/jsj_field.c

@@ -0,0 +1,383 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+ 
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the code used to reflect Java fields as properties of
+ * JavaObject objects and the code to access those fields.
+ *
+ */
+
+#include <stdlib.h>
+#include "prtypes.h"
+#include "prprintf.h"
+#include "prassert.h"
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+/*
+ * Add a single field, described by java_field, to the JavaMemberDescriptor
+ * named by field_name within the given JavaClassDescriptor.
+ *
+ * Returns JS_TRUE on success. Otherwise, returns JS_FALSE and reports an error.
+ */
+static JSBool
+add_java_field_to_class_descriptor(JSContext *cx,
+                                   JNIEnv *jEnv,
+                                   JavaClassDescriptor *class_descriptor, 
+                                   jstring field_name_jstr,
+                                   jobject java_field,  /* a java.lang.reflect.Field */
+                                   jint modifiers)
+{
+    jclass fieldType;
+    jfieldID fieldID;
+    jclass java_class;
+
+    JSBool is_static_field;
+    JavaMemberDescriptor *member_descriptor = NULL;
+    const char *sig_cstr = NULL;
+    const char *field_name = NULL;
+    JavaSignature *signature = NULL;
+    JavaFieldSpec *field_spec = NULL;
+        
+    is_static_field = modifiers & ACC_STATIC;
+    if (is_static_field) {
+        member_descriptor = jsj_GetJavaStaticMemberDescriptor(cx, jEnv, class_descriptor, field_name_jstr);
+    } else {
+        member_descriptor = jsj_GetJavaMemberDescriptor(cx, jEnv, class_descriptor, field_name_jstr);
+    }
+    if (!member_descriptor)
+        goto error;
+    
+    field_spec = (JavaFieldSpec*)JS_malloc(cx, sizeof(JavaFieldSpec));
+    if (!field_spec)
+        goto error;
+
+    field_spec->modifiers = modifiers;
+
+    /* Get the Java class corresponding to the type of the field */
+    fieldType = (*jEnv)->CallObjectMethod(jEnv, java_field, jlrField_getType);
+    if (!fieldType) {
+        jsj_UnexpectedJavaError(cx, jEnv,
+                                "Unable to determine type of field using"
+                                " java.lang.reflect.Field.getType()");
+        goto error;
+    }
+    
+    signature = jsj_GetJavaClassDescriptor(cx, jEnv, fieldType);
+    if (!signature)
+        goto error;
+    field_spec->signature = signature;
+
+    field_name = jsj_DupJavaStringUTF(cx, jEnv, field_name_jstr);
+    if (!field_name)
+        goto error;
+    field_spec->name = field_name;
+
+    /* Compute the JNI-style (string-based) signature of the field type */
+    sig_cstr = jsj_ConvertJavaSignatureToString(cx, signature);
+    if (!sig_cstr)
+        goto error;
+
+    /* Compute the JNI fieldID and cache it for quick field access */
+    java_class = class_descriptor->java_class;
+    if (is_static_field)
+        fieldID = (*jEnv)->GetStaticFieldID(jEnv, java_class, field_name, sig_cstr);
+    else
+        fieldID = (*jEnv)->GetFieldID(jEnv, java_class, field_name, sig_cstr);
+    if (!fieldID) {
+       jsj_UnexpectedJavaError(cx, jEnv,
+                           "Can't get Java field ID for class %s, field %s (sig=%s)",
+                           class_descriptor->name, field_name, sig_cstr);
+       goto error;
+    }
+    field_spec->fieldID = fieldID;
+    
+    JS_free(cx, (char*)sig_cstr);
+    
+    member_descriptor->field = field_spec;
+
+    /* Success */
+    return JS_TRUE;
+
+error:
+    if (field_spec) {
+        JS_FREE_IF(cx, (char*)field_spec->name);
+        JS_free(cx, field_spec);
+    }
+    JS_FREE_IF(cx, (char*)sig_cstr);
+    if (signature)
+        jsj_ReleaseJavaClassDescriptor(cx, jEnv, signature);
+    return JS_FALSE;
+}
+
+/*
+ * Free up a JavaFieldSpec and all its resources.
+ */
+void
+jsj_DestroyFieldSpec(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field)
+{
+    JS_FREE_IF(cx, (char*)field->name);
+    jsj_ReleaseJavaClassDescriptor(cx, jEnv, field->signature);
+    JS_free(cx, field);
+}
+
+/*
+ * Add a JavaMemberDescriptor to the collection of members in class_descriptor
+ * for every public field of the identified Java class.  (A separate collection
+ * is kept in class_descriptor for static and instance members.)
+ * If reflect_only_static_fields is set, instance fields are not reflected.  If
+ * it isn't set, only instance fields are reflected and static fields are not
+ * reflected.
+ *
+ * Returns JS_TRUE on success. Otherwise, returns JS_FALSE and reports an error.
+ */
+JSBool 
+jsj_ReflectJavaFields(JSContext *cx, JNIEnv *jEnv, JavaClassDescriptor *class_descriptor,
+                      JSBool reflect_only_static_fields)
+{
+    int i;
+    JSBool ok;
+    jint modifiers;
+    jobject java_field;
+    jstring field_name_jstr;
+    jarray joFieldArray;
+    jsize num_fields;
+    jclass java_class;
+
+    /* Get a java array of java.lang.reflect.Field objects, by calling
+       java.lang.Class.getFields(). */
+    java_class = class_descriptor->java_class;
+    joFieldArray = (*jEnv)->CallObjectMethod(jEnv, java_class, jlClass_getFields);
+    if (!joFieldArray) {
+        jsj_UnexpectedJavaError(cx, jEnv,
+                                "Can't determine Java object's fields "
+                                "using java.lang.Class.getFields()");
+        return JS_FALSE;
+    }
+
+    /* Iterate over the class fields */
+    num_fields = (*jEnv)->GetArrayLength(jEnv, joFieldArray);
+    for (i = 0; i < num_fields; i++) {
+       
+        /* Get the i'th reflected field */
+        java_field = (*jEnv)->GetObjectArrayElement(jEnv, joFieldArray, i);
+        if (!java_field) {
+            jsj_UnexpectedJavaError(cx, jEnv, "Can't access a Field[] array");
+            return JS_FALSE;
+        }
+
+        /* Get the field modifiers, e.g. static, public, private, etc. */
+        modifiers = (*jEnv)->CallIntMethod(jEnv, java_field, jlrField_getModifiers);
+        if ((*jEnv)->ExceptionOccurred(jEnv)) {
+            jsj_UnexpectedJavaError(cx, jEnv,
+                                    "Can't access a Field's modifiers using"
+                                    "java.lang.reflect.Field.getModifiers()");
+            return JS_FALSE;
+        }
+
+        /* Don't allow access to private or protected Java fields. */
+        if (!(modifiers & ACC_PUBLIC))
+            continue;
+
+        /* Reflect all instance fields or all static fields, but not both */
+        if (reflect_only_static_fields != ((modifiers & ACC_STATIC) != 0))
+            continue;
+
+        /* Determine the unqualified name of the field */
+        field_name_jstr = (*jEnv)->CallObjectMethod(jEnv, java_field, jlrField_getName);
+        if (!field_name_jstr) {
+            jsj_UnexpectedJavaError(cx, jEnv,
+                                    "Can't obtain a Field's name"
+                                    "java.lang.reflect.Field.getName()");
+            return JS_FALSE;
+        }
+        
+        /* Add a JavaFieldSpec object to the JavaClassDescriptor */
+        ok = add_java_field_to_class_descriptor(cx, jEnv, class_descriptor, field_name_jstr,
+                                                java_field, modifiers);
+        if (!ok)
+            return JS_FALSE;
+    }
+
+    /* Success */
+    return JS_TRUE;
+}
+
+/*
+ * Read the value of a Java field and return it as a JavaScript value.
+ * If the field is static, then java_obj is a Java class, otherwise
+ * it's a Java instance object.
+ *
+ * Returns JS_TRUE on success. Otherwise, returns JS_FALSE and reports an error.
+ */
+JSBool
+jsj_GetJavaFieldValue(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field_spec,
+                      jobject java_obj, jsval *vp)
+{
+    JSBool is_static_field;
+    jvalue java_value;
+    JavaSignature *signature;
+    JavaSignatureChar field_type;
+    jfieldID fieldID = field_spec->fieldID;
+
+    is_static_field = field_spec->modifiers & ACC_STATIC;
+
+#define GET_JAVA_FIELD(Type,member)                                          \
+    PR_BEGIN_MACRO                                                           \
+    if (is_static_field)                                                     \
+        java_value.member =                                                  \
+            (*jEnv)->GetStatic##Type##Field(jEnv, java_obj, fieldID);        \
+    else                                                                     \
+        java_value.member =                                                  \
+            (*jEnv)->Get##Type##Field(jEnv, java_obj, fieldID);              \
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {                                  \
+        jsj_ReportJavaError(cx, jEnv, "Error reading Java field");           \
+        return JS_FALSE;                                                     \
+    }                                                                        \
+    PR_END_MACRO
+
+    signature = field_spec->signature;
+    field_type = signature->type;
+    switch(field_type) {
+    case JAVA_SIGNATURE_BYTE:
+        GET_JAVA_FIELD(Byte,b);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        GET_JAVA_FIELD(Char,c);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        GET_JAVA_FIELD(Short,s);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        GET_JAVA_FIELD(Int,i);
+        break;
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        GET_JAVA_FIELD(Boolean,z);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        GET_JAVA_FIELD(Long,j);
+        break;
+  
+    case JAVA_SIGNATURE_FLOAT:
+        GET_JAVA_FIELD(Float,f);
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        GET_JAVA_FIELD(Double,d);
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        GET_JAVA_FIELD(Object,l);
+        break;
+
+#undef GET_JAVA_FIELD
+    default:
+        PR_ASSERT(0);        /* Unknown java type signature */
+        return JS_FALSE;
+    }
+
+    return jsj_ConvertJavaValueToJSValue(cx, jEnv, signature, &java_value, vp);
+}
+
+JSBool
+jsj_SetJavaFieldValue(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field_spec,
+                      jclass java_obj, jsval js_val)
+{
+    JSBool is_static_field;
+    int dummy_cost;
+    jvalue java_value;
+    JavaSignature *signature;
+    JavaSignatureChar field_type;
+    jfieldID fieldID = field_spec->fieldID;
+
+    is_static_field = field_spec->modifiers & ACC_STATIC;
+
+#define SET_JAVA_FIELD(Type,member)                                          \
+    PR_BEGIN_MACRO                                                           \
+    if (is_static_field) {                                                   \
+        (*jEnv)->SetStatic##Type##Field(jEnv, java_obj, fieldID,             \
+                                        java_value.member);                  \
+    } else {                                                                 \
+        (*jEnv)->Set##Type##Field(jEnv, java_obj, fieldID,java_value.member);\
+    }                                                                        \
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {                                  \
+        jsj_ReportJavaError(cx, jEnv, "Error assigning to Java field");      \
+        return JS_FALSE;                                                     \
+    }                                                                        \
+    PR_END_MACRO
+
+    signature = field_spec->signature;
+    if (!jsj_ConvertJSValueToJavaValue(cx, jEnv, js_val, signature, &dummy_cost, &java_value))
+        return JS_FALSE;
+
+    field_type = signature->type;
+    switch(field_type) {
+    case JAVA_SIGNATURE_BYTE:
+        SET_JAVA_FIELD(Byte,b);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        SET_JAVA_FIELD(Char,c);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        SET_JAVA_FIELD(Short,s);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        SET_JAVA_FIELD(Int,i);
+        break;
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        SET_JAVA_FIELD(Boolean,z);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        SET_JAVA_FIELD(Long,j);
+        break;
+  
+    case JAVA_SIGNATURE_FLOAT:
+        SET_JAVA_FIELD(Float,f);
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        SET_JAVA_FIELD(Double,d);
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        SET_JAVA_FIELD(Object,l);
+        break;
+
+#undef SET_JAVA_FIELD
+    default:
+        PR_ASSERT(0);        /* Unknown java type signature */
+        return JS_FALSE;
+    }
+    
+    return JS_TRUE;
+}

mozilla/js/ref/liveconnect/jsj_private.h

@@ -0,0 +1,507 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * Declarations of private (internal) functions/data/types for
+ * JavaScript <==> Java communication.
+ *
+ */
+ 
+
+#ifndef _JSJAVA_PVT_H
+#define _JSJAVA_PVT_H
+
+#include "prhash.h"          /* NSPR hash-tables      */
+#include "jni.h"             /* Java Native Interface */
+#include "jsapi.h"           /* JavaScript engine API */
+
+
+/*************************** Type Declarations ******************************/
+
+/* Forward type declarations */
+typedef struct JavaMemberDescriptor JavaMemberDescriptor;
+typedef struct JavaMethodSpec JavaMethodSpec;
+typedef struct JavaClassDescriptor JavaClassDescriptor;
+typedef struct JavaClassDescriptor JavaSignature;
+typedef struct JSJCallbacks JSJCallbacks;
+typedef struct CapturedJSError CapturedJSError;
+typedef struct JavaPackageDef JavaPackageDef;
+typedef struct JSJavaThreadState JSJavaThreadState;
+typedef struct JSJavaVM JSJavaVM;
+typedef struct JavaMemberVal JavaMemberVal;
+
+/*
+ * This enum uses the same character encoding used by the JDK to encode
+ * Java type signatures, but the enum is easier to debug/compile with.
+ */
+typedef enum {
+    JAVA_SIGNATURE_ARRAY    =   '[',
+    JAVA_SIGNATURE_BYTE     =   'B',
+    JAVA_SIGNATURE_CHAR     =   'C',
+    JAVA_SIGNATURE_CLASS    =   'L',
+    JAVA_SIGNATURE_FLOAT    =   'F',
+    JAVA_SIGNATURE_DOUBLE   =   'D',
+    JAVA_SIGNATURE_INT      =   'I',
+    JAVA_SIGNATURE_LONG     =   'J',
+    JAVA_SIGNATURE_SHORT    =   'S',
+    JAVA_SIGNATURE_VOID     =   'V',
+    JAVA_SIGNATURE_BOOLEAN  =   'Z',
+    JAVA_SIGNATURE_UNKNOWN  =    0
+} JavaSignatureChar;
+
+/* The signature of a Java method consists of the signatures of all its
+   arguments and its return type signature. */
+typedef struct JavaMethodSignature {
+    jsize                   num_args;               /* Length of arg_signatures array */
+    JavaSignature **        arg_signatures;         /* Array of argument signatures */
+    JavaSignature *         return_val_signature;   /* Return type signature */
+} JavaMethodSignature;
+
+/* A descriptor for the reflection of a single Java field */
+typedef struct JavaFieldSpec {
+    jfieldID                fieldID;    /* JVM opaque access handle for field */
+    JavaSignature *         signature;  /* Java type of field */
+    int                     modifiers;  /* Bitfield indicating field qualifiers */
+    const char *            name;       /* UTF8; TODO - Should support Unicode field names */
+} JavaFieldSpec;
+
+/* A descriptor for the reflection of a single Java method.
+   Each overloaded method has a separate corresponding JavaMethodSpec. */
+typedef struct JavaMethodSpec {
+    jmethodID               methodID;   /* JVM opaque access handle for method */
+    JavaMethodSignature     signature;
+    const char *            name;       /* UTF8; TODO - Should support Unicode method names */
+    JavaMethodSpec *        next;       /* next method in chain of overloaded methods */
+} JavaMethodSpec;
+
+/*
+ * A descriptor for the reflection of a single member of a Java object.
+ * This can represent one or more Java methods and/or a single field.
+ * (When there is more than one method attached to a single JavaMemberDescriptor
+ * they are overloaded methods sharing the same simple name.)  This same
+ * descriptor type is used for both static or instance members.
+ */
+typedef struct JavaMemberDescriptor {
+    const char *            name;       /* simple name of field and/or method */
+    jsid                    id;         /* hashed name for quick JS property lookup */
+    JavaFieldSpec *         field;      /* field with the given name, if any */
+    JavaMethodSpec *        methods;    /* Overloaded methods which share the same name, if any */
+    JavaMemberDescriptor *  next;       /* next descriptor in same defining class */
+} JavaMemberDescriptor;
+
+/* This is the native portion of a reflected Java class */
+typedef struct JavaClassDescriptor {
+    const char *            name;       /* Name of class, e.g. "java/lang/Byte" */
+    JavaSignatureChar       type;       /* class category: primitive type, object, array */
+    jclass                  java_class; /* Opaque JVM handle to corresponding java.lang.Class */
+    int                     num_instance_members;
+    int                     num_static_members;
+    JSBool                  instance_members_reflected;
+    JavaMemberDescriptor *  instance_members;
+    JSBool                  static_members_reflected;
+    JavaMemberDescriptor *  static_members;
+    JavaMemberDescriptor *  constructors;
+    int                     modifiers;  /* Class declaration qualifiers,
+                                           e.g. abstract, private */
+    int                     ref_count;  /* # of references to this struct */
+    JavaSignature *         array_component_signature; /* Only non-NULL for array classes */
+} JavaClassDescriptor;
+
+/* This is the native portion of a reflected Java method or field */
+typedef struct JavaMemberVal {
+    jsval                   field_val;              /* Captured value of Java field */
+    jsval                   invoke_method_func_val; /* JSFunction wrapper around Java method invoker */
+    JavaMemberDescriptor *  descriptor;
+    JavaMemberVal *         next;
+} JavaMemberVal;
+
+/* This is the native portion of a reflected Java object */
+typedef struct {
+    jobject                 java_obj;           /* Opaque JVM ref to Java object */
+    JavaClassDescriptor *   class_descriptor;   /* Java class info */
+    JavaMemberVal *         members;            /* Reflected methods and fields */
+} JavaObjectWrapper;
+
+/* These are definitions of the Java class/method/field modifier bits.
+   These really shouldn't be hard-coded here.  Rather,
+   they should be read from java.lang.reflect.Modifier */
+#define ACC_PUBLIC          0x0001      /* visible to everyone */
+#define ACC_STATIC          0x0008      /* instance variable is static */
+#define ACC_FINAL           0x0010      /* no further subclassing,overriding */
+#define ACC_INTERFACE       0x0200      /* class is an interface */
+#define ACC_ABSTRACT	    0x0400      /* no definition provided */
+
+/* A JSJavaVM structure must be created for each Java VM that is accessed
+   via LiveConnect */
+typedef struct JSJavaVM {
+/* TODO -  all LiveConnect global variables should be migrated into this
+           structure in order to allow more than one LiveConnect-enabled
+           Java VM to exist within the same process. */
+    JavaVM *            java_vm;
+    JNIEnv *            main_thread_env;       /* Main-thread Java environment */
+    JSBool              jsj_created_java_vm;
+    int                 num_attached_threads;
+    JSJavaVM *          next;           /* next VM among all created VMs */
+} JSJavaVM;
+
+/* Per-thread state that encapsulates the connection to the Java VM */
+typedef struct JSJavaThreadState {
+    const char *        name;           /* Thread name, for debugging */
+    JSJavaVM *          jsjava_vm;      /* All per-JVM state */
+    JNIEnv *            jEnv;           /* Per-thread opaque handle to Java VM */
+    CapturedJSError *   pending_js_errors; /* JS errors to be thrown as Java exceptions */
+    JSContext *         cx;             /* current JS context for thread */
+    JSJavaThreadState * next;           /* next thread state among all created threads */
+} JSJavaThreadState;
+
+/******************************** Globals ***********************************/
+
+extern JNIEnv *jENV;
+extern JSJCallbacks *JSJ_callbacks;
+
+/* JavaScript classes that reflect Java objects */
+extern JSClass JavaObject_class;
+extern JSClass JavaArray_class;
+extern JSClass JavaClass_class;
+
+/*
+ * Opaque JVM handles to Java classes, methods and objects required for
+ * Java reflection.  These are computed and cached during initialization.
+ * TODO: These should be moved inside the JSJavaVM struct
+ */
+extern jclass jlObject;                        /* java.lang.Object */
+extern jclass jlrConstructor;                  /* java.lang.reflect.Constructor */
+extern jclass jlThrowable;                     /* java.lang.Throwable */
+extern jclass jlSystem;                        /* java.lang.System */
+extern jclass jlClass;                         /* java.lang.Class */
+extern jclass jlBoolean;                       /* java.lang.Boolean */
+extern jclass jlDouble;                        /* java.lang.Double */
+extern jclass jlString;                        /* java.lang.String */
+extern jclass njJSObject;                      /* netscape.javascript.JSObject */
+extern jclass njJSException;                   /* netscape.javascript.JSException */
+extern jclass njJSUtil;                        /* netscape.javascript.JSUtil */
+
+extern jmethodID jlClass_getMethods;           /* java.lang.Class.getMethods() */
+extern jmethodID jlClass_getConstructors;      /* java.lang.Class.getConstructors() */
+extern jmethodID jlClass_getFields;            /* java.lang.Class.getFields() */
+extern jmethodID jlClass_getName;              /* java.lang.Class.getName() */
+extern jmethodID jlClass_getComponentType;     /* java.lang.Class.getComponentType() */
+extern jmethodID jlClass_getModifiers;         /* java.lang.Class.getModifiers() */
+extern jmethodID jlClass_isArray;              /* java.lang.Class.isArray() */
+
+extern jmethodID jlrMethod_getName;            /* java.lang.reflect.Method.getName() */
+extern jmethodID jlrMethod_getParameterTypes;  /* java.lang.reflect.Method.getParameterTypes() */
+extern jmethodID jlrMethod_getReturnType;      /* java.lang.reflect.Method.getReturnType() */
+extern jmethodID jlrMethod_getModifiers;       /* java.lang.reflect.Method.getModifiers() */
+
+extern jmethodID jlrConstructor_getParameterTypes; /* java.lang.reflect.Constructor.getParameterTypes() */
+extern jmethodID jlrConstructor_getModifiers;  /* java.lang.reflect.Constructor.getModifiers() */
+
+extern jmethodID jlrField_getName;             /* java.lang.reflect.Field.getName() */
+extern jmethodID jlrField_getType;             /* java.lang.reflect.Field.getType() */
+extern jmethodID jlrField_getModifiers;        /* java.lang.reflect.Field.getModifiers() */
+
+extern jmethodID jlThrowable_getMessage;       /* java.lang.Throwable.getMessage() */
+extern jmethodID jlThrowable_toString;         /* java.lang.Throwable.toString() */
+
+extern jmethodID jlBoolean_Boolean;            /* java.lang.Boolean constructor */
+extern jmethodID jlBoolean_booleanValue;       /* java.lang.Boolean.booleanValue() */
+extern jmethodID jlDouble_Double;              /* java.lang.Double constructor */
+extern jmethodID jlDouble_doubleValue;         /* java.lang.Double.doubleValue() */
+
+extern jmethodID jlSystem_identityHashCode;    /* java.lang.System.identityHashCode() */
+
+extern jobject jlVoid_TYPE;                    /* java.lang.Void.TYPE value */
+
+extern jmethodID njJSException_JSException;    /* netscape.javascipt.JSexception constructor */
+extern jmethodID njJSObject_JSObject;          /* netscape.javascript.JSObject constructor */
+extern jmethodID njJSUtil_getStackTrace;       /* netscape.javascript.JSUtil.getStackTrace() */
+extern jfieldID njJSObject_internal;           /* netscape.javascript.JSObject.internal */
+extern jfieldID njJSException_lineno;          /* netscape.javascript.JSException.lineno */
+extern jfieldID njJSException_tokenIndex;      /* netscape.javascript.JSException.tokenIndex */
+extern jfieldID njJSException_source;          /* netscape.javascript.JSException.source */
+extern jfieldID njJSException_filename;        /* netscape.javascript.JSException.filename */
+
+
+/**************** Java <==> JS conversions and Java types *******************/
+extern JSBool
+jsj_ComputeJavaClassSignature(JSContext *cx,
+                              JavaSignature *signature,
+                              jclass java_class);
+
+extern const char *
+jsj_ConvertJavaSignatureToString(JSContext *cx, JavaSignature *signature);
+extern const char *
+jsj_ConvertJavaSignatureToHRString(JSContext *cx,
+                                   JavaSignature *signature);
+extern JavaMethodSignature *
+jsj_InitJavaMethodSignature(JSContext *cx, JNIEnv *jEnv, jobject method,
+                            JavaMethodSignature *method_signature);
+
+extern const char *
+jsj_ConvertJavaMethodSignatureToString(JSContext *cx,
+                                       JavaMethodSignature *method_signature);
+extern const char *
+jsj_ConvertJavaMethodSignatureToHRString(JSContext *cx,
+                                         const char *method_name,
+                                         JavaMethodSignature *method_signature);
+extern void
+jsj_PurgeJavaMethodSignature(JSContext *cx, JNIEnv *jEnv, JavaMethodSignature *signature);
+
+extern JSBool
+jsj_ConvertJSValueToJavaValue(JSContext *cx, JNIEnv *jEnv, jsval v, JavaSignature *signature,
+			      int *cost, jvalue *java_value);
+extern JSBool
+jsj_ConvertJSValueToJavaObject(JSContext *cx, JNIEnv *jEnv, jsval v, JavaSignature *signature,
+			       int *cost, jobject *java_value);
+extern jstring
+jsj_ConvertJSStringToJavaString(JSContext *cx, JNIEnv *jEnv, JSString *js_str);
+
+extern JSBool
+jsj_ConvertJavaValueToJSValue(JSContext *cx, JNIEnv *jEnv, JavaSignature *signature,
+                              jvalue *java_value, jsval *vp);
+extern JSBool
+jsj_ConvertJavaObjectToJSValue(JSContext *cx, JNIEnv *jEnv,
+                               jobject java_obj, jsval *vp);
+extern JSBool
+jsj_ConvertJavaObjectToJSString(JSContext *cx, JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor,
+                                jobject java_obj, jsval *vp);
+extern JSBool
+jsj_ConvertJavaObjectToJSNumber(JSContext *cx, JNIEnv *jEnv,
+                                jobject java_obj, jsval *vp);
+extern JSBool
+jsj_ConvertJavaObjectToJSBoolean(JSContext *cx, JNIEnv *jEnv,
+                                 jobject java_obj, jsval *vp);
+
+/************************ Java package reflection **************************/
+extern JSBool
+jsj_init_JavaPackage(JSContext *, JSObject *,
+                     JavaPackageDef *predefined_packages);
+
+/************************* Java class reflection ***************************/
+extern JSBool
+jsj_init_JavaClass(JSContext *cx, JSObject *global_obj);
+
+const char *
+jsj_GetJavaClassName(JSContext *cx, JNIEnv *jEnv, jclass java_class);
+
+extern JavaClassDescriptor *
+jsj_GetJavaClassDescriptor(JSContext *cx, JNIEnv *jEnv, jclass java_class);
+
+extern void
+jsj_ReleaseJavaClassDescriptor(JSContext *cx, JNIEnv *jEnv, JavaClassDescriptor *class_descriptor);
+
+extern JSObject *
+jsj_define_JavaClass(JSContext *cx, JNIEnv *jEnv, JSObject *obj,
+                     const char *unqualified_class_name,
+                     jclass jclazz);
+
+extern JavaMemberDescriptor *
+jsj_GetJavaMemberDescriptor(JSContext *cx,
+                            JNIEnv *jEnv,
+                            JavaClassDescriptor *class_descriptor,
+                            jstring member_name);
+
+/* extern JavaMemberDescriptor *
+jsj_LookupJavaClassMember(JSContext *cx,
+                          JavaClassDescriptor *class_descriptor,
+                          const char *member_name);*/
+
+extern JavaMemberDescriptor *
+jsj_LookupJavaMemberDescriptorById(JSContext *cx, JNIEnv *jEnv,
+                                   JavaClassDescriptor *class_descriptor,
+                                   jsid id);
+
+/* extern JavaMemberDescriptor *
+jsj_LookupJavaStaticMemberDescriptor(JSContext *cx,
+                                     JavaClassDescriptor *class_descriptor,
+                                     jstring member_name); */
+
+extern JavaMemberDescriptor *
+jsj_LookupJavaStaticMemberDescriptorById(JSContext *cx, JNIEnv *jEnv,
+                                         JavaClassDescriptor *class_descriptor,
+                                         jsid id);
+
+extern JavaMemberDescriptor *
+jsj_GetJavaStaticMemberDescriptor(JSContext *cx, JNIEnv *jEnv,
+                                  JavaClassDescriptor *class_descriptor,
+                                  jstring member_name);
+
+extern JavaMemberDescriptor *
+jsj_GetJavaClassConstructors(JSContext *cx,
+                             JavaClassDescriptor *class_descriptor);
+
+extern JavaMemberDescriptor *
+jsj_LookupJavaClassConstructors(JSContext *cx, JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor);
+
+extern JavaMemberDescriptor *
+jsj_GetClassInstanceMembers(JSContext *cx, JNIEnv *jEnv,
+                            JavaClassDescriptor *class_descriptor);
+
+extern JavaMemberDescriptor *
+jsj_GetClassStaticMembers(JSContext *cx, JNIEnv *jEnv,
+                          JavaClassDescriptor *class_descriptor);
+
+extern JSBool
+jsj_InitJavaClassReflectionsTable();
+
+/************************* Java field reflection ***************************/
+
+extern JSBool
+jsj_GetJavaFieldValue(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field_spec,
+                      jobject java_obj, jsval *vp);
+extern JSBool
+jsj_SetJavaFieldValue(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field_spec,
+                      jobject java_obj, jsval js_val);
+extern JSBool 
+jsj_ReflectJavaFields(JSContext *cx, JNIEnv *jEnv,
+                      JavaClassDescriptor *class_descriptor,
+                      JSBool reflect_only_static_fields);
+extern void
+jsj_DestroyFieldSpec(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field);
+
+/************************* Java method reflection ***************************/
+extern JSBool
+jsj_JavaInstanceMethodWrapper(JSContext *cx, JSObject *obj,
+                              uintN argc, jsval *argv, jsval *vp);
+extern JSBool
+jsj_JavaStaticMethodWrapper(JSContext *cx, JSObject *obj,
+                            uintN argc, jsval *argv, jsval *vp);
+extern JSBool
+jsj_JavaConstructorWrapper(JSContext *cx, JSObject *obj,
+                           uintN argc, jsval *argv, jsval *vp);
+extern JSBool 
+jsj_ReflectJavaMethods(JSContext *cx, JNIEnv *jEnv,
+                       JavaClassDescriptor *class_descriptor,
+                       JSBool reflect_only_static_methods);
+extern void
+jsj_DestroyMethodSpec(JSContext *cx, JNIEnv *jEnv, JavaMethodSpec *method_spec);
+
+/************************* Java member reflection ***************************/
+extern JSBool
+jsj_init_JavaMember(JSContext *, JSObject *);
+
+extern JSBool
+jsj_ReflectJavaMethodsAndFields(JSContext *cx, JavaClassDescriptor *class_descriptor,
+                                JSBool reflect_only_statics);
+
+/************************* Java object reflection **************************/
+extern JSBool
+jsj_init_JavaObject(JSContext *, JSObject *);
+
+extern JSObject *
+jsj_WrapJavaObject(JSContext *cx, JNIEnv *jEnv, jobject java_obj, jclass java_class);
+
+extern JSBool
+JavaObject_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp);
+
+extern void
+JavaObject_finalize(JSContext *cx, JSObject *obj);
+
+extern JSBool
+JavaObject_resolve(JSContext *cx, JSObject *obj, jsval id);
+
+extern JSBool
+JavaObject_enumerate(JSContext *cx, JSObject *obj);
+
+extern JSBool
+JavaObject_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+extern JSBool
+JavaObject_getPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
+
+/************************* Java array reflection ***************************/
+extern JSBool
+jsj_init_JavaArray(JSContext *cx, JSObject *global_obj);
+
+extern JSBool
+jsj_GetJavaArrayElement(JSContext *cx, JNIEnv *jEnv, jarray java_array,
+                        jsize index, JavaSignature *array_component_signature,
+                        jsval *vp);
+   
+extern JSBool     
+jsj_SetJavaArrayElement(JSContext *cx, JNIEnv *jEnv, jarray java_array,
+                        jsize index, JavaSignature *array_component_signature,
+                        jsval js_val);
+
+/********************* JavaScript object reflection ************************/                        
+extern jobject
+jsj_WrapJSObject(JSContext *cx, JNIEnv *jEnv, JSObject *js_obj);
+
+extern void
+jsj_ClearPendingJSErrors(JSJavaThreadState *jsj_env);
+
+extern JSBool
+jsj_ReportUncaughtJSException(JSContext *cx, JNIEnv *jEnv, jthrowable java_exception);
+
+/**************************** Utilities ************************************/
+extern void
+jsj_ReportJavaError(JSContext *cx, JNIEnv *env, const char *format, ...);
+
+extern void
+jsj_UnexpectedJavaError(JSContext *cx, JNIEnv *env, const char *format, ...);
+
+extern const char *
+jsj_GetJavaErrorMessage(JNIEnv *env);
+
+extern void
+jsj_LogError(const char *error_msg);
+
+PR_CALLBACK prhashcode
+jsj_HashJavaObject(const void *key);
+
+PR_CALLBACK intN
+jsj_JavaObjectComparator(const void *v1, const void *v2);
+
+extern JSJavaThreadState *
+jsj_MapJavaThreadToJSJavaThreadState(JNIEnv *jEnv, char **errp);
+
+extern void
+jsj_MakeJNIClassname(char *jClassName);
+
+extern const char *
+jsj_ClassNameOfJavaObject(JSContext *cx, JNIEnv *jEnv, jobject java_object);
+
+extern jsize
+jsj_GetJavaArrayLength(JSContext *cx, JNIEnv *jEnv, jarray java_array);
+
+extern JSBool
+JavaStringToId(JSContext *cx, JNIEnv *jEnv, jstring jstr, jsid *idp);
+
+extern const char *
+jsj_DupJavaStringUTF(JSContext *cx, JNIEnv *jEnv, jstring jstr);
+
+JSJavaThreadState *
+jsj_MapJSContextToJSJThread(JSContext *cx, JNIEnv **envp);
+
+#ifdef DEBUG
+#define DEBUG_LOG(args) printf args
+#endif
+
+#define JS_FREE_IF(cx, x)                                                   \
+    PR_BEGIN_MACRO                                                          \
+        if (x)                                                              \
+            JS_free(cx, x);                                                 \
+    PR_END_MACRO
+
+#endif   /* _JSJAVA_PVT_H */

mozilla/js/ref/liveconnect/jsj_utils.c

@@ -0,0 +1,339 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains low-level utility code.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "prtypes.h"
+#include "prprintf.h"
+#include "prassert.h"
+
+#include "jsj_private.h"        /* LiveConnect internals */
+#include "jsjava.h"             /* External LiveConnect API */
+
+
+/*
+ * This is a hash-table utility routine that computes the hash code of a Java
+ * object by calling java.lang.System.identityHashCode()
+ */
+PR_CALLBACK prhashcode
+jsj_HashJavaObject(const void *key)
+{
+    prhashcode hash_code;
+    jobject java_obj;
+
+    java_obj = (jobject)key;
+    hash_code = (*jENV)->CallStaticIntMethod(jENV, jlSystem,
+                                             jlSystem_identityHashCode, java_obj);
+    PR_ASSERT(!(*jENV)->ExceptionOccurred(jENV));
+    return hash_code;
+}
+
+/* 
+ * This is a hash-table utility routine for comparing two Java objects.
+ * It's not possible to use the == operator to directly compare two jobject's,
+ * since they're opaque references and aren't guaranteed to be simple pointers
+ * or handles (though they may be in some JVM implementations).  Instead,
+ * use the JNI routine for comparing the two objects.
+ */
+PR_CALLBACK intN
+jsj_JavaObjectComparator(const void *v1, const void *v2)
+{
+    jobject java_obj1, java_obj2;
+
+    java_obj1 = (jobject)v1;
+    java_obj2 = (jobject)v2;
+
+    if (java_obj1 == java_obj2)
+        return 1;
+    return (*jENV)->IsSameObject(jENV, java_obj1, java_obj2);
+}
+
+/*
+ * Return a UTF8, null-terminated encoding of a Java string.  The string must
+ * be free'ed by the caller.
+ *
+ * If an error occurs, returns NULL and calls the JS error reporter.
+ */
+const char *
+jsj_DupJavaStringUTF(JSContext *cx, JNIEnv *jEnv, jstring jstr)
+{
+    const char *str, *retval;
+
+    str = (*jEnv)->GetStringUTFChars(jEnv, jstr, 0);
+    if (!str) {
+        jsj_UnexpectedJavaError(cx, jEnv, "Can't get UTF8 characters from "
+                                          "Java string");
+        return NULL;
+    }
+    retval = JS_strdup(cx, str);
+    (*jEnv)->ReleaseStringUTFChars(jEnv, jstr, str);
+    return retval;
+}
+
+JSBool
+JavaStringToId(JSContext *cx, JNIEnv *jEnv, jstring jstr, jsid *idp)
+{
+    const jschar *ucs2;
+    JSString *jsstr;
+    jsize ucs2_len;
+    jsval val;
+    
+    ucs2 = (*jEnv)->GetStringChars(jEnv, jstr, 0);
+    if (!ucs2) {
+        jsj_UnexpectedJavaError(cx, jEnv, "Couldn't obtain Unicode characters"
+                                "from Java string");
+        return JS_FALSE;
+    }
+    
+    ucs2_len = (*jEnv)->GetStringLength(jEnv, jstr);
+    jsstr = JS_InternUCStringN(cx, ucs2, ucs2_len);
+    (*jEnv)->ReleaseStringChars(jEnv, jstr, ucs2);
+    if (!jsstr)
+        return JS_FALSE;
+
+    val = STRING_TO_JSVAL(jsstr);
+    JS_ValueToId(cx, STRING_TO_JSVAL(jsstr), idp);
+    return JS_TRUE;
+}
+
+/* Not used ?
+const char *
+jsj_ClassNameOfJavaObject(JSContext *cx, JNIEnv *jEnv, jobject java_object)
+{
+    jobject java_class;
+
+    java_class = (*jEnv)->GetObjectClass(jEnv, java_object);
+
+    if (!java_class) {
+        PR_ASSERT(0);
+        return NULL;
+    }
+
+    return jsj_GetJavaClassName(cx, jEnv, java_class);
+}
+*/
+
+/*
+ * Return, as a C string, the error message associated with a Java exception
+ * that occurred as a result of a JNI call, preceded by the class name of
+ * the exception.  As a special case, if the class of the exception is
+ * netscape.javascript.JSException, the exception class name is omitted.
+ *
+ * NULL is returned if no Java exception is pending.  The caller is
+ * responsible for free'ing the returned string.  On exit, the Java exception
+ * is *not* cleared.
+ */
+const char *
+jsj_GetJavaErrorMessage(JNIEnv *jEnv)
+{
+    const char *java_error_msg;
+    char *error_msg = NULL;
+    jthrowable exception;
+    jstring java_exception_jstring;
+
+    exception = (*jEnv)->ExceptionOccurred(jEnv);
+    if (exception) {
+        java_exception_jstring =
+            (*jEnv)->CallObjectMethod(jEnv, exception, jlThrowable_toString);
+        java_error_msg = (*jEnv)->GetStringUTFChars(jEnv, java_exception_jstring, NULL);
+        error_msg = strdup((char*)java_error_msg);
+        (*jEnv)->ReleaseStringUTFChars(jEnv, java_exception_jstring, java_error_msg);
+
+#ifdef DEBUG
+        /* (*jEnv)->ExceptionDescribe(jEnv); */
+#endif
+    }
+    return error_msg;
+}    
+
+/*
+ * Return, as a C string, the JVM stack trace associated with a Java
+ * exception, as would be printed by java.lang.Throwable.printStackTrace().
+ * The caller is responsible for free'ing the returned string.
+ *
+ * Returns NULL if an error occurs.
+ */
+static const char *
+get_java_stack_trace(JSContext *cx, JNIEnv *jEnv, jthrowable java_exception)
+{
+    const char *backtrace;
+    jstring backtrace_jstr;
+
+    backtrace = NULL;
+    if (java_exception && njJSUtil_getStackTrace) {
+        backtrace_jstr = (*jEnv)->CallStaticObjectMethod(jEnv, njJSUtil,
+                                                         njJSUtil_getStackTrace,
+                                                         java_exception);
+        if (!backtrace_jstr) {
+            jsj_UnexpectedJavaError(cx, jEnv, "Unable to get exception stack trace");
+            return NULL;
+        }
+        backtrace = jsj_DupJavaStringUTF(cx, jEnv, backtrace_jstr);
+    }
+    return backtrace;
+} 
+
+/* Full Java backtrace when Java exceptions reported to JavaScript */
+#define REPORT_JAVA_EXCEPTION_STACK_TRACE
+
+/*
+ * This is a wrapper around JS_ReportError(), useful when an error condition
+ * is the result of a JVM failure or exception condition.  It appends the
+ * message associated with the pending Java exception to the passed in
+ * printf-style format string and arguments.
+ */
+static void
+vreport_java_error(JSContext *cx, JNIEnv *jEnv, const char *format, va_list ap)
+{
+    char *error_msg, *js_error_msg;
+    const char *java_stack_trace;
+    const char *java_error_msg;
+    jthrowable java_exception;
+        
+    java_error_msg = NULL;
+    java_exception = (*jEnv)->ExceptionOccurred(jEnv);
+    if (java_exception && njJSException && 
+        (*jEnv)->IsInstanceOf(jEnv, java_exception, njJSException)) {
+        (*jEnv)->ExceptionClear(jEnv);
+        jsj_ReportUncaughtJSException(cx, jEnv, java_exception);
+        return;
+    }
+
+    js_error_msg = PR_vsmprintf(format, ap);
+
+    if (!js_error_msg) {
+        PR_ASSERT(0);       /* Out-of-memory */
+        return;
+    }
+
+#ifdef REPORT_JAVA_EXCEPTION_STACK_TRACE
+
+    java_stack_trace = get_java_stack_trace(cx, jEnv, java_exception);
+    if (java_stack_trace) {
+        error_msg = PR_smprintf("%s\n%s", js_error_msg, java_stack_trace);
+        free((char*)java_stack_trace);
+        if (!error_msg) {
+            PR_ASSERT(0);       /* Out-of-memory */
+            return;
+        }
+    }
+
+#else
+
+    java_error_msg = jsj_GetJavaErrorMessage(jEnv);
+    if (java_error_msg) {
+        error_msg = PR_smprintf("%s (%s)\n", js_error_msg, java_error_msg);
+        free((char*)java_error_msg);
+        free(js_error_msg);
+    } else {
+        error_msg = js_error_msg;
+    }
+#endif
+    
+    JS_ReportError(cx, error_msg);
+    
+    /* Important: the Java exception must not be cleared until the reporter
+       has been called, because the capture_js_error_reports_for_java(),
+       called from JS_ReportError(), needs to read the exception from the JVM */
+    (*jEnv)->ExceptionClear(jEnv);
+    free(error_msg);
+}
+
+void
+jsj_ReportJavaError(JSContext *cx, JNIEnv *env, const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    vreport_java_error(cx, env, format, ap);
+    va_end(ap);
+}
+
+/*
+ * Same as jsj_ReportJavaError, except "internal error: " is prepended
+ * to message.
+ */
+void
+jsj_UnexpectedJavaError(JSContext *cx, JNIEnv *env, const char *format, ...)
+{
+    va_list ap;
+    const char *format2;
+
+    va_start(ap, format);
+    format2 = PR_smprintf("internal error: %s", format);
+    if (format2)
+        vreport_java_error(cx, env, format2, ap);
+    free((void*)format2);
+    va_end(ap);
+}
+
+/*
+ * Most LiveConnect errors are signaled by calling JS_ReportError(),
+ * but in some circumstances, the target JSContext for such errors
+ * is not determinable, e.g. during initialization.  In such cases
+ * any error messages are routed to this function.
+ */
+void
+jsj_LogError(const char *error_msg)
+{
+    if (JSJ_callbacks && JSJ_callbacks->error_print)
+        JSJ_callbacks->error_print(error_msg);
+    else
+        fputs(error_msg, stderr);
+}
+
+jsize
+jsj_GetJavaArrayLength(JSContext *cx, JNIEnv *jEnv, jarray java_array)
+{
+    jsize array_length = (*jEnv)->GetArrayLength(jEnv, java_array);
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {
+        jsj_UnexpectedJavaError(cx, jEnv, "Couldn't obtain array length");
+        return -1;
+    }
+    return array_length;
+}
+
+JSJavaThreadState *
+jsj_MapJSContextToJSJThread(JSContext *cx, JNIEnv **envp)
+{
+    JSJavaThreadState *jsj_env;
+    char *err_msg;
+
+    *envp = NULL;
+    err_msg = NULL;
+    jsj_env = JSJ_callbacks->map_js_context_to_jsj_thread(cx, &err_msg);
+    if (!jsj_env) {
+        if (err_msg) {
+            JS_ReportError(cx, err_msg);
+            free(err_msg);
+        }
+        return NULL;
+    }
+    if (envp)
+        *envp = jsj_env->jEnv;
+    return jsj_env;
+}

mozilla/js/ref/liveconnect/jsjava.h

@@ -0,0 +1,234 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+ 
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * Publicly exported functions for JavaScript <==> Java communication.
+ *
+ */
+ 
+#ifndef _JSJAVA_H
+#define _JSJAVA_H
+
+#include "jni.h"             /* Java Native Interface */
+#include "jsapi.h"           /* JavaScript engine API */
+
+/*
+ * A JSJavaVM structure is a wrapper around a JavaVM which incorporates
+ * additional LiveConnect state.
+ */
+typedef struct JSJavaVM JSJavaVM;
+
+/* LiveConnect and Java state, one per thread */
+typedef struct JSJavaThreadState JSJavaThreadState;
+
+/*
+ * This callback table provides hooks to external functions that implement
+ * functionality specific to the embedding.  For example, these callbacks are
+ * necessary in multi-threaded environments or to implement a security
+ * policy.
+ */
+typedef struct JSJCallbacks {
+
+    /* This callback is invoked when there is no JavaScript execution
+       environment (JSContext) associated with the current Java thread and
+       a call is made from Java into JavaScript.  (A JSContext is associated
+       with a Java thread by calling the JSJ_SetJSContextForJavaThread()
+       function.)  This callback is only invoked when Java spontaneously calls
+       into JavaScript, i.e. it is not called when JS calls into Java which
+       calls back into JS.
+       
+       This callback can be used to create a JSContext lazily, or obtain
+       one from a pool of available JSContexts.  The implementation of this
+       callback can call JSJ_SetJSContextForJavaThread() to avoid any further
+       callbacks of this type for this Java thread. */
+    JSContext *	        (*map_jsj_thread_to_js_context)(JSJavaThreadState *jsj_env,
+                                                        char **errp);
+
+    /* This callback is invoked whenever a call is made into Java from
+       JavaScript.  It's responsible for mapping from a JavaScript execution
+       environment (JSContext) to a Java thread.  (A JavaContext can only
+       be associated with one Java thread at a time.) */
+    JSJavaThreadState * (*map_js_context_to_jsj_thread)(JSContext *cx,
+                                                        char **errp);
+                                                        
+    /* This callback implements netscape.javascript.JSObject.getWindow(),
+       a method named for its behavior in the browser environment, where it
+       returns the JS "Window" object corresponding to the HTML window that an
+       applet is embedded within.  More generally, it's a way for Java to get
+       hold of a JS object that has not been explicitly passed to it. */
+    JSObject *	        (*map_java_object_to_js_object)(JNIEnv *jEnv, jobject hint,
+                                                        char **errp);
+        
+    /* An interim callback function until the LiveConnect security story is
+       straightened out.  This function pointer can be set to NULL. */
+    JSPrincipals *      (*get_JSPrincipals_from_java_caller)(JNIEnv *jEnv);
+    
+    /* The following two callbacks sandwich any JS evaluation performed
+       from Java.   They may be used to implement concurrency constraints, e.g.
+       by suspending the current thread until some condition is met.  In the
+       browser embedding, these are used to maintain the run-to-completion
+       semantics of JavaScript.  It is acceptable for either function pointer
+       to be NULL. */
+    JSBool	        (*enter_js_from_java)(char **errp);
+    void	        (*exit_js)(void);
+
+    /* Most LiveConnect errors are signaled by calling JS_ReportError(), but in
+       some circumstances, the target JSContext for such errors is not
+       determinable, e.g. during initialization.  In such cases any error
+       messages are routed to this function.  If the function pointer is set to
+       NULL, error messages are sent to stderr. */
+    void                (*error_print)(const char *error_msg);
+
+    /* Reserved for future use */
+    void *              reserved[10];
+} JSJCallbacks;
+
+/*===========================================================================*/
+
+/* A flag that denotes that a Java package has no sub-packages other than those
+   explicitly pre-defined at the time of JSContext initialization.  An access
+   to a simple name within such a package, therefore, must either correspond to
+   one of these explicitly named sub-packages or to a class within this
+   package.  It is reasonable for LiveConnect to signal an error if a simple
+   name does not comply with these criteria. */
+#define PKG_SYSTEM      1
+
+/* A flag that denotes that a Java package which might contain sub-packages
+   that are not pre-defined at initialization time, because the sub-packages
+   may not be the same in all installations.  Therefore, an access to a simple
+   name within such a a package which does not correspond to either a
+   pre-defined sub-package or to a class, must be assummed to refer to an
+   unknown sub-package.  This behavior may cause bogus JavaPackage objects to be
+   created if a package name is misspelled, e.g. sun.oi.net. */
+#define PKG_USER        2
+
+/* A Java package defined at initialization time. */
+typedef struct JavaPackageDef {
+    const char *        name;   /* e.g. "java.lang" */
+    const char *        path;   /* e.g. "java/lang", or NULL for default */
+    int                 flags;  /* PKG_USER, PKG_SYSTEM, etc. */
+} JavaPackageDef;
+
+/*===========================================================================*/
+
+/* The following two convenience functions present a complete, but simplified
+   LiveConnect API which is designed to handle the special case of a single 
+   Java-VM, with single-threaded operation, and the use of only one JSContext.
+   The full API is in the section below. */
+
+/* Initialize the provided JSContext by setting up the JS classes necessary for
+   reflection and by defining JavaPackage objects for the default Java packages
+   as properties of global_obj.  If java_vm is NULL, a new Java VM is
+   created, using the provided classpath in addition to any default classpath.
+   The classpath argument is ignored, however, if java_vm is non-NULL. */
+PR_PUBLIC_API(JSBool)
+JSJ_SimpleInit(JSContext *cx, JSObject *global_obj,
+               JavaVM *java_vm, const char *classpath);
+
+/* Free up all resources.  Destroy the Java VM if it was created by LiveConnect */
+PR_PUBLIC_API(void)
+JSJ_SimpleShutdown();
+
+/*===========================================================================*/
+
+/* The "full" LiveConnect API, required when more than one thread, Java VM, or
+   JSContext is involved.  Initialization pseudocode might go roughly like
+   this:
+
+   JSJ_Init()   // Setup callbacks
+   for each JavaVM {
+      JSJ_ConnectToJavaVM(...)
+   }
+   for each JSContext {
+      JSJ_InitJSContext(...)
+   }
+   for each JS evaluation {
+      run JavaScript code in the JSContext;
+   }
+ */
+
+/* Called once for all instances of LiveConnect to set up callbacks */
+PR_PUBLIC_API(void)
+JSJ_Init(JSJCallbacks *callbacks);
+
+/* Called once per Java VM, this function initializes the classes, fields, and
+   methods required for Java reflection.  If java_vm is NULL, a new Java VM is
+   created, using the provided classpath in addition to any default classpath.
+   The classpath argument is ignored, however, if java_vm is non-NULL. */
+PR_PUBLIC_API(JSJavaVM *)
+JSJ_ConnectToJavaVM(JavaVM *java_vm, const char *classpath);
+
+/* Initialize the provided JSContext by setting up the JS classes necessary for
+   reflection and by defining JavaPackage objects for the default Java packages
+   as properties of global_obj.  Additional packages may be pre-defined by
+   setting the predefined_packages argument.  (Pre-defining a Java package at
+   initialization time is not necessary, but it will make package lookup faster
+   and, more importantly, will avoid unnecessary network accesses if classes
+   are being loaded over the network.) */
+PR_PUBLIC_API(JSBool)
+JSJ_InitJSContext(JSContext *cx, JSObject *global_obj,
+                  JavaPackageDef *predefined_packages);
+   
+/* This function returns a structure that encapsulates the Java and JavaScript
+   execution environment for the current native thread.  It is intended to
+   be called from the embedder's implementation of JSJCallback's
+   map_js_context_to_jsj_thread() function.  The thread_name argument is only
+   used for debugging purposes and can be set to NULL.  The Java JNI
+   environment associated with this thread is returned through the java_envp
+   argument if java_envp is non-NULL.  */
+PR_PUBLIC_API(JSJavaThreadState *)
+JSJ_AttachCurrentThreadToJava(JSJavaVM *jsjava_vm, const char *thread_name,
+                              JNIEnv **java_envp);
+
+/* Destructor routine for per-thread JSJavaThreadState structure */
+PR_PUBLIC_API(JSBool)
+JSJ_DetachCurrentThreadFromJava(JSJavaThreadState *jsj_env);
+
+/* This function is used to specify a particular JSContext as *the* JavaScript
+   execution environment to be used when LiveConnect is accessed from the given
+   Java thread, i.e. when one of the methods of netscape.javascript.JSObject
+   has been called.  There can only be one such JS context for any given Java
+   thread at a time.  To multiplex JSContexts among a single thread, this
+   function could be called before Java is invoked on that thread.)  The return
+   value is the previous JSContext associated with the given Java thread.
+
+   If this function has not been called for a thread and a crossing is made
+   into JavaScript from Java, the map_jsj_thread_to_js_context() callback will
+   be invoked to determine the JSContext for the thread.  The purpose of the 
+   function is to improve performance by avoiding the expense of the callback.
+*/
+PR_PUBLIC_API(JSContext *)
+JSJ_SetDefaultJSContextForJavaThread(JSContext *cx, JSJavaThreadState *jsj_env);
+
+/* This routine severs the connection to a Java VM, freeing all related resources.
+   It shouldn't be called until the global scope has been cleared in all related
+   JSContexts (so that all LiveConnect objects are finalized) and a JavaScript
+   GC is performed.  Otherwise, accessed to free'ed memory could result. */
+PR_PUBLIC_API(void)
+JSJ_DisconnectFromJavaVM(JSJavaVM *);
+
+/*
+ * Reflect a Java object into a JS value.  The source object, java_obj, must
+ * be of type java.lang.Object or a subclass and may, therefore, be an array.
+ */
+PR_PUBLIC_API(JSBool)
+JSJ_ConvertJavaObjectToJSValue(JSContext *cx, jobject java_obj, jsval *vp);
+#endif  /* _JSJAVA_H */

mozilla/js/ref/liveconnect/netscape_javascript_JSObject.h

@@ -0,0 +1,101 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class netscape_javascript_JSObject */
+
+#ifndef _Included_netscape_javascript_JSObject
+#define _Included_netscape_javascript_JSObject
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    initClass
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_initClass
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getMember
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getMember
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getSlot
+ * Signature: (I)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getSlot
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    setMember
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_setMember
+  (JNIEnv *, jobject, jstring, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    setSlot
+ * Signature: (ILjava/lang/Object;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_setSlot
+  (JNIEnv *, jobject, jint, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    removeMember
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_removeMember
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    call
+ * Signature: (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_call
+  (JNIEnv *, jobject, jstring, jobjectArray);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    eval
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_eval
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    toString
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_netscape_javascript_JSObject_toString
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getWindow
+ * Signature: (Ljava/applet/Applet;)Lnetscape/javascript/JSObject;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getWindow
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    finalize
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_finalize
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

mozilla/xpinstall/Makefile.in

@@ -1,39 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (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/NPL/
-#
-# 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.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-
-DEPTH = ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = public
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
-

mozilla/xpinstall/makefile.win

@@ -1,30 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (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/NPL/
-#
-# 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.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-
-DEPTH=..
-
-DIRS= public res src 
-
-include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/notifier/SoftwareUpdate-Source-1.rdf

@@ -1,33 +0,0 @@
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:NC="http://home.netscape.com/NC-rdf#">
-
-  <RDF:Bag ID="NC:SoftwareUpdateRoot">
-    <RDF:li>
-       <RDF:Bag ID="NC:NewSoftwareToday" NC:title="New Software">
-
-    <RDF:li>
-        <RDF:Description ID="AimUpdate344">
-         <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
-         <NC:title>AOL AIM</NC:title>
-         <NC:description>An Instant Message Client</NC:description>
-         <NC:version>3.4.1.12</NC:version>
-         <NC:registryKey>/AOL/AIM/</NC:registryKey>
-         <NC:url>http://home.netscape.com/index.html</NC:url>
-       </RDF:Description>
-    </RDF:li>
-    
-    <RDF:li>
-       <RDF:Description ID="PGPPlugin345">
-         <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
-         <NC:title>PGP Plugin For Mozilla</NC:title>
-         <NC:description>A high grade encryption plugin</NC:description>
-         <NC:version>1.1.2.0</NC:version>
-         <NC:registryKey>/PGP/ROCKS/</NC:registryKey>
-         <NC:url>http://home.netscape.com/index.html</NC:url>
-       </RDF:Description>
-    </RDF:li>
-
-       </RDF:Bag>
-     </RDF:li>
-  </RDF:Bag>
-</RDF:RDF>

mozilla/xpinstall/notifier/SoftwareUpdate.css

@@ -1,57 +0,0 @@
-window { 
- display: block; 
-} 
-
-tree { 
- display: table; 
- background-color: #FFFFFF; 
- border: none; 
- border-spacing: 0px; 
- width: 100%;
-}
-
-treecol {
- display: table-column;
- width: 200px;
-}
-
-treeitem { 
- display: table-row; 
-} 
-
-treehead { 
- display: table-header-group; 
-} 
-
-treebody { 
- display: table-row-group; 
-} 
-
-treecell { 
- display: table-cell; 
- font-family: Verdana, Sans-Serif;
- font-size: 8pt;
-} 
-
-treecell[selectedcell] {
- background-color: yellow;
- }
- 
-
-treehead treeitem treecell { 
- background-color: #c0c0c0; 
- border: outset 1px;
- border-color: white #707070 #707070 white;
- padding-left: 4px;
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#SoftwarePackage"] > treecell > titledbutton {
- list-style-image: url("resource:/res/rdf/SoftwareUpdatePackage.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treecell > titledbutton {
- list-style-image: url("resource:/res/rdf/bookmark-folder-closed.gif");
-
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treecell > titledbutton {
- list-style-image: url("resource:/res/rdf/bookmark-folder-open.gif");
-}

mozilla/xpinstall/notifier/SoftwareUpdate.js

@@ -1,123 +0,0 @@
-    // the rdf service
-    var RDF = Components.classes['component://netscape/rdf/rdf-service'].getService();
-    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
-
-    function getAttr(registry,service,attr_name) 
-    {
-        var attr = registry.GetTarget(service,
-                                      RDF.GetResource('http://home.netscape.com/NC-rdf#' + attr_name),
-                                      true);
-        if (attr)
-            attr = attr.QueryInterface(Components.interfaces.nsIRDFLiteral);
-  
-        if (attr)
-            attr = attr.Value;
-        
-        return attr;
-    }
-
-    function Init()
-    {
-        // this is the main rdf file.
-        
-        var mainRegistry = RDF.GetDataSource('resource://res/rdf/SoftwareUpdates.rdf');
-        
-        var mainContainer = Components.classes['component://netscape/rdf/container'].createInstance();
-        mainContainer = mainContainer.QueryInterface(Components.interfaces.nsIRDFContainer);
-
-        mainContainer.Init(mainRegistry, RDF.GetResource('NC:SoftwareUpdateDataSources'));
-
-        // Now enumerate all of the softwareupdate datasources.
-        var mainEnumerator = mainContainer.GetElements();
-        while (mainEnumerator.HasMoreElements()) 
-        {
-            var aDistributor = mainEnumerator.GetNext();
-            aDistributor = aDistributor.QueryInterface(Components.interfaces.nsIRDFResource);
-
-            var distributorContainer = Components.classes['component://netscape/rdf/container'].createInstance();
-            distributorContainer = distributorContainer.QueryInterface(Components.interfaces.nsIRDFContainer);
-            
-            var distributorRegistry = RDF.GetDataSource(aDistributor.Value);
-            var distributorResource = RDF.GetResource('NC:SoftwareUpdateRoot');
-
-            distributorContainer.Init(distributorRegistry, distributorResource);
-
-            // Now enumerate all of the distributorContainer's packages.
-            
-            var distributorEnumerator = distributorContainer.GetElements();
-            
-            while (distributorEnumerator.HasMoreElements()) 
-            {
-                 var aPackage = distributorEnumerator.GetNext();
-                 aPackage = aPackage.QueryInterface(Components.interfaces.nsIRDFResource);
-                 
-                 // remove any that we do not want.
-            
-                 if (getAttr(distributorRegistry, aPackage, 'title') == "AOL AIM")
-                 {
-                    //distributorContainer.RemoveElement(aPackage, true);
-                 }
-            }
-            var tree = document.getElementById('tree');
-
-            // Add it to the tree control's composite datasource.
-            tree.database.AddDataSource(distributorRegistry);
-
-        }
-        
-        // Install all of the stylesheets in the softwareupdate Registry into the
-        // panel.
-
-        // TODO
-
-        // XXX hack to force the tree to rebuild
-        var treebody = document.getElementById('NC:SoftwareUpdateRoot');
-        treebody.setAttribute('id', 'NC:SoftwareUpdateRoot');
-    }
-
-
-    function OpenURL(event, node)
-    {
-        if (node.getAttribute('type') == "http://home.netscape.com/NC-rdf#SoftwarePackage") 
-        {
-            url = node.getAttribute('url');
-     
-            /*window.open(url,'bookmarks');*/
-  
-            var toolkitCore = XPAppCoresManager.Find("ToolkitCore");
-            if (!toolkitCore) 
-            {
-                toolkitCore = new ToolkitCore();
-                if (toolkitCore) 
-                {
-                    toolkitCore.Init("ToolkitCore");
-                }
-            }
-        
-            if (toolkitCore) 
-            {
-                toolkitCore.ShowWindow(url,window);
-            }
-
-            dump("OpenURL(" + url + ")\n");
-        
-            return true;        
-        }
-        return false;
-    }
-
-
-    // To get around "window.onload" not working in viewer.
-    function Boot()
-    {
-        var tree = document.getElementById('tree');
-        if (tree == null) {
-            setTimeout(Boot, 0);
-        }
-        else {
-            Init();
-        }
-    }
-
-    setTimeout('Boot()', 0);
-

mozilla/xpinstall/notifier/SoftwareUpdate.xul

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="resource:/res/rdf/sidebar.css" type="text/css"?>
-<?xml-stylesheet href="resource:/res/rdf/SoftwareUpdate.css" type="text/css"?>
-<window
-  xmlns:html="http://www.w3.org/TR/REC-html40"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="SoftwareUpdate.js"/>
-  
-  <tree id="tree"
-        flex="100%"
-        datasources="rdf:softwareupdates"
-        ondblclick="return OpenURL(event, event.target.parentNode);">
-
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#title" />
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#description" />
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#version" />
-
-    <treehead>
-      <treeitem>
-        <treecell>Title</treecell>
-        <treecell>Description</treecell>
-        <treecell>Version</treecell>
-      </treeitem>
-    </treehead>
-
-    <treebody id="NC:SoftwareUpdateRoot" rdf:containment="http://home.netscape.com/NC-rdf#child" />
-  </tree>
-</window>

mozilla/xpinstall/notifier/SoftwareUpdates.rdf

@@ -1,7 +0,0 @@
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:NC="http://home.netscape.com/softwareupdate-schema#">
-
-  <RDF:Bag ID="NC:SoftwareUpdateDataSources">
-    <RDF:li resource="resource:/res/rdf/SoftwareUpdate-Source-1.rdf" />
-  </RDF:Bag>
-</RDF:RDF>

mozilla/xpinstall/public/MANIFEST

@@ -1,6 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-nsISoftwareUpdate.h
-nsSoftwareUpdateIIDs.h

mozilla/xpinstall/public/Makefile.in

@@ -1,47 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (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/NPL/
-#
-# 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.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-DEPTH = ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = xpinstall
-
-XPIDLSRCS = nsIXPInstallProgress.idl
-
-EXPORTS =		             \
-        nsIDOMInstallTriggerGlobal.h \
-        nsIDOMInstallVersion.h       \
-        nsSoftwareUpdateIIDs.h       \
-        nsISoftwareUpdate.h          \
-        $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk

mozilla/xpinstall/public/idl/Install.idl

@@ -1,113 +0,0 @@
-interface Install
-{
-/* IID: { 0x18c2f988, 0xb09f, 0x11d2, \
-  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
-
-	const int BAD_PACKAGE_NAME          = -200;
-	const int UNEXPECTED_ERROR          = -201;
-	const int ACCESS_DENIED             = -202;
-	const int TOO_MANY_CERTIFICATES     = -203; /* Installer file must have 1 certificate */
-	const int NO_INSTALLER_CERTIFICATE  = -204; /* Installer file must have a certificate */
-	const int NO_CERTIFICATE            = -205; /* Extracted file is not signed */
-	const int NO_MATCHING_CERTIFICATE   = -206; /* Extracted file does not match installer certificate */
-	const int UNKNOWN_JAR_FILE          = -207; /* JAR file has not been opened */
-	const int INVALID_ARGUMENTS         = -208; /* Bad arguments to a function */
-	const int ILLEGAL_RELATIVE_PATH     = -209; /* Illegal relative path */
-	const int USER_CANCELLED            = -210; /* User cancelled */
-	const int INSTALL_NOT_STARTED       = -211;
-	const int SILENT_MODE_DENIED        = -212;
-	const int NO_SUCH_COMPONENT         = -213; /* no such component in the registry. */
-	const int FILE_DOES_NOT_EXIST       = -214; /* File cannot be deleted as it does not exist */
-	const int FILE_READ_ONLY            = -215; /* File cannot be deleted as it is read only. */
-	const int FILE_IS_DIRECTORY         = -216; /* File cannot be deleted as it is a directory */
-	const int NETWORK_FILE_IS_IN_USE    = -217; /* File on the network is in-use */
-	const int APPLE_SINGLE_ERR          = -218; /* error in AppleSingle unpacking */
-	const int INVALID_PATH_ERR          = -219; /* GetFolder() did not like the folderID */
-	const int PATCH_BAD_DIFF            = -220; /* error in GDIFF patch */
-	const int PATCH_BAD_CHECKSUM_TARGET = -221; /* source file doesn't checksum  */
-	const int PATCH_BAD_CHECKSUM_RESULT = -222; /* final patched file fails checksum  */
-	const int UNINSTALL_FAILED          = -223; /* error while uninstalling a package  */
-	const int GESTALT_UNKNOWN_ERR       = -5550;         
-	const int GESTALT_INVALID_ARGUMENT  = -5551;
-
-	const int SUCCESS					  = 0;
-	const int REBOOT_NEEDED               = 999;
-
-	/* install types */
-	const int LIMITED_INSTALL             = 0;
-	const int FULL_INSTALL                = 1;
-	const int NO_STATUS_DLG				  = 2;
-	const int NO_FINALIZE_DLG			  = 4;
-
-	// these should not be public...
-	/* message IDs*/
-	const int SU_INSTALL_FILE_UNEXPECTED_MSG_ID  = 0;
-	const int SU_DETAILS_REPLACE_FILE_MSG_ID  = 1;
-	const int SU_DETAILS_INSTALL_FILE_MSG_ID  = 2;
-    //////////////////////////
-	
-	readonly attribute wstring UserPackageName;
-	readonly attribute wstring RegPackageName;
-
-	void Install();
-
-	void AbortInstall();
-
-	long AddDirectory(	   in wstring regName, 
-						   in wstring version, 
-						   in wstring jarSource,         
-						   in InstallFolder folder, 
-						   in wstring subdir, 
-						   in boolean forceMode );
-
-
-	long AddSubcomponent(  in wstring regName, 
-						   in wstring version, 
-						   in wstring jarSource,         
-						   in InstallFolder folder, 
-						   in wstring targetName, 
-						   in boolean forceMode );
-
-	long DeleteComponent(  in wstring registryName);
-
-	long DeleteFile(       in InstallFolder folder,
-						   in wstring relativeFileName );
-	
-	long DiskSpaceAvailable( in InstallFolder folder );
-	
-	long Execute(in wstring jarSource, in wstring args);
-	
-	long FinalizeInstall();
-
-	long Gestalt (in wstring selector);
-
-	InstallFolder GetComponentFolder( in wstring regName, 
-						              in wstring subdirectory);
-
-	InstallFolder GetFolder(in wstring targetFolder, 
-				            in wstring subdirectory);
-
-	long GetLastError();
-
-	long GetWinProfile(in InstallFolder folder, in wstring file);
-	
-	long GetWinRegistry();
-
-	long Patch( in wstring regName, 
-				in wstring version, 
-				in wstring jarSource,
-				in InstallFolder folder, 
-				in wstring targetName );
-	
-	void ResetError();
-
-	void SetPackageFolder( in InstallFolder folder );
-	
-	long StartInstall( in wstring userPackageName,
-					   in wstring packageName, 
-					   in wstring version, 
-					   in long flags );
-
-	long Uninstall( in wstring packageName);
-
-};

mozilla/xpinstall/public/idl/InstallTrigger.idl

@@ -1,24 +0,0 @@
-interface InstallTriggerGlobal
-{
-/* IID: { 0x18c2f987, 0xb09f, 0x11d2, \
-  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
-	
-	const int MAJOR_DIFF =  4;
-    const int MINOR_DIFF =  3;
-    const int REL_DIFF   =  2;
-    const int BLD_DIFF   =  1;
-    const int EQUAL      =  0;	
-
-	boolean UpdateEnabled ();
-
-	long StartSoftwareUpdate(in wstring URL);
-
-	long ConditionalSoftwareUpdate(	in wstring URL, 
-									in wstring regName,
-									in long diffLevel, 
-									in wstring version, 
-									in long mode);
-
-	long CompareVersion( in wstring regName, in wstring version );
-
-};

mozilla/xpinstall/public/idl/InstallVersion.idl

@@ -1,34 +0,0 @@
-interface InstallVersion
-{
-/* IID: { 0x18c2f986, 0xb09f, 0x11d2, \
-  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
-	 
-	const int EQUAL				=  0;
-    const int BLD_DIFF			=  1;
-	const int BLD_DIFF_MINUS		= -1;
-    const int REL_DIFF			=  2;
-	const int REL_DIFF_MINUS		= -2;
-    const int MINOR_DIFF			=  3;
-	const int MINOR_DIFF_MINUS   = -3;
-    const int MAJOR_DIFF			=  4;
-	const int MAJOR_DIFF_MINUS   = -4;
-	
-	attribute int major;
-	attribute int minor;
-	attribute int release;
-	attribute int build;
-
-	void InstallVersion();
-
-	void init(in wstring versionString);	
-/*
-	void init(in int major, in int minor, in int release, in int build);	
-*/
-	wstring toString();
-
-/*	int compareTo(in wstring version);
-	int compareTo(in int major, in int minor, in int release, in int build);
-*/
-	int compareTo(in InstallVersion versionObject);
-
-};

mozilla/xpinstall/public/makefile.win

@@ -1,36 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (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/NPL/
-#
-# 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.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-MODULE=xpinstall 
-DEPTH=..\..
-
-EXPORTS=    nsIDOMInstallTriggerGlobal.h \
-			nsIDOMInstallVersion.h       \
-            nsSoftwareUpdateIIDs.h       \
-			nsISoftwareUpdate.h
-
-XPIDLSRCS = .\nsIXPInstallProgress.idl        
-
-include <$(DEPTH)\config\config.mak>
-include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/public/nsIDOMInstall.h

@@ -1 +0,0 @@
-#error

mozilla/xpinstall/public/nsIDOMInstallTriggerGlobal.h

@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#ifndef nsIDOMInstallTriggerGlobal_h__
-#define nsIDOMInstallTriggerGlobal_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIScriptContext.h"
-
-
-#define NS_IDOMINSTALLTRIGGERGLOBAL_IID \
- { 0x18c2f987, 0xb09f, 0x11d2, \
-  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
-
-class nsIDOMInstallTriggerGlobal : public nsISupports {
-public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLTRIGGERGLOBAL_IID; return iid; }
-  enum {
-    MAJOR_DIFF = 4,
-    MINOR_DIFF = 3,
-    REL_DIFF = 2,
-    BLD_DIFF = 1,
-    EQUAL = 0
-  };
-
-  NS_IMETHOD    UpdateEnabled(PRBool* aReturn)=0;
-
-  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn)=0;
-  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn)=0;
-
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)=0;
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)=0;
-
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)=0;
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)=0;
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)=0;
-};
-
-
-#define NS_DECL_IDOMINSTALLTRIGGERGLOBAL   \
-  NS_IMETHOD    UpdateEnabled(PRBool* aReturn);  \
-  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn);  \
-  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn);  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);  \
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);  \
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);  \
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);  \
-
-
-
-#define NS_FORWARD_IDOMINSTALLTRIGGERGLOBAL(_to)  \
-  NS_IMETHOD    UpdateEnabled(PRBool* aReturn) { return _to##UpdateEnabled(aReturn); }  \
-  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn) { return _to##StartSoftwareUpdate(aURL, aFlags, aReturn); }  \
-  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn) { return _to##StartSoftwareUpdate(aURL, aReturn); }  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, aVersion, aMode, aReturn); }  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, aVersion, aMode, aReturn); }  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, nsIDOMInstallVersion* aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aMode, aReturn); }  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aMode, aReturn); }  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aReturn); }  \
-  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aReturn); }  \
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aMajor, aMinor, aRelease, aBuild, aReturn); }  \
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aVersion, aReturn); }  \
-  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aVersion, aReturn); }  \
-
-
-extern nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_DOM nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-
-#endif // nsIDOMInstallTriggerGlobal_h__

mozilla/xpinstall/public/nsIDOMInstallVersion.h

@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#ifndef nsIDOMInstallVersion_h__
-#define nsIDOMInstallVersion_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIScriptContext.h"
-
-class nsIDOMInstallVersion;
-
-#define NS_IDOMINSTALLVERSION_IID \
- { 0x18c2f986, 0xb09f, 0x11d2, \
-  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
-
-class nsIDOMInstallVersion : public nsISupports {
-public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLVERSION_IID; return iid; }
-  enum {
-    EQUAL = 0,
-    BLD_DIFF = 1,
-    BLD_DIFF_MINUS = -1,
-    REL_DIFF = 2,
-    REL_DIFF_MINUS = -2,
-    MINOR_DIFF = 3,
-    MINOR_DIFF_MINUS = -3,
-    MAJOR_DIFF = 4,
-    MAJOR_DIFF_MINUS = -4
-  };
-
-  NS_IMETHOD    GetMajor(PRInt32* aMajor)=0;
-  NS_IMETHOD    SetMajor(PRInt32 aMajor)=0;
-
-  NS_IMETHOD    GetMinor(PRInt32* aMinor)=0;
-  NS_IMETHOD    SetMinor(PRInt32 aMinor)=0;
-
-  NS_IMETHOD    GetRelease(PRInt32* aRelease)=0;
-  NS_IMETHOD    SetRelease(PRInt32 aRelease)=0;
-
-  NS_IMETHOD    GetBuild(PRInt32* aBuild)=0;
-  NS_IMETHOD    SetBuild(PRInt32 aBuild)=0;
-
-  NS_IMETHOD    Init(const nsString& aVersionString)=0;
-
-  NS_IMETHOD    ToString(nsString& aReturn)=0;
-
-  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn)=0;
-  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn)=0;
-  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)=0;
-};
-
-
-#define NS_DECL_IDOMINSTALLVERSION   \
-  NS_IMETHOD    GetMajor(PRInt32* aMajor);  \
-  NS_IMETHOD    SetMajor(PRInt32 aMajor);  \
-  NS_IMETHOD    GetMinor(PRInt32* aMinor);  \
-  NS_IMETHOD    SetMinor(PRInt32 aMinor);  \
-  NS_IMETHOD    GetRelease(PRInt32* aRelease);  \
-  NS_IMETHOD    SetRelease(PRInt32 aRelease);  \
-  NS_IMETHOD    GetBuild(PRInt32* aBuild);  \
-  NS_IMETHOD    SetBuild(PRInt32 aBuild);  \
-  NS_IMETHOD    Init(const nsString& aVersionString);  \
-  NS_IMETHOD    ToString(nsString& aReturn);  \
-  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn);  \
-  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn);  \
-  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);  \
-
-
-
-#define NS_FORWARD_IDOMINSTALLVERSION(_to)  \
-  NS_IMETHOD    GetMajor(PRInt32* aMajor) { return _to##GetMajor(aMajor); } \
-  NS_IMETHOD    SetMajor(PRInt32 aMajor) { return _to##SetMajor(aMajor); } \
-  NS_IMETHOD    GetMinor(PRInt32* aMinor) { return _to##GetMinor(aMinor); } \
-  NS_IMETHOD    SetMinor(PRInt32 aMinor) { return _to##SetMinor(aMinor); } \
-  NS_IMETHOD    GetRelease(PRInt32* aRelease) { return _to##GetRelease(aRelease); } \
-  NS_IMETHOD    SetRelease(PRInt32 aRelease) { return _to##SetRelease(aRelease); } \
-  NS_IMETHOD    GetBuild(PRInt32* aBuild) { return _to##GetBuild(aBuild); } \
-  NS_IMETHOD    SetBuild(PRInt32 aBuild) { return _to##SetBuild(aBuild); } \
-  NS_IMETHOD    Init(const nsString& aVersionString) { return _to##Init(aVersionString); }  \
-  NS_IMETHOD    ToString(nsString& aReturn) { return _to##ToString(aReturn); }  \
-  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn) { return _to##CompareTo(aVersionObject, aReturn); }  \
-  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn) { return _to##CompareTo(aString, aReturn); }  \
-  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn) { return _to##CompareTo(aMajor, aMinor, aRelease, aBuild, aReturn); }  \
-
-
-extern nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_DOM nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-
-#endif // nsIDOMInstallVersion_h__

mozilla/xpinstall/public/nsISoftwareUpdate.h

@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#ifndef nsISoftwareUpdate_h__
-#define nsISoftwareUpdate_h__
-
-#include "nsISupports.h"
-#include "nsIFactory.h"
-#include "nsString.h"
-
-#include "nsIXPInstallProgress.h"
-
-#define NS_IXPINSTALLCOMPONENT_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/xpinstall"
-#define NS_IXPINSTALLCOMPONENT_CLASSNAME "Mozilla XPInstall Component"
-
-
-#define NS_ISOFTWAREUPDATE_IID                   \
-{ 0x18c2f992, 									 \
-  0xb09f, 										 \
-  0x11d2,						                 \
- {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}\
-} 
-
-
-class nsISoftwareUpdate : public nsISupports  
-{
-    public:
-        	NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISOFTWAREUPDATE_IID)
-            
-            NS_IMETHOD InstallJar(const nsString& fromURL,
-                                  const nsString& localFile,
-                                  long  flags) = 0; 
-            
-            NS_IMETHOD RegisterNotifier(nsIXPInstallProgress *notifier) = 0;
-            
-            NS_IMETHOD InstallPending(void) = 0;
-
-            /* FIX: these should be in a private interface */
-            NS_IMETHOD InstallJarCallBack()                   = 0; 
-            NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier) = 0;
-};
-
-
-class nsSoftwareUpdateFactory : public nsIFactory 
-{
-    public:
-        
-        nsSoftwareUpdateFactory();
-        virtual ~nsSoftwareUpdateFactory();
-        
-        NS_DECL_ISUPPORTS
-
-              NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                        REFNSIID aIID,
-                                        void **aResult);
-
-              NS_IMETHOD LockFactory(PRBool aLock);
-
-};
-
-
-#endif // nsISoftwareUpdate_h__
-

mozilla/xpinstall/public/nsIXPInstallProgress.idl

@@ -1,30 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsISupports.idl"
-
-[uuid(eea90d40-b059-11d2-915e-c12b696c9333)]
-interface nsIXPInstallProgress : nsISupports
-{
-        void BeforeJavascriptEvaluation();
-        void AfterJavascriptEvaluation();
-        void InstallStarted([const] in string UIPackageName);
-        void ItemScheduled([const] in string message );
-        void InstallFinalization([const] in string message, in long itemNum, in long totNum );
-        void InstallAborted();
-};

mozilla/xpinstall/public/nsIXPInstallProgressNotifier.h

@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsIXPInstallProgressNotifier_h__
-#define nsIXPInstallProgressNotifier_h__
-
-
-class nsIXPInstallProgressNotifier
-{
-     public:
-        
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: BeforeJavascriptEvaluation
-        // Description	    : This will be called when prior to the install script being evaluate
-        // Return type		: void 
-        // Argument         : void
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void BeforeJavascriptEvaluation(void) = 0;
-        
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: AfterJavascriptEvaluation
-        // Description	    : This will be called after the install script has being evaluated
-        // Return type		: void 
-        // Argument         : void
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-         
-        virtual void AfterJavascriptEvaluation(void) = 0;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: InstallStarted
-        // Description	    : This will be called when StartInstall has been called
-        // Return type		: void
-        // Argument         : char* UIPackageName - User Package Name
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void InstallStarted(const char* UIPackageName) = 0;
-        
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: ItemScheduled
-        // Description	    : This will be called when items are being scheduled 
-        // Return type		: Any value returned other than zero, will be treated as an error and the script will be aborted
-        // Argument         : The message that should be displayed to the user
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual long ItemScheduled( const char* message ) = 0;
-        
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: InstallFinalization
-        // Description	    : This will be called when the installation is in its Finalize stage 
-        // Return type		: void 
-        // Argument         : char* message - The message that should be displayed to the user
-        // Argument         : long itemNum  - This is the current item number
-        // Argument         : long totNum   - This is the total number of items
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void InstallFinalization( const char* message, long itemNum, long totNum ) = 0;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: InstallAborted
-        // Description	    : This will be called when the install is aborted 
-        // Return type		: void
-        // Argument         : void
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void InstallAborted(void) = 0;
-
-};
-
-
-#endif

mozilla/xpinstall/public/nsSoftwareUpdateIIDs.h

@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#ifndef nsSoftwareUpdateIIDs_h___
-#define nsSoftwareUpdateIIDs_h___
-
-#define NS_SoftwareUpdate_CID                        \
-{ /* 18c2f989-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f989,                                      \
-    0xb09f,                                          \
-    0x11d2,                                          \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
-}
-
-#define NS_SoftwareUpdateInstall_CID                 \
-{ /* 18c2f98b-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f98b,                                      \
-    0xb09f,                                          \
-    0x11d2,                                          \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
-}
-
-#define NS_SoftwareUpdateInstallTrigger_CID          \
-{ /* 18c2f98d-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f98d,                                      \
-    0xb09f,                                          \
-    0x11d2,                                          \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
-}
-
-#define NS_SoftwareUpdateInstallVersion_CID          \
-{ /* 18c2f98f-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f98f,                                      \
-    0xb09f,                                          \
-    0x11d2,                                          \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
-}
-
-
-
-#endif /* nsSoftwareUpdateIIDs_h___ */
-

mozilla/xpinstall/res/MANIFEST

@@ -1,3 +0,0 @@
-progress.xul
-progress.css
-progress.html

mozilla/xpinstall/res/Makefile.in

@@ -1,34 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/config/rules.mk
-
-EXPORT_RESOURCE_XPINSTALL = \
-	$(srcdir)/progress.xul \
-	$(srcdir)/progress.html \
-	$(srcdir)/progress.css \
-	$(NULL)
-
-install:: 
-	$(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/res/xpinstall

mozilla/xpinstall/res/makefile.win

@@ -1,31 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=..\..
-IGNORE_MANIFEST=1
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) progress.xul $(DIST)\bin\res\xpinstall
-    $(MAKE_INSTALL) progress.css $(DIST)\bin\res\xpinstall
-    $(MAKE_INSTALL) progress.html $(DIST)\bin\res\xpinstall
-
-clobber::
-	rm -f $(DIST)\res\xpinstall\progress.xul
-    rm -f $(DIST)\res\xpinstall\progress.css
-    rm -f $(DIST)\res\xpinstall\progress.html

mozilla/xpinstall/res/progress.css

@@ -1,3 +0,0 @@
-TD {
-    font: 10pt sans-serif;
-}

mozilla/xpinstall/res/progress.html

@@ -1,16 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<body bgcolor="#C0C0C0"  style="overflow:visible; margin: 0px; color-background: rgb(192,192,192);">
-<center>
-<table BORDER COLS=5 WIDTH="99%" style="color-background:rgb(192,192,192);">
-<tr>
-<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
-<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
-<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
-<td WIDTH="10%" NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
-<td WIDTH="81%" NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
-</tr>
-</table>
-</center>
-</body>
-</html>

mozilla/xpinstall/res/progress.xul

@@ -1,67 +0,0 @@
-<?xml version="1.0"?> 
-<?xml-stylesheet href="../samples/xul.css" type="text/css"?> 
-<?xml-stylesheet href="progress.css" type="text/css"?> 
-
-<!DOCTYPE window
-[
-<!ENTITY downloadWindow.title "XPInstall Progress"> 
-<!ENTITY  status "Status:"> 
-<!ENTITY  cancelButtonTitle "Cancel">
-]
-> 
-
-<window xmlns:html="http://www.w3.org/TR/REC-html40"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XPInstall Progress"
-        width="425"
-        height="225">
-
-    <data>
-        <broadcaster id="data.canceled" type="string" value="false"/>
-    </data>
-
-
-    <html:script>
- 
-         function cancelInstall() 
-         {
-            var cancelData = document.getElementById("data.canceled");
-            cancelData.setAttribute( "value", "true");
-         }
-
-    </html:script>
-
-<html:center>
-  <html:table style="width:100%;">
-
-    <html:tr>
-      <html:td align="center">
-        <html:input id="dialog.uiPackageName" readonly="" style="background-color:lightgray;width:300px;"/>
-      </html:td>
-    </html:tr>
-
-    <html:tr>
-      <html:td nowrap="" style="border: 1px rgb(192,192,192);" align="center">
-        <html:input id="dialog.currentAction" readonly="" style="background-color:lightgray;width:450px;"/>
-      </html:td>
-    </html:tr>
-
-
-    <html:tr>
-      <html:td align="center" width="15%" nowrap="" style="border: 1px rgb(192,192,192);">
-        <progressmeter id="dialog.progress" mode="undetermined" style="width:300px;height:16px;">
-        </progressmeter>
-	  </html:td>
-    </html:tr>
-
-    <html:tr>
-      <html:td align="center" width="3%"  nowrap="" style="border: 1px rgb(192,192,192);">
-        <html:button onclick="cancelInstall()" height="12">
-          &cancelButtonTitle;
-        </html:button>
-      </html:td>
-    </html:tr>
-  </html:table>
-
-</html:center>
-</window>

mozilla/xpinstall/src/Makefile.in

@@ -1,61 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (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/NPL/
-#
-# 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.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-DEPTH           = ../..
-topsrcdir       = @top_srcdir@
-VPATH           = @srcdir@
-srcdir          = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= xpinstall
-LIBRARY_NAME	= xpinstall
-IS_COMPONENT	= 1
-REQUIRES        = dom js netlib raptor xpcom
-
-CPPSRCS = \
-    nsSoftwareUpdate.cpp        \
-    nsInstall.cpp               \
-    nsInstallDelete.cpp         \
-    nsInstallExecute.cpp        \
-    nsInstallFile.cpp           \
-    nsInstallFolder.cpp         \
-    nsInstallPatch.cpp          \
-    nsInstallUninstall.cpp      \
-    nsInstallTrigger.cpp        \
-    nsInstallResources.cpp      \
-    nsJSInstall.cpp             \
-    nsJSInstallTriggerGlobal.cpp\
-    nsSoftwareUpdateRun.cpp     \
-    nsSoftwareUpdateStream.cpp  \
-    nsTopProgressNotifier.cpp   \
-    nsLoggingProgressNotifier   \
-    ScheduledTasks.cpp          \
-    nsInstallFileOpItem.cpp     \
-    $(NULL)
-
-INCLUDES += -I$(srcdir)/../public
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/xpinstall/src/PatchableAppleSingle.h

@@ -1,233 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/*
-
- * The contents of this file are subject to the Netscape Public License
-
- * Version 1.0 (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/NPL/
-
- *
-
- * 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.
-
- *
-
- * The Original Code is Mozilla Communicator client code, 
-
- * released March 31, 1998. 
-
- *
-
- * The Initial Developer of the Original Code is Netscape Communications 
-
- * Corporation.  Portions created by Netscape are 
-
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-
- * Reserved.
-
- *
-
- * Contributors:
-
- *     Douglas Turner <dougt@netscape.com>
-
- */
-
- 
-
-#ifndef SU_PAS_H
-
-#define SU_PAS_H
-
-
-
-
-
-#include <Errors.h>
-
-#include <Types.h>
-
-#include <Files.h>
-
-#include <Script.h>
-
-#include <Resources.h>
-
-
-
-typedef struct PASHeader /* header portion of Patchable AppleSingle */
-
-{
-
-       UInt32 magicNum; 	/* internal file type tag = 0x00244200*/
-
-       UInt32 versionNum; 	/* format version: 1 = 0x00010000 */
-
-       UInt8 filler[16]; 	/* filler */
-
-       UInt16 numEntries; 	/* number of entries which follow */
-
-} PASHeader ; 
-
-
-
-
-
-typedef struct PASEntry 	/* one Patchable AppleSingle entry descriptor */
-
-{
-
-        UInt32 entryID; 	/* entry type: see list, 0 invalid 		*/
-
-        UInt32 entryOffset; /* offset, in bytes, from beginning 	*/
-
-                            /* of file to this entry's data 		*/
-
-        UInt32 entryLength; /* length of data in octets 			*/
-
-        
-
-} PASEntry; 
-
-
-
-
-
-typedef struct PASMiscInfo
-
-{
-
-	short	fileHasResFork;
-
-	short	fileResAttrs;
-
-	OSType 	fileType;
-
-	OSType	fileCreator;
-
-	UInt32	fileFlags;
-
-
-
-} PASMiscInfo; 
-
-
-
-
-
-typedef struct PASResFork
-
-{
-
-	short	NumberOfTypes;
-
-	
-
-} PASResFork; 
-
-
-
-
-
-typedef struct PASResource
-
-{
-
-	short			attr;
-
-	short			attrID;
-
-	OSType			attrType;
-
-	Str255			attrName;
-
-	unsigned long	length;
-
-		
-
-} PASResource; 
-
-
-
-
-
-
-
-#if PRAGMA_ALIGN_SUPPORTED
-
-#pragma options align=reset
-
-#endif
-
-
-
-
-
-#define kCreator	'MOSS'
-
-#define kType		'PASf'
-
-#define PAS_BUFFER_SIZE (1024*512)
-
-
-
-#define PAS_MAGIC_NUM	(0x00244200)
-
-#define PAS_VERSION		(0x00010000)
-
-
-
-enum
-
-{
-
-	ePas_Data	=	1,
-
-	ePas_Misc,
-
-	ePas_Resource
-
-};
-
-
-
-#ifdef __cplusplus
-
-extern "C" {
-
-#endif
-
-
-
-/* Prototypes */
-
-OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec);
-
-OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec);
-
-
-
-
-
-
-
-#ifdef __cplusplus
-
-}
-
-#endif
-
-
-
-#endif /* SU_PAS_H */

mozilla/xpinstall/src/ScheduledTasks.cpp

@@ -1,380 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nscore.h"
-#include "NSReg.h"
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsInstall.h" // for error codes
-#include "prmem.h"
-#include "ScheduledTasks.h"
-
-#ifdef _WINDOWS
-#include <sys/stat.h>
-#include <windows.h>
-
-BOOL WIN32_IsMoveFileExBroken()
-{
-    /* the NT option MOVEFILE_DELAY_UNTIL_REBOOT is broken on 
-     * Windows NT 3.51 Service Pack 4 and NT 4.0 before Service Pack 2
-     */
-    BOOL broken = FALSE;
-    OSVERSIONINFO osinfo;
-
-    // they *all* appear broken--better to have one way that works.
-    return TRUE;
-
-    osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    if (GetVersionEx(&osinfo) && osinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
-    {
-        if ( osinfo.dwMajorVersion == 3 && osinfo.dwMinorVersion == 51 )
-        {
-            if ( 0 == stricmp(osinfo.szCSDVersion,"Service Pack 4"))
-            {
-                broken = TRUE;
-            }
-        }
-        else if ( osinfo.dwMajorVersion == 4 )
-        {
-            if (osinfo.szCSDVersion[0] == '\0' || 
-                (0 == stricmp(osinfo.szCSDVersion,"Service Pack 1")))
-            {
-                broken = TRUE;
-            }
-        }
-    }
-
-    return broken;
-}
-
-
-PRInt32 DoWindowsReplaceExistingFileStuff(const char* currentName, const char* finalName)
-{
-    PRInt32 err = 0;
-
-    char* final   = strdup(finalName);
-    char* current = strdup(currentName);
-
-    /* couldn't delete, probably in use. Schedule for later */
-     DWORD	dwVersion, dwWindowsMajorVersion;
-
-    /* Get OS version info */
-    dwVersion = GetVersion();
-    dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
-
-    /* Get build numbers for Windows NT or Win32s */
-
-    if (dwVersion < 0x80000000)                // Windows NT
-    {
-    	/* On Windows NT */
-        if ( WIN32_IsMoveFileExBroken() )
-        {
-            /* the MOVEFILE_DELAY_UNTIL_REBOOT option doesn't work on
-             * NT 3.51 SP4 or on NT 4.0 until SP2
-             */
-            struct stat statbuf;
-            PRBool nameFound = PR_FALSE;
-            char tmpname[_MAX_PATH];
-            
-            strncpy( tmpname, finalName, _MAX_PATH );
-            int len = strlen(tmpname);
-            while (!nameFound && len < _MAX_PATH ) 
-            {
-                    tmpname[len-1] = '~';
-                    tmpname[len] = '\0';
-                    if ( stat(tmpname, &statbuf) != 0 )
-                        nameFound = TRUE;
-                    else
-                        len++;
-            }
-
-            if ( nameFound ) 
-            {
-                if ( MoveFile( finalName, tmpname ) ) 
-                {
-                    if ( MoveFile( currentName, finalName ) ) 
-                    {
-                        DeleteFileNowOrSchedule(nsFileSpec(tmpname));
-                    }
-                    else 
-                    {
-                        /* 2nd move failed, put old file back */
-                        MoveFile( tmpname, finalName );
-                    }
-                }
-                else
-                {
-                    /* non-executable in use; schedule for later */
-                    return -1;  // let the start registry stuff do our work!
-                }
-            }
-        }
-        else if ( MoveFileEx(currentName, finalName, MOVEFILE_DELAY_UNTIL_REBOOT) )
-        {
-		    err = 0;
-        }
-    }
-	else // Windows 95 or Win16
-	{
-        /*
- 		 * Place an entry in the WININIT.INI file in the Windows directory
-		 * to delete finalName and rename currentName to be finalName at reboot
- 		 */
-
-        int strlen;
- 		char	Src[_MAX_PATH];   // 8.3 name
- 		char	Dest[_MAX_PATH];  // 8.3 name
-
-        strlen = GetShortPathName( (LPCTSTR)currentName, (LPTSTR)Src, (DWORD)sizeof(Src) );
-        if ( strlen > 0 ) 
-        {
-            free(current);
-            current   = strdup(Src);
-        }
-
-		strlen = GetShortPathName( (LPCTSTR) finalName, (LPTSTR) Dest, (DWORD) sizeof(Dest));
-        if ( strlen > 0 ) 
-        {
-            free(final);
-            final   = strdup(Dest);
-        }
-        
-        /* NOTE: use OEM filenames! Even though it looks like a Windows
-         *       .INI file, WININIT.INI is processed under DOS 
-         */
-        
-        AnsiToOem( final, final );
-        AnsiToOem( current, current );
-
-        if ( WritePrivateProfileString( "Rename", final, current, "WININIT.INI" ) )
-		    err = 0;
-    }
-    
-    free(final);
-    free(current);
-
-    return err;
-}
-#endif
-
-
-
-
-
-
-REGERR DeleteFileNowOrSchedule(nsFileSpec& filename)
-{
-
-    REGERR result = 0;
-    
-    filename.Delete(false);
-    
-    if (filename.Exists())
-    {
-        RKEY newkey;
-        HREG reg;
-        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
-        {
-            if (REGERR_OK == NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY, &newkey) )
-            {
-                // FIX should be using nsPersistentFileDescriptor!!!
-
-                result = NR_RegSetEntry( reg, newkey, (char*)(const char*)filename.GetNativePathCString(), REGTYPE_ENTRY_FILE, nsnull, 0);
-                if (result == REGERR_OK)
-                    result = nsInstall::REBOOT_NEEDED;
-            }
-
-            NR_RegClose(reg);
-        }
-    }
-
-    return result;
-}
-/* tmp file is the bad one that we want to replace with target. */
-
-REGERR ReplaceFileNowOrSchedule(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
-{
-    REGERR result = 0;
-    
-    if(replacementFile == doomedFile)
-    {
-        /* do not have to do anything */
-        return result;
-    }
-
-    doomedFile.Delete(false);
-
-    if (! doomedFile.Exists() )
-    {
-        // Now that we have move the existing file, we can move the mExtracedFile into place.
-        nsFileSpec parentofFinalFile;
-
-        doomedFile.GetParent(parentofFinalFile);
-        result = replacementFile.Move(parentofFinalFile);
-        if ( NS_SUCCEEDED(result) )
-        {
-            char* leafName = doomedFile.GetLeafName();
-            replacementFile.Rename(leafName);
-            nsCRT::free(leafName);
-        }
-    }
-    else
-    {
-#ifdef _WINDOWS
-        if (DoWindowsReplaceExistingFileStuff(replacementFile.GetNativePathCString(), doomedFile.GetNativePathCString()) == 0)
-            return 0;
-#endif
-
-        RKEY newkey;
-        HREG reg;
-
-        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
-        {
-            result = NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &newkey);
-            if ( result == REGERR_OK ) 
-            {
-                char* replacementFileName = (char*)(const char*)replacementFile.GetNativePathCString();
-                result = NR_RegSetEntry( reg, newkey, (char*)(const char*)doomedFile.GetNativePathCString(), REGTYPE_ENTRY_FILE, replacementFileName, strlen(replacementFileName));
-                if (result == REGERR_OK)
-                    result = nsInstall::REBOOT_NEEDED;
-            }
-
-            NR_RegClose(reg);
-        }
-    }
-
-    return result;
-}
-
-void DeleteScheduledFiles(void);
-void ReplaceScheduledFiles(void);
-
-extern "C" void PerformScheduledTasks(void *data)
-{
-    DeleteScheduledFiles();
-    ReplaceScheduledFiles();
-}
-
-
-void DeleteScheduledFiles(void)
-{
-    HREG reg;
-
-    if (REGERR_OK == NR_RegOpen("", &reg))
-    {
-        RKEY    key;
-	    REGENUM state;
-
-        /* perform scheduled file deletions and replacements (PC only) */
-        if (REGERR_OK ==  NR_RegGetKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY,&key))
-        {
-            char buf[MAXREGNAMELEN];
-
-            while (REGERR_OK == NR_RegEnumEntries(reg, key, &state, buf, sizeof(buf), NULL ))
-            {
-                nsFileSpec doomedFile(buf);
-
-                doomedFile.Delete(PR_FALSE);
-                
-                if (! doomedFile.Exists()) 
-                {
-                    NR_RegDeleteEntry( reg, key, buf );
-                }
-            }
-
-            /* delete list node if empty */
-			if (REGERR_NOMORE == NR_RegEnumEntries( reg, key, &state, buf, sizeof(buf), NULL ))
-            {
-                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY);
-            }
-        }
-        
-        NR_RegClose(reg);
-    }
-}
-
-void ReplaceScheduledFiles(void)
-{
-    HREG reg;
-     
-    if (REGERR_OK == NR_RegOpen("", &reg))
-    {
-        RKEY    key;
-	    REGENUM state;
-
-        /* replace files if any listed */
-        if (REGERR_OK ==  NR_RegGetKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &key))
-        {
-            char tmpfile[MAXREGNAMELEN];
-            char target[MAXREGNAMELEN];
-
-            state = 0;
-            while (REGERR_OK == NR_RegEnumEntries(reg, key, &state, tmpfile, sizeof(tmpfile), NULL ))
-            {
-
-                nsFileSpec replaceFile(tmpfile);
-
-                if (! replaceFile.Exists() )
-                {
-                    NR_RegDeleteEntry( reg, key, tmpfile );
-                }
-                else if ( REGERR_OK != NR_RegGetEntryString( reg, key, tmpfile, target, sizeof(target) ) )
-                {
-                    /* can't read target filename, corruption? */
-                    NR_RegDeleteEntry( reg, key, tmpfile );
-                }
-                else 
-                {
-                    nsFileSpec targetFile(target);
-                
-                    targetFile.Delete(PR_FALSE);
-                
-                    if (!targetFile.Exists())
-                    {
-                        nsFileSpec parentofTarget;
-                        targetFile.GetParent(parentofTarget);                                           
-                    
-                        nsresult result = replaceFile.Move(parentofTarget);
-                        if ( NS_SUCCEEDED(result) )
-                        {
-                            char* leafName = targetFile.GetLeafName();
-                            replaceFile.Rename(leafName);
-                            nsCRT::free(leafName);
-                            
-                            NR_RegDeleteEntry( reg, key, tmpfile );
-                        }
-                    }
-                }
-            }
-            /* delete list node if empty */
-            if (REGERR_NOMORE == NR_RegEnumEntries(reg, key, &state, tmpfile, sizeof(tmpfile), NULL )) 
-            {
-                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY);
-            }
-        }
-        
-        NR_RegClose(reg);
-    }
-}

mozilla/xpinstall/src/ScheduledTasks.h

@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef __SCHEDULEDTASKS_H__
-#define __SCHEDULEDTASKS_H__
-
-
-#include "NSReg.h"
-#include "nsFileSpec.h"
-
-
-REGERR DeleteFileNowOrSchedule(nsFileSpec& filename);
-REGERR ReplaceFileNowOrSchedule(nsFileSpec& tmpfile, nsFileSpec& target );
-
-
-extern "C" void PerformScheduledTasks(void *data);
-
-
-#endif

mozilla/xpinstall/src/gdiff.h

@@ -1,135 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-/*--------------------------------------------------------------
- * GDIFF.H
- *
- * Constants used in processing the GDIFF format
- *--------------------------------------------------------------*/
-
-
-#include "prio.h"
-#include "nsFileSpec.h"
-
-#define GDIFF_MAGIC         "\xD1\xFF\xD1\xFF"
-#define GDIFF_MAGIC_LEN     4
-#define GDIFF_VER           5
-#define GDIFF_EOF           "\0"
-
-#define GDIFF_VER_POS       4
-#define GDIFF_CS_POS        5
-#define GDIFF_CSLEN_POS     6
-
-#define GDIFF_HEADERSIZE    7
-#define GDIFF_APPDATALEN    4
-
-#define GDIFF_CS_NONE       0
-#define GDIFF_CS_MD5        1
-#define GDIFF_CS_SHA        2
-#define GDIFF_CS_CRC32      32
-
-#define CRC32_LEN           4
-
-/*--------------------------------------
- *  GDIFF opcodes
- *------------------------------------*/
-#define ENDDIFF     0
-#define ADD8MAX     246
-#define ADD16       247
-#define ADD32       248
-#define COPY16BYTE  249
-#define COPY16SHORT 250
-#define COPY16LONG  251
-#define COPY32BYTE  252
-#define COPY32SHORT 253
-#define COPY32LONG  254
-#define COPY64      255
-
-/* instruction sizes */
-#define ADD16SIZE           2
-#define ADD32SIZE           4
-#define COPY16BYTESIZE      3
-#define COPY16SHORTSIZE     4
-#define COPY16LONGSIZE      6
-#define COPY32BYTESIZE      5
-#define COPY32SHORTSIZE     6
-#define COPY32LONGSIZE      8
-#define COPY64SIZE          12
-
-
-/*--------------------------------------
- *  error codes
- *------------------------------------*/
-#define GDIFF_OK                0
-#define GDIFF_ERR_UNKNOWN       -1
-#define GDIFF_ERR_ARGS          -2
-#define GDIFF_ERR_ACCESS        -3
-#define GDIFF_ERR_MEM           -4
-#define GDIFF_ERR_HEADER        -5
-#define GDIFF_ERR_BADDIFF       -6
-#define GDIFF_ERR_OPCODE        -7
-#define GDIFF_ERR_OLDFILE       -8
-#define GDIFF_ERR_CHKSUMTYPE    -9
-#define GDIFF_ERR_CHECKSUM      -10
-#define GDIFF_ERR_CHECKSUM_TARGET  -11
-#define GDIFF_ERR_CHECKSUM_RESULT  -12
-
-
-/*--------------------------------------
- *  types
- *------------------------------------*/
-#ifndef AIX
-#ifdef OSF1
-#include <sys/types.h>
-#else
-typedef unsigned char uchar;
-#endif
-#endif
-
-typedef struct _diffdata {
-    PRFileDesc*	fSrc;
-    PRFileDesc*	fOut;
-    PRFileDesc*	fDiff;
-    uint8       checksumType;
-    uint8       checksumLength;
-    uchar*      oldChecksum;
-    uchar*      newChecksum;
-    PRBool      bMacAppleSingle;
-    PRBool      bWin32BoundImage;
-    uchar*      databuf;
-    uint32      bufsize;
-} DIFFDATA;
-
-typedef DIFFDATA* pDIFFDATA;
-
-
-/*--------------------------------------
- *  miscellaneous
- *------------------------------------*/
-
-#define APPFLAG_W32BOUND        "autoinstall:Win32PE"
-#define APPFLAG_APPLESINGLE     "autoinstall:AppleSingle"
-
-#ifndef TRUE
-  #define TRUE  1
-#endif
-
-#ifndef FALSE
-  #define FALSE 0
-#endif
-
-

mozilla/xpinstall/src/makefile.win

@@ -1,111 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (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/NPL/
-#
-# 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.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-
-DEPTH=..\..
-IGNORE_MANIFEST=1
-
-MAKE_OBJ_TYPE = DLL
-MODULE=xpinstall
-
-DLL=.\$(OBJDIR)\$(MODULE).dll
-
-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
-
-LCFLAGS =          \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-LINCS=                          \
-        -I$(PUBLIC)\xpinstall   \
-        -I$(PUBLIC)\jar         \
-        -I$(PUBLIC)\libreg      \
-        -I$(PUBLIC)\netlib      \
-        -I$(PUBLIC)\xpcom       \
-        -I$(PUBLIC)\pref        \
-        -I$(PUBLIC)\rdf         \
-        -I$(PUBLIC)\js          \
-        -I$(PUBLIC)\dom         \
-        -I$(PUBLIC)\raptor      \
-        -I$(PUBLIC)\nspr2       \
-		-I$(PUBLIC)\zlib        \
-        -I$(PUBLIC)\xpfe\components \
-        $(NULL)
-
-LLIBS =                                \
-        $(DIST)\lib\jar50.lib          \
-        $(DIST)\lib\libreg32.lib       \
-        $(DIST)\lib\netlib.lib         \
-        $(DIST)\lib\xpcom.lib        \
-        $(DIST)\lib\js3250.lib         \
-        $(DIST)\lib\jsdombase_s.lib    \
-        $(DIST)\lib\jsdomevents_s.lib  \
-		$(DIST)\lib\zlib.lib           \
-		$(DIST)\lib\plc3.lib           \
-        $(LIBNSPR)                     \
-        $(NULL)
-
-
-OBJS =                                          \
-       .\$(OBJDIR)\nsInstall.obj                \
-       .\$(OBJDIR)\nsInstallTrigger.obj         \
-       .\$(OBJDIR)\nsInstallVersion.obj         \
-       .\$(OBJDIR)\nsInstallFolder.obj          \
-       .\$(OBJDIR)\nsJSInstall.obj              \
-       .\$(OBJDIR)\nsJSInstallTriggerGlobal.obj \
-       .\$(OBJDIR)\nsJSInstallVersion.obj       \
-       .\$(OBJDIR)\nsSoftwareUpdate.obj         \
-       .\$(OBJDIR)\nsSoftwareUpdateRun.obj      \
-       .\$(OBJDIR)\nsSoftwareUpdateStream.obj   \
-       .\$(OBJDIR)\nsInstallFile.obj            \
-       .\$(OBJDIR)\nsInstallDelete.obj          \
-       .\$(OBJDIR)\nsInstallExecute.obj         \
-       .\$(OBJDIR)\nsInstallPatch.obj           \
-       .\$(OBJDIR)\nsInstallUninstall.obj       \
-       .\$(OBJDIR)\nsInstallResources.obj       \
-       .\$(OBJDIR)\nsTopProgressNotifier.obj    \
-       .\$(OBJDIR)\nsLoggingProgressNotifier.obj\
-       .\$(OBJDIR)\ScheduledTasks.obj           \
-       .\$(OBJDIR)\nsWinReg.obj                 \
-       .\$(OBJDIR)\nsJSWinReg.obj               \
-       .\$(OBJDIR)\nsWinRegItem.obj             \
-       .\$(OBJDIR)\nsWinRegValue.obj            \
-       .\$(OBJDIR)\nsWinProfile.obj             \
-       .\$(OBJDIR)\nsJSWinProfile.obj           \
-       .\$(OBJDIR)\nsWinProfileItem.obj         \
-       .\$(OBJDIR)\nsInstallProgressDialog.obj  \
-       .\$(OBJDIR)\nsInstallFileOpItem.obj      \
-       $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
-    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin\components
-
-clobber::
-        rm -f $(DIST)\lib\$(MODULE).lib
-        rm -f $(DIST)\bin\components\$(MODULE).dll
-

mozilla/xpinstall/src/nsInstall.h

@@ -1,265 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef __NS_INSTALL_H__
-#define __NS_INSTALL_H__
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-#include "jsapi.h"
-
-#include "plevent.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsVector.h"
-#include "nsHashtable.h"
-
-#include "nsSoftwareUpdate.h"
-
-#include "nsInstallObject.h"
-#include "nsInstallVersion.h"
-
-#include "nsIXPInstallProgress.h"
-
-
-class nsInstallInfo
-{
-  public:
-    
-    nsInstallInfo(const nsString& fromURL, const nsString& localFile, long flags);
-
-    nsInstallInfo(nsVector* fromURL, nsVector* localFiles, long flags);
-    
-    virtual ~nsInstallInfo();
-
-    nsString& GetFromURL(PRUint32 index = 0);
-    
-    nsString& GetLocalFile(PRUint32 index = 0);
-
-    void GetArguments(nsString& args, PRUint32 index = 0);
-    
-    long GetFlags();
-    
-    PRBool    IsMultipleTrigger();
-
-    static void DeleteVector(nsVector* vector);    
-    
-  private:
-    
-    
-    PRBool    mMultipleTrigger;
-    nsresult  mError;
-
-    long       mFlags;
-    nsVector  *mFromURLs;
-    nsVector  *mLocalFiles;
-};
-
-
-
-class nsInstall
-{
-    friend class nsWinReg;
-    friend class nsWinProfile;
-
-    public:
-       
-        enum 
-        {
-            BAD_PACKAGE_NAME            = -200,
-            UNEXPECTED_ERROR            = -201,
-            ACCESS_DENIED               = -202,
-            TOO_MANY_CERTIFICATES       = -203,
-            NO_INSTALLER_CERTIFICATE    = -204,
-            NO_CERTIFICATE              = -205,
-            NO_MATCHING_CERTIFICATE     = -206,
-            UNKNOWN_JAR_FILE            = -207,
-            INVALID_ARGUMENTS           = -208,
-            ILLEGAL_RELATIVE_PATH       = -209,
-            USER_CANCELLED              = -210,
-            INSTALL_NOT_STARTED         = -211,
-            SILENT_MODE_DENIED          = -212,
-            NO_SUCH_COMPONENT           = -213,
-            FILE_DOES_NOT_EXIST         = -214,
-            FILE_READ_ONLY              = -215,
-            FILE_IS_DIRECTORY           = -216,
-            NETWORK_FILE_IS_IN_USE      = -217,
-            APPLE_SINGLE_ERR            = -218,
-            INVALID_PATH_ERR            = -219,
-            PATCH_BAD_DIFF              = -220,
-            PATCH_BAD_CHECKSUM_TARGET   = -221,
-            PATCH_BAD_CHECKSUM_RESULT   = -222,
-            UNINSTALL_FAILED            = -223,
-            GESTALT_UNKNOWN_ERR         = -5550,
-            GESTALT_INVALID_ARGUMENT    = -5551,
-            
-            SUCCESS                     = 0,
-            REBOOT_NEEDED               = 999,
-            
-            LIMITED_INSTALL             = 0,
-            FULL_INSTALL                = 1,
-            NO_STATUS_DLG               = 2,
-            NO_FINALIZE_DLG             = 4,
-
-            INSTALL_FILE_UNEXPECTED_MSG_ID = 0,
-            DETAILS_REPLACE_FILE_MSG_ID = 1,
-            DETAILS_INSTALL_FILE_MSG_ID = 2
-        };
-
-
-        nsInstall();
-        virtual ~nsInstall();
-        
-        PRInt32    SetScriptObject(void* aScriptObject);
-
-        PRInt32    SaveWinRegPrototype(void* aScriptObject);
-        PRInt32    SaveWinProfilePrototype(void* aScriptObject);
-        
-        JSObject*  RetrieveWinRegPrototype(void);
-        JSObject*  RetrieveWinProfilePrototype(void);
-
-        PRInt32    GetUserPackageName(nsString& aUserPackageName);
-        PRInt32    GetRegPackageName(nsString& aRegPackageName);
-
-        PRInt32    AbortInstall();
-        
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRBool aForceMode, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aJarSource, PRInt32* aReturn);
-        
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRBool aForceMode, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aJarSource, PRInt32* aReturn);
-        
-        PRInt32    DeleteComponent(const nsString& aRegistryName, PRInt32* aReturn);
-        PRInt32    DeleteFile(const nsString& aFolder, const nsString& aRelativeFileName, PRInt32* aReturn);
-        PRInt32    DiskSpaceAvailable(const nsString& aFolder, PRInt32* aReturn);
-        PRInt32    Execute(const nsString& aJarSource, const nsString& aArgs, PRInt32* aReturn);
-        PRInt32    Execute(const nsString& aJarSource, PRInt32* aReturn);
-        PRInt32    FinalizeInstall(PRInt32* aReturn);
-        PRInt32    Gestalt(const nsString& aSelector, PRInt32* aReturn);
-        PRInt32    GetComponentFolder(const nsString& aComponentName, const nsString& aSubdirectory, nsString** aFolder);
-        PRInt32    GetComponentFolder(const nsString& aComponentName, nsString** aFolder);
-        PRInt32    GetFolder(const nsString& aTargetFolder, const nsString& aSubdirectory, nsString** aFolder);
-        PRInt32    GetFolder(const nsString& aTargetFolder, nsString** aFolder);
-        PRInt32    GetLastError(PRInt32* aReturn);
-        PRInt32    GetWinProfile(const nsString& aFolder, const nsString& aFile, JSContext* jscontext, JSClass* WinProfileClass, jsval* aReturn);
-        PRInt32    GetWinRegistry(JSContext* jscontext, JSClass* WinRegClass, jsval* aReturn);
-        PRInt32    Patch(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    Patch(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    ResetError();
-        PRInt32    SetPackageFolder(const nsString& aFolder);
-        PRInt32    StartInstall(const nsString& aUserPackageName, const nsString& aPackageName, const nsString& aVersion, PRInt32* aReturn);
-        PRInt32    Uninstall(const nsString& aPackageName, PRInt32* aReturn);
-        
-        PRInt32    FileOpDirCreate(nsFileSpec& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpDirGetParent(nsFileSpec& aTarget, nsFileSpec* aReturn);
-        PRInt32    FileOpDirRemove(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpDirRename(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileCopy(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileDelete(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpFileExists(nsFileSpec& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileExecute(nsFileSpec& aTarget, nsString& aParams, PRInt32* aReturn);
-        PRInt32    FileOpFileGetNativeVersion(nsFileSpec& aTarget, nsString* aReturn);
-        PRInt32    FileOpFileGetDiskSpaceAvailable(nsFileSpec& aTarget, PRUint32* aReturn);
-        PRInt32    FileOpFileGetModDate(nsFileSpec& aTarget, nsFileSpec::TimeStamp* aReturn);
-        PRInt32    FileOpFileGetSize(nsFileSpec& aTarget, PRUint32* aReturn);
-        PRInt32    FileOpFileIsDirectory(nsFileSpec& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileIsFile(nsFileSpec& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileModDateChanged(nsFileSpec& aTarget, nsFileSpec::TimeStamp& aOldStamp, PRBool* aReturn);
-        PRInt32    FileOpFileMove(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileRename(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileWinShortcutCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpFileMacAliasCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpFileUnixLinkCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-
-        PRInt32    ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedName, nsFileSpec** aRealName);
-        void       AddPatch(nsHashKey *aKey, nsFileSpec* fileName);
-        void       GetPatch(nsHashKey *aKey, nsFileSpec* fileName);
-        
-        void       GetJarFileLocation(nsString& aFile);
-        void       SetJarFileLocation(const nsString& aFile);
-
-        void       GetInstallArguments(nsString& args);
-        void       SetInstallArguments(const nsString& args);
-
-
-    private:
-        JSObject*           mScriptObject;
-        
-        JSObject*           mWinRegObject;
-        JSObject*           mWinProfileObject;
-        
-        nsString            mJarFileLocation;
-        void*               mJarFileData;
-        
-        nsString            mInstallArguments;
-
-        PRBool              mUserCancelled;
-        
-        PRBool              mUninstallPackage;
-        PRBool              mRegisterPackage;
-
-        nsString            mRegistryPackageName;   /* Name of the package we are installing */
-        nsString            mUIName;                /* User-readable package name */
-
-        nsInstallVersion*   mVersionInfo;           /* Component version info */
-        
-        nsVector*           mInstalledFiles;        
-        nsHashtable*        mPatchList;
-        
-        nsIXPInstallProgress *mNotifier;
-        
-        PRInt32             mLastError;
-
-        void        ParseFlags(int flags);
-        PRInt32     SanityCheck(void);
-        void        GetTime(nsString &aString);
-
-        
-        PRInt32     GetQualifiedRegName(const nsString& name, nsString& qualifiedRegName );
-        PRInt32     GetQualifiedPackageName( const nsString& name, nsString& qualifiedName );
-        
-        void        CurrentUserNode(nsString& userRegNode);
-        PRBool      BadRegName(const nsString& regName);
-        PRInt32     SaveError(PRInt32 errcode);
-
-        void        CleanUp();
-
-        PRInt32     OpenJARFile(void);
-        void        CloseJARFile(void);
-        PRInt32     ExtractDirEntries(const nsString& directory, nsVector *paths);
-
-        PRInt32     ScheduleForInstall(nsInstallObject* ob);
-        
-
-};
-
-#endif

mozilla/xpinstall/src/nsInstallDelete.cpp

@@ -1,235 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#include "prmem.h"
-
-#include "nsFileSpec.h"
-
-#include "VerReg.h"
-#include "ScheduledTasks.h"
-#include "nsInstallDelete.h"
-#include "nsInstallResources.h"
-
-#include "nsInstall.h"
-#include "nsIDOMInstallVersion.h"
-
-nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
-                                  const nsString& folderSpec,
-                                  const nsString& inPartialPath,
-                                  PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    if ((folderSpec == "null") || (inInstall == NULL)) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mDeleteStatus = DELETE_FILE;
-    mFinalFile      = nsnull;
-    mRegistryName   = "";
-    
-
-    mFinalFile = new nsFileSpec(folderSpec);
-    *mFinalFile += inPartialPath;
-
-    *error = ProcessInstallDelete();
-}
-
-nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
-                                  const nsString& inComponentName,
-                                  PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    if (inInstall == NULL) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mDeleteStatus = DELETE_COMPONENT;
-    mFinalFile    = nsnull;
-    mRegistryName = inComponentName;
-
-    *error = ProcessInstallDelete();
-}
-
-
-nsInstallDelete::~nsInstallDelete()
-{
-    if (mFinalFile == nsnull)
-        delete mFinalFile;
-}
-
-
-PRInt32 nsInstallDelete::Prepare()
-{
-    // no set-up necessary
-    return nsInstall::SUCCESS;
-}
-
-PRInt32 nsInstallDelete::Complete()
-{
-    PRInt32 err = nsInstall::SUCCESS;
-
-    if (mInstall == NULL) 
-       return nsInstall::INVALID_ARGUMENTS;
-
-    if (mDeleteStatus == DELETE_COMPONENT) 
-    {
-        char* temp = mRegistryName.ToNewCString();
-        err = VR_Remove(temp);
-        delete [] temp;
-    }
-
-    if ((mDeleteStatus == DELETE_FILE) || (err == REGERR_OK)) 
-    {
-        err = NativeComplete();
-    }	
-    else 
-    {
-        err = nsInstall::UNEXPECTED_ERROR;
-    }
-
-    
-    return err;
-}
-
-void nsInstallDelete::Abort()
-{
-}
-
-char* nsInstallDelete::toString()
-{
-    char* buffer = new char[1024];
-    
-    if (mDeleteStatus == DELETE_COMPONENT)
-    {
-        sprintf( buffer, nsInstallResources::GetDeleteComponentString(), nsAutoCString(mRegistryName));
-    }
-    else
-    {
-        if (mFinalFile)
-            sprintf( buffer, nsInstallResources::GetDeleteFileString(), mFinalFile->GetCString());
-    }
-
-    return buffer;
-}
-
-
-PRBool
-nsInstallDelete::CanUninstall()
-{
-    return PR_FALSE;
-}
-
-PRBool
-nsInstallDelete::RegisterPackageNode()
-{
-    return PR_FALSE;
-}
-
-
-PRInt32 nsInstallDelete::ProcessInstallDelete()
-{
-    PRInt32 err;
-    
-    char* tempCString = nsnull;
-
-    if (mDeleteStatus == DELETE_COMPONENT) 
-    {
-        /* Check if the component is in the registry */
-        tempCString = mRegistryName.ToNewCString();
-
-        err = VR_InRegistry( tempCString );
-                
-        if (err != REGERR_OK) 
-        {
-            return err;
-        } 
-        else 
-        {
-            char* tempRegistryString;
-
-            tempRegistryString = (char*)PR_Calloc(MAXREGPATHLEN, sizeof(char));
-            
-            err = VR_GetPath( tempCString , MAXREGPATHLEN, tempRegistryString);
-            
-            if (err == REGERR_OK)
-            {
-                if (mFinalFile)
-                    delete mFinalFile;
-
-                mFinalFile = new nsFileSpec(tempRegistryString);
-            }
-
-            PR_FREEIF(tempRegistryString);
-        }
-    }
-    
-    if(tempCString)
-        delete [] tempCString;
-
-    if (mFinalFile->Exists())
-    {
-        if (mFinalFile->IsFile())
-        {
-            err = nsInstall::SUCCESS;
-        }
-        else
-        {
-            err = nsInstall::FILE_IS_DIRECTORY;
-        }
-    }
-    else
-    {
-        err = nsInstall::FILE_DOES_NOT_EXIST;
-    }
-
-    return err;
-}
-
-
-
-PRInt32 nsInstallDelete::NativeComplete()
-{
-    if (mFinalFile->Exists())
-    {
-        if (mFinalFile->IsFile())
-        {
-           return DeleteFileNowOrSchedule(*mFinalFile);
-        }
-        else
-        {
-            return nsInstall::FILE_IS_DIRECTORY;
-        }
-    }
-    
-    return nsInstall::FILE_DOES_NOT_EXIST;
-}
-

mozilla/xpinstall/src/nsInstallDelete.h

@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsInstallDelete_h__
-#define nsInstallDelete_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-#include "nsInstallObject.h"
-
-#include "nsInstall.h"
-
-#define DELETE_COMPONENT 1
-#define DELETE_FILE      2
-
-class nsInstallDelete : public nsInstallObject 
-{
-    public:
-
-        nsInstallDelete(  nsInstall* inInstall,
-                          const nsString& folderSpec,
-                          const nsString& inPartialPath,
-                          PRInt32 *error);
-
-        nsInstallDelete(  nsInstall* inInstall,
-                          const nsString& ,
-                          PRInt32 *error);
-
-        virtual ~nsInstallDelete();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void    Abort();
-        char*   toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	    
-  
-    private:
-
-        /* Private Fields */
-
-        nsFileSpec* mFinalFile;
-        
-        nsString    mRegistryName;
-        PRInt32     mDeleteStatus;
-
-        PRInt32 ProcessInstallDelete();
-        PRInt32 NativeComplete();
-        
-};
-
-#endif /* nsInstallDelete_h__ */

mozilla/xpinstall/src/nsInstallExecute.cpp

@@ -1,136 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-
-#include "prmem.h"
-
-#include "nsFileSpec.h"
-
-#include "VerReg.h"
-#include "nsInstallExecute.h"
-#include "nsInstallResources.h"
-#include "ScheduledTasks.h"
-
-#include "nsInstall.h"
-#include "nsIDOMInstallVersion.h"
-
-nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
-                                      const nsString& inJarLocation,
-                                      const nsString& inArgs,
-                                      PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    if ((inInstall == nsnull) || (inJarLocation == "null"))
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    mJarLocation        = inJarLocation;
-    mArgs               = inArgs;
-    mExecutableFile     = nsnull;
-
-}
-
-
-nsInstallExecute::~nsInstallExecute()
-{
-    if (mExecutableFile)
-        delete mExecutableFile;
-}
-
-
-
-PRInt32 nsInstallExecute::Prepare()
-{
-    if (mInstall == NULL || mJarLocation == "null") 
-        return nsInstall::INVALID_ARGUMENTS;
-
-    return mInstall->ExtractFileFromJar(mJarLocation, nsnull, &mExecutableFile);
-}
-
-PRInt32 nsInstallExecute::Complete()
-{
-    if (mExecutableFile == nsnull)
-        return nsInstall::INVALID_ARGUMENTS;
-
-    nsFileSpec app( *mExecutableFile);
-    
-    if (!app.Exists())
-	{
-		return nsInstall::INVALID_ARGUMENTS;
-	}
-
-    PRInt32 result = app.Execute( mArgs );
-    
-    DeleteFileNowOrSchedule( app );
-    
-    return result;
-}
-
-void nsInstallExecute::Abort()
-{
-    /* Get the names */
-    if (mExecutableFile == nsnull) 
-        return;
-
-    DeleteFileNowOrSchedule(*mExecutableFile);
-}
-
-char* nsInstallExecute::toString()
-{
-    char* buffer = new char[1024];
-    
-    // if the FileSpec is NULL, just us the in jar file name.
-
-    if (mExecutableFile == nsnull)
-    {
-        char *tempString = mJarLocation.ToNewCString();
-        sprintf( buffer, nsInstallResources::GetExecuteString(), tempString);
-        delete [] tempString;
-    }
-    else
-    {
-        sprintf( buffer, nsInstallResources::GetExecuteString(), mExecutableFile->GetCString());
-    }
-    return buffer;
-
-}
-
-
-PRBool
-nsInstallExecute::CanUninstall()
-{
-    return PR_FALSE;
-}
-
-PRBool
-nsInstallExecute::RegisterPackageNode()
-{
-    return PR_FALSE;
-}
-

mozilla/xpinstall/src/nsInstallExecute.h

@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsInstallExecute_h__
-#define nsInstallExecute_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-#include "nsInstallObject.h"
-
-#include "nsInstall.h"
-#include "nsIDOMInstallVersion.h"
-
-
-class nsInstallExecute : public nsInstallObject 
-{
-    public:
-          
-        nsInstallExecute( nsInstall* inInstall,
-                          const nsString& inJarLocation,
-                          const nsString& inArgs,
-                          PRInt32 *error);
-
-
-        virtual ~nsInstallExecute();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void  Abort();
-        char* toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	  
-  
-    private:
-          
-        nsString mJarLocation; // Location in the JAR
-        nsString mArgs;        // command line arguments
-        
-        nsFileSpec *mExecutableFile;    // temporary file location
-        
-
-        PRInt32 NativeComplete(void);
-        void NativeAbort(void);
-
-};
-
-#endif /* nsInstallExecute_h__ */

mozilla/xpinstall/src/nsInstallFile.cpp

@@ -1,366 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsInstallFile.h"
-#include "nsFileSpec.h"
-#include "VerReg.h"
-#include "ScheduledTasks.h"
-#include "nsInstall.h"
-#include "nsIDOMInstallVersion.h"
-#include "nsInstallResources.h"
-
-/* Public Methods */
-
-/*	Constructor
-        inInstall    - softUpdate object we belong to
-        inComponentName	- full path of the registry component
-        inVInfo	        - full version info
-        inJarLocation   - location inside the JAR file
-        inFinalFileSpec	- final	location on disk
-*/
-
-
-nsInstallFile::nsInstallFile(nsInstall* inInstall,
-                             const nsString& inComponentName,
-                             const nsString& inVInfo,
-                             const nsString& inJarLocation,
-                             const nsString& folderSpec,
-                             const nsString& inPartialPath,
-                             PRBool forceInstall,
-                             PRInt32 *error) 
-: nsInstallObject(inInstall)
-{
-    mVersionRegistryName = nsnull;
-    mJarLocation         = nsnull;
-    mExtracedFile        = nsnull;
-    mFinalFile           = nsnull;
-    mVersionInfo         = nsnull;
-
-    mUpgradeFile = PR_FALSE;
-    
-    if ((folderSpec == "null") || (inInstall == NULL)) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    /* Check for existence of the newer	version	*/
-    
-    PRBool versionNewer = PR_FALSE;  // Is this a newer version
-    char* qualifiedRegNameString = inComponentName.ToNewCString();
-
-    if ( (forceInstall == PR_FALSE ) && (inVInfo !=  "") && ( VR_ValidateComponent( qualifiedRegNameString ) == 0 ) ) 
-    {
-        nsInstallVersion *newVersion = new nsInstallVersion();
-        newVersion->Init(inVInfo);
-        
-        VERSION versionStruct;
-        
-        VR_GetVersion( qualifiedRegNameString, &versionStruct );
-        
-        nsInstallVersion* oldVersion = new nsInstallVersion();
-
-        oldVersion->Init(versionStruct.major,
-                         versionStruct.minor,
-                         versionStruct.release,
-                         versionStruct.build);
-
-        PRInt32 areTheyEqual;
-        newVersion->CompareTo(oldVersion, &areTheyEqual);
-        
-        delete oldVersion;
-        delete newVersion;
-
-        if (areTheyEqual == nsIDOMInstallVersion::MAJOR_DIFF_MINUS ||
-            areTheyEqual == nsIDOMInstallVersion::MINOR_DIFF_MINUS ||
-            areTheyEqual == nsIDOMInstallVersion::REL_DIFF_MINUS   ||
-            areTheyEqual == nsIDOMInstallVersion::BLD_DIFF_MINUS   )
-        {
-            // the file to be installed is OLDER than what is on disk.  Return error
-            delete qualifiedRegNameString;
-            *error = areTheyEqual;
-            return;
-        }
-    }
-
-    delete qualifiedRegNameString;
-
-    
-     mFinalFile = new nsFileSpec(folderSpec);
-    *mFinalFile += inPartialPath;
-    
-    mReplaceFile = mFinalFile->Exists();
-    
-    if (mReplaceFile == PR_FALSE)
-    {
-        nsFileSpec parent;
-        mFinalFile->GetParent(parent);
-        nsFileSpec makeDirs(parent.GetCString(), PR_TRUE);
-    }
-
-    mForceInstall           = forceInstall;
-    
-    mVersionRegistryName    = new nsString(inComponentName);
-    mJarLocation            = new nsString(inJarLocation);
-    mVersionInfo	        = new nsString(inVInfo);
-        
-    nsString regPackageName;
-    mInstall->GetRegPackageName(regPackageName);
-    
-    // determine Child status
-    if ( regPackageName == "" ) 
-    {
-        // in the "current communicator package" absolute pathnames (start
-        // with slash) indicate shared files -- all others are children
-        mChildFile = ( mVersionRegistryName->CharAt(0) != '/' );
-    } 
-    else 
-    {
-        
-        // there is no "starts with" api in nsString.  LAME!
-        nsString startsWith;
-        mVersionRegistryName->Left(startsWith, regPackageName.Length());
-
-        if (startsWith.Equals(regPackageName))
-        {
-            mChildFile = true;
-        }
-        else
-        {
-            mChildFile = false;
-        }
-    }
-}
-
-
-nsInstallFile::~nsInstallFile()
-{
-    if (mVersionRegistryName)
-        delete mVersionRegistryName;
-  
-    if (mJarLocation)
-        delete mJarLocation;
-  
-    if (mExtracedFile)
-        delete mExtracedFile;
-
-    if (mFinalFile)
-        delete mFinalFile;
-  
-    if (mVersionInfo)
-      delete mVersionInfo;
-}
-
-/* Prepare
- * Extracts file out of the JAR archive
- */
-PRInt32 nsInstallFile::Prepare()
-{
-    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull ) 
-        return nsInstall::INVALID_ARGUMENTS;
-
-    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtracedFile);
-}
-
-/* Complete
- * Completes the install:
- * - move the downloaded file to the final location
- * - updates the registry
- */
-PRInt32 nsInstallFile::Complete()
-{
-    PRInt32 err;
-
-    if (mInstall == nsnull || mVersionRegistryName == nsnull || mFinalFile == nsnull ) 
-    {
-       return nsInstall::INVALID_ARGUMENTS;
-    }
-
-    err = CompleteFileMove();
-    
-    if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
-    {
-        err = RegisterInVersionRegistry();
-    }
-    
-    return err;
-
-}
-
-void nsInstallFile::Abort()
-{
-    if (mExtracedFile != nsnull)
-        mExtracedFile->Delete(PR_FALSE);
-}
-
-char* nsInstallFile::toString()
-{
-    char* buffer = new char[1024];
-    
-    if (mFinalFile == nsnull)
-    {
-        sprintf( buffer, nsInstallResources::GetInstallFileString(), nsnull);
-    }
-    else if (mReplaceFile)
-    {
-        // we are replacing this file.
-
-        sprintf( buffer, nsInstallResources::GetReplaceFileString(), mFinalFile->GetCString());
-    }
-    else
-    {
-        sprintf( buffer, nsInstallResources::GetInstallFileString(), mFinalFile->GetCString());
-    }
-
-    return buffer;
-}
-
-
-PRInt32 nsInstallFile::CompleteFileMove()
-{
-    int result = 0;
-    
-    if (mExtracedFile == nsnull) 
-    {
-        return -1;
-    }
-   	
-    if ( *mExtracedFile == *mFinalFile ) 
-    {
-        /* No need to rename, they are the same */
-        result = 0;
-    } 
-    else 
-    {
-        result = ReplaceFileNowOrSchedule(*mExtracedFile, *mFinalFile );
-    }
-
-  return result;  
-}
-
-PRInt32
-nsInstallFile::RegisterInVersionRegistry()
-{
-    int refCount;
-    nsString regPackageName;
-    mInstall->GetRegPackageName(regPackageName);
-    
-  
-    // Register file and log for Uninstall
-  
-    if (!mChildFile) 
-    {
-        int found;
-        if (regPackageName != "") 
-        {
-            found = VR_UninstallFileExistsInList( (char*)(const char*)nsAutoCString(regPackageName) , 
-                                                  (char*)(const char*)nsAutoCString(*mVersionRegistryName));
-        } 
-        else 
-        {
-            found = VR_UninstallFileExistsInList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
-        }
-        
-        if (found != REGERR_OK)
-            mUpgradeFile = PR_FALSE;
-        else
-            mUpgradeFile = PR_TRUE;
-    } 
-    else if (REGERR_OK == VR_InRegistry( (char*)(const char*)nsAutoCString(*mVersionRegistryName))) 
-    {
-        mUpgradeFile = PR_TRUE;
-    } 
-    else 
-    {
-        mUpgradeFile = PR_FALSE;
-    }
-
-    if ( REGERR_OK != VR_GetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), &refCount )) 
-    {
-        refCount = 0;
-    }
-
-    VR_Install( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 
-                (char*)(const char*)mFinalFile->GetNativePathCString(),  // DO NOT CHANGE THIS. 
-                (char*)(const char*)nsAutoCString(*mVersionInfo), 
-                PR_FALSE );
-
-    if (mUpgradeFile) 
-    {
-        if (refCount == 0) 
-            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
-        else 
-            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount );  //FIX?? what should the ref count be/
-    }
-    else
-    {
-        if (refCount != 0) 
-        {
-            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount + 1 );
-        } 
-        else 
-        {
-            if (mReplaceFile)
-                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 2 );
-            else
-                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
-        }
-    }
-    
-    if ( !mChildFile && !mUpgradeFile ) 
-    {
-        if (regPackageName != "") 
-        { 
-            VR_UninstallAddFileToList( (char*)(const char*)nsAutoCString(regPackageName), 
-                                       (char*)(const char*)nsAutoCString(*mVersionRegistryName));
-        } 
-        else 
-        {
-            VR_UninstallAddFileToList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
-        }
-    }
-
-    return nsInstall::SUCCESS;
-}
-
-/* CanUninstall
-* InstallFile() installs files which can be uninstalled,
-* hence this function returns true. 
-*/
-PRBool
-nsInstallFile::CanUninstall()
-{
-    return TRUE;
-}
-
-/* RegisterPackageNode
-* InstallFile() installs files which need to be registered,
-* hence this function returns true.
-*/
-PRBool
-nsInstallFile::RegisterPackageNode()
-{
-    return TRUE;
-}

mozilla/xpinstall/src/nsInstallFile.h

@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsInstallFile_h__
-#define nsInstallFile_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-#include "nsInstallObject.h"
-
-#include "nsInstall.h"
-#include "nsInstallVersion.h"
-
-class nsInstallFile : public nsInstallObject 
-{
-    public:
-
-      /*************************************************************
-       * Public Methods 
-       *
-       *	Constructor
-       *    inSoftUpdate    - softUpdate object we belong to
-       *    inComponentName	- full path of the registry component
-       *    inVInfo	        - full version info
-       *    inJarLocation   - location inside the JAR file
-       *    inFinalFileSpec	- final	location on	disk
-       *************************************************************/
-        nsInstallFile(  nsInstall* inInstall,
-                        const nsString& inVRName,
-                        const nsString& inVInfo,
-                        const nsString& inJarLocation,
-                        const nsString& folderSpec,
-                        const nsString& inPartialPath,
-                        PRBool forceInstall,
-                        PRInt32 *error);
-
-        virtual ~nsInstallFile();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void  Abort();
-        char* toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	  
-  
-    private:
-
-        /* Private Fields */
-        nsString*     mVersionInfo;	  /* Version info for this file*/
-        
-        nsString*     mJarLocation;	      /* Location in the JAR */
-        nsFileSpec*   mExtracedFile;	  /* temporary file location */
-        nsFileSpec*   mFinalFile;	      /* final file destination */
-
-        nsString*   mVersionRegistryName; /* full version path */
-        
-        PRBool      mForceInstall;   /* whether install is forced */
-        PRBool      mReplaceFile;    /* whether file exists */
-        PRBool      mChildFile;      /* whether file is a child */
-        PRBool      mUpgradeFile;    /* whether file is an upgrade */
-
-
-        PRInt32     CompleteFileMove();
-        PRInt32     RegisterInVersionRegistry();
-};
-
-#endif /* nsInstallFile_h__ */

mozilla/xpinstall/src/nsInstallFileOpEnums.h

@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsInstallFileOpEnums_h__
-#define nsInstallFileOpEnums_h__
-
-typedef enum nsInstallFileOpEnums {
-  NS_FOP_DIR_CREATE = 0,
-  NS_FOP_DIR_REMOVE = 1,
-  NS_FOP_DIR_RENAME = 2,
-  NS_FOP_FILE_COPY = 3,
-  NS_FOP_FILE_DELETE = 4,
-  NS_FOP_FILE_EXECUTE = 5,
-  NS_FOP_FILE_MOVE = 6,
-  NS_FOP_FILE_RENAME = 7,
-  NS_FOP_WIN_SHORTCUT_CREATE = 8,
-  NS_FOP_MAC_ALIAS_CREATE = 9,
-  NS_FOP_UNIX_LINK_CREATE = 10,
-  NS_FOP_FILE_SET_STAT = 11
-
-} nsInstallFileOpEnums;
-
-#endif /* nsInstallFileOpEnums_h__ */

mozilla/xpinstall/src/nsInstallFileOpItem.cpp

@@ -1,316 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nspr.h"
-#include "nsInstall.h"
-#include "nsInstallFileOpEnums.h"
-#include "nsInstallFileOpItem.h"
-
-/* Public Methods */
-
-nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
-                                         PRInt32        aCommand,
-                                         nsFileSpec&    aTarget,
-                                         PRInt32        aFlags,
-                                         PRInt32*       aReturn)
-:nsInstallObject(aInstallObj)
-{
-	mIObj    = aInstallObj;
-	mCommand = aCommand;
-	mFlags   = aFlags;
-	mSrc     = nsnull;
-  mParams  = nsnull;
-	mTarget  = new nsFileSpec(aTarget);
-
-  *aReturn = NS_OK;
-}
-
-nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
-                                         PRInt32        aCommand,
-                                         nsFileSpec&    aSrc,
-                                         nsFileSpec&    aTarget,
-                                         PRInt32*       aReturn)
-:nsInstallObject(aInstallObj)
-{
-	mIObj    = aInstallObj;
-	mCommand = aCommand;
-	mFlags   = 0;
-	mSrc     = new nsFileSpec(aSrc);
-  mParams  = nsnull;
-	mTarget  = new nsFileSpec(aTarget);
-
-  *aReturn = NS_OK;
-}
-
-nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
-                                         PRInt32        aCommand,
-                                         nsFileSpec&    aTarget,
-                                         PRInt32*       aReturn)
-:nsInstallObject(aInstallObj)
-{
-	mIObj    = aInstallObj;
-	mCommand = aCommand;
-	mFlags   = 0;
-	mSrc     = nsnull;
-  mParams  = nsnull;
-	mTarget  = new nsFileSpec(aTarget);
-
-  *aReturn = NS_OK;
-}
-
-nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
-                                         PRInt32        aCommand,
-                                         nsFileSpec&    aTarget,
-                                         nsString&      aParams,
-                                         PRInt32*       aReturn)
-:nsInstallObject(aInstallObj)
-{
-	mIObj    = aInstallObj;
-	mCommand = aCommand;
-	mFlags   = 0;
-	mSrc     = nsnull;
-  mParams  = new nsString(aParams);
-	mTarget  = new nsFileSpec(aTarget);
-
-  *aReturn = NS_OK;
-}
-
-nsInstallFileOpItem::~nsInstallFileOpItem()
-{
-  if(mSrc)
-    delete mSrc;
-  if(mTarget)
-    delete mTarget;
-}
-
-PRInt32 nsInstallFileOpItem::Complete()
-{
-  PRInt32 aReturn = NS_OK;
-
-  switch(mCommand)
-  {
-    case NS_FOP_DIR_CREATE:
-      NativeFileOpDirCreate(mTarget);
-      break;
-    case NS_FOP_DIR_REMOVE:
-      NativeFileOpDirRemove(mTarget, mFlags);
-      break;
-    case NS_FOP_DIR_RENAME:
-      NativeFileOpDirRename(mSrc, mTarget);
-      break;
-    case NS_FOP_FILE_COPY:
-      NativeFileOpFileCopy(mSrc, mTarget);
-      break;
-    case NS_FOP_FILE_DELETE:
-      NativeFileOpFileDelete(mTarget, mFlags);
-      break;
-    case NS_FOP_FILE_EXECUTE:
-      NativeFileOpFileExecute(mTarget, mParams);
-      break;
-    case NS_FOP_FILE_MOVE:
-      NativeFileOpFileMove(mSrc, mTarget);
-      break;
-    case NS_FOP_FILE_RENAME:
-      NativeFileOpFileRename(mSrc, mTarget);
-      break;
-    case NS_FOP_WIN_SHORTCUT_CREATE:
-      NativeFileOpWinShortcutCreate();
-      break;
-    case NS_FOP_MAC_ALIAS_CREATE:
-      NativeFileOpMacAliasCreate();
-      break;
-    case NS_FOP_UNIX_LINK_CREATE:
-      NativeFileOpUnixLinkCreate();
-      break;
-  }
-	return aReturn;
-}
-  
-float nsInstallFileOpItem::GetInstallOrder()
-{
-	return 3;
-}
-
-char* nsInstallFileOpItem::toString()
-{
-	nsString result;
-  char*    resultCString;
-
-  switch(mCommand)
-  {
-    case NS_FOP_FILE_COPY:
-      result = "Copy file: ";
-      result.Append(mSrc->GetNativePathCString());
-      result.Append(" to ");
-      result.Append(mTarget->GetNativePathCString());
-      resultCString = result.ToNewCString();
-      break;
-    case NS_FOP_FILE_DELETE:
-      result = "Delete file: ";
-      result.Append(mTarget->GetNativePathCString());
-      resultCString = result.ToNewCString();
-      break;
-    case NS_FOP_FILE_MOVE:
-      result = "Move file: ";
-      result.Append(mSrc->GetNativePathCString());
-      result.Append(" to ");
-      result.Append(mTarget->GetNativePathCString());
-      resultCString = result.ToNewCString();
-      break;
-    case NS_FOP_FILE_RENAME:
-      result = "Rename file: ";
-      result.Append(mTarget->GetNativePathCString());
-      resultCString = result.ToNewCString();
-      break;
-    case NS_FOP_DIR_CREATE:
-      result = "Create Folder: ";
-      result.Append(mTarget->GetNativePathCString());
-      resultCString = result.ToNewCString();
-      break;
-    case NS_FOP_DIR_REMOVE:
-      result = "Remove Folder: ";
-      result.Append(mTarget->GetNativePathCString());
-      resultCString = result.ToNewCString();
-      break;
-    case NS_FOP_WIN_SHORTCUT_CREATE:
-      break;
-    case NS_FOP_MAC_ALIAS_CREATE:
-      break;
-    case NS_FOP_UNIX_LINK_CREATE:
-      break;
-    case NS_FOP_FILE_SET_STAT:
-      result = "Set file stat: ";
-      result.Append(mTarget->GetNativePathCString());
-      resultCString = result.ToNewCString();
-      break;
-    default:
-      result = "Unkown file operation command!";
-      resultCString = result.ToNewCString();
-      break;
-  }
-  return resultCString;
-}
-
-PRInt32 nsInstallFileOpItem::Prepare()
-{
-	return NULL;
-}
-
-void nsInstallFileOpItem::Abort()
-{
-}
-
-/* Private Methods */
-
-/* CanUninstall
-* InstallFileOpItem() does not install any files which can be uninstalled,
-* hence this function returns false. 
-*/
-PRBool
-nsInstallFileOpItem::CanUninstall()
-{
-    return FALSE;
-}
-
-/* RegisterPackageNode
-* InstallFileOpItem() does notinstall files which need to be registered,
-* hence this function returns false.
-*/
-PRBool
-nsInstallFileOpItem::RegisterPackageNode()
-{
-    return FALSE;
-}
-
-//
-// File operation functions begin here
-//
-PRInt32
-nsInstallFileOpItem::NativeFileOpDirCreate(nsFileSpec* aTarget)
-{
-  aTarget->CreateDirectory();
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpDirRemove(nsFileSpec* aTarget, PRInt32 aFlags)
-{
-  aTarget->Delete(aFlags);
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpDirRename(nsFileSpec* aSrc, nsFileSpec* aTarget)
-{
-  aSrc->Rename(*aTarget);
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpFileCopy(nsFileSpec* aSrc, nsFileSpec* aTarget)
-{
-  aSrc->Copy(*aTarget);
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpFileDelete(nsFileSpec* aTarget, PRInt32 aFlags)
-{
-  aTarget->Delete(aFlags);
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpFileExecute(nsFileSpec* aTarget, nsString* aParams)
-{
-  aTarget->Execute(*aParams);
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpFileMove(nsFileSpec* aSrc, nsFileSpec* aTarget)
-{
-  aSrc->Move(*aTarget);
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpFileRename(nsFileSpec* aSrc, nsFileSpec* aTarget)
-{
-  aSrc->Rename(*aTarget);
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpWinShortcutCreate()
-{
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpMacAliasCreate()
-{
-  return NS_OK;
-}
-
-PRInt32
-nsInstallFileOpItem::NativeFileOpUnixLinkCreate()
-{
-  return NS_OK;
-}
-

mozilla/xpinstall/src/nsInstallFileOpItem.h

@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsInstallFileOpItem_h__
-#define nsInstallFileOpItem_h__
-
-#include "prtypes.h"
-
-#include "nsFileSpec.h"
-#include "nsSoftwareUpdate.h"
-#include "nsInstallObject.h"
-#include "nsInstall.h"
-
-class nsInstallFileOpItem : public nsInstallObject
-{
-  public:
-    /* Public Fields */
-
-    /* Public Methods */
-    // used by:
-    //   FileOpFileDelete()
-    nsInstallFileOpItem(nsInstall*    installObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   aTarget,
-                        PRInt32       aFlags,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   FileOpDirRemove()
-    //   FileOpDirRename()
-    //   FileOpFileCopy()
-    //   FileOpFileMove()
-    //   FileOpFileRename()
-    nsInstallFileOpItem(nsInstall*    installObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   aSrc,
-                        nsFileSpec&   aTarget,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   FileOpDirCreate()
-    nsInstallFileOpItem(nsInstall*    aInstallObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   aTarget,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   FileOpFileExecute()
-    nsInstallFileOpItem(nsInstall*    aInstallObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   aTarget,
-                        nsString&     aParams,
-                        PRInt32*      aReturn);
-
-    ~nsInstallFileOpItem();
-
-    PRInt32       Prepare(void);
-    PRInt32       Complete();
-    char*         toString();
-    void          Abort();
-    float         GetInstallOrder();
-    
-  /* should these be protected? */
-    PRBool        CanUninstall();
-    PRBool        RegisterPackageNode();
-      
-  private:
-    
-    /* Private Fields */
-    
-    nsInstall*    mIObj;        // initiating Install object
-    nsFileSpec*   mSrc;
-    nsFileSpec*   mTarget;
-    nsString*     mParams;
-    long          mFStat;
-    PRInt32       mFlags;
-    PRInt32       mCommand;
-    
-    /* Private Methods */
-
-    PRInt32       NativeFileOpDirCreate(nsFileSpec* aTarget);
-    PRInt32       NativeFileOpDirRemove(nsFileSpec* aTarget, PRInt32 aFlags);
-    PRInt32       NativeFileOpDirRename(nsFileSpec* aSrc, nsFileSpec* aTarget);
-    PRInt32       NativeFileOpFileCopy(nsFileSpec* aSrc, nsFileSpec* aTarget);
-    PRInt32       NativeFileOpFileDelete(nsFileSpec* aTarget, PRInt32 aFlags);
-    PRInt32       NativeFileOpFileExecute(nsFileSpec* aTarget, nsString* aParams);
-    PRInt32       NativeFileOpFileMove(nsFileSpec* aSrc, nsFileSpec* aTarget);
-    PRInt32       NativeFileOpFileRename(nsFileSpec* aSrc, nsFileSpec* aTarget);
-    PRInt32       NativeFileOpWinShortcutCreate();
-    PRInt32       NativeFileOpMacAliasCreate();
-    PRInt32       NativeFileOpUnixLinkCreate();
-
-};
-
-#endif /* nsInstallFileOpItem_h__ */
-

mozilla/xpinstall/src/nsInstallFolder.cpp

@@ -1,336 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsInstall.h"
-#include "nsInstallFolder.h"
-
-#include "nscore.h"
-#include "prtypes.h"
-#include "nsRepository.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsSpecialSystemDirectory.h"
-
-#include "nsFileLocations.h"
-#include "nsIFileLocator.h"
-
-struct DirectoryTable
-{
-	char *  directoryName;			/* The formal directory name */
-	PRInt32 folderEnum;		        /* Directory ID */
-};
-
-struct DirectoryTable DirectoryTable[] = 
-{
-    {"Plugins",             100 },
-	{"Program",             101 },
-	{"Communicator",        102 },
-	{"User Pick",           103 },
-	{"Temporary",           104 },
-	{"Installed",           105 },
-	{"Current User",        106 },
-	{"Preferences",         107 },
-	{"OS Drive",            108 },
-	{"file:///",            109 },
-
-    {"Components",          110 },
-    {"Chrome",              111 },
-
-	{"Win System",          200 },
-	{"Windows",             201 },
-
-	{"Mac System",          300 },
-	{"Mac Desktop",         301 },
-	{"Mac Trash",           302 },
-	{"Mac Startup",         303 },
-	{"Mac Shutdown",        304 },
-	{"Mac Apple Menu",      305 },
-	{"Mac Control Panel",   306 },
-	{"Mac Extension",       307 },
-	{"Mac Fonts",           308 },
-	{"Mac Preferences",     309 },
-    {"Mac Documents",       310 },
-
-	{"Unix Local",          400 },
-	{"Unix Lib",            401 },
-
-	{"",                    -1  }
-};
-
-
-
-nsInstallFolder::nsInstallFolder(const nsString& aFolderID)
-{
-    mFileSpec = nsnull;
-    SetDirectoryPath( aFolderID, "");
-}
-
-nsInstallFolder::nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath)
-{
-    mFileSpec = nsnull;
-
-    /*
-        aFolderID can be either a Folder enum in which case we merely pass it to SetDirectoryPath, or
-        it can be a Directory.  If it is the later, it must already exist and of course be a directory
-        not a file.  
-    */
-    
-    nsFileSpec dirCheck(aFolderID);
-    if ( (dirCheck.Error() == NS_OK) && (dirCheck.IsDirectory()) && (dirCheck.Exists()))
-    {
-        nsString tempString = aFolderID;
-        tempString += aRelativePath;
-        mFileSpec = new nsFileSpec(tempString);
-
-        // make sure that the directory is created.
-        nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
-    }
-    else
-    {
-        SetDirectoryPath( aFolderID, aRelativePath);
-    }
-}
-
-
-nsInstallFolder::~nsInstallFolder()
-{
-    if (mFileSpec != nsnull)
-        delete mFileSpec;
-}
-        
-void 
-nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
-{
-	aDirectoryPath = "";
-    
-    if (mFileSpec != nsnull)
-    {
-        // We want the a NATIVE path.
-       aDirectoryPath.SetString(mFileSpec->GetCString());
-    }
-}
-
-void
-nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath)
-{
-    if ( aFolderID.EqualsIgnoreCase("User Pick") )
-    {
-        PickDefaultDirectory();
-        return;
-    }
-    else if ( aFolderID.EqualsIgnoreCase("Installed") )
-    {   
-        mFileSpec = new nsFileSpec(aRelativePath, PR_TRUE);  // creates the directories to the relative path.
-        return;
-    }
-    else
-    {
-        PRInt32 folderDirSpecID = MapNameToEnum(aFolderID);
-        
-        switch (folderDirSpecID) 
-		{
-            case 100: ///////////////////////////////////////////////////////////  Plugins
-                SetAppShellDirectory(nsSpecialFileSpec::App_PluginsDirectory );
-                break; 
-
-            case 101: ///////////////////////////////////////////////////////////  Program
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
-                break;
-            
-            case 102: ///////////////////////////////////////////////////////////  Communicator
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
-                break;
-
-            case 103: ///////////////////////////////////////////////////////////  User Pick
-                // we should never be here.
-                mFileSpec = nsnull;
-                break;
-
-            case 104: ///////////////////////////////////////////////////////////  Temporary
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_TemporaryDirectory ));
-                break;
-
-            case 105: ///////////////////////////////////////////////////////////  Installed
-                // we should never be here.
-                mFileSpec = nsnull;
-                break;
-
-            case 106: ///////////////////////////////////////////////////////////  Current User
-                SetAppShellDirectory(nsSpecialFileSpec::App_UserProfileDirectory50 );
-                break;
-
-            case 107: ///////////////////////////////////////////////////////////  Preferences
-                SetAppShellDirectory(nsSpecialFileSpec::App_PrefsDirectory50 );
-                break;
-
-            case 108: ///////////////////////////////////////////////////////////  OS Drive
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_DriveDirectory ));
-                break;
-
-            case 109: ///////////////////////////////////////////////////////////  File URL
-                {
-                    nsString tempFileURLString = aFolderID;
-                    tempFileURLString += aRelativePath;
-                    mFileSpec = new nsFileSpec( nsFileURL(tempFileURLString) );
-                }
-                break;
-
-            case 110: ///////////////////////////////////////////////////////////  Components
-                SetAppShellDirectory(nsSpecialFileSpec::App_ComponentsDirectory );
-                break;
-            
-            case 111: ///////////////////////////////////////////////////////////  Chrome
-                SetAppShellDirectory(nsSpecialFileSpec::App_ChromeDirectory );
-                break;
-
-            case 200: ///////////////////////////////////////////////////////////  Win System
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_SystemDirectory ));
-                break;
-
-            case 201: ///////////////////////////////////////////////////////////  Windows
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_WindowsDirectory ));
-                break;
-
-            case 300: ///////////////////////////////////////////////////////////  Mac System
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_SystemDirectory ));
-                break;
-
-            case 301: ///////////////////////////////////////////////////////////  Mac Desktop
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DesktopDirectory ));
-                break;
-
-            case 302: ///////////////////////////////////////////////////////////  Mac Trash
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_TrashDirectory ));
-                break;
-
-            case 303: ///////////////////////////////////////////////////////////  Mac Startup
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
-                break;
-
-            case 304: ///////////////////////////////////////////////////////////  Mac Shutdown
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
-                break;
-
-            case 305: ///////////////////////////////////////////////////////////  Mac Apple Menu
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_AppleMenuDirectory ));
-                break;
-
-            case 306: ///////////////////////////////////////////////////////////  Mac Control Panel
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ControlPanelDirectory ));
-                break;
-
-            case 307: ///////////////////////////////////////////////////////////  Mac Extension
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ExtensionDirectory ));
-                break;
-
-            case 308: ///////////////////////////////////////////////////////////  Mac Fonts
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_FontsDirectory ));
-                break;
-
-            case 309: ///////////////////////////////////////////////////////////  Mac Preferences
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_PreferencesDirectory ));
-                break;
-                    
-            case 310: ///////////////////////////////////////////////////////////  Mac Documents
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DocumentsDirectory ));
-                break;
-                    
-            case 400: ///////////////////////////////////////////////////////////  Unix Local
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LocalDirectory ));
-                break;
-
-            case 401: ///////////////////////////////////////////////////////////  Unix Lib
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LibDirectory ));
-                break;
-
-
-            case -1:
-		    default:
-                mFileSpec = nsnull;
-			   return;
-		}
-#ifndef XP_MAC
-        if (aRelativePath.Length() > 0)
-        {
-            nsString tempPath(aRelativePath);
-
-            if (aRelativePath.Last() != '/' || aRelativePath.Last() != '\\')
-                tempPath += '/';
-
-            *mFileSpec += tempPath;
-        }
-#endif
-            // make sure that the directory is created.
-        nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
-    }
-}
-
-void nsInstallFolder::PickDefaultDirectory()
-{
-    //FIX:  Need to put up a dialog here and set mFileSpec
-    return;   
-}
-
-/* MapNameToEnum
- * maps name from the directory table to its enum */
-PRInt32 
-nsInstallFolder::MapNameToEnum(const nsString& name)
-{
-	int i = 0;
-
-	if ( name == "null")
-        return -1;
-
-	while ( DirectoryTable[i].directoryName[0] != 0 )
-	{
-		if ( name.EqualsIgnoreCase(DirectoryTable[i].directoryName) )
-			return DirectoryTable[i].folderEnum;
-		i++;
-	}
-	return -1;
-}
-
-
-static NS_DEFINE_IID(kFileLocatorIID, NS_IFILELOCATOR_IID);
-static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID);
-
-void
-nsInstallFolder::SetAppShellDirectory(PRUint32 value)
-{
-    nsIFileLocator * appShellLocator;
-    
-    nsresult rv = nsComponentManager::CreateInstance(kFileLocatorCID, 
-                                                     nsnull,
-                                                     kFileLocatorIID,
-                                                     (void**) &appShellLocator);
-
-    if ( NS_SUCCEEDED(rv) )
-    {
-        mFileSpec = new nsFileSpec();
-        appShellLocator->GetFileLocation(value, mFileSpec);
-        NS_RELEASE(appShellLocator);
-    }
-}

mozilla/xpinstall/src/nsInstallFolder.h

@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef __NS_INSTALLFOLDER_H__
-#define __NS_INSTALLFOLDER_H__
-
-#include "nscore.h"
-#include "prtypes.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsSpecialSystemDirectory.h"
-
-class nsInstallFolder
-{
-    public:
-        
-       nsInstallFolder(const nsString& aFolderID);
-       nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath);
-       virtual ~nsInstallFolder();
-
-       void GetDirectoryPath(nsString& aDirectoryPath);
-       
-    private:
-        
-        nsFileSpec*  mFileSpec;
-
-		void         SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath);
-        void         PickDefaultDirectory();
-        PRInt32      MapNameToEnum(const nsString&  name);
-        void         SetAppShellDirectory(PRUint32 value);
-};
-
-
-#endif

mozilla/xpinstall/src/nsInstallObject.h

@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsInstallObject_h__
-#define nsInstallObject_h__
-
-#include "prtypes.h"
-
-class nsInstall;
-
-class nsInstallObject 
-{
-    public:
-        /* Public Methods */
-        nsInstallObject(nsInstall* inInstall) {mInstall = inInstall; }
-
-        /* Override with your set-up action */
-        virtual PRInt32 Prepare() = 0;
-
-        /* Override with your Completion action */
-        virtual PRInt32 Complete() = 0;
-
-        /* Override with an explanatory string for the progress dialog */
-        virtual char* toString() = 0;
-
-        /* Override with your clean-up function */
-        virtual void Abort() = 0;
-
-        /* should these be protected? */
-        virtual PRBool CanUninstall() = 0;
-        virtual PRBool RegisterPackageNode() = 0;
-
-    protected:
-        nsInstall* mInstall;
-};
-
-#endif /* nsInstallObject_h__ */

mozilla/xpinstall/src/nsInstallPatch.cpp

@@ -1,986 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsFileSpec.h"
-#include "prmem.h"
-#include "nsInstall.h"
-#include "nsInstallPatch.h"
-#include "nsInstallResources.h"
-#include "nsIDOMInstallVersion.h"
-#include "zlib.h"
-
-#include "gdiff.h"
-
-#include "VerReg.h"
-#include "ScheduledTasks.h"
-#include "plstr.h"
-#include "xp_file.h" /* for XP_PlatformFileToURL */
-
-
-#ifdef XP_MAC
-#include "PatchableAppleSingle.h"
-#endif
-
-#define BUFSIZE     32768
-#define OPSIZE      1
-#define MAXCMDSIZE  12
-#define SRCFILE     0
-#define OUTFILE     1
-
-#define getshort(s) (uint16)( ((uchar)*(s) << 8) + ((uchar)*((s)+1)) )
-
-#define getlong(s)  \
-            (uint32)( ((uchar)*(s) << 24) + ((uchar)*((s)+1) << 16 ) + \
-                      ((uchar)*((s)+2) << 8) + ((uchar)*((s)+3)) )
-
-
-
-static int32   gdiff_parseHeader( pDIFFDATA dd );
-static int32   gdiff_validateFile( pDIFFDATA dd, int file );
-static int32   gdiff_valCRC32( pDIFFDATA dd, PRFileDesc* fh, uint32 chksum );
-static int32   gdiff_ApplyPatch( pDIFFDATA dd );
-static int32   gdiff_getdiff( pDIFFDATA dd, uchar *buffer, uint32 length );
-static int32   gdiff_add( pDIFFDATA dd, uint32 count );
-static int32   gdiff_copy( pDIFFDATA dd, uint32 position, uint32 count );
-static int32   gdiff_validateFile( pDIFFDATA dd, int file );
-
-
-nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
-                                const nsString& inVRName,
-                                const nsString& inVInfo,
-                                const nsString& inJarLocation,
-                                PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    char tempTargetFile[MAXREGPATHLEN];
-    char* tempVersionString = inVRName.ToNewCString();
-
-    PRInt32 err = VR_GetPath(tempVersionString, MAXREGPATHLEN, tempTargetFile );
-    
-    delete [] tempVersionString;
-    
-    if (err != REGERR_OK)
-    {
-        *error = nsInstall::NO_SUCH_COMPONENT;
-        return;
-    }
-	nsString folderSpec(tempTargetFile);
-
-    mPatchFile      =   nsnull;
-    mTargetFile     =   nsnull;
-    mPatchedFile    =   nsnull;
-    mRegistryName   =   new nsString(inVRName);
-    mJarLocation    =   new nsString(inJarLocation);
-    mTargetFile     =   new nsFileSpec(folderSpec);
-    
-    mVersionInfo    =   new nsInstallVersion();
-    
-    mVersionInfo->Init(inVInfo);
-    
-}
-
-
-nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
-                                const nsString& inVRName,
-                                const nsString& inVInfo,
-                                const nsString& inJarLocation,
-                                const nsString& folderSpec,
-                                const nsString& inPartialPath,
-                                PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    if ((inInstall == nsnull) || (inVRName == "null") || (inJarLocation == "null")) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mPatchFile      =   nsnull;
-    mTargetFile     =   nsnull;
-    mPatchedFile    =   nsnull;
-    mRegistryName   =   new nsString(inVRName);
-    mJarLocation    =   new nsString(inJarLocation);
-    mVersionInfo    =   new nsInstallVersion();
-    
-    mVersionInfo->Init(inVInfo);
-    
-    mTargetFile = new nsFileSpec(folderSpec);
-    if(inPartialPath != "null")
-        *mTargetFile += inPartialPath;
-}
-
-nsInstallPatch::~nsInstallPatch()
-{
-    if (mVersionInfo)
-        delete mVersionInfo;
-
-    if (mTargetFile)
-        delete mTargetFile;
-
-    if (mJarLocation)
-        delete mJarLocation;
-    
-    if (mRegistryName)
-        delete mRegistryName;
-
-    if (mPatchedFile)
-        delete mPatchedFile;
-    
-    if (mPatchFile)
-        delete mPatchFile;
-
-}
-
-
-PRInt32 nsInstallPatch::Prepare()
-{
-    PRInt32 err;
-    PRBool deleteOldSrc;
-    
-    if (mTargetFile == nsnull)
-        return  nsInstall::INVALID_ARGUMENTS;
-
-    if (mTargetFile->Exists())
-    {
-        if (mTargetFile->IsFile())
-        {
-            err = nsInstall::SUCCESS;
-        }
-        else
-        {
-            err = nsInstall::FILE_IS_DIRECTORY;
-        }
-    }
-    else
-    {
-        err = nsInstall::FILE_DOES_NOT_EXIST;
-    }
-
-    if (err != nsInstall::SUCCESS)
-    {   
-        return err;
-    }
-
-    err =  mInstall->ExtractFileFromJar(*mJarLocation, mTargetFile, &mPatchFile);
-   
-    
-    nsFileSpec *fileName = nsnull;
-    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) ) );
-    
-    mInstall->GetPatch(&ikey, fileName);
-
-    if (fileName != nsnull) 
-    {
-        deleteOldSrc = PR_TRUE;
-    } 
-    else 
-    {
-        fileName     = mTargetFile;
-        deleteOldSrc = PR_FALSE;
-    }
-
-    err = NativePatch(  *fileName,           // the file to patch
-                        *mPatchFile,         // the patch that was extracted from the jarfile
-                        &mPatchedFile);     // the new patched file
-    
-    if (err != nsInstall::SUCCESS)
-    {   
-        return err;
-    }
-
-    PR_ASSERT(mPatchedFile != nsnull);
-	mInstall->AddPatch(&ikey, mPatchedFile );
-	
-    if ( deleteOldSrc ) 
-    {
-		DeleteFileNowOrSchedule(*fileName );
-    }
-  
-    return err;
-}
-
-PRInt32 nsInstallPatch::Complete()
-{  
-    if ((mInstall == nsnull) || (mVersionInfo == nsnull) || (mPatchedFile == nsnull) || (mTargetFile == nsnull)) 
-    {
-        return nsInstall::INVALID_ARGUMENTS;
-    }
-    
-    PRInt32 err = nsInstall::SUCCESS;
-
-    nsFileSpec *fileName = nsnull;
-    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) )  );
-    
-    mInstall->GetPatch(&ikey, fileName);
-    
-    if (fileName != nsnull && (*fileName == *mPatchedFile) )
-    {
-        // the patch has not been superceded--do final replacement
-		err = ReplaceFileNowOrSchedule( *mTargetFile, *mPatchedFile);
-        if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
-        {
-            nsString tempVersionString;
-            mVersionInfo->ToString(tempVersionString);
-            
-            char* tempRegName = mRegistryName->ToNewCString();
-            char* tempVersion = tempVersionString.ToNewCString();
-
-            err = VR_Install( tempRegName, 
-							  (char*) (const char *) nsNSPRPath(*mTargetFile),
-                              tempVersion, 
-                              PR_FALSE );
-            
-            delete [] tempRegName;
-            delete [] tempVersion;
-
-        }
-        else
-        {
-            err = nsInstall::UNEXPECTED_ERROR;
-        }
-    }
-    else
-    {
-        // nothing -- old intermediate patched file was
-        // deleted by a superceding patch
-    }
-
-    return err;
-}
-
-void nsInstallPatch::Abort()
-{
-    nsFileSpec *fileName = nsnull;
-    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) ) );
-
-    mInstall->GetPatch(&ikey, fileName);
-
-    if (fileName != nsnull && (*fileName == *mPatchedFile) )
-    {
-        DeleteFileNowOrSchedule( *mPatchedFile );
-    }
-}
-
-char* nsInstallPatch::toString()
-{
-	char* buffer = new char[1024];
-
-	// FIX!  sprintf( buffer, nsInstallResources::GetPatchFileString(), mPatchedFile->GetCString());
-
-	return buffer;
-}
-
-
-PRBool
-nsInstallPatch::CanUninstall()
-{
-    return PR_FALSE;
-}
-
-PRBool
-nsInstallPatch::RegisterPackageNode()
-{
-    return PR_FALSE;
-}
-
-
-PRInt32
-nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patchFile, nsFileSpec **newFile)
-{
-
-	DIFFDATA	*dd;
-	PRInt32		status		= GDIFF_ERR_MEM;
-	char 		*tmpurl		= NULL;
-	char 		*realfile	= PL_strdup(nsNSPRPath(sourceFile)); // needs to be sourceFile!!!
-	nsFileSpec  outFileSpec = sourceFile;
-
-	dd = (DIFFDATA *)PR_Calloc( 1, sizeof(DIFFDATA));
-	if (dd != NULL)
-	{
-		dd->databuf = (uchar*)PR_Malloc(BUFSIZE);
-		if (dd->databuf == NULL) 
-		{
-			status = GDIFF_ERR_MEM;
-			goto cleanup;
-		}
-
-
-		dd->bufsize = BUFSIZE;
-
-		// validate patch header & check for special instructions
-		dd->fDiff = PR_Open (nsNSPRPath(patchFile), PR_RDONLY, 0666);
-
-
-		if (dd->fDiff != NULL)
-		{
-			status = gdiff_parseHeader(dd);
-		} else {
-			status = GDIFF_ERR_ACCESS;
-		}
-
-#ifdef dono
-#ifdef WIN32
-
-        /* unbind Win32 images */
-        if ( dd->bWin32BoundImage && status == GDIFF_OK ) {
-            tmpurl = WH_TempName( xpURL, NULL );
-            if ( tmpurl != NULL ) {
-                if (su_unbind( srcfile, srctype, tmpurl, xpURL ))  	
-				{
-                    PL_strfree(realfile);
-					realfile = tmpurl;
-                    realtype = xpURL;
-                    
-                }
-            }
-            else
-                status = GDIFF_ERR_MEM;
-        }
-#endif
-#endif
-
-#ifdef XP_MAC
-
-		if ( dd->bMacAppleSingle && status == GDIFF_OK ) 
-		{
-           // create a tmp file, so that we can AppleSingle the src file
-           nsSpecialSystemDirectory tempMacFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-           nsString srcName = sourceFile.GetLeafName();
-           tempMacFile.SetLeafName(srcName);
-           tempMacFile.MakeUnique();
-           
-           // Encode! 
-		   // Encode src file, and put into temp file
-		   FSSpec sourceSpec = sourceFile.GetFSSpec();
-		   FSSpec tempSpec   = tempMacFile.GetFSSpec();
-		    
-			status = PAS_EncodeFile(&sourceSpec, &tempSpec);   
-				
-			if (status == noErr)
-			{
-				// set
-                PL_strfree(realfile);
-				realfile = PL_strdup(nsNSPRPath(tempMacFile));
-			}
-		}
-#endif 
-
-
-
-		if (status != NS_OK)
-			goto cleanup;
-
-		// make a unique file at the same location of our source file  (FILENAME-ptch.EXT)
-        nsString patchFileName = "-ptch";
-		nsString newFileName = sourceFile.GetLeafName();
-
-        PRInt32 index;
-		if ((index = newFileName.RFind(".")) > 0)
-		{
-            nsString extention;
-            nsString fileName;
-            newFileName.Right(extention, (newFileName.Length() - index) );        
-            newFileName.Left(fileName, (newFileName.Length() - (newFileName.Length() - index)));
-            newFileName = fileName + patchFileName + extention;
-
-        } else {
-            newFileName += patchFileName;
-        }
-        
-
-		outFileSpec.SetLeafName(newFileName); //????
-		outFileSpec.MakeUnique();
-
-        char *outFile = PL_strdup(nsNSPRPath(outFileSpec));
-
-		// apply patch to the source file
-		dd->fSrc = PR_Open ( realfile, PR_RDONLY, 0666);
-		dd->fOut = PR_Open ( outFile, PR_RDWR|PR_CREATE_FILE|PR_TRUNCATE, 0666);
-
-		if (dd->fSrc != NULL && dd->fOut != NULL)
-		{
-			status = gdiff_validateFile (dd, SRCFILE);
-
-			// specify why diff failed
-			if (status == GDIFF_ERR_CHECKSUM)
-				status = GDIFF_ERR_CHECKSUM_TARGET;
-
-			if (status == GDIFF_OK)
-				status = gdiff_ApplyPatch(dd);
-
-			if (status == GDIFF_OK)
-				status = gdiff_validateFile (dd, OUTFILE);
-
-			if (status == GDIFF_ERR_CHECKSUM)
-				status = GDIFF_ERR_CHECKSUM_RESULT;
-
-            if (status == GDIFF_OK)
-            {
-                *newFile = &outFileSpec;
-                if ( outFile != nsnull)
-                    PL_strfree( outFile );
-            }
-
-		} else {
-
-			status = GDIFF_ERR_ACCESS;
-		}		
-	}
-
-
-
-#ifdef XP_MAC
-	if ( dd->bMacAppleSingle && status == GDIFF_OK ) 
-	{
-        // create another file, so that we can decode somewhere
-        nsFileSpec anotherName = outFileSpec;
-        anotherName.MakeUnique();
-        
-		// Close the out file so that we can read it 		
-		PR_Close( dd->fOut );
-		dd->fOut = NULL;
-		
-		
-		FSSpec outSpec = outFileSpec.GetFSSpec();
-		FSSpec anotherSpec   = anotherName.GetFSSpec();
-		
-			
-        status =  PAS_DecodeFile(&outSpec, &anotherSpec);
-		if (status != noErr)
-		{
-		   	goto cleanup;
-        }
-		
-        nsFileSpec parent;
-        
-        outFileSpec.GetParent(parent);
-        
-        outFileSpec.Delete(PR_FALSE);
-        anotherName.Copy(parent);
-        
-        *newFile = &anotherName;
-	}
-	
-#endif 
-
-
-cleanup:
-    if ( dd != NULL ) 
-    {
-        if ( dd->fSrc != nsnull )
-            PR_Close( dd->fSrc );
-
-
-        if ( dd->fDiff != nsnull )
-            PR_Close( dd->fDiff );
-		
-		if ( dd->fOut != nsnull )
-        {
-            PR_Close( dd->fOut );
-        }
-        
-        if ( status != GDIFF_OK )
-		   	//XP_FileRemove( outfile, outtype );
-			newFile = NULL;
-		        
-		PR_FREEIF( dd->databuf );
-        PR_FREEIF( dd->oldChecksum );
-        PR_FREEIF( dd->newChecksum );
-        PR_DELETE(dd);
-    }
-
-	if ( tmpurl != NULL ) {
-        //XP_FileRemove( tmpurl, xpURL );
-		tmpurl = NULL;
-        PR_DELETE( tmpurl );
-    }
-    
-	/* lets map any GDIFF error to nice SU errors */
-
-	switch (status)
-	{
-        case GDIFF_OK:
-                break;
-		case GDIFF_ERR_HEADER:
-		case GDIFF_ERR_BADDIFF:
-		case GDIFF_ERR_OPCODE:
-		case GDIFF_ERR_CHKSUMTYPE:
-				status = nsInstall::PATCH_BAD_DIFF;
-				break;
-		case GDIFF_ERR_CHECKSUM_TARGET:
-				status = nsInstall::PATCH_BAD_CHECKSUM_TARGET;
-				break;
-		case GDIFF_ERR_CHECKSUM_RESULT:
-				status = nsInstall::PATCH_BAD_CHECKSUM_RESULT;
-				break;
-		case GDIFF_ERR_OLDFILE:
-		case GDIFF_ERR_ACCESS:
-		case GDIFF_ERR_MEM:
-		case GDIFF_ERR_UNKNOWN:
-		default:
-				status = nsInstall::UNEXPECTED_ERROR;
-				break;
-	}
-
-    return status;
-
-	// return -1;	//old return value
-}
-
-
-void* 
-nsInstallPatch::HashFilePath(const nsFilePath& aPath)
-{
-    PRUint32 rv = 0;
-
-	char* cPath = PL_strdup(nsNSPRPath(aPath));
-    
-    if(cPath != nsnull) 
-    {
-        char  ch;
-        char* filePath = PL_strdup(cPath);
-        PRUint32 cnt=0;
-
-        while ((ch = *filePath++) != 0) 
-        {
-            // FYI: rv = rv*37 + ch
-            rv = ((rv << 5) + (rv << 2) + rv) + ch;
-            cnt++;
-        }
-        
-        for (PRUint32 i=0; i<=cnt; i++)
-            *filePath--;
-		PL_strfree(filePath);
-    }
-
-	PL_strfree(cPath);
-
-    return (void*)rv;
-}
-
-
-
-
-/*---------------------------------------------------------
- *  gdiff_parseHeader()
- *
- *  reads and validates the GDIFF header info
- *---------------------------------------------------------
- */
-static
-int32 gdiff_parseHeader( pDIFFDATA dd )
-{
-    int32   err = GDIFF_OK;
-    uint8   cslen;
-    uint8   oldcslen;
-    uint8   newcslen;
-    uint32  nRead;
-    uchar   header[GDIFF_HEADERSIZE];
-
-    /* Read the fixed-size part of the header */
-
-	nRead = PR_Read (dd->fDiff, header, GDIFF_HEADERSIZE);
-    if ( nRead != GDIFF_HEADERSIZE ||
-         memcmp( header, GDIFF_MAGIC, GDIFF_MAGIC_LEN ) != 0  ||
-         header[GDIFF_VER_POS] != GDIFF_VER )
-    {
-        err = GDIFF_ERR_HEADER;
-    }
-    else
-    {
-        /* get the checksum information */
-
-        dd->checksumType = header[GDIFF_CS_POS];
-        cslen = header[GDIFF_CSLEN_POS];
-
-        if ( cslen > 0 )
-        {
-            oldcslen = cslen / 2;
-            newcslen = cslen - oldcslen;
-            PR_ASSERT( newcslen == oldcslen );
-
-            dd->checksumLength = oldcslen;
-            dd->oldChecksum = (uchar*)PR_MALLOC(oldcslen);
-            dd->newChecksum = (uchar*)PR_MALLOC(newcslen);
-
-            if ( dd->oldChecksum != NULL && dd->newChecksum != NULL )
-            {
-				nRead = PR_Read (dd->fDiff, dd->oldChecksum, oldcslen);
-                if ( nRead == oldcslen )
-                {
-					nRead = PR_Read (dd->fDiff, dd->newChecksum, newcslen);
-                    if ( nRead != newcslen ) {
-                        err = GDIFF_ERR_HEADER;
-                    }
-                }
-                else {
-                    err = GDIFF_ERR_HEADER;
-                }
-            }
-            else {
-                err = GDIFF_ERR_MEM;
-            }
-        }
-
-
-        /* get application data, if any */
-
-        if ( err == GDIFF_OK )
-        {
-            uint32  appdataSize;
-            uchar   *buf;
-            uchar   lenbuf[GDIFF_APPDATALEN];
-
-			nRead = PR_Read(dd->fDiff, lenbuf, GDIFF_APPDATALEN);
-            if ( nRead == GDIFF_APPDATALEN ) 
-            {
-                appdataSize = getlong(lenbuf);
-
-                if ( appdataSize > 0 ) 
-                {
-                    buf = (uchar *)PR_MALLOC( appdataSize );
-
-                    if ( buf != NULL )
-                    {
-						nRead = PR_Read (dd->fDiff, buf, appdataSize);
-                        if ( nRead == appdataSize ) 
-                        {
-                            if ( 0 == memcmp( buf, APPFLAG_W32BOUND, appdataSize ) )
-                                dd->bWin32BoundImage = TRUE;
-
-                            if ( 0 == memcmp( buf, APPFLAG_APPLESINGLE, appdataSize ) )
-                                dd->bMacAppleSingle = TRUE;
-                        }
-                        else {
-                            err = GDIFF_ERR_HEADER;
-                        }
-
-                        PR_DELETE( buf );
-                    }
-                    else {
-                        err = GDIFF_ERR_MEM;
-                    }
-                }
-            }
-            else {
-                err = GDIFF_ERR_HEADER;
-            }
-        }
-    }
-
-    return (err);
-}
-
-
-/*---------------------------------------------------------
- *  gdiff_validateFile()
- *
- *  computes the checksum of the file and compares it to 
- *  the value stored in the GDIFF header
- *---------------------------------------------------------
- */
-static 
-int32 gdiff_validateFile( pDIFFDATA dd, int file )
-{
-    int32		result;
-    PRFileDesc*	fh;
-    uchar*		chksum;
-
-    /* which file are we dealing with? */
-    if ( file == SRCFILE ) {
-        fh = dd->fSrc;
-        chksum = dd->oldChecksum;
-    }
-    else { /* OUTFILE */
-        fh = dd->fOut;
-        chksum = dd->newChecksum;
-    }
-
-    /* make sure file's at beginning */
-    PR_Seek( fh, 0, PR_SEEK_SET );
-
-    /* calculate appropriate checksum */
-    switch (dd->checksumType)
-    {
-        case GDIFF_CS_NONE:
-            result = GDIFF_OK;
-            break;
-
-
-        case GDIFF_CS_CRC32:
-            if ( dd->checksumLength == CRC32_LEN )
-                result = gdiff_valCRC32( dd, fh, getlong(chksum) );
-            else
-                result = GDIFF_ERR_HEADER;
-            break;
-
-
-        case GDIFF_CS_MD5:
-
-
-        case GDIFF_CS_SHA:
-
-
-        default:
-            /* unsupported checksum type */
-            result = GDIFF_ERR_CHKSUMTYPE;
-            break;
-    }
-
-    /* reset file position to beginning and return status */
-    PR_Seek( fh, 0, PR_SEEK_SET );
-    return (result);
-}
-
-
-/*---------------------------------------------------------
- *  gdiff_valCRC32()
- *
- *  computes the checksum of the file and compares it to 
- *  the passed in checksum.  Assumes file is positioned at
- *  beginning.
- *---------------------------------------------------------
- */
-static 
-int32 gdiff_valCRC32( pDIFFDATA dd, PRFileDesc* fh, uint32 chksum )
-{
-    uint32 crc;
-    uint32 nRead;
-
-    crc = crc32(0L, Z_NULL, 0);
-
-	nRead = PR_Read (fh, dd->databuf, dd->bufsize);
-    while ( nRead > 0 ) 
-    {
-        crc = crc32( crc, dd->databuf, nRead );
-		nRead = PR_Read (fh, dd->databuf, dd->bufsize);
-    }
-
-    if ( crc == chksum )
-        return GDIFF_OK;
-    else
-        return GDIFF_ERR_CHECKSUM;
-}
-
-
-/*---------------------------------------------------------
- *  gdiff_ApplyPatch()
- *
- *  Combines patch data with source file to produce the
- *  new target file.  Assumes all three files have been
- *  opened, GDIFF header read, and all other setup complete
- *
- *  The GDIFF patch is processed sequentially which random
- *  access is neccessary for the source file.
- *---------------------------------------------------------
- */
-static
-int32 gdiff_ApplyPatch( pDIFFDATA dd )
-{
-    int32   err;
-    XP_Bool done;
-    uint32  position;
-    uint32  count;
-    uchar   opcode;
-    uchar   cmdbuf[MAXCMDSIZE];
-
-    done = FALSE;
-    while ( !done ) {
-        err = gdiff_getdiff( dd, &opcode, OPSIZE );
-        if ( err != GDIFF_OK )
-            break;
-
-        switch (opcode)
-        {
-            case ENDDIFF:
-                done = TRUE;
-                break;
-
-            case ADD16:
-                err = gdiff_getdiff( dd, cmdbuf, ADD16SIZE );
-                if ( err == GDIFF_OK ) {
-                    err = gdiff_add( dd, getshort( cmdbuf ) );
-                }
-                break;
-
-            case ADD32:
-                err = gdiff_getdiff( dd, cmdbuf, ADD32SIZE );
-                if ( err == GDIFF_OK ) {
-                    err = gdiff_add( dd, getlong( cmdbuf ) );
-                }
-                break;
-
-            case COPY16BYTE:
-                err = gdiff_getdiff( dd, cmdbuf, COPY16BYTESIZE );
-                if ( err == GDIFF_OK ) {
-                    position = getshort( cmdbuf );
-                    count = *(cmdbuf + sizeof(short));
-                    err = gdiff_copy( dd, position, count );
-                }
-                break;
-
-            case COPY16SHORT:
-                err = gdiff_getdiff( dd, cmdbuf, COPY16SHORTSIZE );
-                if ( err == GDIFF_OK ) {
-                    position = getshort( cmdbuf );
-                    count = getshort(cmdbuf + sizeof(short));
-                    err = gdiff_copy( dd, position, count );
-                }
-                break;
-
-            case COPY16LONG:
-                err = gdiff_getdiff( dd, cmdbuf, COPY16LONGSIZE );
-                if ( err == GDIFF_OK ) {
-                    position = getshort( cmdbuf );
-                    count =  getlong(cmdbuf + sizeof(short));
-                    err = gdiff_copy( dd, position, count );
-                }
-                break;
-
-            case COPY32BYTE:
-                err = gdiff_getdiff( dd, cmdbuf, COPY32BYTESIZE );
-                if ( err == GDIFF_OK ) {
-                    position = getlong( cmdbuf );
-                    count = *(cmdbuf + sizeof(long));
-                    err = gdiff_copy( dd, position, count );
-                }
-                break;
-
-            case COPY32SHORT:
-                err = gdiff_getdiff( dd, cmdbuf, COPY32SHORTSIZE );
-                if ( err == GDIFF_OK ) {
-                    position = getlong( cmdbuf );
-                    count = getshort(cmdbuf + sizeof(long));
-                    err = gdiff_copy( dd, position, count );
-                }
-                break;
-
-            case COPY32LONG:
-                err = gdiff_getdiff( dd, cmdbuf, COPY32LONGSIZE );
-                if ( err == GDIFF_OK ) {
-                    position = getlong( cmdbuf );
-                    count = getlong(cmdbuf + sizeof(long));
-                    err = gdiff_copy( dd, position, count );
-                }
-                break;
-
-            case COPY64:
-                /* we don't support 64-bit file positioning yet */
-                err = GDIFF_ERR_OPCODE;
-                break;
-
-            default:
-                err = gdiff_add( dd, opcode );
-                break;
-        }
-
-        if ( err != GDIFF_OK )
-            done = TRUE;
-    }
-
-    /* return status */
-    return (err);
-}
-
-
-/*---------------------------------------------------------
- *  gdiff_getdiff()
- *
- *  reads the next "length" bytes of the diff into "buffer"
- *
- *  XXX: need a diff buffer to optimize reads!
- *---------------------------------------------------------
- */
-static
-int32 gdiff_getdiff( pDIFFDATA dd, uchar *buffer, uint32 length )
-{
-    uint32 bytesRead;
-
-	bytesRead = PR_Read (dd->fDiff, buffer, length);
-    if ( bytesRead != length )
-        return GDIFF_ERR_BADDIFF;
-
-    return GDIFF_OK;
-}
-
-
-/*---------------------------------------------------------
- *  gdiff_add()
- *
- *  append "count" bytes from diff file to new file
- *---------------------------------------------------------
- */
-static
-int32 gdiff_add( pDIFFDATA dd, uint32 count )
-{
-    int32   err = GDIFF_OK;
-    uint32  nRead;
-    uint32  chunksize;
-
-    while ( count > 0 ) {
-        chunksize = ( count > dd->bufsize) ? dd->bufsize : count;
-		nRead = PR_Read (dd->fDiff, dd->databuf, chunksize);
-        if ( nRead != chunksize ) {
-            err = GDIFF_ERR_BADDIFF;
-            break;
-        }
-
-		PR_Write (dd->fOut, dd->databuf, chunksize);
-
-        count -= chunksize;
-    }
-
-    return (err);
-}
-
-
-
-/*---------------------------------------------------------
- *  gdiff_copy()
- *
- *  copy "count" bytes from "position" in source file
- *---------------------------------------------------------
- */
-static
-int32 gdiff_copy( pDIFFDATA dd, uint32 position, uint32 count )
-{
-    int32 err = GDIFF_OK;
-    uint32 nRead;
-    uint32 chunksize;
-
-	PR_Seek (dd->fSrc, position, PR_SEEK_SET);
-
-    while ( count > 0 ) {
-        chunksize = (count > dd->bufsize) ? dd->bufsize : count;
-
-		nRead = PR_Read (dd->fSrc, dd->databuf, chunksize);
-        if ( nRead != chunksize ) {
-            err = GDIFF_ERR_OLDFILE;
-            break;
-        }
-
-		PR_Write (dd->fOut, dd->databuf, chunksize);
-
-        count -= chunksize;
-    }
-
-    return (err);
-}
-

mozilla/xpinstall/src/nsInstallPatch.h

@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsInstallPatch_h__
-#define nsInstallPatch_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-#include "nsInstallObject.h"
-
-#include "nsInstall.h"
-#include "nsInstallFolder.h"
-#include "nsInstallVersion.h"
-
-
-class nsInstallPatch : public nsInstallObject 
-{
-    public:
-
-        nsInstallPatch( nsInstall* inInstall,
-                        const nsString& inVRName,
-                        const nsString& inVInfo,
-                        const nsString& inJarLocation,
-                        const nsString& folderSpec,
-                        const nsString& inPartialPath,
-                        PRInt32 *error);
-
-        nsInstallPatch( nsInstall* inInstall,
-                        const nsString& inVRName,
-                        const nsString& inVInfo,
-                        const nsString& inJarLocation,
-                        PRInt32 *error);
-
-        virtual ~nsInstallPatch();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void  Abort();
-        char* toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	  
-  
-    private:
-        
-        
-        nsInstallVersion        *mVersionInfo;
-        
-        nsFileSpec              *mTargetFile;
-        nsFileSpec              *mPatchFile;
-        nsFileSpec              *mPatchedFile;
-
-        nsString                *mJarLocation;
-        nsString                *mRegistryName;
-        
-       
-
-        PRInt32  NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patchfile, nsFileSpec **newFile);
-        void*    HashFilePath(const nsFilePath& aPath);
-};
-
-#endif /* nsInstallPatch_h__ */

mozilla/xpinstall/src/nsInstallProgressDialog.cpp

@@ -1,343 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#include "nsIXPInstallProgress.h"
-#include "nsInstallProgressDialog.h"
-
-#include "nsIAppShellComponentImpl.h"
-
-#include "nsIServiceManager.h"
-#include "nsIDocumentViewer.h"
-#include "nsIContent.h"
-#include "nsINameSpaceManager.h"
-#include "nsIContentViewer.h"
-#include "nsIDOMElement.h"
-#include "nsINetService.h"
-
-#include "nsIWebShell.h"
-#include "nsIWebShellWindow.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID( kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
-static NS_DEFINE_IID( kNetServiceCID,      NS_NETSERVICE_CID );
-
-// Utility to set element attribute.
-static nsresult setAttribute( nsIDOMXULDocument *doc,
-                              const char *id,
-                              const char *name,
-                              const nsString &value ) {
-    nsresult rv = NS_OK;
-
-    if ( doc ) {
-        // Find specified element.
-        nsCOMPtr<nsIDOMElement> elem;
-        rv = doc->GetElementById( id, getter_AddRefs( elem ) );
-        if ( elem ) {
-            // Set the text attribute.
-            rv = elem->SetAttribute( name, value );
-            if ( NS_SUCCEEDED( rv ) ) {
-            } else {
-                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
-                               __FILE__, (int)__LINE__, (int)rv );
-            }
-        } else {
-            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
-                          __FILE__, (int)__LINE__, (int)rv );
-        }
-    } else {
-        rv = NS_ERROR_NULL_POINTER;
-    }
-
-    return rv;
-}
-
-
-// Utility to get element attribute.
-static nsresult getAttribute( nsIDOMXULDocument *doc,
-                              const char *id,
-                              const char *name,
-                              nsString &value ) {
-    nsresult rv = NS_OK;
-
-    if ( doc ) {
-        // Find specified element.
-        nsCOMPtr<nsIDOMElement> elem;
-        rv = doc->GetElementById( id, getter_AddRefs( elem ) );
-        if ( elem ) {
-            // Set the text attribute.
-            rv = elem->GetAttribute( name, value );
-            if ( NS_SUCCEEDED( rv ) ) {
-            } else {
-                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
-                               __FILE__, (int)__LINE__, (int)rv );
-            }
-        } else {
-            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
-                          __FILE__, (int)__LINE__, (int)rv );
-        }
-    } else {
-        rv = NS_ERROR_NULL_POINTER;
-    }
-
-    return rv;
-}
-
-
-nsInstallProgressDialog::nsInstallProgressDialog()
-{
-    NS_INIT_REFCNT();
-    mWindow = nsnull;
-    mDocument = nsnull;
-
-}
-
-nsInstallProgressDialog::~nsInstallProgressDialog()
-{
-}
-
-
-NS_IMPL_ADDREF( nsInstallProgressDialog );
-NS_IMPL_RELEASE( nsInstallProgressDialog );
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-{
-  if (aInstancePtr == NULL) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  // Always NULL result, in case of failure
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIXPInstallProgress::GetIID())) {
-    *aInstancePtr = (void*) ((nsInstallProgressDialog*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(nsIXULWindowCallbacks::GetIID())) {
-    *aInstancePtr = (void*) ((nsIXULWindowCallbacks*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*) (nsISupports*)((nsIXPInstallProgress*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  return NS_ERROR_NO_INTERFACE;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::BeforeJavascriptEvaluation()
-{
-    nsresult rv = NS_OK;
-
-    // Get app shell service.
-    nsIAppShellService *appShell;
-    rv = nsServiceManager::GetService( kAppShellServiceCID,
-                                       nsIAppShellService::GetIID(),
-                                       (nsISupports**)&appShell );
-
-    if ( NS_SUCCEEDED( rv ) ) 
-    {
-        // Open "progress" dialog.
-        nsIURL *url;
-        rv = NS_NewURL( &url, "resource:/res/xpinstall/progress.xul" );
-        
-        if ( NS_SUCCEEDED(rv) ) 
-        {
-        
-            nsIWebShellWindow *newWindow;
-
-            rv = appShell->CreateTopLevelWindow( nsnull,
-                                                 url,
-                                                 PR_TRUE,
-                                                 newWindow,
-                                                 nsnull,
-                                                 this,  // callbacks??
-                                                 0,
-                                                 0 );
-
-            if ( NS_SUCCEEDED( rv ) ) 
-            {
-                mWindow = newWindow;
-                NS_RELEASE( newWindow );
-
-                 if (mWindow != nsnull)
-                    mWindow->Show(PR_TRUE);
-            }
-            else 
-            {
-                DEBUG_PRINTF( PR_STDOUT, "Error creating progress dialog, rv=0x%X\n", (int)rv );
-            }
-            NS_RELEASE( url );
-        }
-        
-        nsServiceManager::ReleaseService( kAppShellServiceCID, appShell );
-    } 
-    else 
-    {
-        DEBUG_PRINTF( PR_STDOUT, "Unable to get app shell service, rv=0x%X\n", (int)rv );
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::AfterJavascriptEvaluation()
-{
-    if (mWindow)
-    {
-        mWindow->Close();
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::InstallStarted(const char *UIPackageName)
-{
-    setAttribute( mDocument, "dialog.uiPackageName", "value", nsString(UIPackageName) );
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::ItemScheduled(const char *message)
-{
-    PRInt32 maxChars = 40;
-
-    nsString theMessage(message);
-    PRInt32 len = theMessage.Length();
-    if (len > maxChars)
-    {
-        PRInt32 offset = (len/2) - ((len - maxChars)/2);
-        PRInt32 count  = (len - maxChars);
-        theMessage.Cut(offset, count); 
-        theMessage.Insert(nsString("..."), offset);
-    }
-    setAttribute( mDocument, "dialog.currentAction", "value", theMessage );
-    
-    nsString aValue;
-    getAttribute( mDocument, "data.canceled", "value", aValue );
-
-    if (aValue.EqualsIgnoreCase("true"))
-        return -1;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum)
-{
-
-    PRInt32 maxChars = 40;
-
-    nsString theMessage(message);
-    PRInt32 len = theMessage.Length();
-    if (len > maxChars)
-    {
-        PRInt32 offset = (len/2) - ((len - maxChars)/2);
-        PRInt32 count  = (len - maxChars);
-        theMessage.Cut(offset, count);  
-        theMessage.Insert(nsString("..."), offset);
-    }
-
-    setAttribute( mDocument, "dialog.currentAction", "value", theMessage );
-
-    nsresult rv = NS_OK;
-    char buf[16];
-    
-    PR_snprintf( buf, sizeof buf, "%lu", totNum );
-    setAttribute( mDocument, "dialog.progress", "max", buf );
-   
-    if (totNum != 0)
-    {
-        PR_snprintf( buf, sizeof buf, "%lu", ((totNum-itemNum)/totNum) );
-    }
-    else
-    {
-        PR_snprintf( buf, sizeof buf, "%lu", 0 );
-    }
-    setAttribute( mDocument, "dialog.progress", "value", buf );
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::InstallAborted()
-{
-    return NS_OK;
-}
-
-
-
-
-// Do startup stuff from C++ side.
-NS_IMETHODIMP
-nsInstallProgressDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) 
-{
-    nsresult rv = NS_OK;
-
-    // Get content viewer from the web shell.
-    nsCOMPtr<nsIContentViewer> contentViewer;
-    rv = aWebShell ? aWebShell->GetContentViewer(getter_AddRefs(contentViewer))
-                   : NS_ERROR_NULL_POINTER;
-
-    if ( contentViewer ) {
-        // Up-cast to a document viewer.
-        nsCOMPtr<nsIDocumentViewer> docViewer( do_QueryInterface( contentViewer, &rv ) );
-        if ( docViewer ) {
-            // Get the document from the doc viewer.
-            nsCOMPtr<nsIDocument> document;
-            rv = docViewer->GetDocument(*getter_AddRefs(document));
-            if ( document ) {
-                // Upcast to XUL document.
-                mDocument = do_QueryInterface( document, &rv );
-                if ( ! mDocument ) 
-                {
-                    DEBUG_PRINTF( PR_STDOUT, "%s %d: Upcast to nsIDOMXULDocument failed, rv=0x%X\n",
-                                  __FILE__, (int)__LINE__, (int)rv );
-                }
-            } 
-            else 
-            {
-                DEBUG_PRINTF( PR_STDOUT, "%s %d: GetDocument failed, rv=0x%X\n",
-                              __FILE__, (int)__LINE__, (int)rv );
-            }
-        } 
-        else 
-        {
-            DEBUG_PRINTF( PR_STDOUT, "%s %d: Upcast to nsIDocumentViewer failed, rv=0x%X\n",
-                          __FILE__, (int)__LINE__, (int)rv );
-        }
-    } 
-    else 
-    {
-        DEBUG_PRINTF( PR_STDOUT, "%s %d: GetContentViewer failed, rv=0x%X\n",
-                      __FILE__, (int)__LINE__, (int)rv );
-    }
-
-    return rv;
-}

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-#ifndef __nsInstallProgressDialog_h__
-#define __nsInstallProgressDialog_h__
-
-#include "nsIXPInstallProgress.h"
-#include "nsISupports.h"
-#include "nsISupportsUtils.h"
-
-#include "nsCOMPtr.h"
-
-#include "nsIWebShell.h"
-#include "nsIWebShellWindow.h"
-#include "nsIXULWindowCallbacks.h"    
-
-#include "nsIDocument.h"
-#include "nsIDOMXULDocument.h"
-
-
-class nsInstallProgressDialog : public nsIXPInstallProgress, public nsIXULWindowCallbacks
-{
-    public: 
-
-        nsInstallProgressDialog();
-        virtual ~nsInstallProgressDialog();
-        
-        NS_DECL_ISUPPORTS
-
-        
-        NS_IMETHOD BeforeJavascriptEvaluation();
-        NS_IMETHOD AfterJavascriptEvaluation();
-        NS_IMETHOD InstallStarted(const char *UIPackageName);
-        NS_IMETHOD ItemScheduled(const char *message);
-        NS_IMETHOD InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum);
-        NS_IMETHOD InstallAborted();
-
-        // Declare implementations of nsIXULWindowCallbacks interface functions.
-        NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);
-        NS_IMETHOD ConstructAfterJavaScript(nsIWebShell *aWebShell) { return NS_OK; }
-
-    private:
-
-        nsCOMPtr<nsIDOMXULDocument>  mDocument;
-        nsCOMPtr<nsIWebShellWindow>  mWindow;
-};
-#endif

mozilla/xpinstall/src/nsInstallResources.cpp

@@ -1,67 +0,0 @@
- /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsInstallResources.h"
-
-char* nsInstallResources::GetInstallFileString(void)
-{ 
-    return "Installing: %s"; 
-}
-
-char* nsInstallResources::GetReplaceFileString(void)
-{ 
-    return "Replacing %s"; 
-}     
-
-char* nsInstallResources::GetDeleteFileString(void)
-{ 
-    return "Deleting file: %s"; 
-} 
-
-char* nsInstallResources::GetDeleteComponentString(void) 
-{ 
-    return "Deleting component: %s"; 
-}
-
-char* nsInstallResources::GetExecuteString(void)         
-{ 
-    return "Executing: %s"; 
-}
-
-char* nsInstallResources::GetExecuteWithArgsString(void) 
-{ 
-    return "Executing: %s with argument: %s"; 
-}
-
-char* nsInstallResources::GetPatchFileString(void)       
-{ 
-    return "Patching: %s"; 
-}
-
-char* nsInstallResources::GetUninstallString(void)       
-{ 
-    return "Uninstalling: %s"; 
-}
-

mozilla/xpinstall/src/nsInstallResources.h

@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef __NS_INSTALLRESOURCES_H__
-#define __NS_INSTALLRESOURCES_H__
-
-class nsInstallResources
-{
-    public:
-       
-       static char* GetInstallFileString(void);
-       static char* GetReplaceFileString(void);     
-       static char* GetDeleteFileString(void);      
-       static char* GetDeleteComponentString(void); 
-       static char* GetExecuteString(void);         
-       static char* GetExecuteWithArgsString(void); 
-       static char* GetPatchFileString(void);       
-       static char* GetUninstallString(void);       
-};
-
-
-#endif

mozilla/xpinstall/src/nsInstallTrigger.cpp

@@ -1,359 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are Copyright (C) 1998
- * Netscape Communications Corporation.  All Rights Reserved.
- */
-
-#include "nsSoftwareUpdate.h"
-#include "nsSoftwareUpdateStream.h"
-#include "nsInstallTrigger.h"
-#include "nsIDOMInstallTriggerGlobal.h"
-
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIScriptGlobalObject.h"
-
-#include "nsIPref.h"
-
-#include "nsRepository.h"
-#include "nsIServiceManager.h"
-
-#include "nsSpecialSystemDirectory.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-
-static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-static NS_DEFINE_IID(kIInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
-
-
-
-
-
-
-nsInstallTrigger::nsInstallTrigger()
-{
-    mScriptObject   = nsnull;
-    NS_INIT_REFCNT();
-}
-
-nsInstallTrigger::~nsInstallTrigger()
-{
-}
-
-NS_IMETHODIMP 
-nsInstallTrigger::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-{
-    if (aInstancePtr == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    // Always NULL result, in case of failure
-    *aInstancePtr = NULL;
-
-    if ( aIID.Equals(kIScriptObjectOwnerIID))
-    {
-        *aInstancePtr = (void*) ((nsIScriptObjectOwner*)this);
-        AddRef();
-        return NS_OK;
-    }
-    else if ( aIID.Equals(kIInstallTrigger_IID) )
-    {
-        *aInstancePtr = (void*) ((nsIDOMInstallTriggerGlobal*)this);
-        AddRef();
-        return NS_OK;
-    }
-    else if ( aIID.Equals(kISupportsIID) )
-    {
-        *aInstancePtr = (void*)(nsISupports*)(nsIScriptObjectOwner*)this;
-        AddRef();
-        return NS_OK;
-    }
-
-     return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsInstallTrigger)
-NS_IMPL_RELEASE(nsInstallTrigger)
-
-
-
-NS_IMETHODIMP 
-nsInstallTrigger::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
-{
-    NS_PRECONDITION(nsnull != aScriptObject, "null arg");
-    nsresult res = NS_OK;
-    
-    if (nsnull == mScriptObject) 
-    {
-         nsIScriptGlobalObject *global = aContext->GetGlobalObject();
-
-        res = NS_NewScriptInstallTriggerGlobal(  aContext, 
-                                                (nsISupports *)(nsIDOMInstallTriggerGlobal*)this, 
-                                                (nsISupports *)global, 
-                                                &mScriptObject);
-        NS_IF_RELEASE(global);
-
-    }
-  
-
-    *aScriptObject = mScriptObject;
-    return res;
-}
-
-NS_IMETHODIMP 
-nsInstallTrigger::SetScriptObject(void *aScriptObject)
-{
-  mScriptObject = aScriptObject;
-  return NS_OK;
-}
-
-static NS_DEFINE_IID(kPrefsIID, NS_IPREF_IID);
-static NS_DEFINE_IID(kPrefsCID,  NS_PREF_CID);
-
-NS_IMETHODIMP    
-nsInstallTrigger::UpdateEnabled(PRBool* aReturn)
-{
-    nsIPref * prefs;
-    
-    nsresult rv = nsServiceManager::GetService(kPrefsCID, 
-                                               kPrefsIID,
-                                               (nsISupports**) &prefs);
-
-
-    if ( NS_SUCCEEDED(rv) )
-    {
-        rv = prefs->GetBoolPref( (const char*) AUTOUPDATE_ENABLE_PREF, aReturn);
-
-        if (NS_FAILED(rv))
-        {
-            *aReturn = PR_FALSE;
-        }
-
-        NS_RELEASE(prefs);
-    }
-    else
-    {
-        *aReturn = PR_FALSE;  /* no prefs manager.  set to false */
-    }
-    
-    //FIX!!!!!!!!!!  
-    *aReturn = PR_TRUE; 
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP    
-nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn)
-{
-    nsString localFile;
-    CreateTempFileFromURL(aURL, localFile);
-
-    // start the download (this will clean itself up)
-    nsSoftwareUpdateListener *downloader = new nsSoftwareUpdateListener(aURL, localFile, aFlags);
-
-    *aReturn = NS_OK;  // maybe we should do something more.
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn)
-{
-    nsString localFile;
-    CreateTempFileFromURL(aURL, localFile);
-
-    // start the download (this will clean itself up)
-    nsSoftwareUpdateListener *downloader = new nsSoftwareUpdateListener(aURL, localFile, 0);
-
-    *aReturn = NS_OK;  // maybe we should do something more.
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-
-
-// this will take a nsIUrl, and create a temporary file.  If it is local, we just us it.
- 
-void
-nsInstallTrigger::CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString)
-{
-    // Checking to see if the url is local
-
-    if ( aURL.EqualsIgnoreCase("file://", 7) )
-    {       
-        tempFileString.SetString( nsNSPRPath(nsFileURL(aURL)) );
-    }
-    else
-    {
-        nsSpecialSystemDirectory tempFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-    
-        PRInt32 result = aURL.RFind("/");
-        if (result != -1)
-        {    
-            nsString jarName;
-                       
-            aURL.Right(jarName, (aURL.Length() - result) );
-            
-            PRInt32 argOffset = jarName.RFind("?");
-
-            if (argOffset != -1)
-            {
-                // we need to remove ? and everything after it
-                jarName.Truncate(argOffset);
-            }
-            
-            
-            tempFile += jarName;
-        }
-        else
-        {   
-            tempFile += "xpinstall.jar";
-        }
-
-        tempFile.MakeUnique();
-
-        tempFileString.SetString( nsNSPRPath( nsFilePath(tempFile) ) );
-    }
-}
-
-
-/////////////////////////////////////////////////////////////////////////
-// 
-/////////////////////////////////////////////////////////////////////////
-
-
-
-nsInstallTriggerFactory::nsInstallTriggerFactory(void)
-{
-    NS_INIT_REFCNT();
-}
-
-nsInstallTriggerFactory::~nsInstallTriggerFactory(void)
-{
-    NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
-}
-
-NS_IMETHODIMP
-nsInstallTriggerFactory::QueryInterface(const nsIID &aIID, void **aResult)
-{
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    // Always NULL result, in case of failure
-    *aResult = nsnull;
-
-    if (aIID.Equals(kISupportsIID)) {
-        *aResult = NS_STATIC_CAST(nsISupports*, this);
-        AddRef();
-        return NS_OK;
-    } else if (aIID.Equals(kIFactoryIID)) {
-        *aResult = NS_STATIC_CAST(nsIFactory*, this);
-        AddRef();
-        return NS_OK;
-    }
-
-    return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsInstallTriggerFactory);
-NS_IMPL_RELEASE(nsInstallTriggerFactory);
-
-NS_IMETHODIMP
-nsInstallTriggerFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-   if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    *aResult = nsnull;
-
-    nsresult rv;
-
-    nsInstallTrigger *inst = new nsInstallTrigger();
-    
-    if (! inst)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    if (NS_FAILED(rv = inst->QueryInterface(aIID, aResult))) 
-    {
-        // We didn't get the right interface.
-        NS_ERROR("didn't support the interface you wanted");
-    }
-    return rv;
-}
-
-    
-NS_IMETHODIMP
-nsInstallTriggerFactory::LockFactory(PRBool aLock)
-{
-    // Not implemented in simplest case.
-    return NS_OK;
-}

mozilla/xpinstall/src/nsInstallTrigger.h

@@ -1,72 +0,0 @@
-#ifndef __NS_INSTALLTRIGGER_H__
-#define __NS_INSTALLTRIGGER_H__
-
-#include "nscore.h"
-#include "nsString.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIScriptObjectOwner.h"
-
-#include "nsIDOMInstallTriggerGlobal.h"
-#include "nsSoftwareUpdate.h"
-
-#include "prtypes.h"
-#include "nsHashtable.h"
-#include "nsVector.h"
-
-
-
-
-
-class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTriggerGlobal
-{
-    public:
-        static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallTrigger_CID; return iid; }
-
-        nsInstallTrigger();
-        ~nsInstallTrigger();
-        
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-        NS_IMETHOD    SetScriptObject(void* aScriptObject);
-
-        NS_IMETHOD    UpdateEnabled(PRBool* aReturn);
-        NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn);
-        NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn);
-        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);
-        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);
-        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);
-        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);
-        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);
-        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);
-        NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);
-        NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);
-        NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);
-
-        
-    private:
-        void *mScriptObject;
-        void CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString);
-
-};
-
-
-class nsInstallTriggerFactory : public nsIFactory 
-{
-    public:
-        
-        nsInstallTriggerFactory();
-        ~nsInstallTriggerFactory();
-        
-        NS_DECL_ISUPPORTS
-
-              NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                        REFNSIID aIID,
-                                        void **aResult);
-
-              NS_IMETHOD LockFactory(PRBool aLock);
-
-};
-
-#endif

mozilla/xpinstall/src/nsInstallUninstall.cpp

@@ -1,196 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsInstall.h"
-#include "nsInstallUninstall.h"
-#include "nsInstallResources.h"
-#include "VerReg.h"
-#include "prmem.h"
-#include "nsFileSpec.h"
-#include "ScheduledTasks.h"
-
-extern "C" NS_EXPORT PRInt32 SU_Uninstall(char *regPackageName);
-REGERR su_UninstallProcessItem(char *component_path);
-
-
-nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall,
-                                        const nsString& regName,
-                                        PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    if (regName == "null") 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mRegName.SetString(regName);
-
-    char* userName = (char*)PR_Malloc(MAXREGPATHLEN);
-    PRInt32 err = VR_GetUninstallUserName( (char*) (const char*) nsAutoCString(regName), 
-                                           userName, 
-                                           MAXREGPATHLEN );
-    
-    mUIName.SetString(userName);
-    
-    if (err != REGERR_OK)
-    {
-        *error = nsInstall::NO_SUCH_COMPONENT;
-    }
-    
-    PR_FREEIF(userName);
-    
-}
-
-nsInstallUninstall::~nsInstallUninstall()
-{
-}
-
-
-PRInt32 nsInstallUninstall::Prepare()
-{
-    // no set-up necessary
-    return nsInstall::SUCCESS;
-}
-
-PRInt32 nsInstallUninstall::Complete()
-{
-    PRInt32 err = nsInstall::SUCCESS;
-
-    if (mInstall == NULL) 
-       return nsInstall::INVALID_ARGUMENTS;
-
-    err = SU_Uninstall( (char*)(const char*) nsAutoCString(mRegName) );
-    
-    return err;
-}
-
-void nsInstallUninstall::Abort()
-{
-}
-
-char* nsInstallUninstall::toString()
-{
-    char* buffer = new char[1024];
-    
-    char* temp = mUIName.ToNewCString();
-    sprintf( buffer, nsInstallResources::GetUninstallString(), temp);
-    delete [] temp;
-
-    return buffer;
-}
-
-
-PRBool
-nsInstallUninstall::CanUninstall()
-{
-    return PR_FALSE;
-}
-
-PRBool
-nsInstallUninstall::RegisterPackageNode()
-{
-    return PR_FALSE;
-}
-
-extern "C" NS_EXPORT PRInt32 SU_Uninstall(char *regPackageName)
-{
-    REGERR status = REGERR_FAIL;
-    char pathbuf[MAXREGPATHLEN+1] = {0};
-    char sharedfilebuf[MAXREGPATHLEN+1] = {0};
-    REGENUM state = 0;
-    int32 length;
-    int32 err;
-
-    if (regPackageName == NULL)
-        return REGERR_PARAM;
-
-    if (pathbuf == NULL)
-        return REGERR_PARAM;
-
-    /* Get next path from Registry */
-    status = VR_Enum( regPackageName, &state, pathbuf, MAXREGPATHLEN );
-
-    /* if we got a good path */
-    while (status == REGERR_OK)
-    {
-        char component_path[2*MAXREGPATHLEN+1] = {0};
-        strcat(component_path, regPackageName);
-        length = strlen(regPackageName);
-        if (component_path[length - 1] != '/')
-            strcat(component_path, "/");
-        strcat(component_path, pathbuf);
-        err = su_UninstallProcessItem(component_path);
-        status = VR_Enum( regPackageName, &state, pathbuf, MAXREGPATHLEN );  
-    }
-    
-    err = VR_Remove(regPackageName);
-    // there is a problem here.  It looks like if the file is refcounted, we still blow away the reg key
-    // FIX!
-    state = 0;
-    status = VR_UninstallEnumSharedFiles( regPackageName, &state, sharedfilebuf, MAXREGPATHLEN );
-    while (status == REGERR_OK)
-    {
-        err = su_UninstallProcessItem(sharedfilebuf);
-        err = VR_UninstallDeleteFileFromList(regPackageName, sharedfilebuf);
-        status = VR_UninstallEnumSharedFiles( regPackageName, &state, sharedfilebuf, MAXREGPATHLEN );
-    }
-
-    err = VR_UninstallDeleteSharedFilesKey(regPackageName);
-    err = VR_UninstallDestroy(regPackageName);
-    return err;
-}
-
-REGERR su_UninstallProcessItem(char *component_path)
-{
-    int refcount;
-    int err;
-    char filepath[MAXREGPATHLEN];
-
-    err = VR_GetPath(component_path, sizeof(filepath), filepath);
-    if ( err == REGERR_OK )
-    {
-        err = VR_GetRefCount(component_path, &refcount);  
-        if ( err == REGERR_OK )
-        {
-            --refcount;
-            if (refcount > 0)
-                err = VR_SetRefCount(component_path, refcount);  
-            else 
-            {
-                err = VR_Remove(component_path);
-                DeleteFileNowOrSchedule(nsFileSpec(filepath));
-            }
-        }
-        else
-        {
-            /* delete node and file */
-            err = VR_Remove(component_path);
-            DeleteFileNowOrSchedule(nsFileSpec(filepath));
-        }
-    }
-    return err;
-}

mozilla/xpinstall/src/nsInstallUninstall.h

@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsInstallUninstall_h__
-#define nsInstallUninstall_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-#include "nsInstallObject.h"
-#include "nsInstall.h"
-
-class nsInstallUninstall : public nsInstallObject 
-{
-    public:
-          
-        nsInstallUninstall( nsInstall* inInstall,
-                            const nsString& regName,
-                            PRInt32 *error);
-
-
-        virtual ~nsInstallUninstall();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void  Abort();
-        char* toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	  
-  
-    private:
-          
-        nsString mRegName;        // Registry name of package
-        nsString mUIName;         // User name of package
-
-        
-};
-
-#endif /* nsInstallUninstall_h__ */

mozilla/xpinstall/src/nsInstallVersion.cpp

@@ -1,399 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are Copyright (C) 1998
- * Netscape Communications Corporation.  All Rights Reserved.
- */
-
-#include "nsSoftwareUpdate.h"
-
-#include "nsInstallVersion.h"
-#include "nsIDOMInstallVersion.h"
-
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIScriptGlobalObject.h"
-
-#include "prprf.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-
-static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID);
-
-
-nsInstallVersion::nsInstallVersion()
-{
-    mScriptObject   = nsnull;
-    NS_INIT_REFCNT();
-}
-
-nsInstallVersion::~nsInstallVersion()
-{
-}
-
-NS_IMETHODIMP 
-nsInstallVersion::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-{
-    if (aInstancePtr == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    // Always NULL result, in case of failure
-    *aInstancePtr = NULL;
-
-    if ( aIID.Equals(kIScriptObjectOwnerIID))
-    {
-        *aInstancePtr = (void*) ((nsIScriptObjectOwner*)this);
-        AddRef();
-        return NS_OK;
-    }
-    else if ( aIID.Equals(kIInstallVersion_IID) )
-    {
-        *aInstancePtr = (void*) ((nsIDOMInstallVersion*)this);
-        AddRef();
-        return NS_OK;
-    }
-    else if ( aIID.Equals(kISupportsIID) )
-    {
-        *aInstancePtr = (void*)(nsISupports*)(nsIScriptObjectOwner*)this;
-        AddRef();
-        return NS_OK;
-    }
-
-     return NS_NOINTERFACE;
-}
-
-
-NS_IMPL_ADDREF(nsInstallVersion)
-NS_IMPL_RELEASE(nsInstallVersion)
-
-
-
-NS_IMETHODIMP 
-nsInstallVersion::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
-{
-    NS_PRECONDITION(nsnull != aScriptObject, "null arg");
-    nsresult res = NS_OK;
-    
-    if (nsnull == mScriptObject) 
-    {
-        res = NS_NewScriptInstallVersion(aContext, 
-                                         (nsISupports *)(nsIDOMInstallVersion*)this, 
-                                         nsnull, 
-                                         &mScriptObject);
-    }
-  
-
-    *aScriptObject = mScriptObject;
-    return res;
-}
-
-NS_IMETHODIMP 
-nsInstallVersion::SetScriptObject(void *aScriptObject)
-{
-  mScriptObject = aScriptObject;
-  return NS_OK;
-}
-
-//  this will go away when our constructors can have parameters.
-NS_IMETHODIMP    
-nsInstallVersion::Init(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild)
-{
-    major   = aMajor;
-    minor   = aMinor;
-    release = aRelease;
-    build   = aBuild;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::Init(const nsString& version)
-{
-    PRInt32 errorCode;
-    PRInt32 aMajor, aMinor, aRelease, aBuild;
-
-    major = minor = release = build = 0;
-    
-    errorCode = nsInstallVersion::StringToVersionNumbers(version, &aMajor, &aMinor, &aRelease, &aBuild);    
-    if (NS_SUCCEEDED(errorCode)) 
-    {
-        Init(aMajor, aMinor, aRelease, aBuild);
-    }
-    
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP    
-nsInstallVersion::GetMajor(PRInt32* aMajor)
-{
-    *aMajor = major;
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::SetMajor(PRInt32 aMajor)
-{
-    major = aMajor;
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::GetMinor(PRInt32* aMinor)
-{
-    *aMinor = minor;
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::SetMinor(PRInt32 aMinor)
-{
-    minor = aMinor;
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::GetRelease(PRInt32* aRelease)
-{
-    *aRelease = release;
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::SetRelease(PRInt32 aRelease)
-{
-    release = aRelease;
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::GetBuild(PRInt32* aBuild)
-{
-    *aBuild = build;
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::SetBuild(PRInt32 aBuild)
-{
-    build = aBuild;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP    
-nsInstallVersion::CompareTo(nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
-{
-    PRInt32 aMajor, aMinor, aRelease, aBuild;
-    
-    aVersion->GetMajor(&aMajor);
-    aVersion->GetMinor(&aMinor);
-    aVersion->GetRelease(&aRelease);
-    aVersion->GetBuild(&aBuild);
-
-    CompareTo(aMajor, aMinor, aRelease, aBuild, aReturn);
-    
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP    
-nsInstallVersion::CompareTo(const nsString& aAString, PRInt32* aReturn)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallVersion::CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)
-{
-    int diff;
-    
-    if ( major == aMajor ) 
-    {
-        if ( minor == aMinor ) 
-        {
-            if ( release == aRelease ) 
-            {
-                if ( build == aBuild )
-                    diff = EQUAL;
-                else if ( build > aBuild )
-                    diff = BLD_DIFF;
-                else
-                    diff = BLD_DIFF_MINUS;
-            }
-            else if ( release > aRelease )
-                diff = REL_DIFF;
-            else
-                diff = REL_DIFF_MINUS;
-        }
-        else if (  minor > aMinor )
-            diff = MINOR_DIFF;
-        else
-            diff = MINOR_DIFF_MINUS;
-    }
-    else if ( major > aMajor )
-        diff = MAJOR_DIFF;
-    else
-        diff = MAJOR_DIFF_MINUS;
-
-    *aReturn = diff;
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP    
-nsInstallVersion::ToString(nsString& aReturn)
-{
-    char *result=NULL;
-    result = PR_sprintf_append(result, "%d.%d.%d.%d", major, minor, release, build);
-    
-    aReturn = result;
-
-    return NS_OK;
-}
-
-
-nsresult
-nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajor, PRInt32 *aMinor, PRInt32 *aRelease, PRInt32 *aBuild)    
-{
-    PRInt32 errorCode;
-
-    int dot = version.Find('.', 0);
-    
-    if ( dot == -1 ) 
-    {
-        *aMajor = version.ToInteger(&errorCode);
-    }
-    else  
-    {
-        nsString majorStr;
-        version.Mid(majorStr, 0, dot);
-        *aMajor  = majorStr.ToInteger(&errorCode);
-
-        int prev = dot+1;
-        dot = version.Find('.',prev);
-        if ( dot == -1 ) 
-        {
-            nsString minorStr;
-            version.Mid(minorStr, prev, version.Length() - prev);
-            *aMinor = minorStr.ToInteger(&errorCode);
-        }
-        else 
-        {
-            nsString minorStr;
-            version.Mid(minorStr, prev, dot - prev);
-            *aMinor = minorStr.ToInteger(&errorCode);
-
-            prev = dot+1;
-            dot = version.Find('.',prev);
-            if ( dot == -1 ) 
-            {
-                nsString releaseStr;
-                version.Mid(releaseStr, prev, version.Length() - prev);
-                *aRelease = releaseStr.ToInteger(&errorCode);
-            }
-            else 
-            {
-                nsString releaseStr;
-                version.Mid(releaseStr, prev, dot - prev);
-                *aRelease = releaseStr.ToInteger(&errorCode);
-    
-                prev = dot+1;
-                if ( version.Length() > dot ) 
-                {
-                    nsString buildStr;
-                    version.Mid(buildStr, prev, version.Length() - prev);
-                    *aBuild = buildStr.ToInteger(&errorCode);
-               }
-            }
-        }
-    }
-
-    return errorCode;
-}
-
-/////////////////////////////////////////////////////////////////////////
-// 
-/////////////////////////////////////////////////////////////////////////
-
-nsInstallVersionFactory::nsInstallVersionFactory(void)
-{
-    NS_INIT_REFCNT();
-}
-
-nsInstallVersionFactory::~nsInstallVersionFactory(void)
-{
-    NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
-}
-
-NS_IMETHODIMP
-nsInstallVersionFactory::QueryInterface(const nsIID &aIID, void **aResult)
-{
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    // Always NULL result, in case of failure
-    *aResult = nsnull;
-
-    if (aIID.Equals(kISupportsIID)) {
-        *aResult = NS_STATIC_CAST(nsISupports*, this);
-        AddRef();
-        return NS_OK;
-    } else if (aIID.Equals(kIFactoryIID)) {
-        *aResult = NS_STATIC_CAST(nsIFactory*, this);
-        AddRef();
-        return NS_OK;
-    }
-    return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsInstallVersionFactory);
-NS_IMPL_RELEASE(nsInstallVersionFactory);
-
-NS_IMETHODIMP
-nsInstallVersionFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aResult == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    *aResult = NULL;
-
-    /* do I have to use iSupports? */
-    nsInstallVersion *inst = new nsInstallVersion();
-
-    if (inst == NULL)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsresult result =  inst->QueryInterface(aIID, aResult);
-
-    if (NS_FAILED(result)) 
-        delete inst;
-
-    return result;
-}
-
-NS_IMETHODIMP
-nsInstallVersionFactory::LockFactory(PRBool aLock)
-{
-  return NS_OK;
-}

mozilla/xpinstall/src/nsInstallVersion.h

@@ -1,76 +0,0 @@
-#ifndef __NS_INSTALLVERSION_H__
-#define __NS_INSTALLVERSION_H__
-
-#include "nscore.h"
-#include "nsString.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIScriptObjectOwner.h"
-
-#include "nsIDOMInstallVersion.h"
-#include "nsSoftwareUpdate.h"
-
-#include "prtypes.h"
-
-class nsInstallVersion: public nsIScriptObjectOwner, public nsIDOMInstallVersion
-{
-    public:
-        static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallVersion_CID; return iid; }
-
-        nsInstallVersion();
-        virtual ~nsInstallVersion();
-        
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-        NS_IMETHOD    SetScriptObject(void* aScriptObject);
-        
-        NS_IMETHOD    Init(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild);
-        NS_IMETHOD    Init(const nsString& aVersionString);
-
-        NS_IMETHOD    GetMajor(PRInt32* aMajor);
-        NS_IMETHOD    SetMajor(PRInt32 aMajor);
-
-        NS_IMETHOD    GetMinor(PRInt32* aMinor);
-        NS_IMETHOD    SetMinor(PRInt32 aMinor);
-
-        NS_IMETHOD    GetRelease(PRInt32* aRelease);
-        NS_IMETHOD    SetRelease(PRInt32 aRelease);
-
-        NS_IMETHOD    GetBuild(PRInt32* aBuild);
-        NS_IMETHOD    SetBuild(PRInt32 aBuild);
-        
-        NS_IMETHOD    ToString(nsString& aReturn);
-        NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersion, PRInt32* aReturn);
-        NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn);
-        NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);
-
-        static nsresult StringToVersionNumbers(const nsString& version, PRInt32 *aMajor, PRInt32 *aMinor, PRInt32 *aRelease, PRInt32 *aBuild);
-
-    private:
-        void *mScriptObject;
-        PRInt32 major;
-        PRInt32 minor;
-        PRInt32 release;
-        PRInt32 build;
-};
-
-
-class nsInstallVersionFactory : public nsIFactory 
-{
-    public:
-        
-        nsInstallVersionFactory();
-        virtual ~nsInstallVersionFactory();
-        
-        NS_DECL_ISUPPORTS
-
-              NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                        REFNSIID aIID,
-                                        void **aResult);
-
-              NS_IMETHOD LockFactory(PRBool aLock);
-
-};
-
-#endif

mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp

@@ -1,665 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-#include "nsIJSScriptObject.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIPtr.h"
-#include "nsString.h"
-#include "nsIDOMInstallVersion.h"
-#include "nsIDOMInstallTriggerGlobal.h"
-
-extern void ConvertJSValToStr(nsString&  aString,
-                             JSContext* aContext,
-                             jsval      aValue);
-
-extern void ConvertStrToJSVal(const nsString& aProp,
-                             JSContext* aContext,
-                             jsval* aReturn);
-
-extern PRBool ConvertJSValToBool(PRBool* aProp,
-                                JSContext* aContext,
-                                jsval aValue);
-
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
-static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
-static NS_DEFINE_IID(kIInstallTriggerGlobalIID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-
-NS_DEF_PTR(nsIDOMInstallTriggerGlobal);
-
-
-/***********************************************************************/
-//
-// InstallTriggerGlobal Properties Getter
-//
-PR_STATIC_CALLBACK(JSBool)
-GetInstallTriggerGlobalProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMInstallTriggerGlobal *a = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    switch(JSVAL_TO_INT(id)) {
-      case 0:
-      default:
-        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-/***********************************************************************/
-//
-// InstallTriggerGlobal Properties Setter
-//
-PR_STATIC_CALLBACK(JSBool)
-SetInstallTriggerGlobalProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMInstallTriggerGlobal *a = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    switch(JSVAL_TO_INT(id)) {
-      case 0:
-      default:
-        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-
-//
-// InstallTriggerGlobal finalizer
-//
-PR_STATIC_CALLBACK(void)
-FinalizeInstallTriggerGlobal(JSContext *cx, JSObject *obj)
-{
-  nsJSUtils::nsGenericFinalize(cx, obj);
-}
-
-
-//
-// InstallTriggerGlobal enumerate
-//
-PR_STATIC_CALLBACK(JSBool)
-EnumerateInstallTriggerGlobal(JSContext *cx, JSObject *obj)
-{
-  return nsJSUtils::nsGenericEnumerate(cx, obj);
-}
-
-
-//
-// InstallTriggerGlobal resolve
-//
-PR_STATIC_CALLBACK(JSBool)
-ResolveInstallTriggerGlobal(JSContext *cx, JSObject *obj, jsval id)
-{
-  return nsJSUtils::nsGenericResolve(cx, obj, id);
-}
-
-//
-// Native method UpdateEnabled
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalUpdateEnabled(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-  JSBool rBool = JS_FALSE;
-  PRBool nativeRet;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if (argc >= 0) {
-
-    if (NS_OK != nativeThis->UpdateEnabled(&nativeRet)) {
-      return JS_FALSE;
-    }
-
-    *rval = BOOLEAN_TO_JSVAL(nativeRet);
-  }
-  else {
-    JS_ReportError(cx, "Function UpdateEnabled requires 0 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method StartSoftwareUpdate
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalStartSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-  JSBool       rBool = JS_FALSE;
-  PRInt32      nativeRet;
-  nsAutoString b0;
-  PRInt32      b1;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if (argc >= 2)
-  {
-    //  public int StartSoftwareUpdate(String url,
-    //                                 int flag);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if(!JS_ValueToInt32(cx, argv[1], (int32 *)&b1))
-    {
-      JS_ReportError(cx, "2nd parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->StartSoftwareUpdate(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else if(argc >= 1)
-  {
-    //  public int StartSoftwareUpdate(String url);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if(NS_OK != nativeThis->StartSoftwareUpdate(b0, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "Function StartSoftwareUpdate requires 2 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method ConditionalSoftwareUpdate
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalConditionalSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-  JSBool rBool = JS_FALSE;
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-  nsAutoString b2str;
-  PRInt32      b2int;
-  nsAutoString b3str;
-  PRInt32      b3int;
-  PRInt32      b4;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if(argc >= 5)
-  {
-    //  public int ConditionalSoftwareUpdate(String url,
-    //                                       String registryName,
-    //                                       int    diffLevel,
-    //                                       String version, --OR-- VersionInfo version
-    //                                       int    mode);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(!JS_ValueToInt32(cx, argv[2], (int32 *)&b2int))
-    {
-      JS_ReportError(cx, "3rd parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if(!JS_ValueToInt32(cx, argv[4], (int32 *)&b4))
-    {
-      JS_ReportError(cx, "5th parameter must be a number");
-      return JS_FALSE;
-    }
-    
-    if(JSVAL_IS_OBJECT(argv[3]))
-    {
-        JSObject* jsobj = JSVAL_TO_OBJECT(argv[3]);
-        JSClass* jsclass = JS_GetClass(cx, jsobj);
-        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
-        {
-          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
-
-          if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2int, version, b4, &nativeRet))
-          {
-                return JS_FALSE;
-          }
-        }
-    }
-    else
-    {
-        ConvertJSValToStr(b3str, cx, argv[3]);
-        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2int, b3str, b4, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else if(argc >= 4)
-  {
-    //  public int ConditionalSoftwareUpdate(String url,
-    //                                       String registryName,
-    //                                       String version,  --OR-- VersionInfo version
-    //                                       int    mode);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(!JS_ValueToInt32(cx, argv[3], (int32 *)&b3int))
-    {
-      JS_ReportError(cx, "4th parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if(JSVAL_IS_OBJECT(argv[2]))
-    {
-        JSObject* jsobj = JSVAL_TO_OBJECT(argv[2]);
-        JSClass* jsclass = JS_GetClass(cx, jsobj);
-        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
-        {
-          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
-
-          if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, version, b3int, &nativeRet))
-          {
-                return JS_FALSE;
-          }
-        }
-    }
-    else
-    {
-        ConvertJSValToStr(b2str, cx, argv[2]);
-        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2str, b3int, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-        
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else if(argc >= 3)
-  {
-    //  public int ConditionalSoftwareUpdate(String url,
-    //                                       String registryName,
-    //                                       String version);  --OR-- VersionInfo version
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(JSVAL_IS_OBJECT(argv[2]))
-    {
-        JSObject* jsobj = JSVAL_TO_OBJECT(argv[2]);
-        JSClass* jsclass = JS_GetClass(cx, jsobj);
-        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
-        {
-          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
-
-          if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, version, &nativeRet))
-          {
-                return JS_FALSE;
-          }
-        }
-    }
-    else
-    {
-        ConvertJSValToStr(b2str, cx, argv[2]);
-        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2str, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-        
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "Function ConditionalSoftwareUpdate requires 5 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method CompareVersion
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalCompareVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-  JSBool rBool = JS_FALSE;
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1str;
-  PRInt32      b1int;
-  PRInt32      b2int;
-  PRInt32      b3int;
-  PRInt32      b4int;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if(argc >= 5)
-  {
-    //  public int CompareVersion(String registryName,
-    //                            int    major,
-    //                            int    minor,
-    //                            int    release,
-    //                            int    build);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if(!JS_ValueToInt32(cx, argv[1], (int32 *)&b1int))
-    {
-      JS_ReportError(cx, "2th parameter must be a number");
-      return JS_FALSE;
-    }
-    if(!JS_ValueToInt32(cx, argv[2], (int32 *)&b2int))
-    {
-      JS_ReportError(cx, "3th parameter must be a number");
-      return JS_FALSE;
-    }
-    if(!JS_ValueToInt32(cx, argv[3], (int32 *)&b3int))
-    {
-      JS_ReportError(cx, "4th parameter must be a number");
-      return JS_FALSE;
-    }
-    if(!JS_ValueToInt32(cx, argv[4], (int32 *)&b4int))
-    {
-      JS_ReportError(cx, "5th parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->CompareVersion(b0, b1int, b2int, b3int, b4int, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else if(argc >= 2)
-  {
-    //  public int CompareVersion(String registryName,
-    //                            String version); --OR-- VersionInfo version
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if(JSVAL_IS_OBJECT(argv[1]))
-    {
-        JSObject* jsobj = JSVAL_TO_OBJECT(argv[1]);
-        JSClass* jsclass = JS_GetClass(cx, jsobj);
-        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
-        {
-          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
-
-          if(NS_OK != nativeThis->CompareVersion(b0, version, &nativeRet))
-          {
-                return JS_FALSE;
-          }
-        }
-    }
-    else
-    {
-        ConvertJSValToStr(b1str, cx, argv[1]);
-        if(NS_OK != nativeThis->CompareVersion(b0, b1str, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "Function CompareVersion requires 5 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-/***********************************************************************/
-//
-// class for InstallTriggerGlobal
-//
-JSClass InstallTriggerGlobalClass = {
-  "InstallTriggerGlobal", 
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  GetInstallTriggerGlobalProperty,
-  SetInstallTriggerGlobalProperty,
-  EnumerateInstallTriggerGlobal,
-  ResolveInstallTriggerGlobal,
-  JS_ConvertStub,
-  FinalizeInstallTriggerGlobal
-};
-
-
-//
-// InstallTriggerGlobal class properties
-//
-static JSPropertySpec InstallTriggerGlobalProperties[] =
-{
-  {0}
-};
-
-
-//
-// InstallTriggerGlobal class methods
-//
-static JSFunctionSpec InstallTriggerGlobalMethods[] = 
-{
-  {"UpdateEnabled",          InstallTriggerGlobalUpdateEnabled,     0},
-  {"StartSoftwareUpdate",          InstallTriggerGlobalStartSoftwareUpdate,     2},
-  {"ConditionalSoftwareUpdate",          InstallTriggerGlobalConditionalSoftwareUpdate,     5},
-  {"CompareVersion",          InstallTriggerGlobalCompareVersion,     5},
-  {0}
-};
-
-
-//
-// InstallTriggerGlobal constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobal(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_FALSE;
-}
-
-
-//
-// InstallTriggerGlobal class initialization
-//
-nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = nsnull;
-  JSObject *parent_proto = nsnull;
-  JSObject *global = JS_GetGlobalObject(jscontext);
-  jsval vp;
-
-  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "InstallTriggerGlobal", &vp)) ||
-      !JSVAL_IS_OBJECT(vp) ||
-      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
-      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
-      !JSVAL_IS_OBJECT(vp)) {
-
-    proto = JS_InitClass(jscontext,     // context
-                         global,        // global object
-                         parent_proto,  // parent proto 
-                         &InstallTriggerGlobalClass,      // JSClass
-                         InstallTriggerGlobal,            // JSNative ctor
-                         0,             // ctor args
-                         InstallTriggerGlobalProperties,  // proto props
-                         InstallTriggerGlobalMethods,     // proto funcs
-                         nsnull,        // ctor props (static)
-                         nsnull);       // ctor funcs (static)
-    if (nsnull == proto) {
-      return NS_ERROR_FAILURE;
-    }
-
-    if ((PR_TRUE == JS_LookupProperty(jscontext, global, "InstallTriggerGlobal", &vp)) &&
-        JSVAL_IS_OBJECT(vp) &&
-        ((constructor = JSVAL_TO_OBJECT(vp)) != nsnull)) {
-      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::MAJOR_DIFF);
-      JS_SetProperty(jscontext, constructor, "MAJOR_DIFF", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::MINOR_DIFF);
-      JS_SetProperty(jscontext, constructor, "MINOR_DIFF", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::REL_DIFF);
-      JS_SetProperty(jscontext, constructor, "REL_DIFF", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::BLD_DIFF);
-      JS_SetProperty(jscontext, constructor, "BLD_DIFF", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::EQUAL);
-      JS_SetProperty(jscontext, constructor, "EQUAL", &vp);
-
-    }
-
-  }
-  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
-    proto = JSVAL_TO_OBJECT(vp);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aPrototype) {
-    *aPrototype = proto;
-  }
-  return NS_OK;
-}
-
-
-//
-// Method for creating a new InstallTriggerGlobal JavaScript object
-//
-extern "C" NS_DOM nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
-{
-  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptInstallTriggerGlobal");
-  JSObject *proto;
-  JSObject *parent;
-  nsIScriptObjectOwner *owner;
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  nsresult result = NS_OK;
-  nsIDOMInstallTriggerGlobal *aInstallTriggerGlobal;
-
-  if (nsnull == aParent) {
-    parent = nsnull;
-  }
-  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
-    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
-      NS_RELEASE(owner);
-      return NS_ERROR_FAILURE;
-    }
-    NS_RELEASE(owner);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (NS_OK != NS_InitInstallTriggerGlobalClass(aContext, (void **)&proto)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  result = aSupports->QueryInterface(kIInstallTriggerGlobalIID, (void **)&aInstallTriggerGlobal);
-  if (NS_OK != result) {
-    return result;
-  }
-
-  // create a js object for this class
-  *aReturn = JS_NewObject(jscontext, &InstallTriggerGlobalClass, proto, parent);
-  if (nsnull != *aReturn) {
-    // connect the native object to the js object
-    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aInstallTriggerGlobal);
-  }
-  else {
-    NS_RELEASE(aInstallTriggerGlobal);
-    return NS_ERROR_FAILURE; 
-  }
-
-  return NS_OK;
-}

mozilla/xpinstall/src/nsJSInstallVersion.cpp

@@ -1,659 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-#include "nsIJSScriptObject.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIPtr.h"
-#include "nsString.h"
-#include "nsIDOMInstallVersion.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsRepository.h"
-#include "nsDOMCID.h"
-
-extern void ConvertJSValToStr(nsString&  aString,
-                             JSContext* aContext,
-                             jsval      aValue);
-
-extern void ConvertStrToJSVal(const nsString& aProp,
-                             JSContext* aContext,
-                             jsval* aReturn);
-
-extern PRBool ConvertJSValToBool(PRBool* aProp,
-                                JSContext* aContext,
-                                jsval aValue);
-
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
-void ConvertJSvalToVersionString(nsString& versionString, JSContext* cx, jsval* argument);
-
-
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
-static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
-static NS_DEFINE_IID(kIInstallVersionIID, NS_IDOMINSTALLVERSION_IID);
-
-NS_DEF_PTR(nsIDOMInstallVersion);
-
-//
-// InstallVersion property ids
-//
-enum InstallVersion_slots {
-  INSTALLVERSION_MAJOR = -1,
-  INSTALLVERSION_MINOR = -2,
-  INSTALLVERSION_RELEASE = -3,
-  INSTALLVERSION_BUILD = -4
-};
-
-/***********************************************************************/
-//
-// InstallVersion Properties Getter
-//
-PR_STATIC_CALLBACK(JSBool)
-GetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMInstallVersion *a = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    switch(JSVAL_TO_INT(id)) {
-      case INSTALLVERSION_MAJOR:
-      {
-        PRInt32 prop;
-        if (NS_OK == a->GetMajor(&prop)) {
-          *vp = INT_TO_JSVAL(prop);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case INSTALLVERSION_MINOR:
-      {
-        PRInt32 prop;
-        if (NS_OK == a->GetMinor(&prop)) {
-          *vp = INT_TO_JSVAL(prop);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case INSTALLVERSION_RELEASE:
-      {
-        PRInt32 prop;
-        if (NS_OK == a->GetRelease(&prop)) {
-          *vp = INT_TO_JSVAL(prop);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case INSTALLVERSION_BUILD:
-      {
-        PRInt32 prop;
-        if (NS_OK == a->GetBuild(&prop)) {
-          *vp = INT_TO_JSVAL(prop);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      default:
-        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-/***********************************************************************/
-//
-// InstallVersion Properties Setter
-//
-PR_STATIC_CALLBACK(JSBool)
-SetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMInstallVersion *a = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    switch(JSVAL_TO_INT(id)) {
-      case INSTALLVERSION_MAJOR:
-      {
-        PRInt32 prop;
-        int32 temp;
-        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
-          prop = (PRInt32)temp;
-        }
-        else {
-          JS_ReportError(cx, "Parameter must be a number");
-          return JS_FALSE;
-        }
-      
-        a->SetMajor(prop);
-        
-        break;
-      }
-      case INSTALLVERSION_MINOR:
-      {
-        PRInt32 prop;
-        int32 temp;
-        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
-          prop = (PRInt32)temp;
-        }
-        else {
-          JS_ReportError(cx, "Parameter must be a number");
-          return JS_FALSE;
-        }
-      
-        a->SetMinor(prop);
-        
-        break;
-      }
-      case INSTALLVERSION_RELEASE:
-      {
-        PRInt32 prop;
-        int32 temp;
-        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
-          prop = (PRInt32)temp;
-        }
-        else {
-          JS_ReportError(cx, "Parameter must be a number");
-          return JS_FALSE;
-        }
-      
-        a->SetRelease(prop);
-        
-        break;
-      }
-      case INSTALLVERSION_BUILD:
-      {
-        PRInt32 prop;
-        int32 temp;
-        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
-          prop = (PRInt32)temp;
-        }
-        else {
-          JS_ReportError(cx, "Parameter must be a number");
-          return JS_FALSE;
-        }
-      
-        a->SetBuild(prop);
-        
-        break;
-      }
-      default:
-        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-
-//
-// InstallVersion finalizer
-//
-PR_STATIC_CALLBACK(void)
-FinalizeInstallVersion(JSContext *cx, JSObject *obj)
-{
-  nsJSUtils::nsGenericFinalize(cx, obj);
-}
-
-
-//
-// InstallVersion enumerate
-//
-PR_STATIC_CALLBACK(JSBool)
-EnumerateInstallVersion(JSContext *cx, JSObject *obj)
-{
-  return nsJSUtils::nsGenericEnumerate(cx, obj);
-}
-
-
-//
-// InstallVersion resolve
-//
-PR_STATIC_CALLBACK(JSBool)
-ResolveInstallVersion(JSContext *cx, JSObject *obj, jsval id)
-{
-  return nsJSUtils::nsGenericResolve(cx, obj, id);
-}
-
-
-//
-// Native method Init
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersionInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
-  JSBool rBool = JS_FALSE;
-  nsAutoString b0;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if (argc >= 1) {
-
-    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-
-    if (NS_OK != nativeThis->Init(b0)) {
-      return JS_FALSE;
-    }
-
-    *rval = JSVAL_VOID;
-  }
-  else {
-    JS_ReportError(cx, "Function init requires 1 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method ToString
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
-  JSBool rBool = JS_FALSE;
-  nsAutoString nativeRet;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if (argc >= 0) {
-
-    if (NS_OK != nativeThis->ToString(nativeRet)) {
-      return JS_FALSE;
-    }
-
-    nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval);
-  }
-  else {
-    JS_ReportError(cx, "Function toString requires 0 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method CompareTo
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersionCompareTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
-  JSBool                  rBool = JS_FALSE;
-  PRInt32                 nativeRet;
-  nsString                b0str;
-  PRInt32                 b0int;
-  PRInt32                 b1int;
-  PRInt32                 b2int;
-  PRInt32                 b3int;
-  nsIDOMInstallVersionPtr versionObj;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if(argc >= 4)
-  {
-    //  public int CompareTo(int    major,
-    //                       int    minor,
-    //                       int    release,
-    //                       int    build);
-
-    if(!JSVAL_IS_INT(argv[0]))
-    {
-        JS_ReportError(cx, "1st parameter must be a number");
-        return JS_FALSE;
-    }
-    else if(!JSVAL_IS_INT(argv[1]))
-    {
-        JS_ReportError(cx, "2nd parameter must be a number");
-        return JS_FALSE;
-    }
-    else if(!JSVAL_IS_INT(argv[2]))
-    {
-        JS_ReportError(cx, "3rd parameter must be a number");
-        return JS_FALSE;
-    }
-    else if(!JSVAL_IS_INT(argv[3]))
-    {
-        JS_ReportError(cx, "4th parameter must be a number");
-        return JS_FALSE;
-    }
-
-    b0int = JSVAL_TO_INT(argv[0]);
-    b1int = JSVAL_TO_INT(argv[1]);
-    b2int = JSVAL_TO_INT(argv[2]);
-    b3int = JSVAL_TO_INT(argv[3]);
-
-    if(NS_OK != nativeThis->CompareTo(b0int, b1int, b2int, b3int, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else if(argc >= 1)
-  {
-     //   public int AddDirectory(String version);  --OR--  VersionInfo version
-
-    if(JSVAL_IS_OBJECT(argv[0]))
-    {
-        if(JS_FALSE == ConvertJSValToObj((nsISupports **)&versionObj,
-                                         kIInstallVersionIID,
-                                         "InstallVersion",
-                                         cx,
-                                         argv[0]))
-        {
-          return JS_FALSE;
-        }
-
-        if(NS_OK != nativeThis->CompareTo(versionObj, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-    else
-    {
-        ConvertJSValToStr(b0str, cx, argv[0]);
-
-        if(NS_OK != nativeThis->CompareTo(b0str, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "Function compareTo requires 4 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-/***********************************************************************/
-//
-// class for InstallVersion
-//
-JSClass InstallVersionClass = {
-  "InstallVersion", 
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  GetInstallVersionProperty,
-  SetInstallVersionProperty,
-  EnumerateInstallVersion,
-  ResolveInstallVersion,
-  JS_ConvertStub,
-  FinalizeInstallVersion
-};
-
-
-//
-// InstallVersion class properties
-//
-static JSPropertySpec InstallVersionProperties[] =
-{
-  {"major",    INSTALLVERSION_MAJOR,    JSPROP_ENUMERATE},
-  {"minor",    INSTALLVERSION_MINOR,    JSPROP_ENUMERATE},
-  {"release",    INSTALLVERSION_RELEASE,    JSPROP_ENUMERATE},
-  {"build",    INSTALLVERSION_BUILD,    JSPROP_ENUMERATE},
-  {0}
-};
-
-
-//
-// InstallVersion class methods
-//
-static JSFunctionSpec InstallVersionMethods[] = 
-{
-  {"init",          InstallVersionInit,     1},
-  {"toString",          InstallVersionToString,     0},
-  {"compareTo",          InstallVersionCompareTo,     1},
-  {0}
-};
-
-
-//
-// InstallVersion constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsresult result;
-  nsIID classID;
-  nsIScriptContext* context = (nsIScriptContext*)JS_GetContextPrivate(cx);
-  nsIScriptNameSpaceManager* manager;
-  nsIDOMInstallVersion *nativeThis;
-  nsIScriptObjectOwner *owner = nsnull;
-
-  static NS_DEFINE_IID(kIDOMInstallVersionIID, NS_IDOMINSTALLVERSION_IID);
-
-  result = context->GetNameSpaceManager(&manager);
-  if (NS_OK != result) {
-    return JS_FALSE;
-  }
-
-  result = manager->LookupName("InstallVersion", PR_TRUE, classID);
-  NS_RELEASE(manager);
-  if (NS_OK != result) {
-    return JS_FALSE;
-  }
-
-  result = nsRepository::CreateInstance(classID,
-                                        nsnull,
-                                        kIDOMInstallVersionIID,
-                                        (void **)&nativeThis);
-  if (NS_OK != result) {
-    return JS_FALSE;
-  }
-
-  // XXX We should be calling Init() on the instance
-
-  result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);
-  if (NS_OK != result) {
-    NS_RELEASE(nativeThis);
-    return JS_FALSE;
-  }
-
-  owner->SetScriptObject((void *)obj);
-  JS_SetPrivate(cx, obj, nativeThis);
-
-  NS_RELEASE(owner);
-  return JS_TRUE;
-}
-
-//
-// InstallVersion class initialization
-//
-nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = nsnull;
-  JSObject *parent_proto = nsnull;
-  JSObject *global = JS_GetGlobalObject(jscontext);
-  jsval vp;
-
-  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "InstallVersion", &vp)) ||
-      !JSVAL_IS_OBJECT(vp) ||
-      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
-      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
-      !JSVAL_IS_OBJECT(vp)) {
-
-    proto = JS_InitClass(jscontext,     // context
-                         global,        // global object
-                         parent_proto,  // parent proto 
-                         &InstallVersionClass,      // JSClass
-                         InstallVersion,            // JSNative ctor
-                         0,             // ctor args
-                         InstallVersionProperties,  // proto props
-                         InstallVersionMethods,     // proto funcs
-                         nsnull,        // ctor props (static)
-                         nsnull);       // ctor funcs (static)
-    if (nsnull == proto) {
-      return NS_ERROR_FAILURE;
-    }
-
-    if ((PR_TRUE == JS_LookupProperty(jscontext, global, "InstallVersion", &vp)) &&
-        JSVAL_IS_OBJECT(vp) &&
-        ((constructor = JSVAL_TO_OBJECT(vp)) != nsnull)) {
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::EQUAL);
-      JS_SetProperty(jscontext, constructor, "EQUAL", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::BLD_DIFF);
-      JS_SetProperty(jscontext, constructor, "BLD_DIFF", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::BLD_DIFF_MINUS);
-      JS_SetProperty(jscontext, constructor, "BLD_DIFF_MINUS", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::REL_DIFF);
-      JS_SetProperty(jscontext, constructor, "REL_DIFF", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::REL_DIFF_MINUS);
-      JS_SetProperty(jscontext, constructor, "REL_DIFF_MINUS", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::MINOR_DIFF);
-      JS_SetProperty(jscontext, constructor, "MINOR_DIFF", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::MINOR_DIFF_MINUS);
-      JS_SetProperty(jscontext, constructor, "MINOR_DIFF_MINUS", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::MAJOR_DIFF);
-      JS_SetProperty(jscontext, constructor, "MAJOR_DIFF", &vp);
-
-      vp = INT_TO_JSVAL(nsIDOMInstallVersion::MAJOR_DIFF_MINUS);
-      JS_SetProperty(jscontext, constructor, "MAJOR_DIFF_MINUS", &vp);
-
-    }
-
-  }
-  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
-    proto = JSVAL_TO_OBJECT(vp);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aPrototype) {
-    *aPrototype = proto;
-  }
-  return NS_OK;
-}
-
-
-//
-// Method for creating a new InstallVersion JavaScript object
-//
-extern "C" NS_DOM nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
-{
-  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptInstallVersion");
-  JSObject *proto;
-  JSObject *parent;
-  nsIScriptObjectOwner *owner;
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  nsresult result = NS_OK;
-  nsIDOMInstallVersion *aInstallVersion;
-
-  if (nsnull == aParent) {
-    parent = nsnull;
-  }
-  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
-    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
-      NS_RELEASE(owner);
-      return NS_ERROR_FAILURE;
-    }
-    NS_RELEASE(owner);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (NS_OK != NS_InitInstallVersionClass(aContext, (void **)&proto)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  result = aSupports->QueryInterface(kIInstallVersionIID, (void **)&aInstallVersion);
-  if (NS_OK != result) {
-    return result;
-  }
-
-  // create a js object for this class
-  *aReturn = JS_NewObject(jscontext, &InstallVersionClass, proto, parent);
-  if (nsnull != *aReturn) {
-    // connect the native object to the js object
-    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aInstallVersion);
-  }
-  else {
-    NS_RELEASE(aInstallVersion);
-    return NS_ERROR_FAILURE; 
-  }
-
-  return NS_OK;
-}

mozilla/xpinstall/src/nsJSWinProfile.cpp

@@ -1,207 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "jsapi.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-
-#include "nsString.h"
-#include "nsInstall.h"
-#include "nsWinProfile.h"
-#include "nsJSWinProfile.h"
-
-extern void ConvertJSValToStr(nsString&  aString,
-                             JSContext* aContext,
-                             jsval      aValue);
-
-extern void ConvertStrToJSVal(const nsString& aProp,
-                             JSContext* aContext,
-                             jsval* aReturn);
-
-extern PRBool ConvertJSValToBool(PRBool* aProp,
-                                JSContext* aContext,
-                                jsval aValue);
-
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
-
-static void PR_CALLBACK WinProfileCleanup(JSContext *cx, JSObject *obj)
-{
-    nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
-    delete nativeThis;
-}
-
-/***********************************************************************************/
-// Native mothods for WinProfile functions
-
-//
-// Native method GetString
-//
-PR_STATIC_CALLBACK(JSBool)
-WinProfileGetString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
-  nsString     nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 2)                             
-  {
-    //  public int getString ( String section,
-    //                         String key);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    nativeThis->getString(b0, b1, &nativeRet);
-
-    ConvertStrToJSVal(nativeRet, cx, rval);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinProfile.getString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method WriteString
-//
-PR_STATIC_CALLBACK(JSBool)
-WinProfileWriteString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-  nsAutoString b2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 3)
-  {
-    //  public int writeString ( String section,
-    //                           String key,
-    //                           String value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-    ConvertJSValToStr(b2, cx, argv[2]);
-
-    if(NS_OK != nativeThis->writeString(b0, b1, b2, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinProfile.writeString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// WinProfile constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-WinProfile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_FALSE;
-}
-
-/***********************************************************************/
-//
-// class for WinProfile
-//
-JSClass WinProfileClass = {
-  "WinProfile",
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  WinProfileCleanup
-};
-
-
-static JSConstDoubleSpec winprofile_constants[] = 
-{
-    {0}
-};
-
-//
-// WinProfile class methods
-//
-static JSFunctionSpec WinProfileMethods[] = 
-{
-  {"getString",                  WinProfileGetString,                 2},
-  {"writeString",                WinProfileWriteString,               3},
-  {0}
-};
-
-PRInt32
-InitWinProfilePrototype(JSContext *jscontext, JSObject *global, JSObject **winProfilePrototype)
-{
-  *winProfilePrototype = JS_InitClass( jscontext,          // context
-                                       global,             // global object
-                                       nsnull,             // parent proto 
-                                       &WinProfileClass,   // JSClass
-                                       nsnull,             // JSNative ctor
-                                       0,                  // ctor args
-                                       nsnull,             // proto props
-                                       nsnull,             // proto funcs
-                                       nsnull,             // ctor props (static)
-                                       WinProfileMethods); // ctor funcs (static)
-
-  if(nsnull == *winProfilePrototype) 
-  {
-    return NS_ERROR_FAILURE;
-  }
-
-  if(PR_FALSE == JS_DefineConstDoubles(jscontext, *winProfilePrototype, winprofile_constants))
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}

mozilla/xpinstall/src/nsJSWinReg.cpp

@@ -1,514 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "jsapi.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-
-#include "nsString.h"
-#include "nsInstall.h"
-#include "nsWinReg.h"
-#include "nsJSWinReg.h"
-
-static void PR_CALLBACK WinRegCleanup(JSContext *cx, JSObject *obj);
-
-extern void ConvertJSValToStr(nsString&  aString,
-                             JSContext* aContext,
-                             jsval      aValue);
-
-extern void ConvertStrToJSVal(const nsString& aProp,
-                             JSContext* aContext,
-                             jsval* aReturn);
-
-extern PRBool ConvertJSValToBool(PRBool* aProp,
-                                JSContext* aContext,
-                                jsval aValue);
-
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
-
-static void PR_CALLBACK WinRegCleanup(JSContext *cx, JSObject *obj)
-{
-    nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-    delete nativeThis;
-}
-
-/***********************************************************************************/
-// Native mothods for WinReg functions
-
-//
-// Native method SetRootKey
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetRootKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis  = (nsWinReg*)JS_GetPrivate(cx, obj);
-  JSBool   rBool        = JS_FALSE;
-  PRInt32  b0;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 1)
-  {
-    //  public int setRootKey(PRInt32 key);
-
-    if(!JS_ValueToInt32(cx, argv[0], (int32 *)&b0))
-    {
-      JS_ReportError(cx, "Parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->setRootKey(b0))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = JSVAL_VOID;
-  }
-  else
-  {
-    JS_ReportError(cx, "Function SetRootKey requires 1 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method CreateKey
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegCreateKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 2)                             
-  {
-    //  public int createKey ( String subKey,
-    //                         String className);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->createKey(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.CreateKey() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method DeleteKey
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegDeleteKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 1)                             
-  {
-    //  public int deleteKey ( String subKey);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if(NS_OK != nativeThis->deleteKey(b0, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.DeleteKey() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method DeleteValue
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegDeleteValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsString b0;
-  nsString b1;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 2)                             
-  {
-    //  public int deleteValue ( String subKey,
-    //                           String valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->deleteValue(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.DeleteValue() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method SetValueString
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-  nsAutoString b2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 3)
-  {
-    //  public int setValueString ( String subKey,
-    //                              String valueName,
-    //                              String value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-    ConvertJSValToStr(b2, cx, argv[2]);
-
-    if(NS_OK != nativeThis->setValueString(b0, b1, b2, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.SetValueString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method GetValueString
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegGetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  nsString* nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 2)                             
-  {
-    //  public int getValueString ( String subKey,
-    //                              String valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->getValueString(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.GetValueString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method SetValue
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-//  nsWinRegItem *b2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 3)
-  {
-    //  public int setValue ( String        subKey,
-    //                        String        valueName,
-    //                        nsWinRegItem  *value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    // fix: this parameter is an object, not a string.
-    // A way needs to be figured out to convert the JSVAL to this object type
-//    ConvertJSValToStr(b2, cx, argv[2]);
-
-//    if(NS_OK != nativeThis->setValue(b0, b1, b2, &nativeRet))
-//    {
-//      return JS_FALSE;
-//    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.SetValue() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method GetValue
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegGetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg      *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  nsWinRegValue *nativeRet;
-  nsAutoString  b0;
-  nsAutoString  b1;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 2)                             
-  {
-    //  public int getValue ( String subKey,
-    //                        String valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->getValue(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.GetValue() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method InstallObject
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegInstallObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg     *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  nsInstall    *nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  //  public int installObject ();
-
-  nativeRet = nativeThis->installObject();
-
-  *rval = INT_TO_JSVAL(nativeRet);
-  return JS_TRUE;
-}
-
-//
-// WinReg constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-WinReg(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_FALSE;
-}
-
-
-/***********************************************************************/
-//
-// class for WinReg
-//
-JSClass WinRegClass = {
-  "WinReg",
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  WinRegCleanup
-};
-
-static JSConstDoubleSpec winreg_constants[] = 
-{
-    { nsWinReg::HKEY_CLASSES_ROOT,           "HKEY_CLASSES_ROOT"            },
-    { nsWinReg::HKEY_CURRENT_USER,           "HKEY_CURRENT_USER"            },
-    { nsWinReg::HKEY_LOCAL_MACHINE,          "HKEY_LOCAL_MACHINE"           },
-    { nsWinReg::HKEY_USERS,                  "HKEY_USERS"                   },
-    {0}
-};
-
-//
-// WinReg class methods
-//
-static JSFunctionSpec WinRegMethods[] = 
-{
-  {"setRootKey",                WinRegSetRootKey,               1},
-  {"createKey",                 WinRegCreateKey,                2},
-  {"deleteKey",                 WinRegDeleteKey,                1},
-  {"deleteValue",               WinRegDeleteValue,              2},
-  {"setValueString",            WinRegSetValueString,           3},
-  {"getValueString",            WinRegGetValueString,           2},
-  {"setValue",                  WinRegSetValue,                 3},
-  {"getValue",                  WinRegGetValue,                 2},
-  {"installObject",             WinRegInstallObject,            0},
-  {0}
-};
-
-PRInt32
-InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype)
-{
-  *winRegPrototype = JS_InitClass( jscontext,         // context
-                                  global,            // global object
-                                  nsnull,            // parent proto 
-                                  &WinRegClass,      // JSClass
-                                  nsnull,            // JSNative ctor
-                                  0,                 // ctor args
-                                  nsnull,            // proto props
-                                  nsnull,            // proto funcs
-                                  nsnull,            // ctor props (static)
-                                  WinRegMethods);    // ctor funcs (static)
-
-  if(nsnull == *winRegPrototype) 
-  {
-    return NS_ERROR_FAILURE;
-  }
-
-  if(PR_FALSE == JS_DefineConstDoubles(jscontext, *winRegPrototype, winreg_constants))
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}

mozilla/xpinstall/src/nsJSWinReg.h

@@ -1,25 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef __NS_JSWINREG_H__
-#define __NS_JSWINREG_H__
-
-PRInt32
-InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
-
-#endif

mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp

@@ -1,134 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsIXPInstallProgress.h"
-#include "nsLoggingProgressNotifier.h"
-
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsSpecialSystemDirectory.h"
-
-#include "nspr.h"
-
-
-
-nsLoggingProgressNotifier::nsLoggingProgressNotifier()
-{
-    NS_INIT_REFCNT();
-}
-
-nsLoggingProgressNotifier::~nsLoggingProgressNotifier()
-{
-}
-
-NS_IMPL_ISUPPORTS(nsLoggingProgressNotifier, nsIXPInstallProgress::GetIID());
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::BeforeJavascriptEvaluation()
-{
-    nsSpecialSystemDirectory logFile(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-    logFile += "Install.log";
-
-    mLogStream = new nsOutputFileStream(logFile, PR_WRONLY | PR_CREATE_FILE | PR_APPEND, 0744 );
-    mLogStream->seek(logFile.GetFileSize());
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::AfterJavascriptEvaluation()
-{
-    char* time;
-    GetTime(&time);
-
-    *mLogStream << nsEndl;
-    *mLogStream << "     Finished Installation  " << time << nsEndl << nsEndl;
-
-    PL_strfree(time);
-
-    mLogStream->close();
-    delete mLogStream;
-    mLogStream = nsnull;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::InstallStarted(const char* UIPackageName)
-{
-    if (mLogStream == nsnull) return -1;
-
-    char* time;
-    GetTime(&time);
-    
-    *mLogStream << "---------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << UIPackageName << nsEndl;    
-    *mLogStream << "---------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << nsEndl;
-    *mLogStream << "     Starting Installation at " << nsAutoCString(time) << nsEndl;   
-    *mLogStream << nsEndl;
-
-
-    PL_strfree(time);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::ItemScheduled(const char* message )
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum )
-{
-    if (mLogStream == nsnull) return -1;
-
-    *mLogStream << "     Item [" << (itemNum+1) << "/" << totNum << "]\t" << message << nsEndl;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::InstallAborted()
-{
-    if (mLogStream == nsnull) return -1;
-
-    char* time;
-    GetTime(&time);
-    
-    *mLogStream << "     Aborted Installation at " << time << nsEndl << nsEndl;
-
-    PL_strfree(time);
-    return NS_OK;
-}
-
-void 
-nsLoggingProgressNotifier::GetTime(char** aString)
-{
-    PRExplodedTime et;
-    char line[256];
-    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &et);
-    PR_FormatTimeUSEnglish(line, sizeof(line), "%m/%d/%Y %H:%M:%S", &et);
-    *aString = PL_strdup(line);
-}
-    

mozilla/xpinstall/src/nsLoggingProgressNotifier.h

@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsLoggingProgressNotifier_H__
-#define nsLoggingProgressNotifier_H__
-
-#include "nsIXPInstallProgress.h"
-#include "nsFileStream.h"
-
-
-class nsLoggingProgressNotifier : public nsIXPInstallProgress
-{
-    public:
-        
-        nsLoggingProgressNotifier();
-        virtual ~nsLoggingProgressNotifier();
-        
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD BeforeJavascriptEvaluation();
-        NS_IMETHOD AfterJavascriptEvaluation();
-        NS_IMETHOD InstallStarted(const char* UIPackageName);
-        NS_IMETHOD ItemScheduled(const char* message );
-        NS_IMETHOD InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum );
-        NS_IMETHOD InstallAborted();
-   
-     private:
-        void GetTime(char** aString);
-        nsOutputFileStream  *mLogStream;
-};
-
-#endif

mozilla/xpinstall/src/nsSoftwareUpdate.cpp

@@ -1,666 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are Copyright (C) 1998
- * Netscape Communications Corporation.  All Rights Reserved.
- */
-
-
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-
-#include "nspr.h"
-#include "nsVector.h"
-#include "VerReg.h"
-#include "nsSpecialSystemDirectory.h"
-
-#include "nsInstall.h"
-#include "nsSoftwareUpdateIIDs.h"
-#include "nsSoftwareUpdate.h"
-#include "nsSoftwareUpdateRun.h"
-#include "nsInstallTrigger.h"
-#include "nsInstallVersion.h"
-#include "ScheduledTasks.h"
-
-#include "nsTopProgressNotifier.h"
-#include "nsLoggingProgressNotifier.h"
-#include "nsInstallProgressDialog.h"
-
-#include "nsIAppShellComponent.h"
-#include "nsIRegistry.h"
-
-/* For Javascript Namespace Access */
-#include "nsDOMCID.h"
-#include "nsIServiceManager.h"
-#include "nsINameSpaceManager.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIScriptNameSetRegistry.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsIScriptExternalNameSet.h"
-
-#include "nsIEventQueueService.h"
-#include "nsProxyObjectManager.h"
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Globals
-////////////////////////////////////////////////////////////////////////////////
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-
-static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
-
-static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID);
-static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
-static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID);
-
-static NS_DEFINE_IID(kISoftwareUpdate_IID, NS_ISOFTWAREUPDATE_IID);
-static NS_DEFINE_IID(kSoftwareUpdate_CID,  NS_SoftwareUpdate_CID);
-
-static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-static NS_DEFINE_IID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
-
-static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID);
-static NS_DEFINE_IID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID);
-
-static NS_DEFINE_IID(kProxyObjectManagerIID, NS_IPROXYEVENT_MANAGER_IID);
-static NS_DEFINE_IID(kEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
-
-
-nsSoftwareUpdate::nsSoftwareUpdate()
-{
-#ifdef NS_DEBUG
-    printf("XPInstall Component created\n");
-#endif
-
-    NS_INIT_ISUPPORTS();
-    
-     /***************************************/
-    /* Create us a queue                   */
-    /***************************************/
-    mInstalling = nsnull;
-
-    mJarInstallQueue = new nsVector();
-
-    /***************************************/
-    /* Add us to the Javascript Name Space */
-    /***************************************/
-   
-    new nsSoftwareUpdateNameSet();
-    
-    /***************************************/
-    /* Register us with NetLib             */
-    /***************************************/
-        // FIX 
-    
-    
-    /***************************************/
-    /* Startup the Version Registry        */
-    /***************************************/
-    
-    NR_StartupRegistry();   /* startup the registry; if already started, this will essentially be a noop */
-
-    nsSpecialSystemDirectory appDir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-    VR_SetRegDirectory( appDir.GetNativePathCString() );
-    
-    /***************************************/
-    /* Stupid Hack to test js env*/
-    /***************************************/
-    // FIX:  HACK HACK HACK!
-#if 0  
-    nsSpecialSystemDirectory jarFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-    jarFile += "test.jar";
-    if (jarFile.Exists())
-    {
-        InstallJar(nsString(nsFileURL(jarFile)), "", "");
-    }
-#endif    
-    /***************************************/
-    /* Perform Scheduled Tasks             */
-    /***************************************/
-    
-    PR_CreateThread(PR_USER_THREAD,
-                    PerformScheduledTasks,
-                    nsnull, 
-                    PR_PRIORITY_NORMAL, 
-                    PR_GLOBAL_THREAD, 
-                    PR_UNJOINABLE_THREAD,
-                    0);  
-    
-    /***************************************/
-    /* Create a top level observer         */
-    /***************************************/
-
-    mTopLevelObserver = new nsTopProgressNotifier();
-    
-    nsLoggingProgressNotifier *logger = new nsLoggingProgressNotifier();
-    RegisterNotifier(logger);
-
-    nsIProxyObjectManager *manager;
-    nsInstallProgressDialog *dialog = new nsInstallProgressDialog();
-    nsInstallProgressDialog *proxy; 
-    nsISupports *dialogBase;
-
-    nsresult rv = dialog->QueryInterface(kISupportsIID, (void**)&dialogBase);
-
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = nsServiceManager::GetService( NS_XPCOMPROXY_PROGID, 
-                                                kProxyObjectManagerIID,
-                                                (nsISupports **)&manager);
-
-        if (NS_SUCCEEDED(rv))
-        {
-            // I am assuming that the thread that starts us up is the UI thread.  this will/may break
-            // I need to make a generic way of getting at the UI event queue.
-        
-            nsIEventQueueService *eventQService;
-            rv = nsServiceManager::GetService(NS_EVENTQUEUESERVICE_PROGID, 
-                                            kEventQueueServiceIID,
-                                            (nsISupports **)&eventQService);
-
-                                
-            if (NS_SUCCEEDED(rv))
-            {
-                nsIEventQueue *eventQ;
-                eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &eventQ);
-
-                PLEventQueue *plEventQ;
-                eventQ->GetPLEventQueue(&plEventQ);
-
-                rv = manager->GetProxyObject(plEventQ, nsIXPInstallProgress::GetIID(), dialogBase, PROXY_SYNC, (void**)&proxy);
-                if (NS_SUCCEEDED(rv))
-                {
-                    RegisterNotifier(proxy);
-                }
-            }
-        }
-    }
-
-    if (dialog)
-        dialog->Release();
-}
-
-
-
-
-
-nsSoftwareUpdate::~nsSoftwareUpdate()
-{
-#ifdef NS_DEBUG
-    printf("*** XPInstall Component destroyed\n");
-#endif
-
-    if (mJarInstallQueue != nsnull)
-    {
-        PRUint32 i=0;
-        for (; i < mJarInstallQueue->GetSize(); i++) 
-        {
-            nsInstallInfo* element = (nsInstallInfo*)mJarInstallQueue->Get(i);
-            //FIX:  need to add to registry....
-            delete element;
-        }
-
-        mJarInstallQueue->RemoveAll();
-        delete (mJarInstallQueue);
-        mJarInstallQueue = nsnull;
-    }
-
-    NR_ShutdownRegistry();
-}
-
-NS_IMPL_ADDREF( nsSoftwareUpdate );
-NS_IMPL_RELEASE( nsSoftwareUpdate );
-
-NS_IMETHODIMP
-nsSoftwareUpdate::QueryInterface( REFNSIID anIID, void **anInstancePtr ) 
-{
-    nsresult rv = NS_OK;
-    /* Check for place to return result. */
-    
-    if ( !anInstancePtr ) 
-    {
-        rv = NS_ERROR_NULL_POINTER;
-    } 
-    else 
-    {
-        /* Initialize result. */
-        *anInstancePtr = 0;
-        /* Check for IIDs we support and cast this appropriately. */
-        if ( anIID.Equals( nsISoftwareUpdate::GetIID() ) ) 
-        {
-            *anInstancePtr = (void*) ( (nsISoftwareUpdate*)this );
-            NS_ADDREF_THIS();
-        } 
-        else if ( anIID.Equals( nsIAppShellComponent::GetIID() ) ) 
-        {
-            *anInstancePtr = (void*) ( (nsIAppShellComponent*)this );
-            NS_ADDREF_THIS();
-        } 
-        else if ( anIID.Equals( kISupportsIID ) )
-        {
-            *anInstancePtr = (void*) ( (nsISupports*) (nsISoftwareUpdate*) this );
-            NS_ADDREF_THIS();
-        }
-        else 
-        {
-            /* Not an interface we support. */\
-            rv = NS_NOINTERFACE;
-        }
-    }
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::Initialize( nsIAppShellService *anAppShell, nsICmdLineService  *aCmdLineService ) 
-{
-    nsresult rv;
-    
-    rv = nsServiceManager::RegisterService( NS_IXPINSTALLCOMPONENT_PROGID, ( (nsISupports*) (nsISoftwareUpdate*) this ) );
-    
-    return rv;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::Shutdown()
-{
-    nsresult rv;
-
-    rv = nsServiceManager::ReleaseService( NS_IXPINSTALLCOMPONENT_PROGID, ( (nsISupports*) (nsISoftwareUpdate*) this ) );
-    
-    return rv;
-}
-
-
-NS_IMETHODIMP 
-nsSoftwareUpdate::RegisterNotifier(nsIXPInstallProgress *notifier)
-{
-    // we are going to ignore the returned ID and enforce that once you 
-    // register a notifier, you can not remove it.  This should at some
-    // point be fixed.
-
-    (void) mTopLevelObserver->RegisterNotifier(notifier);
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::GetTopLevelNotifier(nsIXPInstallProgress **notifier)
-{
-    *notifier = mTopLevelObserver;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::InstallJar(  const nsString& fromURL,
-                               const nsString& localFile, 
-                               long flags)
-{
-    nsInstallInfo *installInfo = new nsInstallInfo(fromURL, localFile, flags);
-    
-    mJarInstallQueue->Add( installInfo );
-    
-    RunNextInstall();
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::InstallPending(void)
-{
-    if (mInstalling || mJarInstallQueue->GetSize() > 0)
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::InstallJarCallBack()
-{
-    nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue->Get(0);
-    
-    if (nextInstall != nsnull)
-        delete nextInstall;
-    
-    mJarInstallQueue->Remove(0);
-    
-    mInstalling = PR_FALSE;
-
-    return RunNextInstall();
-
-}
-
-
-nsresult
-nsSoftwareUpdate::RunNextInstall()
-{
-    if (mInstalling == PR_TRUE)
-        return NS_OK;
-
-    mInstalling = PR_TRUE;
-
-    //  check to see if there is anything in our queue
-    if (mJarInstallQueue->GetSize() <= 0)
-    {
-        mInstalling = PR_FALSE;
-        return NS_OK;
-    }
-    
-    nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue->Get(0);
-        
-    if (nextInstall->IsMultipleTrigger() == PR_FALSE)
-    {
-        RunInstall( nextInstall );
-    }
-    else
-    {
-        ; // should we do something different?! 
-    }
-    
-    return NS_OK;
-}
-
-
-/////////////////////////////////////////////////////////////////////////
-// 
-/////////////////////////////////////////////////////////////////////////
-static PRInt32 gSoftwareUpdateLock        = 0;
-
-nsSoftwareUpdateFactory::nsSoftwareUpdateFactory(void)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsSoftwareUpdateFactory::~nsSoftwareUpdateFactory(void)
-{
-}
-
-NS_IMPL_ISUPPORTS(nsSoftwareUpdateFactory,kIFactoryIID)
-
-NS_IMETHODIMP
-nsSoftwareUpdateFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aResult == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    *aResult = NULL;
-
-    nsSoftwareUpdate *inst = new nsSoftwareUpdate();
-
-    if (inst == NULL)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsresult result =  inst->QueryInterface(aIID, aResult);
-
-    if (NS_FAILED(result)) 
-    {
-        *aResult = NULL;
-    }
-
-    NS_ADDREF(inst);  // Are we sure that we need to addref???
-
-    return result;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateFactory::LockFactory(PRBool aLock)
-{
-    if (aLock)
-        PR_AtomicIncrement(&gSoftwareUpdateLock);
-    else
-        PR_AtomicDecrement(&gSoftwareUpdateLock);
-
-    return NS_OK;
-}
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsSoftwareUpdateNameSet
-////////////////////////////////////////////////////////////////////////////////
-
-nsSoftwareUpdateNameSet::nsSoftwareUpdateNameSet()
-{
-  NS_INIT_REFCNT();
-
-  nsIScriptNameSetRegistry *scriptNameSet;
-  nsresult result = nsServiceManager::GetService(kCScriptNameSetRegistryCID,
-                                                 kIScriptNameSetRegistryIID,
-                                                (nsISupports **)&scriptNameSet);
-    if (NS_SUCCEEDED(result)) 
-    {
-        scriptNameSet->AddExternalNameSet(this);
-    }
-
-}
-
-nsSoftwareUpdateNameSet::~nsSoftwareUpdateNameSet()
-{
-}
-
-NS_IMPL_ISUPPORTS(nsSoftwareUpdateNameSet, kIScriptExternalNameSetIID);
-
-
-NS_IMETHODIMP
-nsSoftwareUpdateNameSet::InitializeClasses(nsIScriptContext* aScriptContext)
-{
-    nsresult result = NS_OK;
-
-    result = NS_InitInstallVersionClass(aScriptContext, nsnull);
-    if (NS_FAILED(result)) return result;
-
-    result = NS_InitInstallTriggerGlobalClass(aScriptContext, nsnull);
-
-    return result;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdateNameSet::AddNameSet(nsIScriptContext* aScriptContext)
-{
-    nsresult result = NS_OK;
-    nsIScriptNameSpaceManager* manager;
-
-    result = aScriptContext->GetNameSpaceManager(&manager);
-    if (NS_SUCCEEDED(result)) 
-    {
-        result = manager->RegisterGlobalName("InstallVersion", 
-                                             kInstallVersion_CID, 
-                                             PR_TRUE);
-        
-        if (NS_FAILED(result))  return result;
-        
-        result = manager->RegisterGlobalName("InstallTrigger", 
-                                             kInstallTrigger_CID, 
-                                             PR_FALSE);
-
-    }
-    
-    if (manager != nsnull)
-        NS_RELEASE(manager);
-
-    return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// DLL Entry Points:
-////////////////////////////////////////////////////////////////////////////////
-
-extern "C" NS_EXPORT PRBool
-NSCanUnload(nsISupports* aServMgr)
-{
-    return PR_FALSE;
-}
-
-extern "C" NS_EXPORT nsresult
-NSRegisterSelf(nsISupports* aServMgr, const char *path)
-{
-    nsresult rv;
-
-    nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
-    if (NS_FAILED(rv)) return rv;
-
-    nsIComponentManager* compMgr;
-    rv = servMgr->GetService(kComponentManagerCID, 
-                             nsIComponentManager::GetIID(), 
-                             (nsISupports**)&compMgr);
-    if (NS_FAILED(rv)) return rv;
-
-#ifdef NS_DEBUG
-    printf("*** XPInstall is being registered\n");
-#endif
-
-    rv = compMgr->RegisterComponent( kSoftwareUpdate_CID,
-                                     NS_IXPINSTALLCOMPONENT_CLASSNAME,
-                                     NS_IXPINSTALLCOMPONENT_PROGID,
-                                     path,
-                                     PR_TRUE,
-                                     PR_TRUE );
-
-    if (NS_FAILED(rv)) goto done;
-    
-    nsIRegistry *registry; 
-    rv = servMgr->GetService( NS_REGISTRY_PROGID, 
-                              nsIRegistry::GetIID(), 
-                              (nsISupports**)&registry );
-
-    if ( NS_SUCCEEDED( rv ) ) 
-    {
-        registry->Open();
-        char buffer[256];
-        char *cid = nsSoftwareUpdate::GetCID().ToString();
-        PR_snprintf( buffer,
-                     sizeof buffer,
-                     "%s/%s",
-                     NS_IAPPSHELLCOMPONENT_KEY,
-                     cid ? cid : "unknown" );
-        delete [] cid;
-
-        nsIRegistry::Key key;
-        rv = registry->AddSubtree( nsIRegistry::Common,
-                                   buffer,
-                                   &key );
-        servMgr->ReleaseService( NS_REGISTRY_PROGID, registry );
-    }
-
-    rv = compMgr->RegisterComponent(kInstallTrigger_CID, NULL, NULL, path, PR_TRUE, PR_TRUE);
-    if (NS_FAILED(rv)) goto done;
-    
-    rv = compMgr->RegisterComponent(kInstallVersion_CID, NULL, NULL, path, PR_TRUE, PR_TRUE);
-  
-done:
-    (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
-    return rv;
-}
-
-
-extern "C" NS_EXPORT nsresult
-NSUnregisterSelf(nsISupports* aServMgr, const char *path)
-{
-nsresult rv;
-
-    nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
-    if (NS_FAILED(rv)) return rv;
-
-    nsIComponentManager* compMgr;
-    rv = servMgr->GetService(kComponentManagerCID, 
-                             nsIComponentManager::GetIID(), 
-                             (nsISupports**)&compMgr);
-    if (NS_FAILED(rv)) return rv;
-
-#ifdef NS_DEBUG
-    printf("*** XPInstall is being unregistered\n");
-#endif
-    
-    rv = compMgr->UnregisterComponent(kSoftwareUpdate_CID, path);
-    if (NS_FAILED(rv)) goto done;
-    rv = compMgr->UnregisterComponent(kInstallTrigger_CID, path);
-    if (NS_FAILED(rv)) goto done;
-    rv = compMgr->UnregisterComponent(kInstallVersion_CID, path);
-
-  done:
-    (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
-    return rv;
-}
-
-
-
-extern "C" NS_EXPORT nsresult
-NSGetFactory(nsISupports* serviceMgr,
-             const nsCID &aClass,
-             const char *aClassName,
-             const char *aProgID,
-             nsIFactory **aFactory)
-{
-
-    if (aFactory == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    *aFactory = NULL;
-    nsISupports *inst;
-
-    
-    if (aClass.Equals(kInstallTrigger_CID) )
-    {
-        inst = new nsInstallTriggerFactory();
-    }
-    else if (aClass.Equals(kInstallVersion_CID) )
-    {
-        inst = new nsInstallVersionFactory();
-    }
-    else if (aClass.Equals(kSoftwareUpdate_CID) )
-    {
-        inst = new nsSoftwareUpdateFactory();
-    }
-    else
-    {
-        return NS_ERROR_ILLEGAL_VALUE;
-    }
-
-
-    if (inst == NULL)
-    {   
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-
-    nsresult res = inst->QueryInterface(kIFactoryIID, (void**) aFactory);
-
-    if (NS_FAILED(res)) 
-    {   
-        delete inst;
-    }
-
-    return res;
-
-}
-
-

mozilla/xpinstall/src/nsSoftwareUpdate.h

@@ -1,77 +0,0 @@
-
-#ifndef nsSoftwareUpdate_h___
-#define nsSoftwareUpdate_h___
-
-#include "nsSoftwareUpdateIIDs.h"
-#include "nsISoftwareUpdate.h"
-
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsVector.h"
-
-class nsInstallInfo;
-
-#include "nsIScriptExternalNameSet.h"
-#include "nsIAppShellComponent.h"
-#include "nsIXPInstallProgress.h"
-#include "nsTopProgressNotifier.h"
-
-class nsSoftwareUpdate:  public nsIAppShellComponent, public nsISoftwareUpdate
-{
-    public:
-        
-        NS_DEFINE_STATIC_CID_ACCESSOR( NS_SoftwareUpdate_CID );
-
-        nsSoftwareUpdate();
-        virtual ~nsSoftwareUpdate();
-
-        NS_DECL_ISUPPORTS
-        NS_DECL_IAPPSHELLCOMPONENT
-        
-        NS_IMETHOD InstallJar(const nsString& fromURL,
-                              const nsString& localFile, 
-                              long flags);  
-
-        NS_IMETHOD RegisterNotifier(nsIXPInstallProgress *notifier);
-        
-        NS_IMETHOD InstallPending(void);
-
-        NS_IMETHOD InstallJarCallBack();
-        NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier);
-
-
-    private:
-        
-        nsresult RunNextInstall();
-        nsresult DeleteScheduledNodes();
-        
-        PRBool            mInstalling;
-        nsVector*         mJarInstallQueue;
-        nsTopProgressNotifier   *mTopLevelObserver;
-};
-
-
-class nsSoftwareUpdateNameSet : public nsIScriptExternalNameSet 
-{
-    public:
-        nsSoftwareUpdateNameSet();
-        virtual ~nsSoftwareUpdateNameSet();
-
-        NS_DECL_ISUPPORTS
-            NS_IMETHOD InitializeClasses(nsIScriptContext* aScriptContext);
-            NS_IMETHOD AddNameSet(nsIScriptContext* aScriptContext);
-};
-
-#define AUTOUPDATE_ENABLE_PREF     "autoupdate.enabled"
-#define AUTOUPDATE_CONFIRM_PREF    "autoupdate.confirm_install"
-#define CHARSET_HEADER             "Charset"
-#define CONTENT_ENCODING_HEADER    "Content-encoding"
-#define INSTALLER_HEADER           "Install-Script"
-#define MOCHA_CONTEXT_PREFIX       "autoinstall:"
-#define REG_SOFTUPDT_DIR           "Netscape/Communicator/SoftwareUpdate/"
-#define LAST_REGPACK_TIME          "LastRegPackTime"
-
-
-#endif

mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp

@@ -1,362 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsSoftwareUpdate.h"
-#include "nsSoftwareUpdateRun.h"
-#include "nsSoftwareUpdateIIDs.h"
-
-#include "nsInstall.h"
-#include "zipfile.h"
-
-#include "nsRepository.h"
-#include "nsIServiceManager.h"
-
-#include "nsSpecialSystemDirectory.h"
-#include "nsFileStream.h"
-
-#include "nspr.h"
-#include "jsapi.h"
-
-#include "nsIEventQueueService.h"
-
-
-static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID);
-static NS_DEFINE_IID(kSoftwareUpdateCID,  NS_SoftwareUpdate_CID);
-
-
-
-
-static JSClass global_class = 
-{
-    "global", JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub
-};
-
-
-extern PRInt32 InitXPInstallObjects(JSContext *jscontext, JSObject *global, const char* jarfile, const char* args);
-
-// Defined in this file:
-static void     XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report);
-static nsresult GetInstallScriptFromJarfile(const char* jarFile, char** scriptBuffer, PRUint32 *scriptLength);
-static nsresult SetupInstallContext(const char* jarFile, const char* args, JSRuntime **jsRT, JSContext **jsCX, JSObject **jsGlob);
-
-extern "C" void RunInstallOnThread(void *data);
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name	: XPInstallErrorReporter
-// Description	    : Prints error message to stdout
-// Return type		: void
-// Argument         : JSContext *cx
-// Argument         : const char *message
-// Argument         : JSErrorReport *report
-///////////////////////////////////////////////////////////////////////////////////////////////
-static void
-XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
-{
-    int i, j, k, n;
-
-    fputs("xpinstall: ", stderr);
-    if (!report) 
-    {
-		fprintf(stderr, "%s\n", message);
-		return;
-    }
-
-    if (report->filename)
-		fprintf(stderr, "%s, ", report->filename);
-    if (report->lineno)
-		fprintf(stderr, "line %u: ", report->lineno);
-    fputs(message, stderr);
-    if (!report->linebuf) 
-    {
-		putc('\n', stderr);
-		return;
-    }
-
-    fprintf(stderr, ":\n%s\n", report->linebuf);
-    n = report->tokenptr - report->linebuf;
-    for (i = j = 0; i < n; i++) {
-		if (report->linebuf[i] == '\t') {
-			for (k = (j + 8) & ~7; j < k; j++)
-				putc('.', stderr);
-			continue;
-		}
-		putc('.', stderr);
-		j++;
-    }
-    fputs("^\n", stderr);
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name	: GetInstallScriptFromJarfile
-// Description	    : Extracts and reads in a install.js file from a passed jar file.
-// Return type		: static nsresult 
-// Argument         : const char* jarFile     - native filepath
-// Argument         : char** scriptBuffer     - must be deleted via delete []
-// Argument         : PRUint32 *scriptLength
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-static nsresult 
-GetInstallScriptFromJarfile(const char* jarFile, char** scriptBuffer, PRUint32 *scriptLength)
-{
-    // Open the jarfile.
-    void* hZip;
-    
-    *scriptBuffer = nsnull;
-    *scriptLength = 0;
-
-    nsresult rv = ZIP_OpenArchive(jarFile ,  &hZip);
-    
-    if (rv != ZIP_OK)
-        return rv;
-
-
-    // Read manifest file for Install Script filename.
-    //FIX:  need to do.
-    
-    // Extract the install.js file to the temporary directory
-    nsSpecialSystemDirectory installJSFileSpec(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-    installJSFileSpec += "install.js";
-    installJSFileSpec.MakeUnique();
-
-    // Extract the install.js file.
-    rv  = ZIP_ExtractFile( hZip, "install.js", nsNSPRPath(installJSFileSpec) );
-    if (rv != ZIP_OK)
-    {
-        ZIP_CloseArchive(&hZip);
-        return rv;
-    }
-    
-    // Read it into a buffer
-    char* buffer;
-    PRUint32 bufferLength;
-    PRUint32 readLength;
-
-    nsInputFileStream fileStream(installJSFileSpec);
-    (fileStream.GetIStream())->GetLength(&bufferLength);
-    buffer = new char[bufferLength + 1];
-
-    rv = (fileStream.GetIStream())->Read(buffer, bufferLength, &readLength);
-
-    if (NS_SUCCEEDED(rv))
-    {
-        *scriptBuffer = buffer;
-        *scriptLength = readLength;
-    }
-    else
-    {
-        delete [] buffer;
-    }
-
-    ZIP_CloseArchive(&hZip);
-    fileStream.close();
-    installJSFileSpec.Delete(PR_FALSE);
-        
-    return rv;   
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name	: SetupInstallContext
-// Description	    : Creates a Javascript runtime and adds our xpinstall objects to it.
-// Return type		: static nsresult
-// Argument         : const char* jarFile - native filepath to where jar exists on disk 
-// Argument         : const char* args    - any arguments passed into the javascript context
-// Argument         : JSRuntime **jsRT   - Must be deleted via JS_DestroyRuntime
-// Argument         : JSContext **jsCX   - Must be deleted via JS_DestroyContext
-// Argument         : JSObject **jsGlob
-///////////////////////////////////////////////////////////////////////////////////////////////
-static nsresult SetupInstallContext(const char* jarFile, 
-                                    const char* args, 
-                                    JSRuntime **jsRT, 
-                                    JSContext **jsCX, 
-                                    JSObject **jsGlob)
-{
-    JSRuntime   *rt;
-	JSContext   *cx;
-    JSObject    *glob;
-    
-    *jsRT   = nsnull;
-    *jsCX   = nsnull;
-    *jsGlob = nsnull;
-
-    // JS init
-	rt = JS_Init(8L * 1024L * 1024L);
-	if (!rt)
-    {
-        return -1;
-    }
-
-    // new context
-    cx = JS_NewContext(rt, 8192);
-	if (!rt)
-    {
-        return -1;
-    }
-
-    JS_SetErrorReporter(cx, XPInstallErrorReporter);
-
-    // new global object
-    glob = JS_NewObject(cx, &global_class, nsnull, nsnull);
-	
-    // Init standard classes
-    JS_InitStandardClasses(cx, glob);
-
-    // Add our Install class to this context
-    InitXPInstallObjects(cx, glob, jarFile, args);
-
-    // Fix:  We have to add Version and Trigger to this context!!
-    
-    
-    *jsRT   = rt;
-    *jsCX   = cx;
-    *jsGlob = glob;
-
-    return NS_OK;
-}
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name	: RunInstall
-// Description	    : Creates our Install Thread.
-// Return type		: PRInt32 
-// Argument         : nsInstallInfo *installInfo
-///////////////////////////////////////////////////////////////////////////////////////////////
-PRInt32 RunInstall(nsInstallInfo *installInfo)
-{   
-    if (installInfo->GetFlags() == 0x00000001)
-    {
-        RunInstallOnThread((void *)installInfo);
-    }
-    else
-    {
-        PR_CreateThread(PR_USER_THREAD,
-                        RunInstallOnThread,
-                        (void*)installInfo, 
-                        PR_PRIORITY_NORMAL, 
-                        PR_GLOBAL_THREAD, 
-                        PR_UNJOINABLE_THREAD,
-                        0);  
-    }
-    return 0;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name	: RunInstallOnThread
-// Description	    : called by starting thread.  It directly calls the C api for xpinstall, 
-//                  : and once that returns, it calls the completion routine to notify installation
-//                  : completion.
-// Return type		: extern "C" 
-// Argument         : void *data
-///////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" void RunInstallOnThread(void *data)
-{
-    nsInstallInfo *installInfo = (nsInstallInfo*)data;
-    
-    char        *scriptBuffer;
-    PRUint32    scriptLength;
-
-    JSRuntime   *rt;
-	JSContext   *cx;
-    JSObject    *glob;
-    
-    nsISoftwareUpdate *softwareUpdate;
-
-    nsresult rv = nsServiceManager::GetService( kSoftwareUpdateCID, 
-                                                kISoftwareUpdateIID,
-                                                (nsISupports**)&softwareUpdate);
-    
-    nsIXPInstallProgress *notifier;
-
-    if (NS_SUCCEEDED(rv))
-    {
-        softwareUpdate->GetTopLevelNotifier(&notifier);
-    }
-    else
-    {
-        return;
-    }
-    
-    if(notifier)
-        notifier->BeforeJavascriptEvaluation();
-    
-    
-    nsString args;
-    installInfo->GetArguments(args);
-
-
-    rv = GetInstallScriptFromJarfile( nsAutoCString( installInfo->GetLocalFile() ), 
-                                      &scriptBuffer, 
-                                      &scriptLength);
-    
-    if (NS_FAILED(rv) || scriptBuffer == nsnull)
-    {
-        goto bail;
-    }
-
-    
-
-    rv = SetupInstallContext(   nsAutoCString( installInfo->GetLocalFile() ), 
-                                nsAutoCString( args ), 
-                                &rt, &cx, &glob);
-    if (NS_FAILED(rv))
-    {
-        delete [] scriptBuffer;
-        goto bail;
-    }
-    
-    // Go ahead and run!!
-    jsval rval;
-
-    JS_EvaluateScript(cx, 
-                      glob,
-		              scriptBuffer, 
-                      scriptLength,
-                      nsnull,
-                      0,
-		              &rval);
-        
-    
-    
-    delete [] scriptBuffer;
-    
-    JS_DestroyContext(cx);
-	JS_DestroyRuntime(rt);
-	          
-
-    if(notifier)
-        notifier->AfterJavascriptEvaluation();
-
-
-bail:
-    softwareUpdate->InstallJarCallBack();
-}

mozilla/xpinstall/src/nsSoftwareUpdateRun.h

@@ -1,6 +0,0 @@
-#ifndef __NS_SoftwareUpdateRun_H__
-#define __NS_SoftwareUpdateRun_H__
-
-PRInt32 RunInstall(nsInstallInfo *installInfo);
-
-#endif 

mozilla/xpinstall/src/nsSoftwareUpdateStream.cpp

@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are Copyright (C) 1998
- * Netscape Communications Corporation.  All Rights Reserved.
- */
-
-#include "nsSoftwareUpdateStream.h"
-#include "nscore.h"
-#include "nsFileSpec.h"
-#include "nsVector.h"
-
-#include "nsISupports.h"
-#include "nsIServiceManager.h"
-
-#include "nsIURL.h"
-#include "nsINetlibURL.h"
-#include "nsINetService.h"
-#include "nsIInputStream.h"
-#include "nsIStreamListener.h"
-
-#include "nsISoftwareUpdate.h"
-#include "nsSoftwareUpdateIIDs.h"
-
-
-static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID);
-static NS_DEFINE_IID(kSoftwareUpdateCID,  NS_SoftwareUpdate_CID);
-
-
-nsSoftwareUpdateListener::nsSoftwareUpdateListener(const nsString& fromURL, const nsString& localFile, long flags)
-{
-    NS_INIT_REFCNT();
-    
-    mFromURL    = fromURL;
-    mLocalFile  = localFile;
-    mFlags      = flags;
-
-    mOutFileDesc = PR_Open(nsAutoCString(localFile),  PR_CREATE_FILE | PR_RDWR, 0744);
-    
-    if(mOutFileDesc == NULL)
-    {
-        mResult = -1;
-    };
-
-    mResult = nsServiceManager::GetService(  kSoftwareUpdateCID, 
-                                             kISoftwareUpdateIID,
-                                             (nsISupports**)&mSoftwareUpdate);
-    
-    if (NS_FAILED(mResult))
-        return;
-
-    nsIURL  *pURL  = nsnull;
-    mResult = NS_NewURL(&pURL, fromURL);
-
-    if (NS_FAILED(mResult)) 
-        return;
- 
-    mResult = NS_OpenURL(pURL, this);
-}
-
-nsSoftwareUpdateListener::~nsSoftwareUpdateListener()
-{    
-    mSoftwareUpdate->Release();
-}
-
-
-NS_IMPL_ISUPPORTS( nsSoftwareUpdateListener, kIStreamListenerIID )
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::GetBindInfo(nsIURL* aURL, nsStreamBindingInfo* info)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnProgress( nsIURL* aURL,
-                          PRUint32 Progress,
-                          PRUint32 ProgressMax)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnStatus(nsIURL* aURL, 
-                       const PRUnichar* aMsg)
-{ 
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnStartBinding(nsIURL* aURL, 
-                             const char *aContentType)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnStopBinding(nsIURL* aURL,
-                                        nsresult status,
-                                        const PRUnichar* aMsg)
-{
-    switch( status ) 
-    {
-
-        case NS_BINDING_SUCCEEDED:
-                PR_Close(mOutFileDesc);
-                mSoftwareUpdate->InstallJar(mFromURL,
-                                            mLocalFile,
-                                            mFlags );
-            break;
-
-        case NS_BINDING_FAILED:
-        case NS_BINDING_ABORTED:
-            mResult = status;
-            PR_Close(mOutFileDesc);
-            break;
-
-        default:
-            mResult = NS_ERROR_ILLEGAL_VALUE;
-    }
-
-    return mResult;
-}
-
-#define BUF_SIZE 1024
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRUint32 length)
-{
-    PRUint32 len;
-    nsresult err;
-    char buffer[BUF_SIZE];
-    
-    do 
-    {
-        err = pIStream->Read(buffer, BUF_SIZE, &len);
-        
-        if (mResult == 0 && err == 0)
-        {
-            if ( PR_Write(mOutFileDesc, buffer, len) == -1 )
-            {
-                /* Error */ 
-                return -1;
-            }
-        }
-
-    } while (len > 0 && err == NS_OK);
-
-    return 0;
-}

mozilla/xpinstall/src/nsSoftwareUpdateStream.h

@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef _NS_SOFTWAREUPDATESTREAM_H__
-#define _NS_SOFTWAREUPDATESTREAM_H__
-
-#include "nsInstall.h"
-
-#include "nscore.h"
-#include "nsISupports.h"
-#include "nsString.h"
-
-#include "nsIURL.h"
-#include "nsINetlibURL.h"
-#include "nsINetService.h"
-#include "nsIInputStream.h"
-#include "nsIStreamListener.h"
-
-#include "nsISoftwareUpdate.h"
-
-static NS_DEFINE_IID(kInetServiceIID, NS_INETSERVICE_IID);
-static NS_DEFINE_IID(kInetServiceCID, NS_NETSERVICE_CID);
-static NS_DEFINE_IID(kInetLibURLIID, NS_INETLIBURL_IID);
-static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
-
-class nsSoftwareUpdateListener : public nsIStreamListener
-{
-    public:
-        NS_DECL_ISUPPORTS
-    
-        nsSoftwareUpdateListener(const nsString& fromURL, const nsString& localFile, long flags);
-
-        NS_IMETHOD GetBindInfo(nsIURL* aURL, nsStreamBindingInfo* info);
-        NS_IMETHOD OnProgress(nsIURL* aURL, PRUint32 Progress, PRUint32 ProgressMax);
-        NS_IMETHOD OnStatus(nsIURL* aURL, const PRUnichar* aMsg);
-        NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType);
-        NS_IMETHOD OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRUint32 length);
-        NS_IMETHOD OnStopBinding(nsIURL* aURL, nsresult status, const PRUnichar* aMsg);
-        
-        
-
-
-    protected:
-        virtual ~nsSoftwareUpdateListener();
-
-
-    private:
-
-          nsISoftwareUpdate *mSoftwareUpdate;
-          PRFileDesc        *mOutFileDesc;
-          
-          nsString           mFromURL;
-          nsString           mLocalFile;
-          long               mFlags;
-
-          PRInt32            mResult;
-};
-
-#endif

mozilla/xpinstall/src/nsTopProgressNotifier.cpp

@@ -1,169 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (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/NPL/
- *
- * 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.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsIXPInstallProgress.h"
-#include "nsTopProgressNotifier.h"
-
-nsTopProgressNotifier::nsTopProgressNotifier()
-{
-    mNotifiers = new nsVector();
-}
-
-nsTopProgressNotifier::~nsTopProgressNotifier()
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            delete element;
-        }
-
-        mNotifiers->RemoveAll();
-        delete (mNotifiers);
-    }
-}
-
-
-NS_IMPL_ISUPPORTS(nsTopProgressNotifier, nsIXPInstallProgress::GetIID());
-
-
-long
-nsTopProgressNotifier::RegisterNotifier(nsIXPInstallProgress * newNotifier)
-{
-     return mNotifiers->Add( newNotifier );
-}
-
-
-void
-nsTopProgressNotifier::UnregisterNotifier(long id)
-{
-     mNotifiers->Set(id, NULL);
-}
-
-
-
-NS_IMETHODIMP
-nsTopProgressNotifier::BeforeJavascriptEvaluation()
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->BeforeJavascriptEvaluation();
-        }
-    }
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::AfterJavascriptEvaluation(void)
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->AfterJavascriptEvaluation();
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::InstallStarted(const char* UIPackageName)
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->InstallStarted(UIPackageName);
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::ItemScheduled( const char* message )
-{
-    long rv = 0;
-
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                if (element->ItemScheduled( message ) != 0)
-                    rv = -1;
-        }
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::InstallFinalization( const char* message, PRInt32 itemNum, PRInt32 totNum )
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->InstallFinalization( message, itemNum, totNum );
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::InstallAborted(void)
-{
-   if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->InstallAborted();
-        }
-    }
-   return NS_OK;
-}
-
-