- Fix for recurring static variable (make it a member of the window group

structure)


git-svn-id: svn://10.0.0.236/branches/js_ops_BRANCH@1188 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/include/jscookie.h

@@ -0,0 +1,62 @@
+/* -*- 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.
+ */
+/*
+   jscookie.h -- javascript reflection of cookies for filters.
+   Created: Frederick G.M. Roeber <roeber@netscape.com>, 12-Jul-97.
+   Adopted: Judson Valeski, 1997
+ */
+
+#ifndef _JSCOOKIE_H_
+#define _JSCOOKIE_H_
+
+typedef enum {
+    JSCF_accept,
+    JSCF_reject,
+    JSCF_ask,
+    JSCF_whatever,
+    JSCF_error
+}
+    JSCFResult;
+
+typedef struct {
+    char *path_from_header;
+    char *host_from_header;
+    char *name_from_header;
+    char *cookie_from_header;
+    time_t expires;
+    char *url;
+    Bool secure;
+    Bool domain;
+    Bool prompt; /* the preference */
+    NET_CookieBehaviorEnum preference;
+}
+    JSCFCookieData;
+
+extern JSCFResult JSCF_Execute(
+                               MWContext *mwcontext,
+                               const char *script_name,
+                               JSCFCookieData *data,
+                               Bool *data_changed
+                               );
+
+/* runs the garbage collector on the filter context. Probably a good
+   idea to call on completion of NET_GetURL or something. */
+extern void JSCF_Cleanup(void);
+
+#endif /* _JSCOOKIE_H_ */
+

mozilla/include/libevent.h

@@ -0,0 +1,755 @@
+/* -*- 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.
+ */
+
+/*
+ * Header file for event passing between the mozilla thread and
+ *   the mocha thread
+ */
+
+#ifndef libevent_h___
+#define libevent_h___
+
+#include "libmocha.h"
+#include "prtypes.h"
+#ifndef NSPR20
+#include "prevent.h"
+#else
+#include "plevent.h"
+#endif
+#include "shist.h"
+#include "fe_proto.h"
+#include "lo_ele.h"
+#include "jscookie.h"
+
+NSPR_BEGIN_EXTERN_C
+
+extern PREventQueue * mozilla_event_queue;
+
+typedef struct WindowGroup LMWindowGroup;
+
+/* 
+ * XXX - should we use the same event values as layer events?
+ */
+
+/* Event bits stored in the low end of decoder->event_mask. */
+#define EVENT_MOUSEDOWN 0x00000001
+#define EVENT_MOUSEUP   0x00000002
+#define EVENT_MOUSEOVER 0x00000004      /* user is mousing over a link */
+#define EVENT_MOUSEOUT  0x00000008      /* user is mousing out of a link */
+#define EVENT_MOUSEMOVE 0x00000010  
+#define EVENT_MOUSEDRAG 0x00000020
+#define EVENT_CLICK     0x00000040      /* input element click in progress */
+#define EVENT_DBLCLICK  0x00000080
+#define EVENT_KEYDOWN   0x00000100
+#define EVENT_KEYUP     0x00000200
+#define EVENT_KEYPRESS	0x00000400
+#define EVENT_DRAGDROP  0x00000800      /* not yet implemented */
+#define EVENT_FOCUS     0x00001000      /* input focus event in progress */
+#define EVENT_BLUR      0x00002000      /* loss of focus event in progress */
+#define EVENT_SELECT    0x00004000      /* input field selection in progress */
+#define EVENT_CHANGE    0x00008000      /* field value change in progress */
+#define EVENT_RESET     0x00010000      /* form submit in progress */
+#define EVENT_SUBMIT    0x00020000      /* form submit in progress */
+#define EVENT_SCROLL    0x00040000      /* window is being scrolled */
+#define EVENT_LOAD      0x00080000      /* layout parsed a loaded document */
+#define EVENT_UNLOAD    0x00100000
+#define EVENT_XFER_DONE	0x00200000      /* document has loaded */
+#define EVENT_ABORT     0x00400000
+#define EVENT_ERROR     0x00800000
+#define EVENT_LOCATE	0x01000000
+#define EVENT_MOVE	0x02000000
+#define EVENT_RESIZE    0x04000000
+#define EVENT_FORWARD   0x08000000
+#define EVENT_HELP	0x10000000		/* for handling of help events */
+#define EVENT_BACK      0x20000000
+
+/* #define EVENT_PRINT     0x20000000	*//* To be removed per joki */
+
+#define STATUS_STOP      0x00000001      /* stop processing */
+#define STATUS_IGNORE    0x00000002      /* no new messages */
+
+#define	EVENT_ALT_MASK	    0x00000001
+#define	EVENT_CONTROL_MASK  0x00000002
+#define	EVENT_SHIFT_MASK    0x00000004
+#define	EVENT_META_MASK	    0x00000008
+
+#define ARGTYPE_NULL	0x00000001
+#define ARGTYPE_INT32	0x00000002
+#define ARGTYPE_BOOL	0x00000004
+#define ARGTYPE_STRING	0x00000008
+
+#define SIZE_MAX	0x00000001
+#define SIZE_MIN        0X00000002
+/*
+ * When the event has been processed by the backend, there will be
+ *   a front-end callback that gets called.  If the event processed
+ *   successfully, the callback will be passed EVENT_OK.  If the
+ *   event wasn't successful (i.e. the user canceled it) the return
+ *   status will be EVENT_CANCEL.  If something radical happened
+ *   and the front-end should do nothing (i.e. mocha changed the
+ *   underlying context) the status will be EVENT_PANIC and the
+ *   front end should treat the context and element passed to the
+ *   exit routine as bogus
+ */
+typedef enum {
+    EVENT_OK,
+    EVENT_CANCEL,
+    EVENT_PANIC
+} ETEventStatus;
+
+/*
+ * When a given event gets processed we may need to tell the front
+ *   end about it so that they can update the UI / continue the 
+ *   operation.  The context, lo_element, lType and whatever
+ *   field are all supplied by the original ET_SendEvent() call.
+ *   See ET_SendEvent() for a description of the values for
+ *   the status parameter
+ */
+typedef void
+(*ETClosureFunc)(MWContext * pContext, LO_Element * lo_element, 
+                 int32 lType, void * whatever, ETEventStatus status);
+
+/*
+ * Someone has initiated a call to LM_EvaluateBuffer().  This function
+ *   gets called back with the result
+ */
+ typedef void
+(*ETEvalAckFunc)(void * data, char * result_string, size_t result_length,
+		 char * wysiwyg_url, char * base_href, Bool valid);
+
+/*
+ * This function is called back after a layer's state has been restored
+ * in a resize_relayout.
+ */
+ typedef void
+ (*ETRestoreAckFunc)(void * data, LO_BlockInitializeStruct *param);
+
+/*
+ * Typedef for a function taking a void pointer and
+ *   returning nothing
+ */
+ typedef void
+(*ETVoidPtrFunc)(void * data);
+
+/*
+ * Typedef for a function taking a void pointer and
+ *   returning a bool
+ */
+ typedef PRBool
+(*ETBoolPtrFunc)(void * data);
+
+/*
+ * Typedef for a function taking a void pointer and
+ *   returning a int32
+ */
+ typedef int32
+(*ETIntPtrFunc)(void * data);
+
+/*
+ * Typedef for a function taking a void pointer and
+ *   returning a char *
+ */
+ typedef char *
+(*ETStringPtrFunc)(void * data);
+
+/*
+ * Struct for passing JS typed variable info through C interface calls
+ */
+typedef union ArgVal {
+    int32		intArg;
+    XP_Bool		boolArg;
+    char *		stringArg;
+} ArgVal;
+
+typedef struct {
+    uint8		type;	  /* arg type as defined at top of file */
+    ArgVal		value;		
+} JSCompArg;
+
+/*
+ * Typedef for a function used to verify installed components and 
+ *   get back components utility functions.
+ */
+ typedef PRBool
+(*ETVerifyComponentFunc)(void **active_callback, void **startup_callback);
+
+/*
+ * Generic function for JS setting values with native calls.
+ */
+ typedef void
+(*ETCompPropSetterFunc)(char *name, void *value);
+
+/*
+ * Generic function for JS getting values from native calls.
+ */
+ typedef void*
+(*ETCompPropGetterFunc)(char *name);
+
+/*
+ * Generic function for JS calling native methods.
+ */
+ typedef void*
+(*ETCompMethodFunc)(int32 argc, JSCompArg *argv);
+
+/* --------------------------------------------------------------------------
+ * Common prologue for talking between the mocha thread and the mozilla 
+ *   thread
+ */
+typedef struct {
+    PREvent		event;	  /* the PREvent structure */
+    MWContext*		context;  /* context */
+    int32		doc_id;   /* doc id of context when event launched */
+    PRPackedBool	handle_eagerly;
+} ETEvent;
+
+/*
+ * Struct to send back from front end in order to get additional 
+ *   event information without having to initialize event object 
+ *   until necessary.  Yow, there is a lot of junk in here now
+ *   can we make a union out of some of these or are they always
+ *   needed?
+ */
+typedef struct {
+    ETEvent	    ce;
+    MochaDecoder  * decoder;
+    JSObject	  * object;
+    int32	    type;
+    int32           layer_id;
+    int32	    id;
+    LO_Element	  * lo_element;
+    ETClosureFunc   fnClosure;    /* event sender closure           */
+    void          * whatever;     /* anything other state           */
+    int32	    x,y;
+    int32	    docx,docy;
+    int32	    screenx,screeny;
+    uint32	    which;
+    uint32	    modifiers;
+    void	  * data;
+    uint32	    dataSize;
+    PRPackedBool    saved;
+    PRPackedBool    event_handled;
+} JSEvent;
+
+/*
+ * Tell the backend about a new event.
+ * The event is placed onto an event queue, it is not processed
+ *   immediately.  If the event is the type that can be cancelled
+ *   by the backend (i.e. a button click or a submit) the front
+ *   end must wait until the callback routine gets called before
+ *   continuing with the operation.  The ETEventStatus will be
+ *   EVENT_OK if the operation is to continue or EVENT_CANCEL
+ *   if it got cancelled.
+ * 
+ * The processing of the event may cause the document to change 
+ *   or even the whole window to close.  In those cases the callback 
+ *   will still get called in case there is any front-end cleanup 
+ *   to do but the ETEventStatus will be set to EVENT_PANIC
+ *
+ */
+
+extern JSBool
+ET_SendEvent(MWContext * pContext, LO_Element *pElement, JSEvent *pEvent, 
+             ETClosureFunc fnClosure, void * whatever);
+
+/*
+ * Tell the backend about a new document load event.  We need a 
+ *   closure so that libparse/layout knows when its safe to discard
+ *   the old document when they were waiting for onunload events to
+ *   finish processing
+ */
+extern void
+ET_SendLoadEvent(MWContext * pContext, int32 type, ETVoidPtrFunc fnClosure,
+		 NET_StreamClass *stream, int32 layer_id, Bool resize_reload);
+
+/*
+ * Tell the backend about a new image event.  Async.  No closure
+ */
+extern void
+ET_SendImageEvent(MWContext * pContext, LO_ImageStruct *image_data,
+                  LM_ImageEvent event);
+
+/*
+ * Send an interrupt event to the current context
+ * Remove all pending events for the event queue of the given context.
+ */
+extern void
+ET_InterruptContext(MWContext * pContext);
+
+extern JSBool
+ET_ContinueProcessing(MWContext * pContext);
+
+/*
+ * Tell mocha to destroy the given context's data.  The callback 
+ *   function gets called when mocha is done with all of its data
+ *   that was associated with the context
+ */
+extern void
+ET_RemoveWindowContext(MWContext * context, ETVoidPtrFunc fn, 
+                       void * data);
+
+typedef struct {
+    uint	   len, line_no;
+    char	 * scope_to;
+    void	 * data;
+    JSVersion	   version;
+    JSPrincipals * principals;
+    JSBool         want_result;
+    JSBool	   unicode;
+} ETEvalStuff;
+
+/*
+ * Evaluate the mocha code in the given buffer
+ */
+extern void
+ET_EvaluateBuffer(MWContext * context, char * buffer, uint buflen,
+		  uint line_no, char * scope_to, JSBool want_result,
+		  ETEvalAckFunc fn, void * data,
+		  JSVersion ver, struct JSPrincipals *);
+
+extern void
+ET_EvaluateScript(MWContext * context, char * buffer, ETEvalStuff * stuff,
+		  ETEvalAckFunc fn);
+
+/*
+ * Ask Mocha to reflect the given object into JavaScript
+ */
+extern void
+ET_ReflectObject(MWContext * pContext, void * lo_ele, void * tag,
+		 int32 layer_id, uint index, ReflectedObject type);
+
+void
+ET_ReflectFormElement(MWContext * pContext, void * form,
+		      LO_FormElementStruct * form_element, PA_Tag * tag);
+
+extern void
+ET_ReflectWindow(MWContext * pContext, 
+		 PA_Block onLoad, PA_Block onUnload, 
+		 PA_Block onFocus, PA_Block onBlur, PA_Block onHelp,
+		 PA_Block onMouseOver, PA_Block onMouseOut, PA_Block onDragDrop,
+		 PA_Block onMove, PA_Block onResize,
+                 PA_Block id, char *all,
+		 Bool bDelete, int newline_count);
+
+/*
+ * Tell mocha we are processing a form
+ */
+extern void
+ET_SetActiveForm(MWContext * pContext, struct lo_FormData_struct * loElement);
+
+/*
+ * Tell mocha which layer we are processing
+ */
+void
+ET_SetActiveLayer(MWContext * pContext, int32 layer_id);
+
+/*
+** Tell mocha where to send its output
+*/
+extern void
+ET_ClearDecoderStream(MWContext * context, NET_StreamClass * old_stream);
+
+extern void
+ET_SetDecoderStream(MWContext * context, NET_StreamClass *stream,
+	            URL_Struct *url_struct, JSBool free_stream_on_close);
+
+/*
+** Remember the current nesting URL in the MochaDecoder
+*/
+extern void
+ET_SetNestingUrl(MWContext * context, char * szUrl);
+
+/*
+** Remember the current language version in the MochaDecoder
+*/
+extern void
+ET_SetVersion(MWContext * context, JSVersion version);
+
+/*
+ * Tell mocha to trash the current document.  around and around...
+ */
+extern void
+ET_ReleaseDocument(MWContext * pContext, JSBool resize_reload);
+
+/*
+ * Tell mocha to trash the layer's document.
+ */
+extern void
+ET_DestroyLayer(MWContext * pContext, JSObject *layer_obj);
+
+extern void
+ET_MochaStreamComplete(MWContext * context, void * buf, int len, 
+		       char * content_type, Bool isUnicode);
+
+extern void
+ET_MochaStreamAbort(MWContext * context, int status);
+			
+/*
+ * Called when a layer's contents are changing and we want to create
+ * a new layer document.
+ */
+extern void
+ET_NewLayerDocument(MWContext *pContext, int32 layer_id);
+
+extern void
+ET_DocWriteAck(MWContext *pContext, int status);
+
+extern void
+ET_RegisterComponent(char *name, void *active_callback, void *startup_callback);
+
+extern void
+ET_RegisterComponentProp(char *comp, char *name, uint8 retType, void *setter, 
+			 void *getter);
+
+extern void
+ET_RegisterComponentMethod(char *comp, char *name, uint8 retType, void *method, 
+			   int32 argc);
+
+/* =============================================================== */
+
+/*
+ * This event can be sent to both the mozilla thread and the moacha thread
+ */
+typedef struct {
+    ETEvent			ce;
+    TimeoutCallbackFunction	fnCallback;
+    void*			pClosure;
+    uint32			ulTime;
+    void*			pTimerId;
+} MozillaEvent_Timeout;
+
+
+/* =============================================================== */
+
+/*
+ * Busy loop waiting for events to come along
+ */
+extern void PR_CALLBACK
+lm_wait_for_events(void *);
+
+/* 
+ * global mocha event queues.  It would be nice to not have these
+ *   exported this globally
+ */
+extern PREventQueue *lm_InterpretQueue;
+extern PREventQueue *lm_PriorityQueue;
+
+/*
+ * Ways to send events to the front end
+ */
+extern JSBool
+ET_PostMessageBox(MWContext* context, char* szMessage, 
+		  JSBool bConfirm);
+
+extern void
+ET_PostProgress(MWContext* context, const char* szMessage);
+
+/* --- timeout routines --- */
+
+/*
+ * Set (or clear) a timeout to go off.  The timeout will go off in the
+ *   mozilla thread so we will use the routine ET_FireTimeoutCallBack()
+ *   to get back into our thread to actually run the closure
+ */
+extern void * 
+ET_PostSetTimeout(TimeoutCallbackFunction fnCallback, 
+		  void * pClosure, uint32 ulTime, int32 doc_id);
+
+extern void
+ET_PostClearTimeout(void * stuff);
+
+extern void
+ET_FireTimeoutCallBack(void *);
+
+/* --- end of timeout routines --- */
+
+extern void
+ET_PostDestroyWindow(MWContext * context);
+
+extern void
+ET_PostManipulateForm(MWContext * context, LO_Element * pForm, int32 action);
+
+extern void
+ET_PostClearView(MWContext * context);
+
+extern void
+ET_PostFreeImageElement(MWContext * context, void * stuff);
+
+extern void
+ET_PostFreeImageContext(MWContext *context, IL_GroupContext *img_cx);
+
+extern void
+ET_PostFreeAnonImages(MWContext *context, IL_GroupContext *img_cx);
+
+extern void
+ET_PostDisplayImage(MWContext *, int, LO_ImageStruct *);
+
+extern void
+ET_PostGetUrl(MWContext *, URL_Struct * pUrl);
+
+extern char *
+ET_PostPrompt(MWContext* context, const char* szMessage, 
+			  const char * szDefault);
+
+extern MWContext *
+ET_PostNewWindow(MWContext* context, URL_Struct * pUrl, 
+                 char * szName, Chrome * pChrome, LMWindowGroup *grp);
+
+extern void
+ET_PostUpdateChrome(MWContext* context, Chrome * pChrome);
+
+extern void
+ET_PostQueryChrome(MWContext* context, Chrome * pChrome);
+
+extern void
+ET_PostGetScreenSize(MWContext* context, int32 *pX, int32 *pY);
+
+extern void
+ET_PostGetAvailScreenRect(MWContext* context, int32 *pX, int32 *pY, 
+					    int32 *pLeft, int32 *pTop);
+
+extern void
+ET_PostGetColorDepth(MWContext* context, int32 *pPixel, int32 *pPallette);
+
+extern char *
+ET_PostGetSelectedText(MWContext* context);
+
+extern void
+ET_PostScrollDocTo(MWContext* context, int loc, int32 x, int32 y);
+
+extern void
+ET_PostScrollDocBy(MWContext* context, int loc, int32 x, int32 y);
+
+extern void
+ET_PostBackCommand(MWContext* context);
+
+extern void
+ET_PostForwardCommand(MWContext* context);
+
+extern void
+ET_PostHomeCommand(MWContext* context);
+
+extern JSBool
+ET_PostFindCommand(MWContext* context, char * szName, JSBool matchCase, 
+		   JSBool searchBackward);
+extern void
+ET_PostPrintCommand(MWContext* context);
+
+extern void
+ET_PostOpenFileCommand(MWContext* context);
+
+extern void 
+ET_MakeHTMLAlert(MWContext * context, const char * szString);
+
+/* respond to events sent to the mocha thread by the mozilla thread */
+
+extern void
+ET_PostJsEventAck(MWContext* context, LO_Element * pEle, int type, 
+                  ETClosureFunc fnClosure, void * pStuff, 
+                  ETEventStatus status);
+
+
+
+extern void
+ET_PostEvalAck(MWContext * context, int doc_id, void * data, 
+	       char * str, size_t len, char * wysiwyg_url, 
+	       char * base_href, Bool valid, ETEvalAckFunc fn);
+
+extern void
+ET_PostRestoreAck(void *data, LO_BlockInitializeStruct *param, 
+                  ETRestoreAckFunc fn);
+
+/* netlib events */
+
+extern char *
+ET_net_GetCookie(MWContext* context, int32 doc_id);
+
+extern char *
+ET_net_SetCookieString(MWContext* context, char * szCookie, int32 doc_id);
+
+extern NET_StreamClass *
+ET_net_CacheConverter(FO_Present_Types format, void * obj,
+                      URL_Struct *pUrl, MWContext * pContext);
+
+extern void
+ET_net_FindURLInCache(URL_Struct * pUrl, MWContext * pContext);
+
+extern NET_StreamClass	*
+ET_net_StreamBuilder(FO_Present_Types format, URL_Struct *pUrl, 
+		     MWContext * pContext);
+
+/* layout events */
+
+extern  void
+ET_lo_ResetForm(MWContext * pContext, LO_Element * ele);
+
+void
+ET_fe_SubmitInputElement(MWContext * pContext, LO_Element * ele);
+
+/*
+ * Synchronously shove the given text down the parser's processing
+ *   queue.  If the currently loaded document is not equal to 
+ *   doc_id, this message should be ignored since it arrived too
+ *   late for the intended document
+ */
+extern int
+ET_lo_DoDocWrite(JSContext *cx, MWContext * context, NET_StreamClass * stream, 
+                 char * str, size_t len, int32 doc_id);
+
+
+extern void
+ET_il_GetImage(const char * str, MWContext * pContext, IL_GroupContext *img_cx,
+               LO_ImageStruct * image_data, NET_ReloadMethod how);
+
+extern void
+ET_il_SetGroupObserver(MWContext * pContext, IL_GroupContext *pImgCX, void *pDpyCX,
+					   JSBool bAddObserver);
+			   
+extern void
+ET_InterruptImgCX(MWContext * pContext);
+
+/*
+ * Tell layout to trash the current document.
+ */
+extern void
+ET_lo_DiscardDocument(MWContext * pContext);
+
+/*
+ * Tell layout to prepare a layer for writing.
+ */
+extern Bool
+ET_lo_PrepareLayerForWriting(MWContext *context, int32 layer_id,
+			     const char *referer);
+
+/*
+ * Return a copy of the current history element.  Caller must free
+ */
+extern History_entry * 
+ET_shist_GetCurrent(MWContext * pContext);
+
+/*
+ * Return the current security status.
+ */
+extern int 
+ET_GetSecurityStatus(MWContext * pContext);
+
+/*
+ * Make sure Mocha/Java glue is ready.  Returns the same return code as
+ * LM_InitMoja.
+ */
+extern int
+ET_InitMoja(MWContext * pContext);
+
+/*
+ * Pack up toys and go home
+ */
+extern void
+ET_FinishMocha(void);
+
+/*
+ * Used to call a stream completion function in the mozilla
+ *   thread
+ */
+extern void
+ET_moz_CallFunction(ETVoidPtrFunc fn, void * data);
+
+extern void
+ET_moz_CallFunctionAsync(ETVoidPtrFunc fn, void * data);
+
+extern PRBool
+ET_moz_CallFunctionBool(ETBoolPtrFunc fn, void * data);
+
+extern int32
+ET_moz_CallFunctionInt(ETIntPtrFunc fn, void * data);
+
+extern char *
+ET_moz_CallFunctionString(ETStringPtrFunc fn, void * data);
+
+extern void
+ET_moz_CallAsyncAndSubEventLoop(ETVoidPtrFunc fn, void *data,
+				MWContext *context);
+
+extern void
+ET_moz_Abort(MKStreamAbortFunc fn, void * data, int status);
+
+extern void
+ET_moz_SetMochaWriteStream(MochaDecoder * decoder);
+
+extern NET_StreamClass *
+ET_moz_DocCacheConverter(MWContext * context, URL_Struct * pUrl, 
+			 char * wysiwyg_url, int32 layer_id);
+
+extern PRBool
+ET_moz_VerifyComponentFunction(ETVerifyComponentFunc fn, ETBoolPtrFunc *pActive_callback, 
+			       ETVoidPtrFunc *pStartup_callback);
+
+extern void
+ET_moz_CompSetterFunction(ETCompPropSetterFunc fn, char *name, void *data);
+
+extern void *
+ET_moz_CompGetterFunction(ETCompPropGetterFunc fn, char *name);
+
+extern void *
+ET_moz_CompMethodFunction(ETCompMethodFunc fn, int32 argc, JSCompArg *argv);
+
+typedef enum { 
+    CL_Move,
+    CL_MoveX,
+    CL_MoveY,
+    CL_Offset,
+    CL_Resize,
+    CL_SetBboxWidth,
+    CL_SetBboxHeight,
+    CL_SetBboxTop,
+    CL_SetBboxLeft,
+    CL_SetBboxBottom,
+    CL_SetBboxRight,
+    CL_SetHidden,
+    CL_MoveInZ,
+    CL_SetSrc,
+    CL_SetSrcWidth,
+    CL_SetZ,
+    CL_SetBgColor,
+    CL_SetBackdrop
+} ETLayerOp;
+
+extern int
+ET_TweakLayer(MWContext * context, CL_Layer * layer, int32 x, int32 y, 
+              void *param_ptr, int32 param_val, ETLayerOp op,
+	      const char *referer, int32 doc_id);
+
+extern void
+ET_RestoreLayerState(MWContext *context, int32 layer_id,
+                     LO_BlockInitializeStruct *param, ETRestoreAckFunc fn,
+                     void *data);
+
+extern int32
+ET_npl_RefreshPluginList(MWContext* context, XP_Bool refreshInstances);
+
+extern JSCFResult 
+ET_JSCFExecute(MWContext *context, const char *script_name,
+		JSCFCookieData *data, Bool *data_changed);
+
+extern JSBool
+ET_HandlePref(JSContext * cx, uint argc, jsval * argv, jsval * rval);
+
+extern void
+ET_SetPluginWindow(MWContext * pContext, void * app);
+
+NSPR_END_EXTERN_C
+
+#endif /* libevent_h___ */

mozilla/include/libmocha.h

@@ -0,0 +1,546 @@
+/* -*- 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.
+ */
+
+/*
+ * Header file for Mocha in the Navigator (libmocha).
+ */
+
+#ifndef libmocha_h___
+#define libmocha_h___
+
+#include "ntypes.h"
+#include "il_types.h"
+#include "prtypes.h"
+#include "plhash.h"
+#include "prthread.h"
+#include "jsapi.h"
+
+/* enable JavaScript Debugger support */
+#if defined (_WIN32) || defined(XP_UNIX) || defined(powerc) || defined(__powerc) || defined(XP_OS2)
+#ifdef JAVA
+#define JSDEBUGGER 1 
+#endif
+#endif
+
+NSPR_BEGIN_EXTERN_C
+
+typedef struct JSTimeout JSTimeout;
+typedef struct JSPrincipalsList JSPrincipalsList;
+typedef struct JSNestingUrl JSNestingUrl;
+
+/*
+ * There exists one MochaDecoder per top-level MWContext that decodes Mocha,
+ * either from an HTML page or from a "mocha:[expr]" URL.
+ */
+typedef struct MochaDecoder {
+    int32           forw_count;		    /* forward reference count */
+    int32           back_count;		    /* back (up the tree) count */
+    JSContext	    *js_context;
+    MWContext       *window_context;
+    JSObject	    *window_object;
+    NET_StreamClass *stream;
+    int32           stream_owner;   /* id of layer that's loading the stream */
+    URL_Struct      *url_struct;
+    JSTimeout	    *timeouts;
+    JSTimeout       *saved_timeouts;
+    uint16          signature_ordinal;
+    PRPackedBool    replace_location;
+    PRPackedBool    resize_reload;
+    PRPackedBool    load_event_sent;
+    PRPackedBool    visited;
+    PRPackedBool    writing_input;
+    PRPackedBool    free_stream_on_close;
+    PRPackedBool    in_window_quota;
+    PRPackedBool    called_win_close;
+    PRPackedBool    principals_compromised;
+    const char      *source_url;
+    JSNestingUrl    *nesting_url;
+    uint32          error_count;
+    uint32          event_mask;
+    int32           active_layer_id;
+    uint32          active_form_id;
+    uint32	    event_bit;
+    int32	    doc_id;
+
+    /*
+     * Class prototype objects, in alphabetical order.  Must be CLEARed (set
+     * to null) in LM_PutMochaDecoder, HELD (GC roots added) in lm_NewWindow,
+     * and DROPped (removed as GC roots) in lm_DestroyWindow.
+     * XXXbe clean up, clear via bzero, using a sub-structure.
+     */
+    JSObject	    *anchor_prototype;
+    JSObject	    *bar_prototype;
+    JSObject        *document_prototype;
+    JSObject	    *event_prototype;
+    JSObject	    *event_capturer_prototype;
+    JSObject	    *event_receiver_prototype;
+    JSObject	    *form_prototype;
+    JSObject	    *image_prototype;
+    JSObject	    *input_prototype;
+    JSObject	    *layer_prototype;
+    JSObject	    *option_prototype;
+    JSObject	    *rect_prototype;
+    JSObject	    *url_prototype;
+
+    /*
+     * Window sub-objects.  These must also follow the CLEAR/HOLD/DROP
+     * protocol mentioned above.
+     */
+    JSObject	    *document;
+    JSObject	    *history;
+    JSObject	    *location;
+    JSObject	    *navigator;
+    JSObject	    *components;
+    JSObject	    *screen;
+    JSObject	    *hardware;
+    JSObject	    *crypto;
+    JSObject        *pkcs11;
+
+    /*
+     * Ad-hoc GC roots.
+     */
+    JSObject	    *event_receiver;
+    JSObject	    *opener;
+
+    JSVersion	    firstVersion;   /* First JS script tag version. */
+
+    /*
+     * Security info for all of this decoder's scripts, except those
+     * contained in layers.
+     */
+    JSPrincipals    *principals;
+    JSPrincipalsList*early_access_list;
+
+    IL_GroupContext *image_context; /* Image context for anonymous images */
+
+    /* 
+     * Table that maintains an id to JS object mapping for reflected
+     * elements. This is used during resize to reestablish the connection
+     * between layout elements and their corresponding JS object. 
+     * Form elements are special, since they can't use the same keying
+     */
+    PRHashTable     *id_to_object_map;
+} MochaDecoder;
+
+/* 
+ * Number of buckets for the id-to-object hash table.
+ */
+#define LM_ID_TO_OBJ_MAP_SIZE 20
+#define LM_FORM_ELEMENT_MAP_SIZE 10
+
+/*
+ * Types of objects reflected into Mocha
+ */
+typedef enum {
+	LM_APPLETS = 0,
+	LM_FORMS,
+	LM_LINKS,
+	LM_NAMEDANCHORS,
+	LM_EMBEDS,
+	LM_IMAGES,
+	LM_FORMELEMENTS,
+	LM_LAYERS
+} ReflectedObject;
+
+/*
+ * Generates an id-to-object mapping key from the ReflectedObject
+ * type, the containing layer id and the id of the object itself.
+ * The key is 4 bits type, 14 bits layer_id and 14 bits id.
+ */
+#define LM_GET_MAPPING_KEY(obj_type, layer_id, id)    \
+     (void *)(((((uint32)obj_type) << 28) & 0xF0000000UL) |     \
+              ((((uint32)layer_id) << 14) & 0x0FFFC000UL) |     \
+              (((uint32)id) & 0x00003FFFUL))
+
+/*
+ * Public, well-known string constants.
+ */
+extern char js_language_name[];      /* "JavaScript" */
+extern char js_content_type[];       /* "application/x-javascript" */
+
+/*
+ * Initialize and finalize Mocha-in-the-client.
+ */
+extern void LM_InitMocha(void);
+extern void LM_FinishMocha(void);
+
+/*
+ * Force mocha on in the given context, even if the user pref is set to
+ * disable mocha.
+ */
+extern void LM_ForceJSEnabled(MWContext *cx);
+
+/*
+ * Initialize and finalize Mocha-Java connection
+ */
+#define LM_MOJA_UNINITIALIZED   0
+#define LM_MOJA_OK              1
+#define LM_MOJA_JAVA_FAILED     2
+#define LM_MOJA_OUT_OF_MEMORY   3
+extern int LM_InitMoja(void);
+extern void LM_FinishMoja(void);
+extern int LM_IsMojaInitialized(void);
+
+/*
+ * Enter or leave the big mocha lock.  Any thread which wants to
+ * preserve JavaScript run-to-completion semantics must bracket
+ * JavaScript evaluation with these calls.
+ */
+typedef void
+(PR_CALLBACK *JSLockReleaseFunc)(void * data);
+
+
+extern void PR_CALLBACK LM_LockJS(MWContext *mwc);
+extern void PR_CALLBACK LM_UnlockJS(MWContext *mwc);
+extern JSBool PR_CALLBACK LM_AttemptLockJS(MWContext *mwc, 
+                                           JSLockReleaseFunc fn, void * data);
+extern JSBool PR_CALLBACK LM_ClearAttemptLockJS(MWContext *mwc, 
+                                                JSLockReleaseFunc fn, 
+                                                void * data);
+extern PRBool PR_CALLBACK
+LM_HandOffJSLock(PRThread * oldOwner, PRThread *newOwner);
+
+/*
+ * For interruption purposes we will sometimes need to know the
+ *   context who is holding the JS lock
+ */
+extern void LM_JSLockSetContext(MWContext * context);
+extern MWContext * LM_JSLockGetContext(MWContext *mwc);
+
+/*
+ * Enable/disable for Mocha-in-the-client.
+ */
+#define LM_SwitchMocha(toggle)	LM_SetMochaEnabled(toggle)
+
+extern JSBool
+LM_GetMochaEnabled(void);
+
+/*
+ * Get (create if necessary) a MochaDecoder for context, adding a reference
+ * to its window_object.  Put drops the reference, destroying window_object
+ * when the count reaches zero.  These functions should only be called in
+ * the mocha thread or while holding the JS-lock
+ */
+extern MochaDecoder *
+LM_GetMochaDecoder(MWContext *context);
+
+extern void
+LM_PutMochaDecoder(MochaDecoder *decoder);
+
+/*
+ * Get the source URL for script being loaded by document.  This URL will be
+ * the document's URL for inline script, or the SRC= URL for included script.
+ * The returned pointer is safe only within the extent of the function that
+ * calls LM_GetSourceURL().
+ */
+extern const char *
+LM_GetSourceURL(MochaDecoder *decoder);
+
+/*
+ * Set the current layer and hence the current scope for script evaluation.
+ */
+extern void
+LM_SetActiveLayer(MWContext * context, int32 layer_id);
+
+/*
+ * Get the current layer and hence the current scope for script evaluation.
+ */
+extern int32
+LM_GetActiveLayer(MWContext * context);
+
+/*
+ * Evaluate the contents of a SCRIPT tag. You can specify the JSObject
+ * to use as the base scope. Pass NULL to use the default window_object
+ */
+extern JSBool
+LM_EvaluateBuffer(MochaDecoder *decoder, void *base, size_t length,
+		  uint lineno, char * scope_to, struct JSPrincipals *principals,
+		  JSBool unicode, jsval *result);
+
+/*
+ * Evaluate an expression entity in an HTML attribute (WIDTH="&{height/2};").
+ * Returns null on error, otherwise a pointer to the malloc'd string result.
+ * The caller is responsible for freeing the string result.
+ */
+extern char *
+LM_EvaluateAttribute(MWContext *context, char *expr, uint lineno);
+
+/*
+ * Remove any MochaDecoder window_context pointer to an MWContext that's
+ * being destroyed.
+ */
+extern void
+LM_RemoveWindowContext(MWContext *context, History_entry * he);
+
+extern void
+LM_DropSavedWindow(MWContext *context, void *window);
+
+/*
+ * Set and clear the HTML stream and URL for the MochaDecoder
+ *   associated with the given context
+ */
+extern JSBool
+LM_SetDecoderStream(MWContext * context, NET_StreamClass *stream,
+		            URL_Struct *url_struct, JSBool free_stream_on_close);
+
+/*
+ * Start caching HTML or plain text generated by document.write() where the
+ * script is running on mc, the document is being generated into decoder's
+ * window, and url_struct tells about the generator.
+ */
+extern NET_StreamClass *
+LM_WysiwygCacheConverter(MWContext *context, URL_Struct *url_struct,
+			 const char * wysiwyg_url, const char * base_href);
+
+/*
+ * Skip over the "wysiwyg://docid/" in url_string and return a pointer to the
+ * real URL hidden after the prefix.  If url_string is not of "wysiwyg:" type,
+ * just return url_string.  Never returns null.
+ */
+extern const char *
+LM_StripWysiwygURLPrefix(const char *url_string);
+
+/*
+ * This function works only on "wysiwyg:" type URLs -- don't call it unless
+ * you know that NET_URL_Type(url_string) is WYSIWYG_TYPE_URL.  It'll return
+ * null if url_string seems too short, or if it can't find the third slash.
+ */
+extern const char *
+LM_SkipWysiwygURLPrefix(const char *url_string);
+
+/*
+ * Return a pointer to a malloc'd string of the form "<BASE HREF=...>" where
+ * the "..." URL is the directory of cx's origin URL.  Such a base URL is the
+ * default base for relative URLs in generated HTML.
+ */
+extern char *
+LM_GetBaseHrefTag(JSContext *cx, JSPrincipals *principals);
+
+/*
+ * XXX Make these public LO_... typedefs in lo_ele.h/ntypes.h?
+ */
+struct lo_FormData_struct;
+struct lo_NameList_struct;
+
+extern struct lo_FormData_struct *
+LO_GetFormDataByID(MWContext *context, int32 layer_id, intn form_id);
+
+extern uint
+LO_EnumerateForms(MWContext *context, int32 layer_id);
+
+extern struct LO_ImageStruct_struct *
+LO_GetImageByIndex(MWContext *context, int32 layer_id, intn image_id);
+
+extern uint
+LO_EnumerateImages(MWContext *context, int32 layer_id);
+
+/*
+ * Reflect display layers into Mocha.
+ */
+extern JSObject *
+LM_ReflectLayer(MWContext *context, int32 layer_id, int32 parent_layer_id,
+                PA_Tag *tag);
+
+extern LO_FormElementStruct *
+LO_GetFormElementByIndex(struct lo_FormData_struct *form_data, int32 index);
+
+extern uint
+LO_EnumerateFormElements(MWContext *context,
+			 struct lo_FormData_struct *form_data);
+
+/*
+ * Layout helper function to find a named anchor by its index in the
+ * document.anchors[] array.
+ */
+extern struct lo_NameList_struct *
+LO_GetNamedAnchorByIndex(MWContext *context, int32 layer_id, uint index);
+
+extern uint
+LO_EnumerateNamedAnchors(MWContext *context, int32 layer_id);
+
+/*
+ * Layout Mocha helper function to find an HREF Anchor by its index in the
+ * document.links[] array.
+ */
+extern LO_AnchorData *
+LO_GetLinkByIndex(MWContext *context, int32 layer_id, uint index);
+
+extern uint
+LO_EnumerateLinks(MWContext *context, int32 layer_id);
+
+extern LO_JavaAppStruct *
+LO_GetAppletByIndex(MWContext *context, int32 layer_id, uint index);
+
+extern uint
+LO_EnumerateApplets(MWContext *context, int32 layer_id);
+
+extern LO_EmbedStruct *
+LO_GetEmbedByIndex(MWContext *context, int32 layer_id, uint index);
+
+extern uint
+LO_EnumerateEmbeds(MWContext *context, int32 layer_id);
+
+/*
+ * Get and set a color attribute in the current document state.
+ */
+extern void
+LO_GetDocumentColor(MWContext *context, int type, LO_Color *color);
+
+extern void
+LO_SetDocumentColor(MWContext *context, int type, LO_Color *color);
+
+/*
+ * Layout function to reallocate the lo_FormElementOptionData array pointed at
+ * by lo_FormElementSelectData's options member to include space for the number
+ * of options given by selectData->option_cnt.
+ */
+extern XP_Bool
+LO_ResizeSelectOptions(lo_FormElementSelectData *selectData);
+
+/*
+ * Discard the current document and all its subsidiary objects.
+ */
+extern void
+LM_ReleaseDocument(MWContext *context, JSBool resize_reload);
+
+/*
+ * Search if a the event is being captured in the frame hierarchy.
+ */
+extern XP_Bool
+LM_EventCaptureCheck(MWContext *context, uint32 current_event);
+
+/*
+ * Scroll a window to the given point.
+ */
+extern void LM_SendOnScroll(MWContext *context, int32 x, int32 y);
+
+/*
+ * Display a help topic.
+ */
+extern void LM_SendOnHelp(MWContext *context);
+
+/*
+ * Send a load or abort event for an image to a callback.
+ */
+typedef enum LM_ImageEvent {
+    LM_IMGUNBLOCK   = 0,
+    LM_IMGLOAD      = 1,
+    LM_IMGABORT     = 2,
+    LM_IMGERROR     = 3,
+    LM_LASTEVENT    = 3
+} LM_ImageEvent;
+
+extern void
+LM_ProcessImageEvent(MWContext *context, LO_ImageStruct *image_data,
+		  LM_ImageEvent event);
+
+/* This should be called when a named anchor is located. */
+extern JSBool
+LM_SendOnLocate(MWContext *context, struct lo_NameList_struct *name_rec);
+
+extern JSObject *
+LM_ReflectApplet(MWContext *context, LO_JavaAppStruct *applet_data,
+                 PA_Tag * tag, int32 layer_id, uint index);
+
+extern JSObject *
+LM_ReflectEmbed(MWContext *context, LO_EmbedStruct *lo_embed,
+                PA_Tag * tag, int32 layer_id, uint index);
+
+struct lo_FormData_struct;
+struct lo_NameList_struct;
+
+extern JSObject *
+LM_ReflectForm(MWContext *context, struct lo_FormData_struct *form_data, 
+	       PA_Tag * tag, int32 layer_id, uint index);
+
+extern JSObject *
+LM_ReflectFormElement(MWContext *context, int32 layer_id, int32 form_id, 
+                      int32 element_id, PA_Tag * tag);
+
+extern JSObject *
+LM_ReflectLink(MWContext *context, LO_AnchorData *anchor_data, PA_Tag * tag, 
+               int32 layer_id, uint index);
+
+extern JSObject *
+LM_ReflectNamedAnchor(MWContext *context, struct lo_NameList_struct *name_rec, 
+                      PA_Tag * tag, int32 layer_id, uint index);
+
+extern JSObject *
+LM_ReflectImage(MWContext *context, LO_ImageStruct *image_data, 
+			    PA_Tag * tag, int32 layer_id, uint index);
+
+extern JSBool
+LM_CanDoJS(MWContext *context);
+
+extern JSBool
+LM_IsActive(MWContext *context);
+
+/*
+ * Security.
+ */
+
+extern JSPrincipals *
+LM_NewJSPrincipals(URL_Struct *archive, char *name, const char *codebase);
+
+extern char *
+LM_ExtractFromPrincipalsArchive(JSPrincipals *principals, char *name, 
+                                uint *length);
+
+extern JSBool
+LM_SetUntransformedSource(JSPrincipals *principals, char *original, 
+                          char *transformed);
+
+extern JSPrincipals * PR_CALLBACK
+LM_GetJSPrincipalsFromJavaCaller(JSContext *cx, int callerDepth);
+
+/*
+ * LM_RegisterPrincipals will verify and register a set of principals 
+ * in the decoder, modifying decoder->principals in the process. It
+ * returns the modified decoder.
+ * 
+ * The "name" parameter may be NULL if "principals" was created with a name.
+ */
+
+extern JSPrincipals *
+LM_RegisterPrincipals(MochaDecoder *decoder, JSPrincipals *principals, 
+                      char *name, char *src);
+/*
+ * JavaScript Debugger support
+ */
+#ifdef JSDEBUGGER 
+
+extern NET_StreamClass*
+LM_StreamBuilder( int         format_out,
+                  void        *data_obj,
+                  URL_Struct  *URL_s,
+                  MWContext   *mwcontext );
+
+extern JSBool
+LM_GetJSDebugActive(void);
+
+extern void
+LM_JamSourceIntoJSDebug( const char *filename,
+                         const char *str, 
+                         int32      len,
+                         MWContext  *mwcontext );
+
+#endif
+
+NSPR_END_EXTERN_C
+
+#endif /* libmocha_h___ */

mozilla/lib/libmocha/Makefile

@@ -0,0 +1,95 @@
+#!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		= ../..
+
+MODULE		= mocha
+LIBRARY_NAME	= mocha
+
+REQUIRES	= lay net parse img js style layer applet dbm nspr security \
+		  htmldlgs util jtools pref java libreg softupdt jsdebug
+
+CSRCS		= et_mocha.c \
+		  et_moz.c \
+		  lm_applt.c \
+		  lm_bars.c \
+		  lm_cmpnt.c \
+		  lm_doc.c \
+		  lm_embed.c \
+		  lm_event.c \
+		  lm_form.c \
+		  lm_hardw.c \
+		  lm_hist.c \
+		  lm_href.c \
+		  lm_img.c \
+		  lm_init.c \
+		  lm_input.c \
+		  lm_nav.c \
+		  lm_plgin.c \
+		  lm_screen.c \
+		  lm_supdt.c \
+		  lm_taint.c \
+		  lm_trggr.c \
+		  lm_url.c \
+		  lm_win.c \
+		  lm_layer.c \
+		  lm_wngrp.c \
+		  $(NULL)
+
+
+ifdef MOZ_JAVA
+CSRCS +=             \
+		  lm_jsd.c \
+		  $(NULL)
+endif
+
+ifndef NO_SECURITY
+CSRCS		+= lm_crypt.c lm_pk11.c
+endif
+
+include $(DEPTH)/config/rules.mk
+
+DEFINES		+= -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
+
+ifdef JS_THREADSAFE
+DEFINES += -DJS_THREADSAFE
+endif
+
+EMBED_CFLAGS	= $(CFLAGS) -I$(DEPTH)/lib/plugin
+TAINT_CFLAGS	= $(CFLAGS) -I$(DEPTH)/lib/libjar -I$(DEPTH)/sun-java/netscape/security/_jri
+
+ifneq ($(OS_ARCH),OS2)
+$(OBJDIR)/lm_embed.o: lm_embed.c
+	@$(MAKE_OBJDIR)
+	$(CC) -o $@ -c $(EMBED_CFLAGS) $<
+
+$(OBJDIR)/lm_taint.o: lm_taint.c
+	@$(MAKE_OBJDIR)
+	$(CC) -o $@ -c $(TAINT_CFLAGS) $<
+
+else
+$(OBJDIR)/lm_embed.o: lm_embed.c
+	@$(MAKE_OBJDIR)
+	$(CC) -Fo$@ -c $(EMBED_CFLAGS) $<
+
+$(OBJDIR)/lm_taint.o: lm_taint.c
+	@$(MAKE_OBJDIR)
+	$(CC) -Fo$@ -c $(TAINT_CFLAGS) $<
+
+endif

mozilla/lib/libmocha/lm.h

@@ -0,0 +1,880 @@
+/* -*- 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 lm_h___
+#define lm_h___
+/*
+ * JS in the Navigator library-private interface.
+ */
+#include "xp.h"         /* for uint and PA_Block */
+#include "prlong.h"	/* for int64 time type used below */
+#include "libevent.h"	/* until its a stand-alone */
+#include "libmocha.h"
+
+/*
+ * Shared string constants for common property names.
+ */
+extern char lm_argc_err_str[];          /* "incorrect number of arguments" */
+
+extern char lm_unknown_origin_str[];    /* "[unknown origin]" */
+
+extern char lm_onLoad_str[];            /* "onLoad" */
+extern char lm_onUnload_str[];          /* "onUnload" */
+extern char lm_onAbort_str[];           /* "onAbort" */
+extern char lm_onError_str[];           /* "onError" */
+extern char lm_onScroll_str[];          /* "onScroll" */
+extern char lm_onFocus_str[];           /* "onFocus" */
+extern char lm_onBlur_str[];            /* "onBlur" */
+extern char lm_onSelect_str[];          /* "onSelect" */
+extern char lm_onChange_str[];          /* "onChange" */
+extern char lm_onReset_str[];           /* "onReset" */
+extern char lm_onSubmit_str[];          /* "onSubmit" */
+extern char lm_onClick_str[];           /* "onClick" */
+extern char lm_onMouseDown_str[];       /* "onMouseDown" */
+extern char lm_onMouseOver_str[];       /* "onMouseOver" */
+extern char lm_onMouseOut_str[];        /* "onMouseOut" */
+extern char lm_onMouseUp_str[];         /* "onMouseUp" */
+extern char lm_onLocate_str[];          /* "onLocate" */
+extern char lm_onHelp_str[];            /* "onHelp" [EA] */
+
+extern char lm_focus_str[];             /* "focus" */
+extern char lm_blur_str[];              /* "blur" */
+extern char lm_select_str[];            /* "select" */
+extern char lm_click_str[];             /* "click" */
+extern char lm_scroll_str[];            /* "scroll" */
+extern char lm_enable_str[];            /* "enable" */
+extern char lm_disable_str[];           /* "disable" */
+
+extern char lm_toString_str[];          /* "toString" */
+extern char lm_length_str[];            /* "length" */
+extern char lm_document_str[];          /* "document" */
+extern char lm_forms_str[];             /* "forms" */
+extern char lm_links_str[];             /* "links" */
+extern char lm_anchors_str[];           /* "anchors" */
+extern char lm_applets_str[];           /* "applets" */
+extern char lm_embeds_str[];            /* "embeds" */
+extern char lm_plugins_str[];           /* "plugins" */
+extern char lm_images_str[];            /* "images" */
+extern char lm_layers_str[];            /* "layers" */
+extern char lm_location_str[];          /* "location" */
+extern char lm_navigator_str[];         /* "navigator" */
+extern char lm_netcaster_str[];         /* "netcaster" */
+extern char lm_components_str[];        /* "components" */
+
+extern char lm_parentLayer_str[];       /* "parentLayer" */
+extern char lm_opener_str[];            /* "opener" */
+extern char lm_closed_str[];            /* "closed" */
+extern char lm_assign_str[];            /* "assign" */
+extern char lm_reload_str[];            /* "reload" */
+extern char lm_replace_str[];           /* "replace" */
+extern char lm_event_str[];             /* "event" */
+extern char lm_methodPrefix_str[];      /* "#method" */
+extern char lm_methodArgc_str[];      /* "#method" */
+extern char lm_methodArgv_str[];      /* "#method" */
+extern char lm_getPrefix_str[];         /* "#get_" */
+extern char lm_setPrefix_str[];         /* "#set_" */
+extern char lm_typePrefix_str[];        /* "#type_" */
+extern const char *lm_event_argv[];     /* {lm_event_str} */
+
+extern PRThread		    *lm_InterpretThread;
+extern PRThread		    *mozilla_thread;
+extern PRThread		    *lm_js_lock_previous_owner;
+
+extern JSContext *lm_writing_context;
+
+/*
+ * Timeout structure threaded on MochaDecoder.timeouts for cleanup.
+ */
+struct JSTimeout {
+    int32               ref_count;      /* reference count to shared usage */
+    char                *expr;          /* the JS expression to evaluate */
+    JSObject            *funobj;        /* or function to call, if !expr */
+    jsval               *argv;          /* function actual arguments */
+    void                *toid;          /* Identifier, used internally only */
+    uint32              public_id;      /* Returned as value of setTimeout() */
+    uint16              argc;           /* and argument count */
+    uint16              spare;          /* alignment padding */
+    int32		doc_id;       	/* document this is for */
+    int32               interval;       /* Non-zero if repetitive timeout */
+    int64               when;           /* nominal time to run this timeout */
+    JSVersion		version;	/* Version of JavaScript to execute */
+    JSPrincipals        *principals;    /* principals with which to execute */
+    char                *filename;      /* filename of setTimeout call */
+    uint32              lineno;         /* line number of setTimeout call */
+    JSTimeout           *next;          /* next timeout in list */
+};
+
+extern void             lm_ClearWindowTimeouts(MochaDecoder *decoder);
+
+struct JSNestingUrl {
+    JSNestingUrl 	*next;
+    char                *str;
+};
+
+/*
+ * Event queue stack madness to handle doc.write("<script>doc.write...").
+ */
+typedef struct QueueStackElement {
+    PREventQueue		* queue;
+    MWContext		        * context;
+    int32			  doc_id;
+    struct QueueStackElement	* up;
+    struct QueueStackElement	* down;
+    PRPackedBool		  done;
+    PRPackedBool		  discarding;
+    PRPackedBool		  inherit_parent;
+    void                        * retval;
+} QueueStackElement;
+
+extern void
+et_SubEventLoop(QueueStackElement * qse);
+
+/*
+ * Stack size per window context, plus one for the navigator.
+ */
+#define LM_STACK_SIZE   8192
+
+extern JSRuntime        *lm_runtime;
+extern JSClass		lm_window_class;
+extern JSClass		lm_layer_class;
+extern JSClass		lm_document_class;
+extern JSClass		lm_event_class;
+
+extern JSBool           lm_SaveParamString(JSContext *cx, PA_Block *bp,
+                                           const char *str);
+extern MochaDecoder     *lm_NewWindow(MWContext *context);
+extern void             lm_DestroyWindow(MochaDecoder *decoder);
+
+/*
+ * Hold and drop the reference count for tree back-edges that go from object
+ * private data to the containing decoder.  These refs do not keep the object
+ * tree under decoder alive from the GC, but they do keep decoder from being
+ * destroyed and some out of order finalizer tripping over its freed memory.
+ */
+#ifdef DEBUG
+extern MochaDecoder     *lm_HoldBackCount(MochaDecoder *decoder);
+extern void             lm_DropBackCount(MochaDecoder *decoder);
+
+#define HOLD_BACK_COUNT(decoder) lm_HoldBackCount(decoder)
+#define DROP_BACK_COUNT(decoder) lm_DropBackCount(decoder)
+#else
+#define HOLD_BACK_COUNT(decoder)                                             \
+    (((decoder) ? (decoder)->back_count++ : 0), (decoder))
+#define DROP_BACK_COUNT(decoder)                                             \
+    (((decoder) && --(decoder)->back_count <= 0 && !(decoder)->forw_count)   \
+     ? lm_DestroyWindow(decoder)					     \
+     : (void)0)
+#endif
+
+extern JSBool           lm_InitWindowContent(MochaDecoder *decoder);
+extern JSBool           lm_DefineWindowProps(JSContext *cx,
+                                             MochaDecoder *decoder);
+extern JSBool           lm_ResolveWindowProps(JSContext *cx,
+                                              MochaDecoder *decoder,
+                                              JSObject *obj,
+                                              jsval id);
+extern void             lm_FreeWindowContent(MochaDecoder *decoder,
+					     JSBool fromDiscard);
+extern JSBool           lm_SetInputStream(JSContext *cx,
+					  MochaDecoder *decoder,
+					  NET_StreamClass *stream,
+					  URL_Struct *url_struct,
+                                          JSBool free_stream_on_close);
+extern JSObject         *lm_DefineDocument(MochaDecoder *decoder,
+                                           int32 layer_id);
+extern JSObject         *lm_DefineHistory(MochaDecoder *decoder);
+extern JSObject         *lm_DefineLocation(MochaDecoder *decoder);
+extern JSObject         *lm_DefineNavigator(MochaDecoder *decoder);
+extern JSObject         *lm_DefineComponents(MochaDecoder *decoder);
+extern JSObject         *lm_DefineCrypto(MochaDecoder *decoder);
+extern JSObject         *lm_DefineScreen(MochaDecoder *decoder,
+                                         JSObject *parent);
+extern JSObject         *lm_DefineHardware(MochaDecoder *decoder,
+                                         JSObject *parent);
+extern JSBool           lm_DefinePluginClasses(MochaDecoder *decoder);
+extern JSBool           lm_DefineBarClasses(MochaDecoder *decoder);
+extern JSBool           lm_ResolveBar(JSContext *cx, MochaDecoder *decoder,
+				      const char *name);
+extern JSBool           lm_DefineTriggers(void);
+extern JSObject         *lm_NewPluginList(JSContext *cx, JSObject *parent_obj);
+extern JSObject         *lm_NewMIMETypeList(JSContext *cx);
+extern JSObject         *lm_GetDocumentFromLayerId(MochaDecoder *decoder,
+                                                   int32 layer_id);
+extern JSObject         *lm_DefinePkcs11(MochaDecoder *decoder);
+/*
+ * Get (create if needed) document's form, link, and named anchor arrays.
+ */
+extern JSObject         *lm_GetFormArray(MochaDecoder *decoder,
+                                         JSObject *document);
+extern JSObject         *lm_GetLinkArray(MochaDecoder *decoder,
+                                         JSObject *document);
+extern JSObject         *lm_GetNameArray(MochaDecoder *decoder,
+                                         JSObject *document);
+extern JSObject         *lm_GetAppletArray(MochaDecoder *decoder,
+                                           JSObject *document);
+extern JSObject         *lm_GetEmbedArray(MochaDecoder *decoder,
+                                          JSObject *document);
+extern JSObject         *lm_GetImageArray(MochaDecoder *decoder,
+                                          JSObject *document);
+extern JSObject         *lm_GetDocumentLayerArray(MochaDecoder *decoder,
+                                                  JSObject *document);
+
+
+/*
+ * dummy object for applets and embeds that can't be reflected
+ */
+extern JSObject *lm_DummyObject;
+extern void lm_InitDummyObject(JSContext *cx);
+
+/* bit vector for handlers */
+typedef enum  {
+	HANDLER_ONCLICK = 1 << 0,
+	HANDLER_ONFOCUS = 1 << 1,
+	HANDLER_ONBLUR = 1 << 2,
+	HANDLER_ONCHANGE = 1 << 3,
+	HANDLER_ONSELECT = 1 << 4,
+	HANDLER_ONSCROLL = 1 << 5,
+	HANDLER_ONMOUSEDOWN = 1 << 6,
+	HANDLER_ONMOUSEUP = 1 << 7,
+	HANDLER_ONKEYDOWN = 1 << 8,
+	HANDLER_ONKEYUP = 1 << 9,
+	HANDLER_ONKEYPRESS = 1 << 10,
+	HANDLER_ONDBLCLICK = 1 << 11
+} JSHandlersBitVector;
+
+/*
+ * Base class of all JS input private object data structures.
+ */
+typedef struct JSInputBase {
+    MochaDecoder        *decoder;       /* this window's JS decoder */
+    int32               type;           /* layout form element type */
+    JSHandlersBitVector	handlers;	/* bit vector for handlers */
+} JSInputBase;
+
+/*
+ * Base class of event-handling elements like layers and documents.
+ */
+typedef struct JSInputHandler {
+    JSInputBase     base;           /* decoder and type */
+    JSObject        *object;        /* this input handler's JS object */
+    uint32          event_mask;     /* mask of events in progress */
+} JSInputHandler;
+
+/*
+ * Base class of input event-capturing elements like layers and documents.
+ */
+typedef struct JSEventReceiver {
+    JSObject        *object;        /* this event receiver's JS object */
+    uint32          event_mask;     /* mask of events in progress */
+} JSEventReceiver;
+
+/*
+ * Base class of input event-handling elements like anchors and form inputs.
+ */
+typedef struct JSEventCapturer {
+    JSEventReceiver base;	    /* this event capturer's receiver base */
+    uint32          event_bit;	    /* mask of events being captured */
+} JSEventCapturer;
+
+#define base_decoder    base.decoder
+#define base_type       base.type
+#define base_handlers	base.handlers
+
+/*
+ * JS URL object.
+ *
+ * Location is a special URL: when you set one of its properties, your client
+ * window goes to the newly formed address.
+ */
+typedef struct JSURL {
+    JSInputHandler  handler;
+    int32           layer_id;
+    uint32          index;
+    JSString        *href;
+    JSString        *target;
+    JSString        *text;
+} JSURL;
+
+/* JS Document Object
+ * Documents exist per-window and per-layer
+ */
+typedef struct JSDocument {
+    JSEventCapturer	capturer;
+    MochaDecoder        *decoder;
+    JSObject            *object;
+    int32               layer_id;     /* The containing layer's id */
+    JSObject	        *forms;
+    JSObject	        *links;
+    JSObject	        *anchors;
+    JSObject	        *applets;
+    JSObject            *embeds;
+    JSObject	        *images;
+    JSObject	        *layers;
+} JSDocument;
+
+#define URL_NOT_INDEXED ((uint32)-1)
+
+#define url_decoder     handler.base_decoder
+#define url_type        handler.base_type
+#define url_object      handler.object
+#define url_event_mask  handler.event_mask
+
+extern JSURL *
+lm_NewURL(JSContext *cx, MochaDecoder *decoder,
+          LO_AnchorData *anchor_data, JSObject *document);
+
+extern void
+lm_ReplaceURL(MWContext *context, URL_Struct *url_struct);
+
+extern JSBool
+lm_GetURL(JSContext *cx, MochaDecoder *decoder, URL_Struct *url_struct);
+
+extern const char *
+lm_CheckURL(JSContext *cx, const char *url_string, JSBool checkFile);
+
+extern JSBool
+lm_CheckWindowName(JSContext *cx, const char *window_name);
+
+extern PRHashTable *
+lm_GetIdToObjectMap(MochaDecoder *decoder);
+
+extern JSBool PR_CALLBACK
+lm_BranchCallback(JSContext *cx, JSScript *script);
+
+extern void PR_CALLBACK
+lm_ErrorReporter(JSContext *cx, const char *message,
+                 JSErrorReport *report);
+
+extern JSObject *
+lm_GetFormObjectByID(MWContext *context, int32 layer_id, uint form_id);
+
+extern LO_FormElementStruct *
+lm_GetFormElementByIndex(JSContext * cx, JSObject *form_obj, int32 index);
+
+extern JSObject *
+lm_GetFormElementFromMapping(JSContext *cx, JSObject *form_obj, uint32 index);
+
+extern JSBool
+lm_AddFormElement(JSContext *cx, JSObject *form, JSObject *obj,
+                  char *name, uint index);
+
+extern JSBool
+lm_ReflectRadioButtonArray(MWContext *context, int32 layer_id, intn form_id,
+                           const char *name, PA_Tag * tag);
+
+extern JSBool
+lm_SendEvent(MWContext *context, JSObject *obj, JSEvent *event,
+             jsval *result);
+
+extern JSBool
+lm_HandleEvent(JSContext *cx, JSObject *obj, JSObject *eventObj,
+	       jsval funval, jsval *result);
+
+extern JSBool
+lm_FindEventHandler(MWContext *context, JSObject *obj, JSObject *eventObj,
+		     jsval funval, jsval *result);
+
+extern JSObject *
+lm_NewEventObject(MochaDecoder * decoder, JSEvent * pEvent);
+
+typedef struct JSEventNames {
+    const char *lowerName;
+    const char *mixedName;
+} JSEventNames;
+
+extern const char *
+lm_EventName(uint32 event_bit);
+
+extern JSEventNames *
+lm_GetEventNames(uint32 event_bit);
+
+/*
+ * Compile the given attribute and attach it to the JSObject
+ */
+extern JSBool
+lm_CompileEventHandler(MochaDecoder * decoder, PA_Block id, PA_Block data, 
+		       int newline_(cx, sizeof *option);
+		if (!option)
+		    goto bad;
+
+		option_obj =
+		    JS_NewObject(cx, &lm_option_class,
+				 input->input_decoder->option_prototype, obj);
+
+		if (!option_obj || !JS_SetPrivate(cx, option_obj, option)) {
+		    JS_free(cx, option);
+		    goto bad;
+		}
+		option->decoder = HOLD_BACK_COUNT(input->input_decoder);
+		option->object = option_obj;
+		option->index = (uint32)slot;
+		option->indexInForm = form_element->element_index;
+		option->data = NULL;
+		*vp = OBJECT_TO_JSVAL(option_obj);
+		goto good;
+	    }
+	}
+	break;
+
+      case FORM_TYPE_RADIO:
+      case FORM_TYPE_CHECKBOX:
+	{
+	    lo_FormElementToggleData *toggle;
+
+	    toggle = &form_element->element_data->ele_toggle;
+	    switch (input_slot) {
+	      case INPUT_NAME:
+		str = lm_LocalEncodingToStr(context, 
+					    (char *)toggle->name);
+		break;
+	      case INPUT_VALUE:
+		str = lm_LocalEncodingToStr(context, 
+					    (char *)toggle->value);
+		break;
+	      case INPUT_STATUS:
+		*vp = BOOLEAN_TO_JSVAL(toggle->toggled);
+		goto good;
+	      case INPUT_DEFAULT_STATUS:
+		*vp = BOOLEAN_TO_JSVAL(toggle->default_toggle);
+		goto good;
+
+#if DISABLED_READONLY_SUPPORT
+	      case INPUT_DISABLED:
+	        *vp = BOOLEAN_TO_JSVAL(toggle->disabled);
+		goto good;
+	      case INPUT_READONLY:
+		*vp = BOOLEAN_TO_JSVAL(FALSE);
+		goto good;
+#endif
+	      default:
+		/* Don't mess with a user-defined property. */
+		goto good;
+	    }
+	}
+	break;
+
+      default:
+	{
+	    lo_FormElementMinimalData *minimal;
+
+	    minimal = &form_element->element_data->ele_minimal;
+	    switch (input_slot) {
+	      case INPUT_NAME:
+		str = lm_LocalEncodingToStr(context, 
+					    (char *)minimal->name);
+		break;
+	      case INPUT_VALUE:
+		str = lm_LocalEncodingToStr(context, 
+					    (char *)minimal->value);
+		break;
+#if DISABLED_READONLY_SUPPORT
+	      case INPUT_DISABLED:
+	        *vp = BOOLEAN_TO_JSVAL(minimal->disabled);
+		goto good;
+	      case INPUT_READONLY:
+		*vp = BOOLEAN_TO_JSVAL(FALSE); /* minimal elements don't have the readonly attribute. */
+		goto good;
+#endif
+	      default:
+		/* Don't mess with a user-defined property. */
+		goto good;
+	    }
+	}
+	break;
+    }
+
+    if (!str)
+	goto bad;
+    *vp = STRING_TO_JSVAL(str);
+
+good:
+    LO_UnlockLayout();
+    return JS_TRUE;
+
+bad:
+    LO_UnlockLayout();
+    return JS_FALSE;
+
+}
+
+char *
+lm_FixNewlines(JSContext *cx, const char *value, JSBool formElement)
+{
+    size_t size;
+    const char *cp;
+    char *tp, *new_value;
+
+#if defined XP_PC
+    size = 1;
+    for (cp = value; *cp != '\0'; cp++) {
+	switch (*cp) {
+	  case '\r':
+	    if (cp[1] != '\n')
+		size++;
+	    break;
+	  case '\n':
+	    if (cp > value && cp[-1] != '\r')
+		size++;
+	    break;
+	}
+    }
+    size += cp - value;
+#else
+    size = XP_STRLEN(value) + 1;
+#endif
+    new_value = JS_malloc(cx, size);
+    if (!new_value)
+	return NULL;
+    for (cp = value, tp = new_value; *cp != '\0'; cp++) {
+#if defined XP_MAC
+	if (*cp == '\n') {
+	    if (cp > value && cp[-1] != '\r')
+		*tp++ = '\r';
+	} else {
+	    *tp++ = *cp;
+	}
+#elif defined XP_PC
+	switch (*cp) {
+	  case '\r':
+	    *tp++ = '\r';
+	    if (cp[1] != '\n' && formElement)
+		*tp++ = '\n';
+	    break;
+	  case '\n':
+	    if (cp > value && cp[-1] != '\r' && formElement)
+		*tp++ = '\r';
+	    *tp++ = '\n';
+	    break;
+	  default:
+	    *tp++ = *cp;
+	    break;
+	}
+#else /* XP_UNIX */
+	if (*cp == '\r') {
+	    if (cp[1] != '\n')
+		*tp++ = '\n';
+	} else {
+	    *tp++ = *cp;
+	}
+#endif
+    }
+    *tp = '\0';
+    return new_value;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+input_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSInput *input;
+    enum input_slot input_slot;
+    const char *prop_name;
+    char *value = NULL;
+    LO_FormElementStruct *form_element;
+    MochaDecoder *decoder;
+    MWContext *context;
+    int32 intval;
+    jsint slot;
+
+    input = JS_GetInstancePrivate(cx, obj, &lm_input_class, NULL);
+    if (!input)
+	return JS_TRUE;
+
+    /* If the property is seting a key handler we find out now so
+     * that we can tell the front end to send the event. */
+    if (JSVAL_IS_STRING(id)) {
+	prop_name = JS_GetStringBytes(JSVAL_TO_STRING(id));
+	/* XXX use lm_onKeyDown_str etc. initialized by PARAM_ONKEYDOWN */
+	if (XP_STRCASECMP(prop_name, "onkeydown") == 0 ||
+	    XP_STRCASECMP(prop_name, "onkeyup") == 0 ||
+	    XP_STRCASECMP(prop_name, "onkeypress") == 0) {
+	    form_element = lm_GetFormElementByIndex(cx, JS_GetParent(cx, obj),
+						    input->index);
+	    form_element->event_handler_present = TRUE;
+	}
+	return JS_TRUE;
+    }
+
+    XP_ASSERT(JSVAL_IS_INT(id));
+    slot = JSVAL_TO_INT(id);
+
+    decoder = input->input_decoder;
+    context = decoder->window_context;
+    input_slot = slot;
+    switch (input_slot) {
+      case INPUT_TYPE:
+      case INPUT_FORM:
+      case INPUT_OPTIONS:
+	/* These are immutable. */
+	break;
+      case INPUT_NAME:
+      case INPUT_VALUE:
+      case INPUT_DEFAULT_VALUE:
+	/* These are string-valued. */
+	if (!JSVAL_IS_STRING(*vp) &&
+	    !JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp)) {
+	    return JS_FALSE;
+	}
+	value = lm_StrToLocalEncoding(context, JSVAL_TO_STRING(*vp));
+	break;
+      case INPUT_STATUS:
+      case INPUT_DEFAULT_STATUS:
+#if DISABLED_READONLY_SUPPORT
+      case INPUT_READONLY:
+      case INPUT_DISABLED:
+#endif
+	/* These must be Booleans. */
+	if (!JSVAL_IS_BOOLEAN(*vp) &&
+	    !JS_ConvertValue(cx, *vp, JSTYPE_BOOLEAN, vp)) {
+	    return JS_FALSE;
+	}
+	break;
+      case INPUT_LENGTH:
+      case INPUT_SELECTED_INDEX:
+	/* These should be integers. */
+	if (JSVAL_IS_INT(*vp))
+	    intval = JSVAL_TO_INT(*vp);
+	else if (!JS_ValueToInt32(cx, *vp, &intval)) {
+	    return JS_FALSE;
+	}
+	break;
+    }
+
+    LO_LockLayout();
+
+    form_element = lm_GetFormElementByIndex(cx, JS_GetParent(cx, obj),
+					    input->index);
+    if (!form_element)
+	goto good;
+
+    switch (form_element->element_data->type) {
+      case FORM_TYPE_FILE:
+	/* if we try to set a file upload widget we better be a signed script */
+	if (!lm_CanAccessTarget(cx, JSTARGET_UNIVERSAL_FILE_READ))
+	    break;
+	/* else fall through... */
+
+      case FORM_TYPE_TEXT:
+      case FORM_TYPE_TEXTAREA:	/* XXX we ASSUME common struct prefixes */
+      case FORM_TYPE_PASSWORD:
+	{
+	    lo_FormElementTextData *text;
+	    JSBool ok;
+	    char * fixed_string;
+
+	    text = &form_element->element_data->ele_text;
+	    switch (input_slot) {
+	      case INPUT_NAME:
+		if (!lm_SaveParamString(cx, &text->name, value))
+		    goto bad;
+		break;
+	      case INPUT_VALUE:
+	      case INPUT_DEFAULT_VALUE:
+		fixed_string = lm_FixNewlines(cx, value, JS_TRUE);
+		if (!fixed_string)
+		    goto bad;
+		ok = (input_slot == INPUT_VALUE)
+		     ? lm_SaveParamString(cx, &text->current_text, fixed_string)
+		     : lm_SaveParamString(cx, &text->default_text, fixed_string);
+
+		JS_free(cx, (char *)fixed_string);
+		if (!ok)
+		    goto bad;
+		if (input_slot == INPUT_VALUE && context) {
+		    ET_PostManipulateForm(context, (LO_Element *)form_element,
+                                  EVENT_CHANGE);
+		}
+		break;
+#if DISABLED_READONLY_SUPPORT
+	      case INPUT_DISABLED:
+		text->disabled = JSVAL_TO_BOOLEAN(*vp);
+		if (context) {
+		  ET_PostManipulateForm(context, (LO_Element *)form_element,
+					EVENT_CHANGE);
+		}
+		break;
+	      case INPUT_READONLY:
+		if (form_element->element_data->type == FORM_TYPE_FILE)
+		  break;
+		text->readonly = JSVAL_TO_BOOLEAN(*vp);
+		if (context) {
+		  ET_PostManipulateForm(context, (LO_Element *)form_element,
+					EVENT_CHANGE);
+		}
+		break;
+#endif
+	      default:
+		/* Don't mess with option or user-defined property. */
+		goto good;
+	    }
+	}
+	break;
+
+      case FORM_TYPE_SELECT_ONE:
+      case FORM_TYPE_SELECT_MULT:
+	{
+	    lo_FormElementSelectData *selectData;
+	    lo_FormElementOptionData *optionData;
+	    JSSelectOption *option;
+	    int32 i, new_option_cnt, old_option_cnt;
+
+	    selectData = &form_element->element_data->ele_select;
+	    switch (slot) {
+	      case INPUT_NAME:
+		if (!lm_SaveParamString(cx, &selectData->name, value))
+		    goto bad;
+		break;
+
+	      case INPUT_LENGTH:
+		new_option_cnt = intval;
+		old_option_cnt = selectData->option_cnt;
+		optionData = (lo_FormElementOptionData *) selectData->options;
+
+		/* Remove truncated slots, or clear extended element data. */
+		if (new_ayer(MWContext *context, int32 wrap_width, int32 parent_layer_id);
+
+extern void
+lm_RestoreLayerState(MWContext *context, int32 layer_id, 
+                     LO_BlockInitializeStruct *param);
+
+extern PRHashNumber 
+lm_KeyHash(const void *key);
+
+extern JSBool
+lm_jsval_to_rgb(JSContext *cx, jsval *vp, LO_Color **rgbp);
+
+extern JSBool
+layer_setBgColorProperty(JSContext *cx, JSObject *obj, jsval *vp);
+
+extern JSObject *
+lm_GetActiveContainer(MochaDecoder *decoder);
+
+extern JSBool
+lm_GetPrincipalsCompromise(JSContext *cx, JSObject *obj);
+
+extern char *
+lm_FixNewlines(JSContext *cx, const char *value, JSBool formElement);
+
+extern JSBool PR_CALLBACK
+win_open(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+
+
+/* defined in libmocha.h */
+#ifdef JSDEBUGGER   
+
+extern void
+lm_InitJSDebug(JSRuntime *jsruntime);
+
+extern void
+lm_ExitJSDebug(JSRuntime *jsruntime);
+
+#endif
+
+#define IS_MESSAGE_WINDOW(context)                                           \
+(((context)->type == MWContextMail)      ||                                  \
+ ((context)->type == MWContextNews)      ||                                  \
+ ((context)->type == MWContextMailMsg)   ||                                  \
+ ((context)->type == MWContextNewsMsg))
+
+/* INTL support */
+
+extern char *
+lm_StrToLocalEncoding(MWContext * context, JSString * str);
+
+extern JSString *
+lm_LocalEncodingToStr(MWContext * context, char * bytes);
+
+/* end INTL support */
+
+/* MLM */
+typedef struct lm_lock_waiter {
+    JSLockReleaseFunc       fn;
+    void                  * data;
+    struct lm_lock_waiter * next;
+} lm_lock_waiter;
+
+typedef struct ContextListStr ContextList;
+
+typedef struct WindowGroup LMWindowGroup;
+
+struct WindowGroup {
+    LMWindowGroup     *next;
+    LMWindowGroup     *prev;
+
+    /* XXXMLM - this entry is currently unused; it should eventually hold
+     *           a shared JSContext for the thread group. 
+     */
+    JSContext         *js_context;
+
+    PRBool            interruptCurrentOp;
+
+    PRMonitor         *owner_monitor;
+    PRThread          *thread;
+    PRThread          *owner;
+    lm_lock_waiter    *waiting_list;
+    int32             current_count;
+
+    PRBool            mozWantsLock;
+    PRBool            mozGotLock;
+    
+    PRBool            hasLock;
+    JSContext         *lock_context;
+
+    JSTimeout         **js_timeout_insertion_point;
+    JSTimeout         *js_timeout_running;
+
+    uint              inputRecurring;
+
+    PREventQueue      *interpret_queue;
+    QueueStackElement *queue_stack;
+    uint              queue_depth;
+    uint              queue_count;
+    PRMonitor         *queue_monitor;
+    ContextList       *mw_contexts;
+    MWContext         *current_context;
+    PRBool            done;
+};
+
+extern void lm_InitWindowGroups(void);
+extern LMWindowGroup *lm_NewWindowGroup(void);
+extern void lm_StartWindowGroup(LMWindowGroup *grp);
+extern void lm_DestroyWindowGroup(LMWindowGroup *grp);
+extern LMWindowGroup *LM_GetDefaultWindowGroup(MWContext *mwc);
+extern LMWindowGroup *lm_MWContextToGroup(MWContext *mwc);
+extern LMWindowGroup *lm_QueueStackToGroup(QueueStackElement *qse);
+extern PREventQueue *LM_MWContextToQueue(MWContext *mwc);
+extern PREventQueue *LM_WindowGroupToQueue(LMWindowGroup *lmg);
+extern ContextList *lm_GetEntryForContext(LMWindowGroup *grp, MWContext *cx);
+extern void LM_AddContextToGroup(LMWindowGroup *grp, MWContext *cx);
+extern void LM_RemoveContextFromGroup(MWContext *cx);
+extern PRBool LM_IsLocked(LMWindowGroup *grp);
+extern void LM_BeginRequest(LMWindowGroup *grp, JSContext *jsc);
+extern void LM_EndRequest(LMWindowGroup *grp, JSContext *jsc);
+
+extern void LM_LockJSByGroup(LMWindowGroup *grp);
+extern void LM_UnlockJSByGroup(LMWindowGroup *grp);
+
+extern JSBool lm_inited(void);
+
+extern JSContext *LM_GetCrippledContext(void);
+extern MochaDecoder *LM_GetCrippledDecoder(void);
+extern void LM_SetCrippledDecoder(MochaDecoder *md);
+extern JSBool LM_ShouldRunGC(JSContext *cx, JSGCStatus status);
+
+/* MLM */
+
+#endif /* lm_h___ */

mozilla/lib/libmocha/lm_cmpnt.c

@@ -0,0 +1,675 @@
+/* -*- 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.
+ */
+
+
+/*
+ * JS reflection of Navigator Components.
+ *
+ * Created: Tom Pixley, 4/22/97
+ *
+ */
+
+#include "lm.h"
+#include "prmem.h"
+#include "np.h"
+#include "net.h"
+#include "fe_proto.h"
+
+/*
+ * -----------------------------------------------------------------------
+ *
+ * Data types
+ *
+ * -----------------------------------------------------------------------
+ */
+
+typedef struct JSComponent
+{
+    MochaDecoder	*decoder;
+    JSObject		*obj;
+    JSString	        *name;
+    ETBoolPtrFunc	 active_callback;
+    ETVoidPtrFunc	 startup_callback;
+} JSComponent;
+
+typedef struct JSComponentArray
+{
+    MochaDecoder       *decoder;
+    JSObject	       *obj;
+    jsint		length;
+} JSComponentArray;
+
+typedef struct JSPreDefComponent
+{
+    const char *name;
+    ETVerifyComponentFunc func;
+} JSPreDefComponent;
+
+static JSPreDefComponent predef_components[] =
+{
+    {0}
+};
+
+/*
+ * -----------------------------------------------------------------------
+ *
+ * Reflection of an installed component.
+ *
+ * -----------------------------------------------------------------------
+ */
+
+enum component_slot
+{
+    COMPONENT_NAME        = -1,
+    COMPONENT_ACTIVE      = -2
+};
+
+
+static JSPropertySpec component_props[] =
+{
+    {"name",        COMPONENT_NAME,	JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"active",	    COMPONENT_ACTIVE,	JSPROP_ENUMERATE | JSPROP_READONLY},
+    {0}
+};
+
+extern JSClass lm_component_class;
+
+PR_STATIC_CALLBACK(JSBool)
+component_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSComponent *component;
+    JSString *str;
+    jsint slot;
+
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    component = JS_GetInstancePrivate(cx, obj, &lm_component_class, NULL);
+    if (!component)
+	return JS_TRUE;
+
+    switch (slot) {
+      case COMPONENT_NAME:
+        str = component->name;
+	if (str)
+	    *vp = STRING_TO_JSVAL(str);
+	else
+	    *vp = JS_GetEmptyStringValue(cx);
+        break;
+
+      case COMPONENT_ACTIVE:
+	*vp = JSVAL_FALSE;
+	if (ET_moz_CallFunctionBool((ETBoolPtrFunc)component->active_callback, NULL))
+	    *vp = JSVAL_TRUE;
+        break;
+
+      default:
+	break;
+    }
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+component_mozilla_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    char *name, *type_str, *get_str;
+    jsval type, func;
+
+    if (!JSVAL_IS_STRING(id))
+	return JS_TRUE;
+
+    name = JS_GetStringBytes(JSVAL_TO_STRING(id));
+
+    type_str = JS_malloc(cx, XP_STRLEN(lm_typePrefix_str) + XP_STRLEN(name) + 1);
+    get_str = JS_malloc(cx, XP_STRLEN(lm_getPrefix_str) + XP_STRLEN(name) + 1);
+    if (!type_str || !get_str)
+	return JS_TRUE;
+
+    XP_STRCPY(type_str, lm_typePrefix_str);
+    XP_STRCAT(type_str, name);
+    XP_STRCPY(get_str, lm_getPrefix_str);
+    XP_STRCAT(get_str, name);
+
+    if (!JS_GetProperty(cx, obj, type_str, &type) ||
+	!JSVAL_IS_INT(type) ||
+	!JS_GetProperty(cx, obj, get_str, &func))
+	return JS_TRUE;
+
+    JS_free(cx, type_str);
+    JS_free(cx, get_str);
+
+    switch(JSVAL_TO_INT(type)) {
+    case ARGTYPE_INT32:
+	*vp = INT_TO_JSVAL((int32)ET_moz_CompGetterFunction((ETCompPropGetterFunc)JSVAL_TO_INT(func), name));
+	break;
+    case ARGTYPE_BOOL:
+	*vp = BOOLEAN_TO_JSVAL((JSBool)ET_moz_CompGetterFunction((ETCompPropGetterFunc)JSVAL_TO_INT(func), name));
+	break;
+    case ARGTYPE_STRING:
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, 
+		(char*)ET_moz_CompGetterFunction((ETCompPropGetterFunc)JSVAL_TO_INT(func), name)));
+	break;
+    }
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+component_mozilla_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    char *name, *type_str, *set_str, *prop_val;
+    jsval type, func;
+
+    if (!JSVAL_IS_STRING(id))
+	return JS_TRUE;
+
+    name = JS_GetStringBytes(JSVAL_TO_STRING(id));
+
+    type_str = JS_malloc(cx, XP_STRLEN(lm_typePrefix_str) + XP_STRLEN(name) + 1);
+    set_str = JS_malloc(cx, XP_STRLEN(lm_setPrefix_str) + XP_STRLEN(name) + 1);
+    if (!type_str || !set_str)
+	return JS_TRUE;
+
+    XP_STRCPY(type_str, lm_typePrefix_str);
+    XP_STRCAT(type_str, name);
+    XP_STRCPY(set_str, lm_setPrefix_str);
+    XP_STRCAT(set_str, name);
+    if (!JS_GetProperty(cx, obj, type_str, &type) ||
+	!JSVAL_IS_INT(type) ||
+	!JS_GetProperty(cx, obj, set_str, &func))
+	return JS_TRUE;
+
+    JS_free(cx, type_str);
+    JS_free(cx, set_str);
+  
+    switch(JSVAL_TO_INT(type)) {
+    case ARGTYPE_INT32:
+	if (JSVAL_IS_INT(*vp))
+	    ET_moz_CompSetterFunction((ETCompPropSetterFunc)JSVAL_TO_INT(func), name, (void*)JSVAL_TO_INT(*vp));
+	break;
+    case ARGTYPE_BOOL:
+	if (JSVAL_IS_BOOLEAN(*vp))
+	    ET_moz_CompSetterFunction((ETCompPropSetterFunc)JSVAL_TO_INT(func), name, (void*)JSVAL_TO_BOOLEAN(*vp));
+	break;
+    case ARGTYPE_STRING:
+	if (JSVAL_IS_STRING(*vp)) {
+	    prop_val = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	    ET_moz_CompSetterFunction((ETCompPropSetterFunc)JSVAL_TO_INT(func), name, (void*)prop_val);
+	}
+	break;
+    }
+
+    return JS_TRUE;
+}
+
+void
+lm_RegisterComponentProp(const char *comp, const char *targetName, 
+			 uint8 retType, ETCompPropSetterFunc setter, 
+			 ETCompPropGetterFunc getter)
+{
+    JSContext *cx;
+    JSObject *arrayObj, *obj;
+    jsval val;
+    char *type, *set, *get;
+    MochaDecoder *cd = LM_GetCrippledDecoder();
+    
+    if (!comp || !targetName || !(cx = cd->js_context))
+	return;
+
+    arrayObj = lm_DefineComponents(cd);
+    if (!arrayObj)
+	return;
+
+    if (!JS_GetProperty(cx, arrayObj, comp, &val) ||
+        !JSVAL_IS_OBJECT(val))
+	return;
+
+    obj = JSVAL_TO_OBJECT(val);
+
+    if (!JS_DefineProperty(cx, obj, targetName, JSVAL_VOID, component_mozilla_getProperty, 
+		       component_mozilla_setProperty, 0)) {
+    }
+
+    type = JS_malloc(cx, XP_STRLEN(lm_typePrefix_str) + XP_STRLEN(targetName) + 1);
+    if (type) {
+	XP_STRCPY(type, lm_typePrefix_str);
+	XP_STRCAT(type, targetName);
+	if (!JS_DefineProperty(cx, obj, type,
+			   INT_TO_JSVAL((int32)retType), 0, 0, JSPROP_READONLY)) {
+	}
+	JS_free(cx, type);
+    }
+
+    get = JS_malloc(cx, XP_STRLEN(lm_getPrefix_str) + XP_STRLEN(targetName) + 1);
+    if (get) {
+	XP_STRCPY(get, lm_getPrefix_str);
+	XP_STRCAT(get, targetName);
+	if (!JS_DefineProperty(cx, obj, get,
+			   INT_TO_JSVAL(getter), 0, 0, JSPROP_READONLY)) {
+	}
+	JS_free(cx, get);
+    }
+
+    set = JS_malloc(cx, XP_STRLEN(lm_setPrefix_str) + XP_STRLEN(targetName) + 1);
+    if (set) {
+	XP_STRCPY(set, lm_setPrefix_str);
+	XP_STRCAT(set, targetName);
+	if (!JS_DefineProperty(cx, obj, set,
+			   INT_TO_JSVAL(setter), 0, 0, JSPROP_READONLY)) {
+	}
+	JS_free(cx, set);
+    }
+}
+
+PR_STATIC_CALLBACK(JSBool)
+component_resolve_name(JSContext *cx, JSObject *obj, jsval id)
+{
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(void)
+component_finalize(JSContext *cx, JSObject *obj)
+{
+    JSComponent* component;
+
+    component = JS_GetPrivate(cx, obj);
+    if (!component)
+	return;
+    JS_UnlockGCThing(cx, component->name);
+    DROP_BACK_COUNT(component->decoder);
+    JS_free(cx, component);
+}
+
+JSClass lm_component_class =
+{
+    "Component", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub,
+    component_getProperty, component_getProperty, JS_EnumerateStub,
+    component_resolve_name, JS_ConvertStub, component_finalize
+};
+
+PR_STATIC_CALLBACK(JSBool)
+component_activate(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+    JSComponent *component;
+
+    component = JS_GetInstancePrivate(cx, obj, &lm_component_class, argv);
+    if (!component)
+	return JS_FALSE;
+
+    ET_moz_CallFunctionAsync((ETVoidPtrFunc)component->startup_callback, NULL);
+
+    return JS_TRUE;
+}
+
+static JSFunctionSpec component_methods[] =
+{
+    {"activate", component_activate, 0},
+    {0}
+};
+
+PR_STATIC_CALLBACK(JSBool)
+component_mozilla_method_stub(JSContext *cx, JSObject *obj, uint argc, 
+			      jsval *argv, jsval *rval)
+{
+    JSFunction *func;
+    JSObject *func_obj;
+    jsval type, native;
+    uint i;
+    JSCompArg *comp_argv;
+
+    func = JS_ValueToFunction(cx, argv[-2]);
+    func_obj = JS_GetFunctionObject(func);
+
+    if (!JS_GetProperty(cx, func_obj, lm_typePrefix_str, &type) ||
+	!JSVAL_IS_INT(type) ||
+	!JS_GetProperty(cx, func_obj, lm_methodPrefix_str, &native) ||
+	!(comp_argv = JS_malloc(cx, argc * sizeof(JSCompArg))))
+	return JS_TRUE;
+  
+    for (i=0; i<argc; i++) {
+	if (JSVAL_IS_INT(argv[i])) {
+	    comp_argv[i].type = ARGTYPE_INT32;
+	    comp_argv[i].value.intArg = JSVAL_TO_INT(argv[i]);
+	}
+	else if (JSVAL_IS_BOOLEAN(argv[i])) {
+	    comp_argv[i].type = ARGTYPE_BOOL;
+	    comp_argv[i].value.boolArg = JSVAL_TO_BOOLEAN(argv[i]);
+	}
+	else if (JSVAL_IS_STRING(argv[i])) {
+	    comp_argv[i].type = ARGTYPE_STRING;
+	    comp_argv[i].value.stringArg = JS_GetStringBytes(JSVAL_TO_STRING(argv[i]));
+	}
+	else {
+	    comp_argv[i].type = ARGTYPE_NULL;
+	    comp_argv[i].value.intArg = 0;
+	}
+    }
+
+    switch(JSVAL_TO_INT(type)) {
+    case ARGTYPE_NULL:
+	ET_moz_CompMethodFunction((ETCompMethodFunc)JSVAL_TO_INT(native), argc, NULL);
+	*rval = 0;
+	break;
+    case ARGTYPE_INT32:
+	*rval = INT_TO_JSVAL((int32)ET_moz_CompMethodFunction((ETCompMethodFunc)JSVAL_TO_INT(native), argc, comp_argv));
+	break;
+    case ARGTYPE_BOOL:
+	*rval = BOOLEAN_TO_JSVAL((JSBool)ET_moz_CompMethodFunction((ETCompMethodFunc)JSVAL_TO_INT(native), argc, comp_argv));
+	break;
+    case ARGTYPE_STRING:
+	*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, 
+		(char*)ET_moz_CompMethodFunction((ETCompMethodFunc)JSVAL_TO_INT(native), argc, comp_argv)));
+	break;
+    }
+    return JS_TRUE;
+}
+
+void
+lm_RegisterComponentMethod(const char *comp, const char *targetName, 
+			   uint8 retType, ETCompMethodFunc method, int32 argc)
+{
+    JSContext *cx;
+    JSObject *arrayObj, *obj, *func_obj;
+    JSFunction *func;
+    jsval val;
+    MochaDecoder *cd = LM_GetCrippledDecoder();
+    
+    if (!comp || !targetName || !(cx = cd->js_context))
+	return;
+
+    arrayObj = lm_DefineComponents(cd);
+    if (!arrayObj)
+	return;
+
+    if (!JS_GetProperty(cx, arrayObj, comp, &val) ||
+        !JSVAL_IS_OBJECT(val))
+	return;
+
+    obj = JSVAL_TO_OBJECT(val);
+
+    if (!(func = JS_DefineFunction(cx, obj, targetName, component_mozilla_method_stub, argc, 0))){
+    }
+
+    func_obj = JS_GetFunctionObject(func);
+
+    if (!JS_DefineProperty(cx, func_obj, lm_typePrefix_str,
+		       INT_TO_JSVAL((int32)retType), 0, 0, JSPROP_READONLY))
+	return;
+    if (!JS_DefineProperty(cx, func_obj, lm_methodPrefix_str,
+		       INT_TO_JSVAL(method), 0, 0, JSPROP_READONLY))
+	return;
+    if (!JS_DefineProperty(cx, func_obj, lm_methodArgc_str,
+		       INT_TO_JSVAL(argc), 0, 0, JSPROP_READONLY))
+	return;
+}
+
+/* Constructor method for a JSComponent object */
+static JSComponent*
+component_create_self(JSContext *cx, MochaDecoder* decoder, JSComponent *component, const char *name)
+{
+    JSObject *obj;
+
+    /* JSComponent may be malloc'd previous to this to make it easier
+     * to fill in the struct with data from the Mozilla thread
+     */
+    if (!component) {
+	component = JS_malloc(cx, sizeof(JSComponent));
+	if (!component)
+	    return NULL;
+    }
+
+    obj = JS_NewObject(cx, &lm_component_class, NULL, NULL);
+    if (!obj || !JS_SetPrivate(cx, obj, component)) {
+	JS_free(cx, component);
+	return NULL;
+    }
+
+    if (!JS_DefineProperties(cx, obj, component_props))
+	return NULL;
+
+    if (!JS_DefineFunctions(cx, obj, component_methods))
+	return NULL;
+
+    /* Fill out static property fields */
+    component->decoder = HOLD_BACK_COUNT(decoder);
+    component->obj = obj;
+
+    component->name = JS_NewStringCopyZ(cx, name);
+    if (!component->name || !JS_LockGCThing(cx, component->name))
+	return NULL;
+
+    return component;
+}
+
+
+/*
+ * -----------------------------------------------------------------------
+ *
+ * Reflection of the list of installed components.
+ * The only static property is the array length;
+ * the array elements (JSComponents) are added
+ * lazily when referenced.
+ *
+ * -----------------------------------------------------------------------
+ */
+
+enum componentarray_slot
+{
+    COMPONENTLIST_ARRAY_LENGTH = -1
+};
+
+static JSPropertySpec componentarray_props[] =
+{
+    {"length",  COMPONENTLIST_ARRAY_LENGTH,    JSPROP_READONLY},
+    {0}
+};
+
+/* Look up the component for the specified slot of the plug-in list */
+static JSComponent*
+componentarray_create_component(JSContext *cx, JSComponentArray *array,
+				JSComponent *component, const char *targetName, jsint targetSlot)
+{
+    component = component_create_self(cx, array->decoder, component, targetName);
+    if (component) {
+	char *name;
+	jsval val;
+
+	name = JS_GetStringBytes(component->name);
+	val = OBJECT_TO_JSVAL(component->obj);
+	JS_DefineProperty(cx, array->obj, name, val, NULL, NULL,
+			  JSPROP_ENUMERATE);
+	JS_AliasElement(cx, array->obj, name, targetSlot);
+	array->length++;
+	return component;
+    }
+    return NULL;
+}
+
+extern JSClass lm_component_array_class;
+
+void
+lm_RegisterComponent(const char *targetName, ETBoolPtrFunc active_callback, 
+		     ETVoidPtrFunc startup_callback) 
+{
+    JSContext *cx;
+    JSObject *arrayObj;
+    JSComponentArray *array;
+    JSComponent *component;
+    jsval val;
+    MochaDecoder *cd = LM_GetCrippledDecoder();
+
+    if (!(cx = cd->js_context) || !targetName)
+	return;
+	
+    arrayObj = lm_DefineComponents(cd);
+    if (!arrayObj)
+	return;
+
+    array = JS_GetInstancePrivate(cx, arrayObj, &lm_component_array_class, NULL);
+    if (!array)
+	return;
+
+    if (JS_GetProperty(cx, arrayObj, targetName, &val) && JSVAL_IS_OBJECT(val)) {
+	/* We already have a component by this name.  Update the active and
+	 * startup callback funcs in case ours are out of date 
+	 */
+	component = JS_GetPrivate(cx, JSVAL_TO_OBJECT(val));
+	if (!component)
+	    return;
+
+	component->active_callback = active_callback;
+	component->startup_callback = startup_callback;
+
+	return;
+    }
+
+    component = JS_malloc(cx, sizeof(JSComponent));
+    if (!component)
+	return;
+
+    component->active_callback = active_callback;
+    component->startup_callback = startup_callback;
+
+    componentarray_create_component(cx, array, component, targetName, array->length);
+}
+
+
+PR_STATIC_CALLBACK(JSBool)
+componentarray_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSComponentArray *array;
+    jsint slot;
+
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    array = JS_GetInstancePrivate(cx, obj, &lm_component_array_class, NULL);
+    if (!array)
+	return JS_TRUE;
+
+    switch (slot) {
+      case COMPONENTLIST_ARRAY_LENGTH:
+        *vp = INT_TO_JSVAL(array->length);
+        break;
+
+      default:
+        /* Don't mess with a user-defined property. */
+        if (slot >= 0 && slot < (jsint) array->length) {
+
+	    /* Search for an existing JSComponent for this slot */
+	    JSObject* componentObj = NULL;
+	    jsval val = *vp;
+
+	    if (JSVAL_IS_OBJECT(val)) {
+    		componentObj = JSVAL_TO_OBJECT(val);
+	    }
+	    else {
+		JSComponent* component;
+		component = componentarray_create_component(cx, array, NULL,
+		                                            NULL, slot);
+		if (component)
+    		    componentObj = component->obj;
+	    }
+
+	    *vp = OBJECT_TO_JSVAL(componentObj);
+	    break;
+	}
+    }
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(void)
+componentarray_finalize(JSContext *cx, JSObject *obj)
+{
+    JSComponentArray* array;
+
+    array = JS_GetPrivate(cx, obj);
+    if (!array)
+	return;
+    DROP_BACK_COUNT(array->decoder);
+    JS_free(cx, array);
+}
+
+JSClass lm_component_array_class =
+{
+    "ComponentArray", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub,
+    componentarray_getProperty, componentarray_getProperty, JS_EnumerateStub,
+    JS_ResolveStub, JS_ConvertStub, componentarray_finalize
+};
+
+
+JSObject*
+lm_DefineComponents(MochaDecoder *decoder)
+{
+    JSObject *obj;
+    JSComponentArray *array;
+    JSContext *cx = decoder->js_context;
+    JSPreDefComponent def_comps;   
+    JSComponent *component;
+    jsint slot;
+
+    obj = decoder->components;
+    if (obj)
+        return obj;
+
+    array = JS_malloc(cx, sizeof(JSComponentArray));
+    if (!array)
+        return NULL;
+    XP_BZERO(array, sizeof *array);
+
+    obj = JS_NewObject(cx, &lm_component_array_class, NULL,
+		       decoder->window_object);
+    if (!obj || !JS_SetPrivate(cx, obj, array)) {
+        JS_free(cx, array);
+        return NULL;
+    }
+    if (!JS_DefineProperties(cx, obj, componentarray_props))
+	return NULL; 
+
+    array->decoder = HOLD_BACK_COUNT(decoder);
+    array->obj = obj;
+
+    /* Components can be added dynamically but some are predefined */
+    slot = 0;
+    array->length = 0;
+    def_comps = predef_components[slot];
+    while (def_comps.name) {
+	component = JS_malloc(cx, sizeof(JSComponent));
+	if (!component)
+	    return NULL;
+
+	if (ET_moz_VerifyComponentFunction(def_comps.func, &(component->active_callback), 
+					   &(component->startup_callback))) {
+	    componentarray_create_component(cx, array, component, def_comps.name, array->length);
+	}
+	else {
+	    /*Component call failed somewhere.*/
+	    JS_free(cx, component);
+	}
+	def_comps = predef_components[++slot];
+    }
+    return obj;
+}

mozilla/lib/libmocha/lm_img.c

@@ -0,0 +1,854 @@
+/* -*- 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.
+ */
+/*
+ * Image reflection and event notification
+ *
+ * Scott Furman, 3/30/96
+ */
+
+#include "lm.h"
+
+#include "lo_ele.h"
+#include "prtypes.h"
+#include "pa_tags.h"
+#include "layout.h"
+
+#define IL_CLIENT
+#include "libimg.h"             /* Image Library public API. */
+
+enum image_array_slot {
+    IMAGE_ARRAY_LENGTH = -1
+};
+
+static JSPropertySpec image_array_props[] = {
+    {lm_length_str, IMAGE_ARRAY_LENGTH,
+		    JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT},
+    {0}
+};
+
+extern JSClass lm_image_array_class;
+
+PR_STATIC_CALLBACK(JSBool)
+image_array_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSObjectArray *array;
+    MochaDecoder *decoder;
+    MWContext *context;
+    jsint count, slot;
+    LO_ImageStruct *image;
+    int32 active_layer_id;
+
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    array = JS_GetInstancePrivate(cx, obj, &lm_image_array_class, NULL);
+    if (!array)
+	return JS_TRUE;
+    decoder = array->decoder;
+    context = decoder->window_context;
+    if (!context)
+	return JS_TRUE;
+
+    LO_LockLayout();
+    switch (slot) {
+      case IMAGE_ARRAY_LENGTH:
+	active_layer_id = LM_GetActiveLayer(context);
+	LM_SetActiveLayer(context, array->layer_id);
+	count = LO_EnumerateImages(context, array->layer_id);
+	LM_SetActiveLayer(context, active_layer_id);
+	if (count > array->length)
+	    array->length = count;
+	*vp = INT_TO_JSVAL(count);
+	break;
+
+      default:
+	if (slot < 0) {
+	    /* Don't mess with user-defined or method properties. */
+	    LO_UnlockLayout();
+	    return JS_TRUE;
+	}
+	if (slot >= array->length)
+	    array->length = slot + 1;
+	image = LO_GetImageByIndex(context, array->layer_id, (uint)slot);
+	if (image) {
+	    *vp = OBJECT_TO_JSVAL(LM_ReflectImage(context, image, NULL,
+						  array->layer_id, 
+                                                  (uint)slot));
+	}
+	break;
+    }
+    LO_UnlockLayout();
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(void)
+image_array_finalize(JSContext *cx, JSObject *obj)
+{
+    JSObjectArray *array;
+
+    array = JS_GetPrivate(cx, obj);
+    if (!array)
+        return;
+    DROP_BACK_COUNT(array->decoder);
+    JS_free(cx, array);
+}
+
+JSClass lm_image_array_class = {
+    "ImageArray", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub,
+    image_array_getProperty, image_array_getProperty, JS_EnumerateStub,
+    JS_ResolveStub, JS_ConvertStub, image_array_finalize
+};
+
+enum image_slot {
+    IMAGE_NAME              = -2,
+    IMAGE_SRC               = -3,
+    IMAGE_LOWSRC            = -4,
+    IMAGE_X                 = -5,
+    IMAGE_Y                 = -6,
+    IMAGE_HEIGHT            = -7,
+    IMAGE_WIDTH             = -8,
+    IMAGE_BORDER            = -9,
+    IMAGE_VSPACE            = -10,
+    IMAGE_HSPACE            = -11,
+    IMAGE_COMPLETE          = -12
+};
+
+static JSPropertySpec image_props[] = {
+    {"name",                IMAGE_NAME,         JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"src",                 IMAGE_SRC,          JSPROP_ENUMERATE},
+    {"lowsrc",              IMAGE_LOWSRC,       JSPROP_ENUMERATE},
+    {"x",                   IMAGE_X,            JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"y",                   IMAGE_Y,            JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"height",              IMAGE_HEIGHT,       JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"width",               IMAGE_WIDTH,        JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"border",              IMAGE_BORDER,       JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"vspace",              IMAGE_VSPACE,       JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"hspace",              IMAGE_HSPACE,       JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"complete",            IMAGE_COMPLETE,     JSPROP_ENUMERATE | JSPROP_READONLY},
+    {0}
+};
+
+/*
+ * Base image element type.
+ */
+typedef struct JSImage {
+    JSEventReceiver	    receiver;
+    MochaDecoder           *decoder;
+    LO_ImageStruct         *image_data;     /* 0 unless made by new Image() */
+    uint8                   pending_events;
+    int32                   layer_id;
+    uint                    index;
+    JSBool            complete;       /* Finished loading or aborted */
+    JSString        *name;
+} JSImage;
+
+#define GET_IMAGE_DATA(context, image)                                        \
+    ((image)->image_data ? (image)->image_data                                \
+     : LO_GetImageByIndex((context), (image)->layer_id, (image)->index))
+
+extern JSClass lm_image_class;
+
+/*
+ * Force the mozilla event queue to flush to make sure any image-set-src
+ *   events have been processed
+ */
+PR_STATIC_CALLBACK(void)
+lm_img_src_sync(void * data)
+{
+}
+
+
+PR_STATIC_CALLBACK(JSBool)
+image_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSImage *image;
+    LO_ImageStruct *image_data;
+    enum image_slot image_slot;
+    JSString *str;
+    jsint slot;
+
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    image = JS_GetInstancePrivate(cx, obj, &lm_image_class, NULL);
+    if (!image)
+	return JS_TRUE;
+    image_data = GET_IMAGE_DATA(image->decoder->window_context, image);
+    if (!image_data)
+        return JS_TRUE;      /* Try to handle this case gracefully. */
+
+    image_slot = slot;
+    if (image_slot == IMAGE_SRC || image_slot == IMAGE_LOWSRC) {
+        if (!lm_CheckPermissions(cx, obj, JSTARGET_UNIVERSAL_BROWSER_READ))
+            return JS_FALSE;
+    }
+
+    switch (image_slot) {
+    case IMAGE_NAME:
+	if (image->name)
+	    *vp = STRING_TO_JSVAL(image->name);
+	else
+	    *vp = JSVAL_NULL;
+        break;
+
+    case IMAGE_SRC:
+	if (image_data->pending_mocha_event) {
+	    ET_moz_CallFunction(lm_img_src_sync, NULL);
+	    image_data->pending_mocha_event = PR_FALSE;
+	}
+	str = JS_NewStringCopyZ(cx, (char*)image_data->image_url);
+	if (!str)
+	    return JS_FALSE;
+	*vp = STRING_TO_JSVAL(str);
+	break;
+
+    case IMAGE_LOWSRC:
+	if (image_data->pending_mocha_event) {
+	    ET_moz_CallFunction(lm_img_src_sync, NULL);
+	    image_data->pending_mocha_event = PR_FALSE;
+	}
+	str = JS_NewStringCopyZ(cx, (char*)image_data->lowres_image_url);
+	if (!str)
+	    return JS_FALSE;
+	*vp = STRING_TO_JSVAL(str);
+	break;
+
+    case IMAGE_X:
+        *vp = INT_TO_JSVAL(image_data->x + image_data->x_offset);
+        break;
+
+    case IMAGE_Y:
+        *vp = INT_TO_JSVAL(image_data->y + image_data->y_offset);
+        break;
+
+    case IMAGE_HEIGHT:
+        *vp = INT_TO_JSVAL(image_data->height);
+        break;
+
+    case IMAGE_WIDTH:
+        *vp = INT_TO_JSVAL(image_data->width);
+        break;
+
+    case IMAGE_BORDER:
+        *vp = INT_TO_JSVAL(image_data->border_width);
+        break;
+
+    case IMAGE_HSPACE:
+        *vp = INT_TO_JSVAL(image_data->border_horiz_space);
+        break;
+
+    case IMAGE_VSPACE:
+        *vp = INT_TO_JSVAL(image_data->border_vert_space);
+        break;
+
+    case IMAGE_COMPLETE:
+        *vp = BOOLEAN_TO_JSVAL(image->complete);
+        break;
+
+    default:
+        /* Don't mess with a user-defined or method property. */
+        return JS_TRUE;
+    }
+
+    return JS_TRUE;
+}
+
+static JSBool
+image_set_src(JSImage *image, const char *str, LO_ImageStruct *image_data)
+{
+    MochaDecoder *decoder;
+    MWContext *context;
+    IL_GroupContext *img_cx;
+    
+    decoder = image->decoder;
+    context = decoder->window_context;
+    img_cx = decoder->image_context;
+
+    if (!context) return JS_TRUE;
+
+    image_data->pending_mocha_event = PR_TRUE;
+    image_data->image_attr->attrmask |= LO_ATTR_MOCHA_IMAGE;
+    
+    ET_il_GetImage(str, context, img_cx, image_data, NET_DONT_RELOAD);
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+image_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSBool ok;
+    JSImage *image;
+    MochaDecoder *decoder;
+    MWContext *context;
+    LO_ImageStruct *image_data;
+    enum image_slot image_slot;
+    const char *url;
+    jsint slot;
+
+    image = JS_GetInstancePrivate(cx, obj, &lm_image_class, NULL);
+    if (!image)
+	return JS_TRUE;
+    decoder = image->decoder;
+    context = decoder->window_context;
+    if (!context) 
+	return JS_TRUE;
+    
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    image_data = GET_IMAGE_DATA(context, image);
+    if (!image_data)
+        return JS_TRUE;      /* Try to handle this case gracefully. */
+
+    image_slot = slot;
+    switch (image_slot) {
+    case IMAGE_SRC:
+    case IMAGE_LOWSRC:
+        if (!lm_CheckPermissions(cx, obj, JSTARGET_UNIVERSAL_BROWSER_WRITE))
+            return JS_FALSE;
+
+        if (JSVAL_IS_NULL(*vp)) {
+            url = NULL;
+        } else {
+            if (!JSVAL_IS_STRING(*vp) &&
+                !JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp))
+                return JS_FALSE;
+                
+            url = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+            url = lm_CheckURL(cx, url, JS_TRUE);  /* will allocate new string */
+            if (!url)
+                return JS_FALSE;
+        }
+
+        if (image_slot == IMAGE_SRC) {
+            ok = image_set_src(image, url, image_data);
+        } else if (url) {
+	    ok = lm_SaveParamString(cx, &image_data->lowres_image_url, url);
+        }
+
+	if (url)
+	    XP_FREE((void *) url);
+
+        if (!ok)
+            return JS_FALSE;
+
+	/*
+	 * don't call image_getProperty so that we don't immediately
+	 *   turn around and block
+	 */
+	return JS_TRUE;
+        break;
+
+    case IMAGE_NAME:
+    case IMAGE_X:
+    case IMAGE_Y:
+    case IMAGE_HEIGHT:
+    case IMAGE_WIDTH:
+    case IMAGE_BORDER:
+    case IMAGE_VSPACE:
+    case IMAGE_HSPACE:
+    case IMAGE_COMPLETE:
+	/* These are immutable. */
+	break;
+    }
+
+    return image_getProperty(cx, obj, id, vp);
+}
+
+PR_STATIC_CALLBACK(void)
+image_finalize(JSContext *cx, JSObject *obj)
+{
+    JSImage *image;
+    LO_ImageStruct *image_data;
+    MochaDecoder *decoder;
+    MWContext *context;
+
+    image = JS_GetPrivate(cx, obj);
+    if (!image)
+	return;
+
+    image_data = image->image_data;
+    decoder = image->decoder;
+    context = decoder->window_context;
+    if (image_data) {
+        /* If this is a layer background image or a reflection of an
+           existing layout image, then layout will take care of
+           destroying the image.  For anonymous images, however, 
+           we need to handle destruction here. */
+        if (!image_data->layer) {
+            ET_PostFreeImageElement(context, image_data);
+            XP_FREE(image_data->image_attr);
+            XP_FREE(image_data);
+        }
+    } else {
+	if (context) {
+	    LO_LockLayout();
+	    image_data = LO_GetImageByIndex(context, image->layer_id,
+                                            image->index);
+	    if (image_data && image_data->mocha_object == obj)
+		image_data->mocha_object = NULL;
+	    LO_UnlockLayout();
+	}
+    }
+    DROP_BACK_COUNT(decoder);
+
+    JS_UnlockGCThing(cx, image->name);
+    JS_free(cx, image);
+}
+
+JSClass lm_image_class = {
+    "Image", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub, image_getProperty, image_setProperty,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, image_finalize
+};
+
+/* Fill in native, private part of JS image */
+static JSImage *
+init_image_object(JSContext *cx, JSObject *obj, LO_ImageStruct *image_data)
+{
+    JSImage *image;
+    MochaDecoder *decoder;
+    
+    image = JS_malloc(cx, sizeof *image);
+    if (!image)
+        return NULL;
+    XP_BZERO(image, sizeof *image);
+
+    image->image_data = image_data;
+    decoder = JS_GetPrivate(cx, JS_GetGlobalObject(cx));
+    image->decoder = HOLD_BACK_COUNT(decoder);
+    image_data->mocha_object = obj;
+
+    /* Events are never blocked for anonymous images
+       since there is no associated layout. */
+    image->pending_events = PR_BIT(LM_IMGUNBLOCK);
+    if (!JS_SetPrivate(cx, obj, image))
+	return NULL;
+
+    return image;
+}
+
+JSObject *
+lm_NewImage(JSContext *cx,
+            LO_ImageStruct *image_data)
+{
+    JSObject *obj, *outer_obj;
+    MochaDecoder *decoder;
+    decoder = JS_GetPrivate(cx, JS_GetGlobalObject(cx));
+    outer_obj = lm_GetOuterObject(decoder);
+
+    obj = JS_NewObject(cx, &lm_image_class, decoder->image_prototype, 
+		       outer_obj);
+    if (!init_image_object(cx, obj, image_data))
+        return NULL;
+    
+    return obj;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+Image(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+    jsint width, height;
+    LO_ImageStruct *image_data;
+
+    XP_ASSERT(JS_InstanceOf(cx, obj, &lm_image_class, NULL));
+
+    height = width = 0;
+
+    if (argc > 0) {
+	if (argc != 2) {
+	    JS_ReportError(cx, lm_argc_err_str);
+	    return JS_FALSE;
+	}
+        if (!JSVAL_IS_INT(argv[0]) ||
+            !JSVAL_IS_INT(argv[1])) {
+            return JS_FALSE;
+        }
+	width = JSVAL_TO_INT(argv[0]);
+	height = JSVAL_TO_INT(argv[1]);
+    }
+
+    /* Allocate dummy layout structure.  This is not really
+       used by layout, but the front-ends and the imagelib
+       need it as a handle on an image instance. */
+    image_data = XP_NEW_ZAP(LO_ImageStruct);
+    if (!image_data) {
+	JS_ReportOutOfMemory(cx);
+        return JS_FALSE;
+    }
+    image_data->image_attr = XP_NEW_ZAP(LO_ImageAttr);
+    if (!image_data->image_attr) {
+        XP_FREE(image_data);
+	JS_ReportOutOfMemory(cx);
+        return JS_FALSE;
+    }
+
+    image_data->type = LO_IMAGE;
+
+    /* Fake layout ID, guaranteed not to match any real layout element */
+    image_data->ele_id = -1;
+
+    if (!init_image_object(cx, obj, image_data)) {
+	XP_FREE(image_data->image_attr);
+	XP_FREE(image_data);
+        return JS_FALSE;
+    }
+
+    /* Process arguments */
+
+    /* Width & Height */
+    if (argc == 2) {
+        image_data->width  = (int)width;
+        image_data->height = (int)height;
+    }
+
+    return JS_TRUE;
+}
+
+static JSObject *
+reflect_image_array(MochaDecoder *decoder, JSObject *document)
+{
+    JSContext *cx;
+    JSObjectArray *array;
+    JSObject *obj;
+    JSDocument *doc;
+
+    cx = decoder->js_context;
+    doc = JS_GetPrivate(cx, document);
+    if (!doc)
+	return NULL;
+
+    array = JS_malloc(cx, sizeof *array);
+    if (!array)
+	return NULL;
+    XP_BZERO(array, sizeof *array);
+
+    obj = JS_NewObject(cx, &lm_image_array_class, NULL, document);
+    if (!obj || !JS_SetPrivate(cx, obj, array)) {
+        LM_PutMochaDecoder(decoder);
+        return NULL;
+    }
+
+    if (!JS_DefineProperties(cx, obj, image_array_props))
+	return NULL;
+
+    array->decoder = HOLD_BACK_COUNT(decoder);
+    array->layer_id = doc->layer_id;
+    return obj;
+}
+
+JSObject *
+lm_GetImageArray(MochaDecoder *decoder, JSObject *document)
+{
+    JSObject *obj;
+    JSDocument *doc;
+
+    doc = JS_GetPrivate(decoder->js_context, document);
+    if (!doc)
+	return NULL;
+
+    obj = doc->images;
+    if (obj)
+	return obj;
+    obj = reflect_image_array(decoder, document);
+    doc->images = obj;
+    return obj;
+}
+
+JSObject *
+LM_ReflectImage(MWContext *context, LO_ImageStruct *image_data, 
+			    PA_Tag * tag, int32 layer_id, uint index)
+{
+    JSObject *obj, *array_obj, *outer_obj, *document;
+    MochaDecoder *decoder;
+    JSContext *cx;
+    JSImage *image;
+    PA_Block name = NULL;
+    lo_TopState *top_state;
+    PRHashTable *map;
+
+    image_data = LO_GetImageByIndex(context, layer_id, index);
+    XP_ASSERT(image_data);
+    if (! image_data)
+      return NULL;
+
+    obj = image_data->mocha_object;
+    if (obj)
+	return obj;
+
+    decoder = LM_GetMochaDecoder(context);
+    if (!decoder)
+	return NULL;
+    cx = decoder->js_context;
+
+    top_state = lo_GetMochaTopState(context);
+    if (top_state->resize_reload) {
+        map = lm_GetIdToObjectMap(decoder);
+        
+        if (map)
+            obj = (JSObject *)PR_HashTableLookup(map,
+                             LM_GET_MAPPING_KEY(LM_IMAGES, layer_id, index));
+        if (obj) {
+            image_data->mocha_object = obj;
+            goto done;
+        }
+    }
+
+    /* Get the document object that will hold this link */
+    document = lm_GetDocumentFromLayerId(decoder, layer_id);
+    if (!document)
+        goto done;
+
+    array_obj = lm_GetImageArray(decoder, document);
+    if (!array_obj)
+	goto done;
+
+    image = JS_malloc(cx, sizeof *image);
+    if (!image)
+	goto done;
+
+    XP_BZERO(image, sizeof *image);
+
+    /* if we got a tag passed in try to get the name out of there */
+    name = lo_FetchParamValue(context, tag, PARAM_NAME);
+
+    outer_obj = lm_GetOuterObject(decoder);
+
+    obj = JS_NewObject(cx, &lm_image_class, decoder->image_prototype,
+		       outer_obj);
+    if (!obj || !JS_SetPrivate(cx, obj, image)) {
+	JS_free(cx, image);
+	goto done;
+    }
+
+    if (name) {
+	JSObject *doc_obj;
+	extern JSClass lm_form_class;
+
+	if (!JS_DefineProperty(cx, outer_obj, (const char *) name, 
+			       OBJECT_TO_JSVAL(obj), NULL, NULL,
+			       JSPROP_ENUMERATE|JSPROP_READONLY)) {
+	    obj = NULL;
+	    goto done;
+	}
+	/* XXX backward compatibility with 3.0 bug: lo_BlockedImageLayout
+	       would eagerly reflect images outside of any active form, so
+	       they'd end up in document scope. */
+	if (JS_GetClass(cx, outer_obj) == &lm_form_class &&
+	    (doc_obj = JS_GetParent(cx, outer_obj)) != NULL &&
+	    !JS_DefineProperty(cx, doc_obj, (const char *) name, 
+			       OBJECT_TO_JSVAL(obj), NULL, NULL,
+			       JSPROP_ENUMERATE|JSPROP_READONLY)) {
+	    obj = NULL;
+	    goto done;
+	}
+    }
+
+    image->decoder = HOLD_BACK_COUNT(decoder);
+    image->index = index;
+    image->layer_id = layer_id;
+    image->name = JS_NewStringCopyZ(cx, (const char *) name);
+    if (!JS_LockGCThing(cx, image->name)) {
+	obj = NULL;
+	goto done;
+    }
+    image_data->mocha_object = obj;
+
+    if (!lm_AddObjectToArray(cx, array_obj, (const char *) name, 
+			     index, obj)) {
+	obj = NULL;
+	goto done;
+    }
+
+    /* Put it in the index to object hash table */
+    map = lm_GetIdToObjectMap(decoder);
+    if (map)
+        PR_HashTableAdd(map,
+                        LM_GET_MAPPING_KEY(LM_IMAGES, layer_id, index),
+                        obj);
+
+    /* OK, we've got our image, see if there are any event handlers
+     *   defined with it
+     */
+    if(tag) {
+	PA_Block onload   = lo_FetchParamValue(context, tag, PARAM_ONLOAD);
+	PA_Block onabort  = lo_FetchParamValue(context, tag, PARAM_ONABORT);
+	PA_Block onerror  = lo_FetchParamValue(context, tag, PARAM_ONERROR);
+	PA_Block onmousedown = lo_FetchParamValue(context, tag, PARAM_ONMOUSEDOWN);
+	PA_Block onmouseup = lo_FetchParamValue(context, tag, PARAM_ONMOUSEUP);
+	PA_Block id	  = lo_FetchParamValue(context, tag, PARAM_ID);
+
+	/* don't hold the layout lock across compiles */
+	LO_UnlockLayout();
+
+	if (onload != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+					  PARAM_ONLOAD, onload);
+	    PA_FREE(onload);
+	}
+
+	if (onabort != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+				          PARAM_ONABORT, onabort);
+	    PA_FREE(onabort);
+	}
+
+	if (onerror != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+					  PARAM_ONERROR, onerror);
+	    PA_FREE(onerror);
+	}
+	if (onmousedown != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+					  PARAM_ONMOUSEDOWN, onmousedown);
+	    PA_FREE(onmousedown);
+	}
+	if (onmouseup != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+					  PARAM_ONMOUSEUP, onmouseup);
+	    PA_FREE(onmouseup);
+	}
+
+	if (id)
+	    PA_FREE(id);
+
+	LO_LockLayout();
+    }
+
+done:
+
+    if(name)
+	PA_FREE(name);
+    LM_PutMochaDecoder(decoder);
+
+    return obj;
+}
+
+void
+lm_ProcessImageEvent(MWContext *context, JSObject *obj,
+                  LM_ImageEvent event)
+{
+    uint event_mask;
+    jsval result;
+    JSImage *image;
+
+    image = JS_GetPrivate(context->mocha_context, obj);
+    if (!image)
+        return;
+
+    image->pending_events |= PR_BIT(event);
+
+    /* Special event used to trigger deferred events */
+    if (! (image->pending_events & PR_BIT(LM_IMGUNBLOCK)))
+        return;
+
+    for (event = LM_IMGLOAD; event <= LM_LASTEVENT; event++) {
+        event_mask = PR_BIT(event);
+        if (image->pending_events & event_mask) {
+
+	    JSEvent *pEvent;
+	    pEvent=XP_NEW_ZAP(JSEvent);
+
+            image->pending_events &= ~event_mask;
+            switch (event) {
+            case LM_IMGLOAD:
+                pEvent->type = EVENT_LOAD;
+                image->complete = JS_TRUE;
+                break;
+            case LM_IMGABORT:
+                pEvent->type = EVENT_ABORT;
+                image->complete = JS_TRUE;
+                break;
+            case LM_IMGERROR:
+                pEvent->type = EVENT_ERROR;
+                image->complete = JS_TRUE;
+                break;
+            default:
+                XP_ABORT(("Unknown image event"));
+            }
+
+            lm_SendEvent(context, obj, pEvent, &result);
+        }
+    }
+}
+
+JSBool
+lm_InitImageClass(MochaDecoder *decoder)
+{
+    JSContext *cx;
+    JSObject *prototype;
+
+    cx = decoder->js_context;
+    prototype = JS_InitClass(cx, decoder->window_object, 
+			     decoder->event_receiver_prototype, &lm_image_class,
+			     Image, 0, image_props, NULL, NULL, NULL);
+    if (!prototype)
+	return JS_FALSE;
+    decoder->image_prototype = prototype;
+    return JS_TRUE;
+}
+
+/* Create an image context for anonymous images and attach it to the specified
+   mocha decoder. */
+JSBool
+lm_NewImageContext(MWContext *context, MochaDecoder *decoder)
+{
+    IL_GroupContext *img_cx;
+    IMGCB* img_cb;
+    JMCException *exc = NULL;
+    
+    if (!decoder->image_context) {
+        img_cb = IMGCBFactory_Create(&exc); /* JMC Module */
+        if (exc) {
+            JMC_DELETE_EXCEPTION(&exc); /* XXX Should really return
+                                           exception */
+            JS_ReportOutOfMemory(decoder->js_context);
+            return JS_FALSE;
+        }
+
+        /* Create an Image Group Context.  IL_NewGroupContext augments the
+           reference count for the JMC callback interface.  The opaque argument
+           to IL_NewGroupContext is the Front End's display context, which will
+           be passed back to all the Image Library's FE callbacks. */
+        img_cx = IL_NewGroupContext((void*)context, (IMGCBIF *)img_cb);
+        if (!img_cx) {
+            JS_ReportOutOfMemory(decoder->js_context);
+            return JS_FALSE;
+        }
+
+        /* Attach the IL_GroupContext to the mocha decoder. */
+        decoder->image_context = img_cx;
+
+		/* Allow the context to observe the decoder's image context. */
+		ET_il_SetGroupObserver(context, decoder->image_context, context, JS_TRUE);
+    }
+    return JS_TRUE;
+}

mozilla/lib/libmocha/lm_trggr.c

@@ -0,0 +1,287 @@
+/* -*- 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.
+ */
+/*
+ * lm_trggr.c
+ * 
+ * Reflects AutoInstall trigger methods
+ * into the global JavaScript config object.
+ *
+ * See Trigger.java for related functions.
+ */
+
+#include "lm.h"
+#include "prefapi.h"
+#include "VerReg.h"
+#include "softupdt.h"
+#include "gui.h"	/* XP_AppPlatform */
+
+JSBool PR_CALLBACK asd_Version(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_get_version(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_start_update(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_conditional_update(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_alert(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_platform(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+
+PRIVATE JSFunctionSpec autoinstall_methods[] = {
+    { "getVersion",	asd_get_version,	2 },
+    { "startUpdate",	asd_start_update,	2 },
+    { "conditionalUpdate",	asd_conditional_update, 4 },
+    { "startUpdateComponent",	asd_conditional_update,	4 },	/* old name */
+    { NULL,	NULL,	0 }
+};
+
+PRIVATE JSFunctionSpec globalconfig_methods[] = {
+    { "alert",	asd_alert,	1 },
+    { "getPlatform", asd_platform, 0 },
+    { NULL,	NULL,	0 }
+};
+
+PRIVATE JSClass autoinstall_class = {
+    "AutoInstall", 0,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+PRIVATE JSClass version_class = {
+    "VersionInfo", 0,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+JSBool lm_DefineTriggers()
+{
+	JSContext	*globalContext = NULL;
+	JSObject	*globalObject = NULL;
+	JSObject	*autoInstallObject, *versionObject;
+	JSBool          ans;
+
+	/* get global mocha context and object */
+    PREF_GetConfigContext(&globalContext);
+    PREF_GetGlobalConfigObject(&globalObject);
+
+    if (globalContext == NULL || globalObject == NULL)	{
+        return JS_FALSE;
+    }
+
+    JS_BeginRequest(globalContext);
+	/* define AutoInstall object in global object */
+	autoInstallObject = JS_DefineObject(globalContext, globalObject, 
+					    "AutoInstall",
+					    &autoinstall_class, 
+					    NULL, 
+					    JSPROP_ENUMERATE|JSPROP_READONLY);
+					    
+	if (!autoInstallObject)  {
+		JS_EndRequest(globalContext);
+		return JS_FALSE;
+	}
+
+	
+	/* define Version class in AutoInstall */
+    versionObject = JS_InitClass(globalContext, autoInstallObject, NULL,
+		        		&version_class, asd_Version, 0, NULL, NULL, NULL, NULL);
+	
+	if (!versionObject)  {
+		JS_EndRequest(globalContext);
+		return JS_FALSE;
+	}
+    
+    /* define some global config utility functions */
+    JS_DefineFunctions(globalContext, globalObject, globalconfig_methods);
+    
+    ans = JS_DefineFunctions(globalContext, autoInstallObject, 
+			     autoinstall_methods);
+    JS_EndRequest(globalContext);
+    return ans;
+}
+
+/* Convert VERSION type to Version JS object */
+static void asd_versToObj(JSContext *cx, VERSION* vers, JSObject* versObj)
+{
+	jsval val = INT_TO_JSVAL(vers->major);
+	JS_SetProperty(cx, versObj, "major", &val);
+	val = INT_TO_JSVAL(vers->minor);
+	JS_SetProperty(cx, versObj, "minor", &val);
+	val = INT_TO_JSVAL(vers->release);
+	JS_SetProperty(cx, versObj, "release", &val);
+	val = INT_TO_JSVAL(vers->build);
+	JS_SetProperty(cx, versObj, "build", &val);
+}
+
+/* Convert Version JS object to VERSION type */
+static void asd_objToVers(JSContext *cx, JSObject* versObj, VERSION* vers)
+{
+	jsval val;
+	JS_GetProperty(cx, versObj, "major", &val);
+	vers->major = JSVAL_TO_INT(val);
+	JS_GetProperty(cx, versObj, "minor", &val);
+	vers->minor = JSVAL_TO_INT(val);
+	JS_GetProperty(cx, versObj, "release", &val);
+	vers->release = JSVAL_TO_INT(val);
+	JS_GetProperty(cx, versObj, "build", &val);
+	vers->build = JSVAL_TO_INT(val);
+}
+
+/*
+ * ?? -- move this to VR?
+ * Returns 0 if versions are equal; < 0 if vers2 is newer; > 0 if vers1 is newer
+ */
+static int asd_compareVersion(VERSION* vers1, VERSION* vers2)
+{
+	int diff;
+	if (vers1 == NULL)
+		diff = -4;
+	else if (vers2 == NULL)
+		diff = 4;
+	else if (vers1->major == vers2->major) {
+		if (vers1->minor == vers2->minor) {
+			if (vers1->release == vers2->release) {
+				if (vers1->build == vers2->build) 
+					diff = 0;
+				else diff = (vers1->build > vers2->build) ? 1 : -1;
+			}
+			else diff = (vers1->release > vers2->release) ? 2 : -2;
+		}
+		else diff = (vers1->minor > vers2->minor) ? 3 : -3;
+	}
+	else diff = (vers1->major > vers2->major) ? 4 : -4;
+	return diff;
+}
+
+/* Version constructor
+   (accepts up to four int params to initialize fields) */
+JSBool PR_CALLBACK asd_Version
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	VERSION vers;
+	vers.major = (argc >= 1 && JSVAL_IS_INT(argv[0])) ? JSVAL_TO_INT(argv[0]) : 0;
+	vers.minor = (argc >= 2 && JSVAL_IS_INT(argv[1])) ? JSVAL_TO_INT(argv[1]) : 0;
+	vers.release = (argc >= 3 && JSVAL_IS_INT(argv[2])) ? JSVAL_TO_INT(argv[2]) : 0;
+	vers.build = (argc >= 4 && JSVAL_IS_INT(argv[3])) ? JSVAL_TO_INT(argv[3]) : 0;
+
+	asd_versToObj(cx, &vers, obj);
+    return JS_TRUE;
+}
+
+/* arguments:
+   0. component name
+   1. version no. to fill in
+   return:
+      error status */
+JSBool PR_CALLBACK asd_get_version
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	REGERR status = 0;
+	if (argc >= 2 && JSVAL_IS_STRING(argv[0])
+		&& JSVAL_IS_OBJECT(argv[1]))
+	{		
+		VERSION vers;
+		char* component_path = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
+		status = VR_GetVersion(component_path, &vers);
+
+		if (status == REGERR_OK) {
+			JSObject* versObj = JSVAL_TO_OBJECT(argv[1]);
+			asd_versToObj(cx, &vers, versObj);
+		}
+	}
+	*rval = INT_TO_JSVAL(status);
+	return JS_TRUE;
+}
+
+/* arguments:
+   0. url
+   1. flags
+   return:
+      true if no errors */
+JSBool PR_CALLBACK asd_start_update
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	if (argc >= 2 && JSVAL_IS_STRING(argv[0]) &&
+		JSVAL_IS_INT(argv[1])) {
+		char* url = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
+		/* Bookmarks is a hack, you should really get some SmartUpdate context */
+		MWContext* cx = XP_FindContextOfType(NULL, MWContextBookmarks);
+		
+		XP_Bool result = SU_StartSoftwareUpdate( cx, url,
+			NULL, NULL, NULL, JSVAL_TO_INT(argv[1]) );
+		*rval = BOOLEAN_TO_JSVAL(result);
+		return JS_TRUE;
+	}
+	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
+	return JS_TRUE;
+}
+
+/* arguments:
+   0. url
+   1. component name
+   2. version no. to compare
+   3. flags
+   return:
+      true if update triggered and no errors */
+JSBool PR_CALLBACK asd_conditional_update
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	REGERR status = 0;
+	if (argc >= 4 && JSVAL_IS_STRING(argv[0]) &&
+		JSVAL_IS_STRING(argv[1]) &&
+		JSVAL_IS_OBJECT(argv[2]) &&
+		JSVAL_IS_INT(argv[3]))
+	{
+		VERSION curr_vers;
+		char* component_path = JS_GetStringBytes(JSVAL_TO_STRING(argv[1]));
+		status = VR_GetVersion(component_path, &curr_vers);
+
+		if (status == REGERR_OK) {
+			JSObject* versObj = JSVAL_TO_OBJECT(argv[2]);
+			VERSION req_vers;
+			asd_objToVers(cx, versObj, &req_vers);
+			if ( asd_compareVersion(&req_vers, &curr_vers) > 0 ) {
+				char* url = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
+				MWContext* cx = XP_FindContextOfType(NULL, MWContextBookmarks);
+
+				XP_Bool result = SU_StartSoftwareUpdate( cx, url,
+					NULL, NULL, NULL, JSVAL_TO_INT(argv[3]) );
+				*rval = BOOLEAN_TO_JSVAL(result);
+				return JS_TRUE;
+			}
+		}
+	}
+	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);	/*INT_TO_JSVAL(status);*/
+	return JS_TRUE;
+}
+
+JSBool PR_CALLBACK asd_alert
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	if (argc >= 1 && JSVAL_IS_STRING(argv[0])) {
+		char* msg = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
+		MWContext* ctx = XP_FindSomeContext();
+		
+		if (ctx)
+			FE_Alert(ctx, msg);
+	}
+	return JS_TRUE;
+}
+
+JSBool PR_CALLBACK asd_platform
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	*rval = STRING_TO_JSVAL( JS_NewStringCopyZ(cx, XP_AppPlatform) );
+	return JS_TRUE;
+}
+

mozilla/lib/libmocha/lm_wngrp.c

@@ -0,0 +1,425 @@
+/*
+ * lm_wngrp.c: Structures and functions to deal with new LM window groups
+ *              and multiple LM threads and what not.
+ * 
+ * All blame to Mike McCool (mlm@netscape.com) 2/17/98
+ */
+
+#include "lm.h"
+#include "xp.h"
+#include "prclist.h"
+#include "prthread.h"
+#include "prmon.h"
+
+#ifdef XP_MAC
+#include "pprthred.h"  /* for PR_CreateThreadGCAble */
+#else
+#include "private/pprthred.h"
+#endif
+
+/* 
+ * Notes to self
+ * 
+ * - lm_window_count: do we care that there's only one? 
+ * - do we need to add a limit to number of threads we spawn()?
+ * - JRIEnv: do we need multiple?
+ * - JSRuntime: do we need multiple?
+ * - Threading changes: impact on debugger?
+ * - JS_SetGlobalObject(JSContext) will be important
+ * - If the global structure is on the mozilla thread, can other threads
+ *    creating a new thread group access, or do I have to post an event?
+ *
+ * ? Rename "MochaDecoder" to "LMWindow"
+ * ? Change so that there is only one JSContext
+ */
+
+PRMonitor *wingroups_mon;
+LMWindowGroup *wingroups;
+PRMonitor *request_mon;
+
+struct ContextListStr  {
+    ContextList *next;
+    ContextList *prev;
+    MWContext   *context;
+};
+
+LMWindowGroup *_lm_NewWindowGroup(int priority);
+
+/* Initialize my globals, from the Mozilla thread 
+ */
+void lm_InitWindowGroups(void)
+{
+    int priority;
+
+    /* run at slightly lower priority than the mozilla thread */
+    priority = PR_GetThreadPriority(PR_CurrentThread());
+    PR_ASSERT(priority >= PR_PRIORITY_FIRST && priority <= PR_PRIORITY_LAST);
+ 
+    if (priority == PR_PRIORITY_NORMAL)
+        priority = PR_PRIORITY_LOW;
+    else if (priority == PR_PRIORITY_HIGH)
+        priority = PR_PRIORITY_NORMAL;
+    else if (priority == PR_PRIORITY_URGENT)
+        priority = PR_PRIORITY_HIGH;
+    else
+        priority = PR_PRIORITY_LOW;
+
+    wingroups_mon = PR_NewMonitor();
+    request_mon = PR_NewMonitor();
+    wingroups = NULL;
+    wingroups = _lm_NewWindowGroup(priority);
+    if(wingroups != NULL)  {
+        PR_INIT_CLIST(wingroups);
+	lm_StartWindowGroup(wingroups);
+    }  /* else huh?! */
+}
+
+/* Create a new window group.  Create new context, create new monitor, create
+ *  new thread, event queue, queue stack, empty context list. 
+ */
+LMWindowGroup *lm_NewWindowGroup(void)
+{
+    int priority;
+
+    /* Run at same priority as current thread (which should be a JS 
+     * thread. 
+     */
+    priority = PR_GetThreadPriority(PR_CurrentThread());
+    PR_ASSERT(priority>=PR_PRIORITY_FIRST && priority<=PR_PRIORITY_LAST);
+    return _lm_NewWindowGroup(priority);
+}
+
+LMWindowGroup *_lm_NewWindowGroup(int priority)
+{
+    LMWindowGroup *newgrp = XP_NEW_ZAP(LMWindowGroup);
+    if(newgrp != NULL)  {
+        newgrp->done = PR_FALSE;
+        newgrp->hasLock = PR_FALSE;
+
+        /* Create a new JS Context for this set of windows. 
+         * Note: Need to get global runtime lm_runtime from somewhere, 
+         *        and perhaps the LM_STACK_SIZE? 
+         */
+/**************************************************** MLM *
+        newgrp->js_context = JS_NewContext(lm_runtime, LM_STACK_SIZE);
+        if(newgrp->js_context == NULL)  {
+            XP_DELETE(newgrp);
+            return NULL;
+        }
+ **************************************************** MLM */
+	newgrp->js_context = NULL;
+	/* JS_SetGCCallback(newgrp->js_context, LM_ShouldRunGC); */
+
+        newgrp->mw_contexts = XP_NEW_ZAP(ContextList);
+        if(newgrp->mw_contexts == NULL)  {
+            JS_DestroyContext(newgrp->js_context);
+            XP_DELETE(newgrp);
+            return NULL;
+        }
+        PR_INIT_CLIST(newgrp->mw_contexts);
+        newgrp->mw_contexts->context = NULL;
+        newgrp->current_context = NULL;
+
+        newgrp->queue_stack = XP_NEW_ZAP(QueueStackElement);
+        if(!newgrp->queue_stack)  {
+            JS_DestroyContext(newgrp->js_context);
+            XP_DELETE(newgrp->mw_contexts);
+            XP_DELETE(newgrp);
+            return NULL;
+        }
+
+        /* Do this here so we don't race ourselves in lm_wait_for_events */
+        PR_EnterMonitor(wingroups_mon);
+        if(wingroups != NULL)  {
+            PR_APPEND_LINK(newgrp, wingroups);
+        }
+        PR_ExitMonitor(wingroups_mon);
+
+        newgrp->waiting_list = NULL;
+
+        newgrp->owner_monitor = PR_NewMonitor();
+        newgrp->queue_monitor = PR_NewMonitor();
+
+        PR_EnterMonitor(newgrp->owner_monitor);
+        newgrp->thread = PR_CreateThreadGCAble(PR_USER_THREAD,
+                                               lm_wait_for_events, newgrp,
+                                               priority, PR_LOCAL_THREAD,
+                                               PR_UNJOINABLE_THREAD, 0);
+        newgrp->owner              = newgrp->thread;
+        newgrp->current_count      = 0;
+        newgrp->mozWantsLock       = PR_FALSE;
+        newgrp->mozGotLock         = PR_FALSE;
+        newgrp->interruptCurrentOp = PR_FALSE;
+        newgrp->queue_depth        = 0;
+        newgrp->queue_count        = 0;
+
+        /* Note: Need a unique identifier for this queue?
+         */
+        newgrp->interpret_queue = PR_CreateEventQueue("new_event_queue",
+                                                      newgrp->thread);
+        newgrp->queue_stack->queue = newgrp->interpret_queue;
+
+	newgrp->lock_context = NULL;
+	newgrp->js_timeout_insertion_point = NULL;
+	newgrp->js_timeout_running = NULL;
+	newgrp->inputRecurring = 0;
+    }
+    return newgrp;
+}
+
+void lm_StartWindowGroup(LMWindowGroup *grp)
+{
+    PR_Notify(grp->owner_monitor);
+    PR_ExitMonitor(grp->owner_monitor);
+}
+
+void lm_DestroyWindowGroup(LMWindowGroup *grp)
+{
+    PR_EnterMonitor(wingroups_mon);
+    /* Note: Thread terminates when the thread's main function (in
+     *        this case, lm_wait_for_events) exits.
+     */
+    /************************************ MLM *
+     * JS_DestroyContext(grp->js_context);
+     ************************************ MLM */
+    PR_DestroyMonitor(grp->owner_monitor);
+    PR_DestroyMonitor(grp->queue_monitor);
+    
+    /* Note: How to destroy an event queue or two?
+     */
+
+    /* Note: Context list should already be null
+     */
+
+    PR_REMOVE_LINK(grp);
+    XP_DELETE(grp);
+    PR_ExitMonitor(wingroups_mon);
+}
+
+LMWindowGroup *LM_GetDefaultWindowGroup(MWContext *mwc)
+{
+    LMWindowGroup *ans;
+
+    /* Check to see if this is a frame context.  If so, check its parent. */
+    if((mwc != NULL) && (mwc->is_grid_cell))  {
+        MWContext *grid_parent, *grid_child;
+	grid_child = mwc;
+	grid_parent = mwc->grid_parent;
+	/* Find the root parent.  I wonder if I need to add cycle checking. */
+	while(grid_parent != NULL)  {
+	    grid_child = grid_parent;
+	    grid_parent = grid_child->grid_parent;
+	}
+	if( (ans = lm_MWContextToGroup(grid_child)) != NULL)  {
+	    /* The parent's been found, return its group. */
+	    return ans;
+	}  else  {  /* Else add the parent to the default group, 
+		     *  and return that. */
+    	    PR_EnterMonitor(wingroups_mon);
+	    LM_AddContextToGroup(wingroups, grid_child);
+	    ans = wingroups;
+    	    PR_ExitMonitor(wingroups_mon);
+	    return ans;
+	}
+    }
+    PR_EnterMonitor(wingroups_mon);
+    ans = wingroups;
+    PR_ExitMonitor(wingroups_mon);
+    return ans;
+}
+
+LMWindowGroup *lm_MWContextToGroup(MWContext *mwc)
+{
+    LMWindowGroup *ptr = NULL;
+    LMWindowGroup *ans = NULL;
+
+    PR_EnterMonitor(wingroups_mon);
+
+    ptr = wingroups;
+ 
+    if(lm_GetEntryForContext(wingroups, mwc) != NULL)  {
+        ans = wingroups;
+        PR_ExitMonitor(wingroups_mon);
+        return ans;
+    }
+ 
+    ptr = PR_NEXT_LINK(ptr);
+    while(ptr != wingroups)  {
+        if(lm_GetEntryForContext(ptr, mwc) != NULL)  {
+            ans = ptr;
+            PR_ExitMonitor(wingroups_mon);
+            return ans;
+        }
+        ptr = PR_NEXT_LINK(ptr);
+    }
+    PR_ExitMonitor(wingroups_mon);
+    return NULL;
+}
+
+LMWindowGroup *lm_QueueStackToGroup(QueueStackElement *qse)
+{
+    LMWindowGroup *ptr = NULL;
+    LMWindowGroup *ans = NULL;
+
+    PR_EnterMonitor(wingroups_mon);
+    ptr = wingroups;
+ 
+    if(wingroups->queue_stack == qse)  {
+        ans = wingroups;
+        PR_ExitMonitor(wingroups_mon);
+        return ans;
+    }
+ 
+    ptr = PR_NEXT_LINK(ptr);
+    while(ptr != wingroups)  {
+        if(ptr->queue_stack == qse)  {
+            ans = ptr;
+            PR_ExitMonitor(wingroups_mon);
+            return ans;
+        }
+        ptr = PR_NEXT_LINK(ptr);
+    }
+    PR_ExitMonitor(wingroups_mon);
+    return NULL;
+}
+
+PREventQueue *LM_MWContextToQueue(MWContext *mwc)
+{
+    /* Note: This gets the interpret queue, need to get top queue as well
+     */
+    LMWindowGroup *grp = lm_MWContextToGroup(mwc);
+    if(grp != NULL)  {
+        return LM_WindowGroupToQueue(grp);
+    }
+    return NULL;
+}
+
+PREventQueue *LM_WindowGroupToQueue(LMWindowGroup *lmg)
+{
+    return lmg->interpret_queue;
+}
+
+ContextList *lm_GetEntryForContext(LMWindowGroup *grp, MWContext *cx)
+{
+    ContextList *cxl = grp->mw_contexts;
+    ContextList *ans = NULL;
+
+    if(PR_CLIST_IS_EMPTY(cxl))  {
+        return NULL;
+    }  else  {
+        ContextList *ptr = PR_NEXT_LINK(cxl);
+        while(ptr != cxl)  {
+            if(ptr->context == cx)  {
+                ans = ptr;
+                break;
+            }
+            ptr = PR_NEXT_LINK(ptr);
+        }
+    }
+    return ans;
+}
+
+void LM_AddContextToGroup(LMWindowGroup *grp, MWContext *cx)
+{
+    ContextList *cxl;
+
+    if(lm_MWContextToGroup(cx) != NULL)  {
+        /* Hey, why are we adding this stuff twice? */
+        XP_ASSERT(0);
+    }
+
+    cxl = XP_NEW_ZAP(ContextList);
+    /* Note: failure?!?!?!
+     */
+    cxl->context = cx;
+
+    PR_APPEND_LINK(cxl, grp->mw_contexts);
+}
+
+void lm_RemoveContextFromGroup(LMWindowGroup *grp, MWContext *cx);
+
+void LM_RemoveContextFromGroup(MWContext *cx)
+{
+    LMWindowGroup *grp = lm_MWContextToGroup(cx);
+    if(grp)  {
+        lm_RemoveContextFromGroup(grp, cx);
+    }
+}
+
+void lm_RemoveContextFromGroup(LMWindowGroup *grp, MWContext *cx)
+{
+    if(!PR_CLIST_IS_EMPTY(grp->mw_contexts))  {
+        ContextList *entry = lm_GetEntryForContext(grp, cx);
+        if(entry != NULL)  {
+            PR_REMOVE_LINK(entry);
+            XP_DELETE(entry);
+        }
+    }
+    if(PR_CLIST_IS_EMPTY(grp->mw_contexts) && (grp != wingroups))  {
+        grp->done = PR_TRUE;
+    }
+}
+
+PRBool LM_IsLocked(LMWindowGroup *grp)
+{
+    PRBool ans;
+    PR_EnterMonitor(request_mon);
+    ans = grp->hasLock;
+    PR_ExitMonitor(request_mon);
+    return ans;
+}
+
+void LM_BeginRequest(LMWindowGroup *grp, JSContext *jsc)
+{
+    PR_EnterMonitor(request_mon);
+    grp->hasLock = PR_TRUE;
+    grp->lock_context = jsc;
+    if((JS_GetContextThread(jsc)) != ((intN) grp->thread))  {
+        JS_SetContextThread(jsc);
+    }
+    PR_ExitMonitor(request_mon);
+    JS_BeginRequest(jsc);
+}
+
+void LM_EndRequest(LMWindowGroup *grp, JSContext *jsc)
+{
+    JS_EndRequest(jsc);
+    PR_EnterMonitor(request_mon);
+    grp->lock_context = NULL;
+    grp->hasLock = PR_FALSE;
+    PR_ExitMonitor(request_mon);
+}
+
+JSBool LM_ShouldRunGC(JSContext *cx, JSGCStatus status)
+{
+    JSBool ans = JS_TRUE;
+    JSContext *active;
+    LMWindowGroup *ptr;
+
+    if(status != JSGC_BEGIN)  {
+        return JS_TRUE;
+    }
+
+    PR_EnterMonitor(request_mon);
+    if(wingroups->hasLock)  {
+        active = wingroups->lock_context;
+        if(active != cx)  {
+            ans=JS_FALSE;
+	    goto bye;
+        }
+    }
+    ptr = PR_NEXT_LINK(wingroups);
+    while(ptr != wingroups)  {
+        if(ptr->hasLock)  {
+            active = ptr->lock_context;
+            if(active != cx)  {
+                ans=JS_FALSE;
+		goto bye;
+            }
+	}
+        ptr = PR_NEXT_LINK(ptr);
+    }
+bye:
+    PR_ExitMonitor(request_mon);
+    return ans;
+}

mozilla/lib/libnet/jscookie.c

@@ -0,0 +1,617 @@
+/* -*- 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 "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.
+ */
+/*
+   jscookie.c -- javascript reflection of cookies for filters.
+   Created: Frederick G.M. Roeber <roeber@netscape.com>, 12-Jul-97.
+   Adopted: Judson Valeski, 1997.
+   Large chunks of this were stolen from jsmsg.c.
+ */
+
+#include "mkutils.h"
+#include "mkutils.h"
+#include "mkparse.h"
+#include "mkaccess.h"
+#include "prefapi.h"
+#include "jsapi.h"
+#include "xp_core.h"
+#include "xp_mcom.h"
+#include "jscookie.h"
+#include "ds.h"
+#include "htmldlgs.h"
+#include "xpgetstr.h"
+
+extern int MK_ACCESS_JAVASCRIPT_COOKIE_FILTER;
+
+static JSObject *filter_obj = NULL;
+static JSContext *filter_context = NULL;
+
+static JSBool error_reporter_installed = JS_FALSE;
+static JSErrorReporter previous_error_reporter;
+
+/* tells us when we should recompile the file. */
+static JSBool need_compile = JS_TRUE;
+
+/* This is the private instance data associated with a cookie */
+typedef struct JSCookieData {
+    JSContext *js_context;
+    JSObject *js_object;
+    JSCFCookieData *data;
+    PRPackedBool property_changed, rejected, accepted, ask, decision_made;
+} JSCookieData;
+
+/* The properties of a cookie that we reflect */
+enum cookie_slot {
+    COOKIE_PATH			= -1,
+    COOKIE_DOMAIN		= -2,
+    COOKIE_NAME			= -3,
+    COOKIE_VALUE		= -4,
+    COOKIE_EXPIRES		= -5,
+    COOKIE_URL			= -6,
+    COOKIE_IS_SECURE		= -7,
+    COOKIE_IS_DOMAIN		= -8,
+    COOKIE_PROMPT_PREF		= -9,
+    COOKIE_PREF			= -10
+};
+
+/* 
+ * Should more of these be readonly? What does it mean for a cookie
+ *   to de secure?  -chouck
+ */
+static JSPropertySpec cookie_props[] = {
+    { "path",       COOKIE_PATH,        JSPROP_ENUMERATE },
+    { "domain",     COOKIE_DOMAIN,      JSPROP_ENUMERATE },
+    { "name",       COOKIE_NAME,        JSPROP_ENUMERATE },
+    { "value",      COOKIE_VALUE,       JSPROP_ENUMERATE },
+    { "expires",    COOKIE_EXPIRES,     JSPROP_ENUMERATE },
+    { "url",        COOKIE_URL,         JSPROP_ENUMERATE|JSPROP_READONLY },
+    { "isSecure",   COOKIE_IS_SECURE,   JSPROP_ENUMERATE },
+    { "isDomain",   COOKIE_IS_DOMAIN,   JSPROP_ENUMERATE },
+    { "prompt",     COOKIE_PROMPT_PREF, JSPROP_ENUMERATE|JSPROP_READONLY },
+    { "preference", COOKIE_PREF,        JSPROP_ENUMERATE|JSPROP_READONLY },
+    { 0 }
+};
+
+PR_STATIC_CALLBACK(JSBool)
+cookie_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSCookieData *data;
+    JSString *str;
+    jsint slot;
+
+    data = (JSCookieData *)JS_GetPrivate(cx, obj);
+    if (!data)
+	return JS_TRUE;
+
+    if (!JSVAL_IS_INT(id))
+        return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    switch (slot) {
+    case COOKIE_PATH:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->path_from_header);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_DOMAIN:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->host_from_header);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_NAME:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->name_from_header);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_VALUE:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->cookie_from_header);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_EXPIRES:
+        *vp = INT_TO_JSVAL(data->data->expires);
+        break;
+    case COOKIE_URL:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->url);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_IS_SECURE:
+        *vp = BOOLEAN_TO_JSVAL(data->data->secure);
+        break;
+    case COOKIE_IS_DOMAIN:
+        *vp = BOOLEAN_TO_JSVAL(data->data->domain);
+        break;
+    case COOKIE_PROMPT_PREF:
+        *vp = BOOLEAN_TO_JSVAL(data->data->prompt);
+        break;
+    case COOKIE_PREF:
+        *vp = INT_TO_JSVAL(data->data->preference);
+        break;
+    }
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+cookie_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSCookieData *data;
+    jsint slot;
+    PRInt32 i;
+    JSBool b;
+
+    data = (JSCookieData *)JS_GetPrivate(cx, obj);
+    if (!data)
+		return JS_TRUE;
+
+    if (!JSVAL_IS_INT(id))
+        return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+	if (slot == COOKIE_PATH) {
+		data->data->path_from_header = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	} 
+	else if (slot == COOKIE_DOMAIN) {
+		data->data->host_from_header = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	}
+	else if (slot == COOKIE_NAME) {
+		data->data->name_from_header = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	}
+	else if (slot == COOKIE_VALUE) {
+		data->data->cookie_from_header = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	}
+	else if (slot == COOKIE_EXPIRES) {
+		if( !JS_ValueToInt32(cx, *vp, (long *)&i) )
+            return JS_FALSE;
+        data->data->expires = i;
+	}
+	else if (slot == COOKIE_IS_SECURE) {
+        if( !JS_ValueToBoolean(cx, *vp, &b) )
+            return JS_FALSE;
+        data->data->secure = b;		
+	}
+	else if (slot == COOKIE_IS_DOMAIN) {
+        if( !JS_ValueToBoolean(cx, *vp, &b) )
+            return JS_FALSE;
+        data->data->domain = b;		
+	}
+
+    data->property_changed = TRUE;
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(void)
+cookie_finalize(JSContext *cx, JSObject *obj)
+{
+    JSCookieData *cookie;
+    cookie = JS_GetPrivate(cx, obj);
+    FREEIF(cookie);
+}
+
+/* So we can possibly add functions "global" to filters... */
+static JSClass global_class = {
+    "CookieFilters", 0 /* no private data */,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+static JSClass js_cookie_class = {
+    "Cookie", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub, cookie_getProperty, cookie_setProperty,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, cookie_finalize
+};
+
+/* cookie.accept() -- mark it okay */
+PR_STATIC_CALLBACK(JSBool)
+cookie_accept(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval * rval)
+{
+    JSCookieData *data;
+
+    if (!(data = (JSCookieData*)JS_GetInstancePrivate(cx, obj, &js_cookie_class, argv)))
+        return JS_FALSE;
+
+    data->accepted = TRUE;
+    data->rejected = FALSE;
+    data->ask = FALSE;
+    data->decision_made = TRUE;
+
+    return JS_TRUE;
+}
+
+/* cookie.reject() -- reject it out of hand */
+PR_STATIC_CALLBACK(JSBool)
+cookie_reject(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval * rval)
+{
+    JSCookieData *data;
+
+    if (!(data = (JSCookieData*)JS_GetInstancePrivate(cx, obj, &js_cookie_class, argv)))
+        return JS_FALSE;
+
+    data->accepted = FALSE;
+    data->rejected = TRUE;
+    data->ask = FALSE;
+    data->decision_made = TRUE;
+
+    return JS_TRUE;
+}
+
+/* cookie.ask() -- ask the luser, even if that pref is off */
+PR_STATIC_CALLBACK(JSBool)
+cookie_ask(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval * rval)
+{
+    JSCookieData *data;
+
+    if (!(data = (JSCookieData*)JS_GetInstancePrivate(cx, obj, &js_cookie_class, argv)))
+        return JS_FALSE;
+
+    data->accepted = FALSE;
+    data->rejected = FALSE;
+    data->ask = TRUE;
+    data->decision_made = TRUE;
+
+    return JS_TRUE;
+}
+
+/* cookie.confirm() -- pop up a confirmation box */
+PR_STATIC_CALLBACK(JSBool)
+cookie_confirm(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval * rval)
+{
+    JSCookieData *data;
+    JSString *str;
+    char *msg = (char *)0;
+    Bool result;
+    MWContext * context = XP_FindSomeContext();
+
+    if (argc < 1 || !context)
+        return JS_FALSE;
+
+    if (!(data = (JSCookieData*)JS_GetInstancePrivate(cx, obj, &js_cookie_class, argv)))
+        return JS_FALSE;
+
+    str = JS_ValueToString(cx, argv[0]);
+    if (!str)
+        return JS_FALSE;
+
+    StrAllocCopy(msg, XP_GetString(MK_ACCESS_JAVASCRIPT_COOKIE_FILTER));
+    StrAllocCat(msg, JS_GetStringBytes(str));
+    if (!msg)
+        return JS_FALSE;
+
+    result = FE_Confirm(context, msg);
+    FREEIF(msg);
+
+    *rval = BOOLEAN_TO_JSVAL(result);
+
+    return JS_TRUE;
+}
+
+#if DEBUG
+/* trace() -- outputs spew to stderr.  Actually, this (or something like it
+   that perhaps outputs to the same file that the rest of the filter logging code
+   writes to) would probably be very useful in the normal course of writing filters. */
+PR_STATIC_CALLBACK(JSBool)
+cookie_filter_trace(JSContext *cx, JSObject * obj, uint argc, jsval *argv, jsval * rval)
+{
+
+        if (argc > 0)
+                {
+                        JSString *str;
+                        const char *trace_str;
+                        if (!(str = JS_ValueToString(cx, argv[0])))
+                                return JS_FALSE;
+
+                        trace_str = JS_GetStringBytes(str);
+                        if (*trace_str != '\0')
+                                {
+                                        fprintf (stderr, "cookie filter trace: %s\n", trace_str);
+                                }
+                        return JS_TRUE;
+                }
+
+        return JS_FALSE;
+}
+#endif
+
+static JSFunctionSpec cookie_methods[] = {
+    { "accept", cookie_accept, 0 },
+    { "reject", cookie_reject, 0 },
+    { "ask",    cookie_ask, 0 },
+    { "confirm", cookie_confirm, 1 },
+    { 0 }
+};
+
+static JSFunctionSpec filter_methods[] = {
+#ifdef DEBUG
+    { "trace", cookie_filter_trace, 1 },
+#endif
+    { 0 }
+};
+
+PRIVATE void
+destroyJSCookieFilterStuff(void)
+{
+        filter_obj = NULL;
+}
+
+/*
+ * This function used to take an MWContext and store it as the private data
+ *   of the filter object.  That is a no-no since the filter_obj is going to
+ *   be around until the end of time but there is no guarentee that the
+ *   context won't get free'd out from under us.  The solution is to not
+ *   hold onto any particular context but just call XP_FindSomeContext() or
+ *   some derivative of it when we need to.
+ */
+PRIVATE JSContext *
+initializeJSCookieFilterStuff()
+{
+
+    /* Only bother initializing once */
+    if (filter_obj)
+        return filter_context;
+
+    /* If we can't get the mozilla-thread global context just bail */
+    PREF_GetConfigContext(&filter_context);
+    if (!filter_context)
+        return NULL;
+
+    JS_BeginRequest(filter_context);
+    /* create our "global" object.  We make the message object a child of this */
+    filter_obj = JS_NewObject(filter_context, &global_class, NULL, NULL);
+    
+    /* MLM - don't do JS_InitStandardClasses() twice */
+    if (!filter_obj
+            || !JS_DefineFunctions(filter_context, filter_obj, filter_methods))
+            {
+                JS_EndRequest(filter_context);
+                destroyJSCookieFilterStuff();
+                return NULL;
+            }
+
+    JS_EndRequest(filter_context);
+    return filter_context;
+}
+
+PRIVATE JSObject *
+newCookieObject(void)
+{
+    JSObject *rv;
+    JSCookieData *cookie_data;
+
+    rv = JS_DefineObject(filter_context, filter_obj,
+                         "cookie", &js_cookie_class,
+                         NULL, JSPROP_ENUMERATE);
+
+    if( (JSObject *)0 == rv )
+        return (JSObject *)0;
+
+    cookie_data = XP_NEW_ZAP(JSCookieData);
+
+    if( (JSCookieData *)0 == cookie_data )
+        return (JSObject *)0;
+
+    if( !JS_SetPrivate(filter_context, rv, cookie_data)
+        || !JS_DefineProperties(filter_context, rv, cookie_props)
+        || !JS_DefineFunctions(filter_context, rv, cookie_methods)) {
+        return (JSObject *)0;
+    }
+
+    return rv;
+}
+
+PR_STATIC_CALLBACK(void)
+jscookie_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
+{
+    char *msg = NULL;
+    MWContext *context;
+    
+    context = XP_FindSomeContext();
+    if(!context || !report)
+        return;
+
+    /*XXX: i18n-ise this */
+    msg = PR_sprintf_append(NULL,
+                            "JavaScript Cookie Filter Error:\n"
+                            "You will be prompted manually to accept or reject this cookie.\n"
+                            "Filename: %s\n"
+                            "Line #: %u\n"
+                            "%s\n"
+                            "%.*s\n",
+                            report->filename, 
+                            report->lineno, 
+                            report->linebuf,
+                            (int)(report->tokenptr - report->linebuf) + 1,
+                            "^"
+                            );
+
+    if (!msg)
+        return;
+
+    FE_Alert(context, msg);
+    XP_FREE(msg);
+
+    return;
+}
+
+PRIVATE JSBool
+compileJSCookieFilters(void)
+{
+    static time_t m_time = 0; /* the last modification time of filters.js */
+    static JSBool ret_val = JS_FALSE;
+    char *filename;
+    XP_File fp;
+    XP_StatStruct stats;
+
+    if (!need_compile)
+        return ret_val;
+
+    filename = WH_FileName("", xpJSCookieFilters);
+
+    XP_Trace("+Filename for script filter is %s\n", filename);
+
+	/* If we can't get to the file, get the hell outa dodge. */
+    if(XP_Stat(filename, &stats, xpJSCookieFilters))
+		return ret_val;
+
+    if (stats.st_mtime > m_time || need_compile)
+        {
+            long fileLength;
+            char *buffer;
+            jsval rval;
+            
+            m_time = stats.st_mtime;
+            
+            fileLength = stats.st_size;
+            if (fileLength <= 1)
+                    {
+                            ret_val = JS_FALSE;
+                            return ret_val;
+                    }
+            
+            if( !(fp = XP_FileOpen(filename, xpJSCookieFilters, "r")) ) {
+					    ret_val = JS_FALSE;
+					    return ret_val;
+				    }
+            
+            buffer = (char*)malloc(fileLength);
+            if (!buffer) {
+                XP_FileClose(fp);
+                ret_val = JS_FALSE;
+                return ret_val;
+            }
+            
+            fileLength = XP_FileRead(buffer, fileLength, fp);
+
+            XP_FileClose(fp);
+
+            XP_Trace("+Compiling filters.js...\n");
+
+            ret_val = JS_EvaluateScript(filter_context, filter_obj, buffer, fileLength,
+                                                                    filename, 1, &rval);
+
+            XP_Trace("+Done.\n");
+            
+            XP_FREE(buffer);
+
+            need_compile = JS_FALSE;
+        }
+
+    return ret_val;
+}
+
+PUBLIC JSCFResult 
+JSCF_Execute(
+                               MWContext *mwcontext,
+                               const char *script_name,
+                               JSCFCookieData *data,
+                               Bool *data_changed
+                               )
+{
+    jsval result;
+    jsval filter_arg; /* we will this in with the message object we create. */
+    JSObject *cookie_obj;
+    JSCookieData *cookie_data;
+
+    if (!script_name)
+        return JSCF_error;
+
+	/* initialize the filter stuff, and bomb out early if it fails */
+    if (!initializeJSCookieFilterStuff())
+        return JSCF_error;
+
+    JS_BeginRequest(filter_context);
+
+    /* 
+	 * try loading (reloading if necessary) the filter file before bothering 
+	 *   to create any JS-objects
+	 */
+    if (!compileJSCookieFilters())  {
+	JS_EndRequest(filter_context);
+        return JSCF_error;
+    }
+
+    if (!error_reporter_installed)
+        {
+            error_reporter_installed = JS_TRUE;
+            previous_error_reporter = JS_SetErrorReporter(filter_context,
+                                                          jscookie_ErrorReporter);
+        }
+
+
+    cookie_obj = newCookieObject();
+    if( (JSObject *)0 == cookie_obj )  {
+	JS_EndRequest(filter_context);
+        return JSCF_error;
+    }
+
+    cookie_data = (JSCookieData *)JS_GetPrivate(filter_context, cookie_obj);
+    cookie_data->js_context = filter_context;
+    cookie_data->js_object = cookie_obj;
+    cookie_data->data = data;
+    cookie_data->property_changed = FALSE;
+    cookie_data->rejected = FALSE;
+    cookie_data->accepted = FALSE;
+    cookie_data->decision_made = FALSE;
+
+    filter_arg = OBJECT_TO_JSVAL(cookie_obj);
+    JS_CallFunctionName(filter_context, filter_obj, script_name, 1, 
+                        &filter_arg, &result);
+
+    JS_EndRequest(filter_context);
+
+    *data_changed = cookie_data->property_changed;
+    if( cookie_data->decision_made ) {
+        if( cookie_data->rejected )
+            return JSCF_reject;
+        else if( cookie_data->accepted )
+            return JSCF_accept;
+        else if( cookie_data->ask )
+            return JSCF_ask;
+    }
+
+    return JSCF_whatever;
+}
+
+PUBLIC void
+JSCF_Cleanup(void)
+{
+    TRACEMSG(("+Cleaning up JS Cookie Filters"));
+
+    need_compile = JS_TRUE;
+
+    if (filter_context)
+    {
+	JS_BeginRequest(filter_context);
+        if (error_reporter_installed)
+            {
+                error_reporter_installed = JS_FALSE;
+                JS_SetErrorReporter(filter_context, previous_error_reporter);
+            }
+
+        JS_GC(filter_context);
+
+        destroyJSCookieFilterStuff();
+	JS_EndRequest(filter_context);
+	}
+}

mozilla/lib/libnet/mkmocha.c

@@ -0,0 +1,751 @@
+/* -*- 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.
+ */
+
+/* Please leave at the top for windows precompiled headers */
+#include "mkutils.h"
+
+#include <stddef.h>
+#include <memory.h>
+#include <time.h>
+#include "net.h"
+#include "xp.h"
+#include "libmocha.h"
+#include "mkgeturl.h"
+#include "mkmocha.h"
+#include "libevent.h"
+#include "fe_proto.h"
+#include "pa_tags.h"	/* included via -I../libparse */
+#include "libi18n.h"    /* unicode */
+#include "layout.h"	/* for lo_ContextToCell only */
+
+extern char lm_unknown_origin_str[];
+
+extern int MK_OUT_OF_MEMORY;
+extern int MK_MALFORMED_URL_ERROR;
+
+typedef struct {
+    char *	  buffer;
+    size_t	  offset;
+    size_t  	  length;
+    MWContext	* context;
+    char	* content_type;
+    int16	  char_set;
+} MochaStream;
+
+typedef struct {
+    int32             ref_count;
+    ActiveEntry     * active_entry;
+    PRPackedBool      is_valid;
+    PRPackedBool      eval_what;
+    PRPackedBool      single_shot;
+    PRPackedBool      polling;
+    char            * str;
+    size_t            len;
+    MWContext       * context;
+    int               status;
+    char            * wysiwyg_url;
+    char	    * base_href;
+    NET_StreamClass * stream;
+} MochaConData;
+
+#define HOLD_CON_DATA(con_data) ((con_data)->ref_count++)
+#define DROP_CON_DATA(con_data) {                                             \
+    if (--(con_data)->ref_count == 0)                                         \
+	free_con_data(con_data);                                              \
+}
+
+static void
+free_con_data(MochaConData * con_data)
+{
+    XP_FREEIF(con_data->str);
+    XP_FREEIF(con_data->wysiwyg_url);
+    XP_FREEIF(con_data->base_href);
+    XP_FREE(con_data);
+}
+
+#define START_POLLING(ae, con_data) {                                         \
+    (con_data)->polling = TRUE;                                               \
+    NET_SetCallNetlibAllTheTime((ae)->window_id, "mkmocha");                              \
+}
+
+#define STOP_POLLING(ae, con_data) {                                          \
+	NET_ClearCallNetlibAllTheTime((ae)->window_id, "mkmocha");                        \
+    (con_data)->polling = FALSE;                                              \
+}
+
+/* forward decl */
+PRIVATE int32 net_ProcessMocha(ActiveEntry * ae);
+
+/*
+ * Add the new bits to our buffer
+ */
+PRIVATE int
+mocha_process(NET_StreamClass *stream, const char *str, int32 len)
+{
+    MochaStream * mocha_stream = (MochaStream *) stream->data_object;
+
+    mocha_stream->length += len;
+    if (!mocha_stream->buffer) {
+        mocha_stream->buffer = (char *)XP_ALLOC(mocha_stream->length);
+    } 
+    else {
+        mocha_stream->buffer = (char *)XP_REALLOC(mocha_stream->buffer, 
+						  mocha_stream->length);
+    }
+    if (!mocha_stream->buffer) {
+        return MK_OUT_OF_MEMORY;
+    }
+    memcpy(mocha_stream->buffer + mocha_stream->offset, str, len);
+    mocha_stream->offset += len;
+    return len;
+}
+
+PRIVATE unsigned int
+mocha_ready(NET_StreamClass *stream)
+{
+    return MAX_WRITE_READY;  /* always ready for writing */
+}
+
+
+/*
+ * All of the processing for this needs to be done in the mocha thread
+ */
+PRIVATE void 
+mocha_complete(NET_StreamClass *stream)
+{
+    void * data;
+    JSBool isUnicode = JS_FALSE;
+
+    MochaStream * mocha_stream = (MochaStream *) stream->data_object;
+
+    if (mocha_stream->char_set != CS_DEFAULT) {
+	uint32 len;
+	INTL_Unicode * unicode;
+
+	/* find out how many unicode characters we'll end up with */
+	len = INTL_TextToUnicodeLen(mocha_stream->char_set, 
+				    (unsigned char *) mocha_stream->buffer,
+				    mocha_stream->length);
+	unicode = XP_ALLOC(sizeof(INTL_Unicode) * len);
+	if (!unicode)
+	    return;
+
+	/* do the conversion */
+	mocha_stream->length = INTL_TextToUnicode(mocha_stream->char_set,
+						  (unsigned char *) mocha_stream->buffer,
+						  mocha_stream->length,
+						  unicode,
+						  len);
+
+	data = unicode;
+	isUnicode = JS_TRUE;
+
+	XP_FREE(mocha_stream->buffer);
+	mocha_stream->buffer = NULL;
+    }
+    else {
+	data = mocha_stream->buffer;
+    }
+
+    /* this will grab ownership of data */
+    ET_MochaStreamComplete(mocha_stream->context, data, 
+			   mocha_stream->length, 
+			   mocha_stream->content_type,
+			   isUnicode);
+
+    XP_FREEIF(mocha_stream->content_type);
+    XP_FREE(mocha_stream);
+
+}
+
+PRIVATE void 
+mocha_abort(NET_StreamClass *stream, int status)
+{
+    MochaStream * mocha_stream = (MochaStream *) stream->data_object;
+
+    ET_MochaStreamAbort(mocha_stream->context, status);
+    XP_FREE(mocha_stream->buffer);
+	XP_FREEIF(mocha_stream->content_type);
+    XP_FREE(mocha_stream);
+}
+
+int16
+net_check_for_charset(URL_Struct *url_struct)
+{
+    int i, max;
+    char *key, *value;
+    static char charset[] = "charset=";
+    int len = XP_STRLEN(charset);
+    
+    max = url_struct->all_headers.empty_index;
+
+    for (i = 0; i < max; i++) {
+	key = url_struct->all_headers.key[i];
+
+	/* keep looking until we find the content type one */
+	if (XP_STRCASECMP(key, "Content-type"))
+	    continue;
+
+	value = url_struct->all_headers.value[i];
+
+	/* don't bother unless this is a JS file to begin with */
+	if (!strcasestr(value, APPLICATION_JAVASCRIPT))
+	    return CS_DEFAULT;
+
+	value = XP_STRTOK(value, ";");
+	while (value) {
+	    value = XP_StripLine(value);
+
+	    if (!strncasecomp(value, charset, len)) {
+		value += len;
+		value = XP_StripLine(value);
+		return (INTL_CharSetNameToID(value));
+	    }
+
+	    /* move to next arg */
+	    value = XP_STRTOK(NULL, ";");
+
+	}
+
+	/* found content-type but no charset */
+	return CS_DEFAULT;
+
+    }
+
+    /* didn't find content-type */
+    return CS_DEFAULT;
+}
+
+static char *
+getOriginFromURLStruct(MWContext *context, URL_Struct *url_struct) 
+{
+    char *referer;
+    /*
+     * Look in url_struct->origin_url for this javascript: URL's
+     * original referrer.
+     *
+     * In the basis case, a javascript: or *.js URL targets a context
+     * from a (the same, or not) context loaded with a non-javascript URL.
+     * The referring document's URL is in url_struct->referer and we
+     * duplicate it as origin_url.  If we find a non-null origin_url
+     * later, we know by induction where it came from.
+     */
+    referer = url_struct->origin_url;
+    if (referer == NULL) {
+        /*
+         * url_struct->referer (sic) tells the URL of the page in
+         * which a javascript: or *.js link or form was clicked or submitted.
+         * If it's non-null, but the context is a frame cell that's
+         * being (re-)created for this load, don't use referer as the
+         * decoder's source URL for the evaluation, because the FE has
+         * arbitrarily set it to the top frameset's URL.  Instead, use
+         * the immediate parent frameset context's wysiwyg URL to get
+         * the origin of the generator (or the parent's address URL if
+         * not wysiwyg).
+         *
+         * If referer is null, the user typed this javascript: URL or
+         * its frameset's URL directly into the Location toolbar.
+         */
+        referer = url_struct->referer;
+        if (referer) {
+	    lo_GridRec *grid = NULL;
+
+	    if (context->is_grid_cell &&
+	        !lo_ContextToCell(context, FALSE, &grid)) {
+	        /*
+	         * Context is a frame being (re)created: veto referer.
+	         * The javascript: or *.js URL can't be a LAYER SRC= URL in a
+	         * frame because the frame's cell must point to its
+	         * context by the time the first tag (even LAYER) is
+	         * processed by layout.
+	         */
+	        referer = NULL;
+	    }
+        }
+        if (!referer) {
+	    History_entry *he;
+
+	    if (context->grid_parent) {
+	        /*
+	         * If grid parent, use its history entry to get the
+	         * wysiwyg or real URL, which tells the subject origin
+	         * of (any code in it that may have generated) this
+	         * javascript: or *.js URL open.  If no grid parent, this must
+	         * be a javascript: or *.js URL that was typed directly into
+	         * Location.
+	         */
+	        context = context->grid_parent;
+	    }
+	    he = SHIST_GetCurrent(&context->hist);
+	    if (!he) {
+	        referer = lm_unknown_origin_str;
+	    } else {
+	        referer = he->wysiwyg_url;
+	        if (!referer)
+		    referer = he->address;
+	    }
+        }
+    }
+
+    XP_ASSERT(referer);
+    referer = XP_STRDUP(referer);
+    if (!referer) {
+	return NULL;
+    }
+    url_struct->origin_url = referer;
+    return referer;
+}
+
+NET_StreamClass *
+NET_CreateMochaConverter(FO_Present_Types format_out,
+                         void             *data_object,
+                         URL_Struct       *url_struct,
+                         MWContext        *context)
+{
+    MochaStream * mocha_stream;
+    NET_StreamClass *stream;
+    char *origin;
+
+    mocha_stream = (MochaStream *) XP_NEW_ZAP(MochaStream);
+    if (!mocha_stream)
+	return NULL;
+
+    mocha_stream->context = context;
+    mocha_stream->content_type = XP_STRDUP(url_struct->content_type);
+    mocha_stream->char_set = net_check_for_charset(url_struct);
+
+    /* Get the origin from the URL struct. We don't have to free origin
+     * here because url_struct->origin_url owns it.
+     */
+    origin = getOriginFromURLStruct(context, url_struct);
+    if (origin == NULL)
+        return NULL;
+
+    if (NET_URL_Type(url_struct->address) == FILE_TYPE_URL &&
+        NET_URL_Type(origin) != FILE_TYPE_URL)
+    {
+        /*
+         * Don't allow loading a file: URL from a non-file URL to
+         * prevent privacy attacks against the local machine from
+         * web pages.
+         */
+        return NULL;
+    }
+
+    stream = NET_NewStream("mocha", mocha_process, mocha_complete, 
+			   mocha_abort, mocha_ready, mocha_stream, 
+			   context); 
+    return stream;
+}
+
+PRIVATE void
+mk_mocha_eval_exit_fn(void * data, char * str, size_t len, char * wysiwyg_url, 
+		      char * base_href, Bool valid)
+{
+    MochaConData * con_data = (MochaConData *) data;
+
+    if (!valid) {
+        con_data->status = MK_MALFORMED_URL_ERROR;
+        con_data->is_valid = TRUE;
+        return;
+    }
+    if (str == NULL) {
+        con_data->status = MK_DATA_LOADED;
+        con_data->is_valid = TRUE;
+        return;
+    }
+
+    con_data->base_href = base_href;
+    con_data->wysiwyg_url = wysiwyg_url;
+    con_data->str = str;
+    con_data->len = len;
+    con_data->is_valid = TRUE;
+
+}
+
+/*
+ * Handle both 'mocha:<stuff>' urls and the mocha type-in widget
+ */
+MODULE_PRIVATE int32
+net_MochaLoad(ActiveEntry *ae)
+{
+    MWContext *context;
+    URL_Struct *url_struct;
+    char *what;
+    Bool eval_what, single_shot;
+    MochaConData * con_data;
+
+    context = ae->window_id;
+    url_struct = ae->URL_s;
+    what = XP_STRCHR(url_struct->address, ':');
+    XP_ASSERT(what);
+    what++;
+    eval_what = FALSE;
+    single_shot = (*what != '?');
+
+    if (single_shot) {
+        /* Don't use an existing Mocha output window's stream. */
+        if (*what == '\0') {
+            /* Generate two grid cells, one for output and one for input. */
+            what = PR_smprintf("<frameset rows=\"75%%,25%%\">\n"
+                               "<frame name=MochaOutput src=about:blank>\n"
+                               "<frame name=MochaInput src=%.*s#input>\n"
+                               "</frameset>",
+                               what - url_struct->address,
+                               url_struct->address);
+        } else if (!XP_STRCMP(what, "#input")) {
+            /* The input cell contains a form with one magic isindex field. */
+            what = PR_smprintf("<b>%.*s typein</b>\n"
+                               "<form action=%.*s target=MochaOutput"
+                               " onsubmit='this.isindex.focus()'>\n"
+                               "<input name=isindex size=60>\n"
+                               "</form>",
+                               what - url_struct->address - 1,
+                               url_struct->address,
+                               what - url_struct->address,
+                               url_struct->address);
+            url_struct->internal_url = TRUE;
+        } else {
+            eval_what = TRUE;
+        }
+    } else {
+        /* Use the Mocha output window if it exists. */
+        url_struct->auto_scroll = 1000;
+
+        /* Skip the leading question-mark and clean up the string. */
+        what++;
+        NET_PlusToSpace(what);
+        NET_UnEscape(what);
+        eval_what = TRUE;
+    }
+
+    /* something got hosed.  bail */
+    if (!what) {
+        ae->status = MK_OUT_OF_MEMORY;
+	return -1;
+    }
+
+    /* make space for the connection data */
+    con_data = XP_NEW_ZAP(MochaConData);
+    if (!con_data) {
+        ae->status = MK_OUT_OF_MEMORY;
+        return -1;
+    }
+
+    /* remember for next time */
+    con_data->ref_count = 1;
+    con_data->active_entry = ae;
+    ae->con_data = con_data;
+
+    /* set up some state so we remember where we are */
+    con_data->eval_what = eval_what;
+    con_data->single_shot = single_shot;
+    con_data->context = context;
+
+    /* fake out netlib so we don't select on the socket id */
+    ae->socket = NULL;
+    ae->local_file = TRUE;
+
+    if (eval_what) {
+	char *referer;
+        JSPrincipals *principals;
+	ETEvalStuff *stuff;
+
+        referer = getOriginFromURLStruct(context, url_struct);
+	if (!referer) {
+	    ae->status = MK_OUT_OF_MEMORY;
+	    return -1;
+	}
+
+	principals = LM_NewJSPrincipals(NULL, NULL, referer);
+	if (!principals) {
+	    ae->status = MK_OUT_OF_MEMORY;
+	    return -1;
+	}
+
+        /* 
+         * send the buffer off to be evaluated 
+         */
+	stuff = (ETEvalStuff *) XP_NEW_ZAP(ETEvalStuff);
+	if (!stuff) {
+	    ae->status = MK_OUT_OF_MEMORY;
+	    return -1;
+	}
+
+	stuff->len = XP_STRLEN(what);
+	stuff->line_no = 0;
+	stuff->scope_to = NULL;
+	stuff->want_result = JS_TRUE;
+	stuff->data = con_data;
+	stuff->version = JSVERSION_UNKNOWN;
+	stuff->principals = principals;
+
+        ET_EvaluateScript(context, what, stuff, mk_mocha_eval_exit_fn);
+    
+    }
+    else {
+
+        /* allocated above, don't need to free */
+        con_data->str = what;
+	con_data->len = XP_STRLEN(what);
+        con_data->is_valid = TRUE;
+
+    }
+
+    /* make sure netlib gets called so we know when our data gets back */
+    START_POLLING(ae, con_data);
+
+    /* ya'll come back now, ya'hear? */
+    return net_ProcessMocha(ae);
+
+}
+
+PRIVATE int
+net_process_mocha(MochaConData * con_data)
+{
+    int32 ref_count;
+
+    ref_count = con_data->ref_count;
+    DROP_CON_DATA(con_data);
+    if (ref_count == 1 || !con_data->active_entry)
+	return -1;
+    return net_ProcessMocha(con_data->active_entry);
+}
+
+static char nscp_open_tag[] = "<" PT_NSCP_OPEN ">";
+
+/*
+ * If the mocha has finished evaluation shove the result
+ *   down the stream and continue else just wait
+ */
+PRIVATE int32
+net_ProcessMocha(ActiveEntry * ae)
+{
+    FO_Present_Types output_format;
+    Bool to_layout;
+    Bool first_time;
+    NET_StreamClass *stream = NULL;
+    MochaConData * con_data = (MochaConData *) ae->con_data;
+    MWContext * context;
+    int status;
+
+    /* if we haven't gotten our data yet just return and wait */
+    if (!con_data || !con_data->is_valid)
+        return 0;
+
+    context = ae->window_id;
+
+    /*
+     * Race with the mocha thread until we can grab the JSLock
+     */
+    if (!con_data->single_shot) {
+	MochaDecoder * decoder;
+
+	HOLD_CON_DATA(con_data);
+	if (!LM_AttemptLockJS(context, 
+                              (JSLockReleaseFunc)net_process_mocha, con_data))
+	    return 0;
+	DROP_CON_DATA(con_data);
+	decoder = LM_GetMochaDecoder(context);
+	if (!decoder) {
+	    LM_UnlockJS(context);
+	    ae->status = MK_OUT_OF_MEMORY;
+	    goto done;
+	}
+        stream = decoder->stream;
+        LM_PutMochaDecoder(decoder);
+	LM_UnlockJS(context);
+    }
+    else {
+	stream = con_data->stream;
+    }
+
+    /* we've gotten valid data, clear the callme all the time flag */
+    STOP_POLLING(ae, con_data);
+
+    /* see if there were any problems */
+    if (con_data->status < 0 || con_data->str == NULL) {
+	ET_SendLoadEvent(context, EVENT_LOAD, NULL, NULL, 
+                         LO_DOCUMENT_LAYER_ID, FALSE);
+        ae->status = con_data->status;
+	goto done;
+    }
+
+    /*
+     * If we don't already have a stream to take our output create one now
+     */
+    first_time = !stream;
+    if (first_time) {
+        StrAllocCopy(ae->URL_s->content_type, TEXT_HTML);
+        ae->format_out = CLEAR_CACHE_BIT(ae->format_out);
+
+        stream = NET_StreamBuilder(ae->format_out, ae->URL_s, ae->window_id);
+        if (!stream) {
+            ae->status = MK_UNABLE_TO_CONVERT;
+            goto done;
+        }
+    }
+
+    /*
+     * If the stream we just created isn't ready for writing just
+     *   hold onto the stream and try again later
+     */
+    if (!stream->is_write_ready(stream)) {
+	con_data->stream = stream;
+	START_POLLING(ae, con_data);
+	return 0;
+    }
+
+    /* XXX this condition is fairly bogus */
+    output_format = CLEAR_CACHE_BIT(ae->format_out);
+    to_layout = (output_format != FO_INTERNAL_IMAGE &&
+		 output_format != FO_MULTIPART_IMAGE &&
+		 output_format != FO_EMBED &&
+		 output_format != FO_PLUGIN);
+
+    if (to_layout) {
+	/* The string must end in a newline so the parser will flush it.  */
+	if (con_data->len != 0 && con_data->str[con_data->len-1] != '\n') {
+	    size_t new_len = con_data->len + 1;
+	    char * new_str = XP_ALLOC((new_len + 1) * sizeof(char));
+
+	    if (!new_str) {
+		ae->status = MK_OUT_OF_MEMORY;
+		goto done;
+	    }
+	    XP_MEMCPY(new_str, con_data->str, con_data->len);
+	    new_str[new_len-1] = '\n';
+	    new_str[new_len] = '\0';
+	    con_data->str = new_str;
+	    con_data->len = new_len;
+	}
+    }
+
+
+    /*
+     * If this is the first time do some initial setup.  We'll set
+     *   the window title and maybe shove out a <BASE> tag
+     */
+    status = 0;
+    if (to_layout && first_time && con_data->eval_what) {
+
+	/* Feed layout an internal tag so it will create a new top state. */
+	stream->put_block(stream, nscp_open_tag,
+			  sizeof nscp_open_tag - 1);
+
+        (void) LM_WysiwygCacheConverter(context, ae->URL_s, 
+					con_data->wysiwyg_url,
+					con_data->base_href);
+
+        if (*con_data->str != '<') {
+            char * prefix = NULL;
+            StrAllocCopy(prefix, "<TITLE>");
+            StrAllocCat(prefix, ae->URL_s->address);
+            StrAllocCat(prefix, "</TITLE><PLAINTEXT>");
+            if (!prefix) {
+		ae->status = MK_OUT_OF_MEMORY;
+		goto done;
+	    }
+            status = (*stream->put_block)(stream, prefix,
+                                          XP_STRLEN(prefix));
+            XP_FREE(prefix);
+        }
+	else {
+	    if (con_data->base_href) {
+		status = (*stream->put_block)(stream, 
+		    			      con_data->base_href,
+					      XP_STRLEN(con_data->base_href));
+	    }
+	}
+    }
+	 
+    if (status >= 0) {
+        status = (*stream->put_block)(stream, con_data->str,
+                                      (int32)con_data->len);
+    }
+
+    if (con_data->single_shot && status >= 0)
+        (*stream->complete)(stream);
+
+    if (!con_data->single_shot && status >= 0) {
+        if (first_time) {
+	    ET_SetDecoderStream(context, stream, ae->URL_s, JS_TRUE);
+	    goto done;
+        }
+    } else {
+        if (status < 0)
+            (*stream->abort)(stream, status);
+        if (first_time)
+            XP_DELETE(stream);
+    }
+
+    ae->status = MK_DATA_LOADED;
+
+done:
+    ae->con_data = NULL;
+    con_data->active_entry = NULL;
+    DROP_CON_DATA(con_data);
+    return -1;
+
+}
+
+PRIVATE int32
+net_InterruptMocha(ActiveEntry *ae)
+{
+    MochaConData * con_data = (MochaConData *) ae->con_data;
+
+    if (!con_data)
+	return MK_INTERRUPTED;
+
+    /* do we need to decrement the callme all the time flag? */
+    if (con_data->polling) {
+	STOP_POLLING(ae, con_data);
+    }
+
+    /* ae is about to go away, break its connection with con_data */
+    ae->con_data = NULL;
+    con_data->active_entry = NULL;
+
+    /* ae is about to go away, better get it off the JS lock waiters list */
+    if (LM_ClearAttemptLockJS(con_data->context,
+                              (JSLockReleaseFunc)net_process_mocha, con_data))
+	DROP_CON_DATA(con_data);
+
+    return ae->status = MK_INTERRUPTED;
+}
+
+PRIVATE void
+net_CleanupMocha(void)
+{
+    /* nothing so far needs freeing */
+    return;
+}
+
+MODULE_PRIVATE void
+NET_InitMochaProtocol(void)
+{
+        static NET_ProtoImpl mocha_proto_impl;
+
+        mocha_proto_impl.init = net_MochaLoad;
+        mocha_proto_impl.process = net_ProcessMocha;
+        mocha_proto_impl.interrupt = net_InterruptMocha;
+        mocha_proto_impl.cleanup = net_CleanupMocha;
+
+        NET_RegisterProtocolImplementation(&mocha_proto_impl, MOCHA_TYPE_URL);
+}
+

mozilla/modules/libhook/src/hk_hook.c

@@ -0,0 +1,187 @@
+/* -*- 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 "xp_core.h"
+#include "xp_mcom.h"
+#include "jsapi.h"
+#include "prefapi.h"
+#include "hk_funcs.h"
+
+#include "hk_private.h"
+
+
+static JSObject *HookObject = NULL;
+
+
+JSObject *
+hk_GetHookObject(void)
+{
+	return HookObject;
+}
+
+
+void
+hk_SetHookObject(JSObject *hook_obj)
+{
+	HookObject = hook_obj;
+}
+
+
+/*
+ * Some hooks have dynamic names and can't be in the
+ * fast hook array lookup, this covers looking up those
+ * hooks.  For example, if I invented a <BLURT> tag,
+ * this would look for a BLURT_hook function.
+ */
+intn
+hk_IsUnknownTagHook(void *extra)
+{
+	const char *hook_func;
+	jsval tmp_val;
+	JSContext *j_context;
+
+	hook_func = HK_GetFunctionName(HK_TAG, extra);
+	if (hook_func == NULL)
+	{
+		return 0;
+	}
+
+	if (!PREF_GetConfigContext(&j_context))
+	{
+		return 0;
+	}
+
+	if ((j_context == NULL)||(HookObject == NULL))
+	{
+		return 0;
+	}
+
+        JS_BeginRequest(j_context);
+	if ((JS_GetProperty(j_context, HookObject, hook_func, &tmp_val))&&
+		(JS_TypeOfValue(j_context, tmp_val) == JSTYPE_FUNCTION))
+	{
+        	JS_EndRequest(j_context);
+		return 1;
+	}
+        JS_EndRequest(j_context);
+
+	return 0;
+}
+
+
+/*
+ * There is no guarantee that someone has checked the existence of the
+ * hook before calling it, so we check again here.  We don't use the
+ * fast array lookup since it can't catch all hooks anyway, and we
+ * may well have to fall back to the slow method.
+ */
+intn
+HK_CallHook(int32 hook_id, void *extra, int32 window_id,
+		char *hook_str, char **hook_ret)
+{
+	const char *hook_func;
+	intn ok;
+	jsval tmp_val;
+	jsval argv[2];
+	JSContext *j_context;
+	JSString *str;
+	const char *result_str;
+	char *return_str;
+
+	*hook_ret = NULL;
+
+	if (hook_str == NULL)
+	{
+		return 0;
+	}
+
+	/*
+	 * Make a function name form the hook_is and possibly the PA_Tag
+	 * pointed to by extra.
+	 */
+	hook_func = HK_GetFunctionName(hook_id, extra);
+	if (hook_func == NULL)
+	{
+		return 0;
+	}
+
+	/*
+	 * Make sure you have a javascript context and object.
+	 */
+	if (!PREF_GetConfigContext(&j_context))
+	{
+		return 0;
+	}
+	if ((j_context == NULL)||(HookObject == NULL))
+	{
+		return 0;
+	}
+
+        JS_BeginRequest(j_context);
+	/*
+	 * Check that there is a function to call.
+	 */
+	if ((!JS_GetProperty(j_context, HookObject, hook_func, &tmp_val))||
+		(JS_TypeOfValue(j_context, tmp_val) != JSTYPE_FUNCTION))
+	{
+                JS_EndRequest(j_context);
+		return 0;
+	}
+
+	/*
+	 * Create the argument/parameter list, and call the function.
+	 */
+	str = JS_NewStringCopyZ(j_context, hook_str);
+	if (str == NULL)
+	{
+                JS_EndRequest(j_context);
+		return 0;
+	}
+	argv[0] = STRING_TO_JSVAL(str);
+	argv[1] = INT_TO_JSVAL(window_id);
+	if (!JS_CallFunctionName(j_context, HookObject,	hook_func, 2, argv,
+							 &tmp_val))
+	{
+                JS_EndRequest(j_context);
+		return 0;
+	}
+
+	/*
+	 * A false return from the function means leave the
+	 * passed string unchanged.
+	 */
+	if (tmp_val != JSVAL_FALSE)
+	{
+		str = JS_ValueToString(j_context, tmp_val);
+		if (str == NULL)
+		{
+                	JS_EndRequest(j_context);
+			return 0;
+		}
+		result_str = JS_GetStringBytes(str);
+		return_str = XP_STRDUP(result_str);
+		if (return_str == NULL)
+		{
+                	JS_EndRequest(j_context);
+			return 0;
+		}
+		*hook_ret = return_str;
+	}
+      	JS_EndRequest(j_context);
+
+	return 1;
+}

mozilla/modules/libhook/src/hk_init.c

@@ -0,0 +1,414 @@
+/* -*- 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 "xp_core.h"
+#include "xp_mcom.h"
+#include "hk_types.h"
+#include "jsapi.h"
+#include "prefapi.h"
+#include "ntypes.h"
+#include "structs.h"
+#include "pa_tags.h"
+
+#include "hk_private.h"
+
+#ifdef XP_MAC
+#include "hk_funcs.h"
+#endif
+
+
+static hk_FunctionRec **FunctionList = NULL;
+static int32 FunctionCount = 0;
+
+static char *hk_FunctionStrings[HK_MAX] = {
+	NULL,
+	"location_hook",
+	"_hook",
+	"document_start_hook"};
+
+static JSClass autoconf_class = {
+	"HookConfig", 0,
+	hk_HookObjectAddProperty, hk_HookObjectDeleteProperty,
+	JS_PropertyStub, hk_HookObjectSetProperty,
+	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+
+/*******************************************
+ * This function really bugs me!  It needs to
+ * be super fast since it will be called for every
+ * HTML tag ever processed.  This means it should be
+ * self-contained, and not call off to other functions.
+ * Making it do that means it can't call off into
+ * hk_tag.c to get inside the PA_Tag structure in extra,
+ * and thus makes me include ntypes.h, structs.h, and pa_tags.h.
+ ********************************************/
+/*
+ * A FAST function existence lookup, using an array set up in
+ * the initialization process.
+ */
+intn
+HK_IsHook(int32 hook_id, void *extra)
+{
+	int32 func_id;
+	hk_FunctionRec *rec_ptr;
+
+	/*
+	 * The no hook case never exists.
+	 */
+	if (hook_id == HK_NONE)
+	{
+		return 0;
+	}
+	/*
+	 * Tag hooks map to the tag types, or alternatly
+	 * unknown tags which are handled elsewhere.
+	 */
+	else if (hook_id == HK_TAG)
+	{
+		PA_Tag *tag;
+
+		tag = (PA_Tag *)extra;
+		if (tag->type != P_UNKNOWN)
+		{
+			func_id = HK_MAX - 1 + tag->type;
+		}
+		/*
+		 * P_UNKNOWN tags must be looked up the slow
+		 * dynamic way.
+		 */
+		else
+		{
+			return(hk_IsUnknownTagHook(extra));
+		}
+	}
+	else
+	{
+		func_id = hook_id - 1;
+	}
+
+	/*
+	 * If we are outside the known funtion array, fail.
+	 */
+	if ((func_id < 0)||(func_id >= FunctionCount))
+	{
+		return 0;
+	}
+
+	/*
+	 * If no function is registered, fail.
+	 */
+	rec_ptr = FunctionList[func_id];
+	if (rec_ptr == NULL)
+	{
+		return 0;
+	}
+
+	if (rec_ptr->func_exists == FALSE)
+	{
+		return 0;
+	}
+	else
+	{
+		return 1;
+	}
+}
+
+
+/*
+ * Set the existence state of a particular index in the array.
+ */
+static void
+hk_set_function_existence(int32 indx, XP_Bool exists)
+{
+	if ((indx < 0)||(indx >= FunctionCount))
+	{
+		return;
+	}
+
+	if (FunctionList[indx] != NULL)
+	{
+		FunctionList[indx]->func_exists = exists;
+	}
+}
+
+
+void
+hk_SetFunctionExistence(char *func_name, XP_Bool exists)
+{
+	int32 i, len;
+	char *tptr;
+	char *up_str;
+	char *ptr1, *ptr2;
+	int32 indx;
+
+	/*
+	 * A NULL function one too short for the hook suffix
+	 * cannot be a hook function.
+	 */
+	if (func_name == NULL)
+	{
+		return;
+	}
+	len = XP_STRLEN(func_name);
+	if (len < XP_STRLEN("_hook"))
+	{
+		return;
+	}
+
+	/*
+	 * If the function has no hook suffix we just don't care.
+	 */
+	tptr = func_name + len - XP_STRLEN("_hook");
+	if (XP_STRCMP(tptr, "_hook") != 0)
+	{
+		return;
+	}
+
+
+	/*
+	 * Make an all upper-case copy of the prefix.
+	 */
+	*tptr = '\0';
+	up_str = XP_ALLOC(XP_STRLEN(func_name) + 1);
+	/*
+	 * If allocation fails, restore original and return.
+	 */
+	if (up_str == NULL)
+	{
+		*tptr = '_';
+		return;
+	}
+	ptr1 = func_name;
+	ptr2 = up_str;
+	while (*ptr1 != '\0')
+	{
+		*ptr2 = (char)(XP_TO_UPPER(*ptr1));
+		ptr1++;
+		ptr2++;
+	}
+	*ptr2 = '\0';
+	*tptr = '_';
+
+	/*
+	 * Check if the prefix is a known TAG name.
+	 */
+	indx = hk_TagStringToIndex(up_str);
+	XP_FREE(up_str);
+	if (indx >= 0)
+	{
+		indx = HK_MAX - 1 + indx;
+		hk_set_function_existence(indx, exists);
+		return;
+	}
+
+	/*
+	 * Special check for the TEXT_hook which is a tag hook but
+	 * won't be caught by the hk_TagStringToIndex test.
+	 */
+	if (XP_STRCMP(func_name, "TEXT_hook") == 0)
+	{
+		indx = HK_MAX - 1 + 0;
+		hk_set_function_existence(indx, exists);
+		return;
+	}
+
+	/*
+	 * Finally, check the array of known tag hooks.
+	 */
+	for (i=1; i<HK_MAX; i++)
+	{
+		if ((hk_FunctionStrings[i] != NULL)&&
+			(XP_STRCMP(func_name, hk_FunctionStrings[i]) == 0))
+		{
+			indx = i - 1;
+			hk_set_function_existence(indx, exists);
+			return;
+		}
+	}
+}
+
+
+/*
+ * Free all members of the function list array up to
+ * the passed index.
+ */
+static void
+hk_free_function_list(int32 indx)
+{
+	int32 i;
+
+	for (i=0; i<indx; i++)
+	{
+		if (FunctionList[i] != NULL)
+		{
+			if (FunctionList[i]->func_name != NULL)
+			{
+				XP_FREE(FunctionList[i]->func_name);
+				FunctionList[i]->func_name = NULL;
+			}
+			XP_FREE(FunctionList[i]);
+			FunctionList[i] = NULL;
+		}
+	}
+	XP_FREE(FunctionList);
+	FunctionList = NULL;
+	FunctionCount = 0;
+}
+
+
+/*
+ * Initialize the function list array to contain all the known tags
+ * plus all the known special hook functions.
+ */
+static intn
+hk_initialize_function_list(void)
+{
+	int32 i, indx;
+	int32 tag_cnt;
+
+	/*
+	 * Subtract one from HK_MAX because it includes the unknown
+	 * at 0.  For the tag count, unknown is -1, so we can just
+	 * use it as is.
+	 */
+	tag_cnt = hk_NumKnownTags();
+	FunctionCount = HK_MAX - 1 + tag_cnt;
+	FunctionList = (hk_FunctionRec **)XP_ALLOC(FunctionCount *
+						sizeof(hk_FunctionRec *));
+	if (FunctionList == NULL)
+	{
+		return 0;
+	}
+
+	indx = 0;
+	/*
+	 * First allocate all the known special hooks.
+	 */
+	for (i=1; i < HK_MAX; i++)
+	{
+		hk_FunctionRec *rec_ptr;
+
+		rec_ptr = XP_NEW(hk_FunctionRec);
+		if (rec_ptr == NULL)
+		{
+			hk_free_function_list(indx);
+			return 0;
+		}
+		rec_ptr->func_exists = FALSE;
+		rec_ptr->func_name = hk_FunctionStrings[i];
+		FunctionList[indx] = rec_ptr;
+		indx++;
+	}
+
+	/*
+	 * Now do all known tags.
+	 */
+	for (i=0; i < tag_cnt; i++)
+	{
+		hk_FunctionRec *rec_ptr;
+
+		rec_ptr = XP_NEW(hk_FunctionRec);
+		if (rec_ptr == NULL)
+		{
+			hk_free_function_list(indx);
+			return 0;
+		}
+		rec_ptr->func_exists = FALSE;
+		rec_ptr->func_name = hk_TagIndexToFunctionString(i);
+		FunctionList[indx] = rec_ptr;
+		indx++;
+	}
+
+	return 1;
+}
+
+
+/*
+ * Initialize all the libhook stuff.  SHould only be called once.
+ * Usually just before reading hook.js.
+ */
+intn
+HK_Init(void)
+{
+	intn ret;
+	JSContext *j_context;
+	JSObject *j_object;
+	JSObject *hook_obj;
+
+	/*
+	 * If a hook object does not already exist, create
+	 * one.  If you cannot create one, then return failure.
+	 */
+	hook_obj = hk_GetHookObject();
+	if (hook_obj == NULL)
+	{
+		if ((!PREF_GetConfigContext(&j_context))||
+			(!PREF_GetGlobalConfigObject(&j_object)))
+		{
+			return 0;
+		}
+
+                JS_BeginRequest(j_context);
+		hook_obj = JS_DefineObject(j_context, j_object,
+			"HookConfig",
+			&autoconf_class,
+			NULL,
+			JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_PERMANENT);
+                JS_EndRequest(j_context);
+	}
+	if (hook_obj == NULL)
+	{
+		return 0;
+	}
+
+	hk_SetHookObject(hook_obj);
+
+	ret = hk_initialize_function_list();
+
+	return ret;
+}
+
+
+/*
+ * Get the hook know for the passed hook id.
+ */
+const char *
+HK_GetFunctionName(int32 hook_id, void *extra)
+{
+	if ((hook_id < 0)||(hook_id >= HK_MAX))
+	{
+		return NULL;
+	}
+
+	/*
+	 * Special name creation for tag hooks.
+	 */
+	if (hook_id == HK_TAG)
+	{
+		const char *ret_str;
+
+		ret_str = (const char *)hk_TagFunctionString(
+				hk_FunctionStrings[hook_id], extra);
+		return ret_str;
+	}
+	else
+	{
+		return hk_FunctionStrings[hook_id];
+	}
+}
+

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/nsJSWinProfile.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_JSWINPROTOTYPE_H__
-#define __NS_JSWINPROTOTYPE_H__
-
-PRInt32
-InitWinProfilePrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
-
-#endif

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;
-
-}
-
-