updated comment

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

mozilla/modules/libpr0n/Makefile.in

@@ -1,33 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src decoders
-
-include $(topsrcdir)/config/rules.mk
-
-

mozilla/modules/libpr0n/decoders/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= ppm png gif jpeg
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/gif/GIF2.h

@@ -1,323 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.
- *
- * Contributor(s): 
- */
-#ifndef _GIF_H_
-#define _GIF_H_
-
-/* gif2.h  
-   The interface for the GIF87/89a decoder. 
-*/
-// List of possible parsing states
-typedef enum {
-    gif_gather,
-    gif_init,                   //1
-    gif_type,
-    gif_version,
-    gif_global_header,
-    gif_global_colormap,
-    gif_image_start,            //6
-    gif_image_header,
-    gif_image_colormap,
-    gif_image_body,
-    gif_lzw_start,
-    gif_lzw,                    //11
-    gif_sub_block,
-    gif_extension,
-    gif_control_extension,
-    gif_consume_block,
-    gif_skip_block,
-    gif_done,                   //17
-    gif_oom,
-    gif_error,
-    gif_comment_extension,
-    gif_application_extension,
-    gif_netscape_extension_block,
-    gif_consume_netscape_extension,
-    gif_consume_comment,
-    gif_delay,
-    gif_wait_for_buffer_full,
-    gif_stop_animating   //added for animation stop 
-} gstate;
-
-/* "Disposal" method indicates how the image should be handled in the
-   framebuffer before the subsequent image is displayed. */
-typedef enum 
-{
-    DISPOSE_NOT_SPECIFIED      = 0,
-    DISPOSE_KEEP               = 1, /* Leave it in the framebuffer */
-    DISPOSE_OVERWRITE_BGCOLOR  = 2, /* Overwrite with background color */
-    DISPOSE_OVERWRITE_PREVIOUS = 4  /* Save-under */
-} gdispose;
-
-/* A RGB triplet representing a single pixel in the image's colormap
-   (if present.) */
-typedef struct _GIF_RGB
-{
-  PRUint8 red, green, blue, pad; /* Windows requires the fourth byte &
-                                    many compilers pad it anyway. */
-                    
-  /* XXX: hist_count appears to be unused */                                  
-  //PRUint16 hist_count;           /* Histogram frequency count. */
-} GIF_RGB;
-    
-/* Colormap information. */
-typedef struct _GIF_ColorMap {
-    int32 num_colors;           /* Number of colors in the colormap.
-                                   A negative value can be used to denote a
-                                   possibly non-unique set. */
-    GIF_RGB *map;                /* Colormap colors. */
-    PRUint8 *index;             /* NULL, if map is in index order.  Otherwise
-                                   specifies the indices of the map entries. */
-    void *table;                /* Lookup table for this colormap.  Private to
-                                   the Image Library. */
-} GIF_ColorMap;
-    
-/* An indexed RGB triplet. */
-typedef struct _GIF_IRGB {
-    PRUint8 index;
-    PRUint8 red, green, blue;
-} GIF_IRGB;
-
-/* A GIF decoder's state */
-typedef struct gif_struct {
-    void* clientptr;
-    /* Callbacks for this decoder instance*/
-    int (PR_CALLBACK *GIFCallback_NewPixmap)();
-    int (PR_CALLBACK *GIFCallback_BeginGIF)(
-      void*    aClientData,
-      PRUint32 aLogicalScreenWidth, 
-      PRUint32 aLogicalScreenHeight,
-      PRUint8  aLogicalScreenBackgroundRGBIndex);
-      
-    int (PR_CALLBACK* GIFCallback_EndGIF)(
-      void*    aClientData,
-      int      aAnimationLoopCount);
-      
-    int (PR_CALLBACK* GIFCallback_BeginImageFrame)(
-      void*    aClientData,
-      PRUint32 aFrameNumber,   /* Frame number, 1-n */
-      PRUint32 aFrameXOffset,  /* X offset in logical screen */
-      PRUint32 aFrameYOffset,  /* Y offset in logical screen */
-      PRUint32 aFrameWidth,    
-      PRUint32 aFrameHeight,   
-      GIF_RGB* aTransparencyChromaKey);
-    int (PR_CALLBACK* GIFCallback_EndImageFrame)(
-      void* aClientData,
-      PRUint32 aFrameNumber,
-      PRUint32 aDelayTimeout);
-    int (PR_CALLBACK* GIFCallback_SetupColorspaceConverter)();
-    int (PR_CALLBACK* GIFCallback_ResetPalette)(); 
-    int (PR_CALLBACK* GIFCallback_InitTransparentPixel)();
-    int (PR_CALLBACK* GIFCallback_DestroyTransparentPixel)();
-    int (PR_CALLBACK* GIFCallback_HaveDecodedRow)(
-      void* aClientData,
-      PRUint8* aRowBufPtr,   /* Pointer to single scanline temporary buffer */
-      PRUint8* aRGBrowBufPtr,/* Pointer to temporary storage for dithering/mapping */
-      int aXOffset,          /* With respect to GIF logical screen origin */
-      int aLength,           /* Length of the row? */
-      int aRow,              /* Row number? */
-      int aDuplicateCount,   /* Number of times to duplicate the row? */
-      PRUint8 aDrawMode,     /* il_draw_mode */
-      int aInterlacePass);
-    int (PR_CALLBACK *GIFCallback_HaveImageAll)(
-      void* aClientData);
-        
-    /* Parsing state machine */
-    gstate state;               /* Curent decoder master state */
-    PRUint8 *hold;                /* Accumulation buffer */
-    int32 hold_size;            /* Capacity, in bytes, of accumulation buffer */
-    PRUint8 *gather_head;         /* Next byte to read in accumulation buffer */
-    int32 gather_request_size;  /* Number of bytes to accumulate */
-    int32 gathered;             /* bytes accumulated so far*/
-    gstate post_gather_state;   /* State after requested bytes accumulated */
-    int32 requested_buffer_fullness; /* For netscape application extension */
-
-    /* LZW decoder state machine */
-    PRUint8 *stack;               /* Base of decoder stack */
-    PRUint8 *stackp;              /* Current stack pointer */
-    PRUint16 *prefix;
-    PRUint8 *suffix;
-    int datasize;
-    int codesize;
-    int codemask;
-    int clear_code;             /* Codeword used to trigger dictionary reset */
-    int avail;                  /* Index of next available slot in dictionary */
-    int oldcode;
-    PRUint8 firstchar;
-    int count;                  /* Remaining # bytes in sub-block */
-    int bits;                   /* Number of unread bits in "datum" */
-    int32 datum;                /* 32-bit input buffer */
-
-    /* Output state machine */
-    int ipass;                  /* Interlace pass; Ranges 1-4 if interlaced. */
-    PRUintn rows_remaining;        /* Rows remaining to be output */
-    PRUintn irow;                  /* Current output row, starting at zero */
-    PRUint8 *rgbrow;              /* Temporary storage for dithering/mapping */
-    PRUint8 *rowbuf;              /* Single scanline temporary buffer */
-    PRUint8 *rowend;              /* Pointer to end of rowbuf */
-    PRUint8 *rowp;                /* Current output pointer */
-
-    /* Parameters for image frame currently being decoded*/
-    PRUintn x_offset, y_offset;    /* With respect to "screen" origin */
-    PRUintn height, width;
-    PRUintn last_x_offset, last_y_offset; /* With respect to "screen" origin */
-    PRUintn last_height, last_width;
-    int interlaced;             /* TRUE, if scanlines arrive interlaced order */
-    int tpixel;                 /* Index of transparent pixel */
-    GIF_IRGB* transparent_pixel;
-    int is_transparent;         /* TRUE, if tpixel is valid */
-    int control_extension;      /* TRUE, if image control extension present */
-    int is_local_colormap_defined;
-    gdispose disposal_method;   /* Restore to background, leave in place, etc.*/
-    gdispose last_disposal_method;
-    GIF_RGB *local_colormap;     /* Per-image colormap */
-    int local_colormap_size;    /* Size of local colormap array. */
-    PRUint32 delay_time;        /* Display time, in milliseconds,
-                                   for this image in a multi-image GIF */
-
-    /* Global (multi-image) state */
-    int screen_bgcolor;         /* Logical screen background color */
-    int version;                /* Either 89 for GIF89 or 87 for GIF87 */
-    PRUintn screen_width;       /* Logical screen width & height */
-    PRUintn screen_height;
-    GIF_RGB *global_colormap;    /* Default colormap if local not supplied  */
-    int global_colormap_size;   /* Size of global colormap array. */
-    int images_decoded;         /* Counts images for multi-part GIFs */
-    int destroy_pending;        /* Stream has ended */
-    int progressive_display;    /* If TRUE, do Haeberli interlace hack */
-    int loop_count;             /* Netscape specific extension block to control
-                                   the number of animation loops a GIF renders. */
-} gif_struct;
-
-
-/* Create a new gif_struct */
-extern PRBool gif_create(gif_struct **gs);
-
-/* These are the APIs that the client calls to intialize,
-push data to, and shut down the GIF decoder. */
-PRBool GIFInit(
-  gif_struct* gs,
-
-  void* aClientData,
-  
-  int (*PR_CALLBACK GIFCallback_NewPixmap)(),
-  
-  int (*PR_CALLBACK GIFCallback_BeginGIF)(
-    void* aClientData,
-    PRUint32 aLogicalScreenWidth, 
-    PRUint32 aLogicalScreenHeight,
-    PRUint8  aBackgroundRGBIndex),
-    
-  int (*PR_CALLBACK GIFCallback_EndGIF)(
-    void*    aClientData,
-    int      aAnimationLoopCount),
-  
-  int (*PR_CALLBACK GIFCallback_BeginImageFrame)(
-    void*    aClientData,
-    PRUint32 aFrameNumber,   /* Frame number, 1-n */
-    PRUint32 aFrameXOffset,  /* X offset in logical screen */
-    PRUint32 aFrameYOffset,  /* Y offset in logical screen */
-    PRUint32 aFrameWidth,    
-    PRUint32 aFrameHeight,   
-    GIF_RGB* aTransparencyChromaKey),
-  
-  int (*PR_CALLBACK GIFCallback_EndImageFrame)(
-    void* aClientData,
-    PRUint32 aFrameNumber,
-    PRUint32 aDelayTimeout),
-  
-  int (*PR_CALLBACK GIFCallback_SetupColorspaceConverter)(),
-  
-  int (*PR_CALLBACK GIFCallback_ResetPalette)(),
-  
-  int (*PR_CALLBACK GIFCallback_InitTransparentPixel)(),
-  
-  int (*PR_CALLBACK GIFCallback_DestroyTransparentPixel)(),
-  
-  int (*PR_CALLBACK GIFCallback_HaveDecodedRow)(
-    void* aClientData,
-    PRUint8* aRowBufPtr,   /* Pointer to single scanline temporary buffer */
-    PRUint8* aRGBrowBufPtr,/* Pointer to temporary storage for dithering/mapping */
-    int aXOffset,          /* With respect to GIF logical screen origin */
-    int aLength,           /* Length of the row? */
-    int aRow,              /* Row number? */
-    int aDuplicateCount,   /* Number of times to duplicate the row? */
-    PRUint8 aDrawMode,     /* il_draw_mode */
-    int aInterlacePass),
-    
-  int (*PR_CALLBACK GIFCallback_HaveImageAll)(
-    void* aClientData)
-  );
-
-extern void gif_destroy(gif_struct* aGIFStruct);
-
-int gif_write(gif_struct* aGIFStruct, const PRUint8 * buf, PRUint32 numbytes);
-
-PRUint8 gif_write_ready(gif_struct* aGIFStruct);
-
-extern void gif_complete(gif_struct** aGIFStruct);
-extern void gif_delay_time_callback(/* void *closure */);
-
-
-/* Callback functions that the client must implement and pass in 
-pointers for during the GIFInit call. These will be called back
-when the decoder has a decoded rows, frame size information, etc.*/
-
-/* GIFCallback_LogicalScreenSize is called only once to notify the client
-of the logical screen size, which will be the size of the total image. */
-typedef int (*PR_CALLBACK BEGINGIF_CALLBACK)(
-  void*    aClientData,
-  PRUint32 aLogicalScreenWidth, 
-  PRUint32 aLogicalScreenHeight,
-  PRUint8  aLogicalScreenBackgroundRGBIndex);
-                            
-typedef int (PR_CALLBACK *GIFCallback_EndGIF)(
-  void*    aClientData,
-  int      aAnimationLoopCount);
-
-/* GIFCallback_BeginImageFrame is called at the beginning of each frame of
-a GIF.*/
-typedef int (PR_CALLBACK *GIFCallback_BeginImageFrame)(
-  void*    aClientData,
-  PRUint32 aFrameNumber,   /* Frame number, 1-n */
-  PRUint32 aFrameXOffset,  /* X offset in logical screen */
-  PRUint32 aFraqeYOffset,  /* Y offset in logical screen */
-  PRUint32 aFrameWidth,    
-  PRUint32 aFrameHeight); 
-
-extern int GIFCallback_EndImageFrame(
-  void*    aClientData,
-  PRUint32 aFrameNumber,
-  PRUint32 aDelayTimeout); /* Time in milliseconds this frame should be displayed before the next frame.
-                              This information appears in a sub control block, so we don't
-                              transmit it back to the client until we're done with the frame. */
-
-/*
-extern int GIFCallback_SetupColorspaceConverter();
-extern int GIFCallback_ResetPalette(); 
-extern int GIFCallback_InitTransparentPixel();
-extern int GIFCallback_DestroyTransparentPixel();
-*/
-extern int GIFCallback_HaveDecodedRow();
-extern int GIFCallback_HaveImageAll();
-
-#endif
-

mozilla/modules/libpr0n/decoders/gif/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imggif
-LIBRARY_NAME	= imggif
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom necko layout gfx2 imglib2
-
-CPPSRCS		= GIF2.cpp nsGIFDecoder2.cpp nsGIFModule.cpp
-
-EXTRA_DSO_LDOPTS = $(GIF_LIBS) $(ZLIB_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/gif/makefile.win

@@ -1,52 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imggif
-LIBRARY_NAME	= imggif
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsGIFDecoder2.obj \
-		.\$(OBJDIR)\GIF2.obj \
-		.\$(OBJDIR)\nsGIFModule.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp

@@ -1,506 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s): 
- *  Chris Saari <saari@netscape.com>
- */
-
-#include "nsGIFDecoder2.h"
-#include "nsIInputStream.h"
-#include "nsIComponentManager.h"
-#include "nsIImage.h"
-#include "nsMemory.h"
-
-#include "imgIContainerObserver.h"
-
-#include "nsRect.h"
-
-//////////////////////////////////////////////////////////////////////
-// GIF Decoder Implementation
-// This is an adaptor between GIF2 and imgIDecoder
-
-NS_IMPL_ISUPPORTS2(nsGIFDecoder2, imgIDecoder, nsIOutputStream);
-
-nsGIFDecoder2::nsGIFDecoder2()
-{
-  NS_INIT_ISUPPORTS();
-  mImageFrame = nsnull;
-  
-  mGIFStruct = nsnull;
-
-  mAlphaLine = nsnull;
-}
-
-nsGIFDecoder2::~nsGIFDecoder2(void)
-{
-  if (mAlphaLine)
-    nsMemory::Free(mAlphaLine);
-
-  if (mGIFStruct) {
-    gif_destroy(mGIFStruct);
-    mGIFStruct = nsnull;
-  }
-}
-
-//******************************************************************************
-/** imgIDecoder methods **/
-//******************************************************************************
-
-//******************************************************************************
-/* void init (in imgIRequest aRequest); */
-NS_IMETHODIMP nsGIFDecoder2::Init(imgIRequest *aRequest)
-{
-  mImageRequest = aRequest;
-  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
-
-  aRequest->GetImage(getter_AddRefs(mImageContainer));
-
-  /* do gif init stuff */
-  /* Always decode to 24 bit pixdepth */
-  
-  PRBool created = gif_create(&mGIFStruct);
-
-  NS_ASSERTION(created, "gif_create failed");
-
-  // Call GIF decoder init routine
-  GIFInit(
-    mGIFStruct,
-    this,
-    NewPixmap,
-    BeginGIF,
-    EndGIF,
-    BeginImageFrame,
-    EndImageFrame,
-    SetupColorspaceConverter,
-    ResetPalette,
-    InitTransparentPixel,
-    DestroyTransparentPixel,
-    HaveDecodedRow,
-    HaveImageAll);
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute imgIRequest request; */
-NS_IMETHODIMP nsGIFDecoder2::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mImageRequest;
-  NS_IF_ADDREF(*aRequest);
-      
-  return NS_OK;
-}
-
-
-//******************************************************************************
-/** nsIOutputStream methods **/
-//******************************************************************************
-
-//******************************************************************************
-/* void close (); */
-NS_IMETHODIMP nsGIFDecoder2::Close()
-{
-  if (mGIFStruct) {
-    gif_destroy(mGIFStruct);
-    mGIFStruct = nsnull;
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void flush (); */
-NS_IMETHODIMP nsGIFDecoder2::Flush()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* unsigned long write (in string buf, in unsigned long count); */
-NS_IMETHODIMP nsGIFDecoder2::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* static callback from nsIInputStream::ReadSegments */
-static NS_METHOD ReadDataOut(nsIInputStream* in,
-                             void* closure,
-                             const char* fromRawSegment,
-                             PRUint32 toOffset,
-                             PRUint32 count,
-                             PRUint32 *writeCount)
-{
-  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, closure);
-  *writeCount = decoder->ProcessData((unsigned char*)fromRawSegment, count);
-  return NS_OK;
-}
-
-//******************************************************************************
-PRUint32 nsGIFDecoder2::ProcessData(unsigned char *data, PRUint32 count)
-{
-  // Push the data to the GIF decoder
-  
-  // First we ask if the gif decoder is ready for more data, and if so, push it.
-  // In the new decoder, we should always be able to process more data since
-  // we don't wait to decode each frame in an animation now.
-  if(gif_write_ready(mGIFStruct)) {
-    gif_write(mGIFStruct, data, count);
-  }
-    
-
-  return count; // we always consume all the data
-}
-
-//******************************************************************************
-/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
-NS_IMETHODIMP nsGIFDecoder2::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-  inStr->ReadSegments(
-    ReadDataOut, // Callback
-    this,     
-    count, 
-    _retval);
-
-    // if error
-    //mRequest->Cancel(NS_BINDING_ABORTED); // XXX is this the correct error ?
-  return NS_OK;
-}
-
-//******************************************************************************
-/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
-NS_IMETHODIMP nsGIFDecoder2::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* attribute boolean nonBlocking; */
-NS_IMETHODIMP nsGIFDecoder2::GetNonBlocking(PRBool *aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-//******************************************************************************
-NS_IMETHODIMP nsGIFDecoder2::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* attribute nsIOutputStreamObserver observer; */
-NS_IMETHODIMP nsGIFDecoder2::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-NS_IMETHODIMP nsGIFDecoder2::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
-//******************************************************************************
-// GIF decoder callback methods. Part of pulic API for GIF2
-//******************************************************************************
-
-//******************************************************************************
-int BeginGIF(
-  void*    aClientData,
-  PRUint32 aLogicalScreenWidth, 
-  PRUint32 aLogicalScreenHeight,
-  PRUint8  aBackgroundRGBIndex)
-{
-  // copy GIF info into imagelib structs
-  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartDecode(nsnull, nsnull);
-
-  decoder->mImageContainer->Init(aLogicalScreenWidth, aLogicalScreenHeight, decoder->mObserver);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartContainer(nsnull, nsnull, decoder->mImageContainer);
-
-  return 0;
-}
-
-//******************************************************************************
-int EndGIF(
-    void*    aClientData,
-    int      aAnimationLoopCount)
-{
-  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-  if (decoder->mObserver) {
-    decoder->mObserver->OnStopContainer(nsnull, nsnull, decoder->mImageContainer);
-    decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-  
-  decoder->mImageContainer->SetLoopCount(aAnimationLoopCount);
-  decoder->mImageContainer->DecodingComplete();
-  return 0;
-}
-
-//******************************************************************************
-int BeginImageFrame(
-  void*    aClientData,
-  PRUint32 aFrameNumber,   /* Frame number, 1-n */
-  PRUint32 aFrameXOffset,  /* X offset in logical screen */
-  PRUint32 aFrameYOffset,  /* Y offset in logical screen */
-  PRUint32 aFrameWidth,    
-  PRUint32 aFrameHeight,   
-  GIF_RGB* aTransparencyChromaKey) /* don't have this info yet */
-{
-  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-  
-  decoder->mImageFrame = nsnull; // clear out our current frame reference
-  decoder->mGIFStruct->x_offset = aFrameXOffset;
-  decoder->mGIFStruct->y_offset = aFrameYOffset;
-  decoder->mGIFStruct->width = aFrameWidth;
-  decoder->mGIFStruct->height = aFrameHeight;
-
-  return 0;
-}
-
-//******************************************************************************
-int EndImageFrame(
-  void*    aClientData, 
-  PRUint32 aFrameNumber,
-  PRUint32 aDelayTimeout)  /* Time this frame should be displayed before the next frame 
-                              we can't have this in the image frame init because it doesn't
-                              show up in the GIF frame header, it shows up in a sub control
-                              block.*/
-{
-  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-  
-  // We actually have the timeout information before we get the lzw encoded image
-  // data, at least according to the spec, but we delay in setting the timeout for
-  // the image until here to help ensure that we have the whole image frame decoded before
-  // we go off and try to display another frame.
-
-// XXXXXXXX
-  // decoder->mImageFrame->SetTimeout(aDelayTimeout);
-  decoder->mImageContainer->EndFrameDecode(aFrameNumber, aDelayTimeout);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStopFrame(nsnull, nsnull, decoder->mImageFrame);
-
-  decoder->mImageFrame = nsnull;
-  return 0;
-}
-  
-
-
-//******************************************************************************
-// GIF decoder callback
-int HaveImageAll(
-  void* aClientData)
-{
-  return 0;
-}
-
-//******************************************************************************
-// GIF decoder callback notification that it has decoded a row
-int HaveDecodedRow(
-  void* aClientData,
-  PRUint8* aRowBufPtr,   // Pointer to single scanline temporary buffer
-  PRUint8* aRGBrowBufPtr,// Pointer to temporary storage for dithering/mapping
-  int aXOffset,          // With respect to GIF logical screen origin
-  int aLength,           // Length of the row?
-  int aRowNumber,        // Row number?
-  int aDuplicateCount,   // Number of times to duplicate the row?
-  PRUint8 aDrawMode,     // il_draw_mode
-  int aInterlacePass)    // interlace pass (1-4)
-{
-  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-  PRUint32 bpr, abpr;
-  // We have to delay allocation of the image frame until now because
-  // we won't have control block info (transparency) until now. The conrol
-  // block of a GIF stream shows up after the image header since transparency
-  // is added in GIF89a and control blocks are how the extensions are done.
-  // How annoying.
-  if(! decoder->mImageFrame) {
-    gfx_format format = gfxIFormats::RGB;
-    if (decoder->mGIFStruct->is_transparent)
-      format = gfxIFormats::RGB_A1;
-
-#ifdef XP_PC
-    // XXX this works...
-    format += 1; // RGB to BGR
-#endif
-
-    // initalize the frame and append it to the container
-    decoder->mImageFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-    decoder->mImageFrame->Init(
-      decoder->mGIFStruct->x_offset, decoder->mGIFStruct->y_offset, 
-      decoder->mGIFStruct->width, decoder->mGIFStruct->height, format);
-      
-    decoder->mImageContainer->AppendFrame(decoder->mImageFrame);
-
-    if (decoder->mObserver)
-      decoder->mObserver->OnStartFrame(nsnull, nsnull, decoder->mImageFrame);
-
-    decoder->mImageFrame->GetImageBytesPerRow(&bpr);
-    decoder->mImageFrame->GetAlphaBytesPerRow(&abpr);
-
-    if (format == gfxIFormats::RGB_A1 || format == gfxIFormats::BGR_A1) {
-      if (decoder->mAlphaLine)
-        nsMemory::Free(decoder->mAlphaLine);
-      decoder->mAlphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
-    }
-  } else {
-    decoder->mImageFrame->GetImageBytesPerRow(&bpr);
-    decoder->mImageFrame->GetAlphaBytesPerRow(&abpr);
-  }
-  
-  if (aRowBufPtr) {
-    nscoord width;
-
-    decoder->mImageFrame->GetWidth(&width);
-    PRUint32 iwidth = width;
-
-    gfx_format format;
-    decoder->mImageFrame->GetFormat(&format);
-
-    // XXX map the data into colors
-    int cmapsize;
-    GIF_RGB* cmap;
-    if(decoder->mGIFStruct->local_colormap) {
-      cmapsize = decoder->mGIFStruct->local_colormap_size;
-      cmap = decoder->mGIFStruct->local_colormap;
-    } else {
-      cmapsize = decoder->mGIFStruct->global_colormap_size;
-      cmap = decoder->mGIFStruct->global_colormap;
-    }
-
-    PRUint8* rgbRowIndex = aRGBrowBufPtr;
-    PRUint8* rowBufIndex = aRowBufPtr;
-        
-    switch (format) {
-    case gfxIFormats::RGB:
-      {
-        while(rowBufIndex != decoder->mGIFStruct->rowend) {
-#ifdef XP_MAC
-          *rgbRowIndex++ = 0; // Mac is always 32bits per pixel, this is pad
-#endif
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
-          ++rowBufIndex;
-        }
-
-        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
-      }
-      break;
-    case gfxIFormats::BGR:
-      {
-        while(rowBufIndex != decoder->mGIFStruct->rowend) {
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
-          ++rowBufIndex;
-        }
-
-        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
-      }
-      break;
-    case gfxIFormats::RGB_A1:
-    case gfxIFormats::BGR_A1:
-      {
-        memset(aRGBrowBufPtr, 0, bpr);
-        memset(decoder->mAlphaLine, 0, abpr);
-        PRUint32 iwidth = (PRUint32)width;
-        for (PRUint32 x=0; x<iwidth; x++) {
-          if (*rowBufIndex != decoder->mGIFStruct->tpixel) {
-#ifdef XP_PC
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
-#else
-#ifdef XP_MAC
-          *rgbRowIndex++ = 0; // Mac is always 32bits per pixel, this is pad
-#endif
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
-#endif
-            decoder->mAlphaLine[x>>3] |= 1<<(7-x&0x7);
-          } else {
-#ifdef XP_MAC
-            rgbRowIndex+=4;
-#else
-            rgbRowIndex+=3;
-#endif
-          }
-
-          ++rowBufIndex;
-        }
-        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
-        decoder->mImageFrame->SetAlphaData(decoder->mAlphaLine, abpr, aRowNumber*abpr);
-      }
-      break;
-    default:
-      break;
-
-    }
-
-    nsRect r(0, aRowNumber, width, 1);
-
-    decoder->mObserver->OnDataAvailable(nsnull, nsnull, decoder->mImageFrame, &r);
-  }
-
-  return 0;
-}
-
-//******************************************************************************
-int ResetPalette()
-{
-  return 0;
-}
-
-//******************************************************************************
-int SetupColorspaceConverter()
-{
-  return 0;
-}
-
-//******************************************************************************
-int EndImageFrame()
-{
-  return 0;
-}
-
-//******************************************************************************
-int NewPixmap()
-{
-  return 0;
-}
-
-//******************************************************************************
-int InitTransparentPixel()
-{
-  return 0;
-}
-
-//******************************************************************************
-int DestroyTransparentPixel()
-{
-  return 0;
-}

mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.h

@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s): 
- *  Chris Saari <saari@netscape.com>
- */
-
-#ifndef _nsGIFDecoder2_h
-#define _nsGIFDecoder2_h
-
-#include "nsCOMPtr.h"
-#include "imgIDecoder.h"
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-#include "gfxIImageFrame.h"
-#include "imgIRequest.h"
-
-#include "GIF2.h"
-
-#define NS_GIFDECODER2_CID \
-{ /* 797bec5a-1dd2-11b2-a7f8-ca397e0179c4 */         \
-     0x797bec5a,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0xa7, 0xf8, 0xca, 0x39, 0x7e, 0x01, 0x79, 0xc4} \
-}
-
-//////////////////////////////////////////////////////////////////////
-// nsGIFDecoder2 Definition
-
-class nsGIFDecoder2 : public imgIDecoder   
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsGIFDecoder2();
-  virtual ~nsGIFDecoder2();
-
-  static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-  
-  NS_METHOD ProcessData(unsigned char *data, PRUint32 count);
-  
-  nsCOMPtr<imgIContainer> mImageContainer;
-  nsCOMPtr<gfxIImageFrame> mImageFrame;
-  nsCOMPtr<imgIRequest> mImageRequest;
-  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
-  
-  gif_struct *mGIFStruct;
-  
-  PRUint8 *mAlphaLine;
-};
-
-// static callbacks for the GIF decoder
-static int PR_CALLBACK BeginGIF(
-  void*    aClientData,
-  PRUint32 aLogicalScreenWidth, 
-  PRUint32 aLogicalScreenHeight,
-  PRUint8  aBackgroundRGBIndex);
-  
-static int PR_CALLBACK HaveDecodedRow(
-  void* aClientData,
-  PRUint8* aRowBufPtr,   // Pointer to single scanline temporary buffer
-  PRUint8* aRGBrowBufPtr,// Pointer to temporary storage for dithering/mapping
-  int aXOffset,          // With respect to GIF logical screen origin
-  int aLength,           // Length of the row?
-  int aRow,              // Row number?
-  int aDuplicateCount,   // Number of times to duplicate the row?
-  PRUint8 aDrawMode,     // il_draw_mode
-  int aInterlacePass);
-    
-static int PR_CALLBACK NewPixmap();
-
-static int PR_CALLBACK EndGIF(
-  void*    aClientData,
-  int      aAnimationLoopCount);
-  
-static int PR_CALLBACK BeginImageFrame(
-  void*    aClientData,
-  PRUint32 aFrameNumber,   /* Frame number, 1-n */
-  PRUint32 aFrameXOffset,  /* X offset in logical screen */
-  PRUint32 aFrameYOffset,  /* Y offset in logical screen */
-  PRUint32 aFrameWidth,    
-  PRUint32 aFrameHeight,   
-  GIF_RGB* aTransparencyChromaKey);
-static int PR_CALLBACK EndImageFrame(
-  void*    aClientData, 
-  PRUint32 aFrameNumber,
-  PRUint32 aDelayTimeout);
-static int PR_CALLBACK SetupColorspaceConverter();
-static int PR_CALLBACK ResetPalette();
-static int PR_CALLBACK InitTransparentPixel();
-static int PR_CALLBACK DestroyTransparentPixel();
-
-static int PR_CALLBACK HaveImageAll(
-  void* aClientData);
-#endif

mozilla/modules/libpr0n/decoders/gif/win32.order

@@ -1,18 +0,0 @@
-?AddRef@nsGIFDecoder2@@UAGKXZ ; 2550
-?Release@nsGIFDecoder2@@UAGKXZ ; 2550
-?gif_write_ready@@YAEPAUgif_struct@@@Z ; 1624
-?ProcessData@nsGIFDecoder2@@QAGIPAEI@Z ; 1624
-?gif_write@@YAHPAUgif_struct@@PBEI@Z ; 1624
-?WriteFrom@nsGIFDecoder2@@UAGIPAVnsIInputStream@@IPAI@Z ; 1309
-?Close@nsGIFDecoder2@@UAGIXZ ; 1275
-??_GnsGIFDecoder2@@UAEPAXI@Z ; 1275
-??0nsGIFDecoder2@@QAE@XZ ; 1275
-??1nsGIFDecoder2@@UAE@XZ ; 1275
-?QueryInterface@nsGIFDecoder2@@UAGIABUnsID@@PAPAX@Z ; 1275
-?GIFInit@@YAHPAUgif_struct@@PAXP6AHXZP6AH1IIE@ZP6AH1H@ZP6AH1IIIIIPAU_GIF_RGB@@@ZP6AH1II@Z2222P6AH1PAE8HHHHEH@ZP6AH1@Z@Z ; 1275
-?Init@nsGIFDecoder2@@UAGIPAVimgIRequest@@@Z ; 1275
-?Flush@nsGIFDecoder2@@UAGIXZ ; 1275
-?gif_destroy@@YAXPAUgif_struct@@@Z ; 1275
-?gif_create@@YAHPAPAUgif_struct@@@Z ; 1275
-?il_BACat@@YAPADPAPADIPBDI@Z ; 698
-_NSGetModule ; 1

mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp

@@ -1,378 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-
-#include "nsIconChannel.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsMimeTypes.h"
-#include "nsMemory.h"
-#include "nsIStringStream.h"
-#include "nsIURL.h"
-#include "nsNetUtil.h"
-#include "nsIMimeService.h"
-#include "nsCExternalHandlerService.h"
-#include "plstr.h"
-
-#include <Files.h>
-#include <QuickDraw.h>
-
-// nsIconChannel methods
-nsIconChannel::nsIconChannel()
-{
-  NS_INIT_REFCNT();
-  mStatus = NS_OK;
-}
-
-nsIconChannel::~nsIconChannel() 
-{}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsIconChannel, 
-                              nsIChannel, 
-                              nsIRequest)
-
-nsresult nsIconChannel::Init(nsIURI* uri)
-{
-  nsresult rv;
-  NS_ASSERTION(uri, "no uri");
-  mUrl = uri;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP nsIconChannel::GetName(PRUnichar* *result)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::IsPending(PRBool *result)
-{
-  NS_NOTREACHED("nsIconChannel::IsPending");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
-{
-  *status = mStatus;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
-{
-  NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
-  nsresult rv = NS_ERROR_FAILURE;
-
-  mStatus = status;
-  return rv;
-}
-
-NS_IMETHODIMP nsIconChannel::Suspend(void)
-{
-  NS_NOTREACHED("nsIconChannel::Suspend");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::Resume(void)
-{
-  NS_NOTREACHED("nsIconChannel::Resume");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
-{
-  *aURI = mOriginalURI ? mOriginalURI : mUrl;
-  NS_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
-{
-  mOriginalURI = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
-{
-  *aURI = mUrl;
-  NS_IF_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetURI(nsIURI* aURI)
-{
-  mUrl = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIconChannel::Open(nsIInputStream **_retval)
-{
-  return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
-{
-  // get the file name from the url
-  nsXPIDLCString fileName; // will contain a dummy file we'll use to figure out the type of icon desired.
-  nsXPIDLCString filePath; // will contain an optional parameter for small vs. large icon. default is small
-  mUrl->GetHost(getter_Copies(fileName));
-  nsCOMPtr<nsIURL> url (do_QueryInterface(mUrl));
-  if (url)
-    url->GetFileBaseName(getter_Copies(filePath));
-  nsresult rv = NS_OK;  
-  nsCOMPtr<nsIMIMEService> mimeService (do_GetService(NS_MIMESERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  
-  // extract the extension out of the dummy file so we can look it up in the mime service.
-  char * chFileName = fileName.get(); // get the underlying buffer
-  char * fileExtension = PL_strrchr(chFileName, '.');
-  if (!fileExtension) return NS_ERROR_FAILURE; // no file extension to work from.
-  
-  // look the file extension up in the registry.
-  nsCOMPtr<nsIMIMEInfo> mimeInfo;
-  mimeService->GetFromExtension(fileExtension, getter_AddRefs(mimeInfo));
-  NS_ENSURE_TRUE(mimeInfo, NS_ERROR_FAILURE);
-  
-  // get the mac creator and file type for this mime object
-  PRUint32 macType;
-  PRUint32 macCreator;
-  
-  mimeInfo->GetMacType(&macType);
-  mimeInfo->GetMacCreator(&macCreator);
-  
-  // get a refernce to the desktop database  
-  DTPBRec 	pb;
-  OSErr err = noErr;
-  
-  memset(&pb, 0, sizeof(DTPBRec));
-  pb.ioCompletion = nil;
-  pb.ioVRefNum = 0; // default desktop volume
-  pb.ioNamePtr = nil;
-  err = PBDTGetPath(&pb);
-  if (err != noErr) return NS_ERROR_FAILURE;
-  
-  pb.ioFileCreator = macCreator;
-  pb.ioFileType = macType;
-  pb.ioCompletion = nil;
-  pb.ioTagInfo = 0;
-  
-  PRUint32 numPixelsInRow = 0;
-  if (filePath && !nsCRT::strcmp(filePath, "large"))
-  {
-    pb.ioDTReqCount = kLarge8BitIconSize;
-    pb.ioIconType = kLarge8BitIcon;
-    numPixelsInRow = 32;
-  }
-  else
-  {
-    pb.ioDTReqCount = kSmall8BitIconSize;
-    pb.ioIconType = kSmall8BitIcon;  
-    numPixelsInRow = 16;
-  }
-  
-  // allocate a buffer large enough to handle the icon
-  PRUint8 * bitmapData = (PRUint8 *) nsMemory::Alloc (pb.ioDTReqCount);
-  pb.ioDTBuffer = (Ptr) bitmapData;
-  
-  err = PBDTGetIcon(&pb, false);
-  if (err != noErr) return NS_ERROR_FAILURE; // unable to fetch the icon....
-  
-  nsCString iconBuffer;
-  iconBuffer.Assign((char) numPixelsInRow);
-  iconBuffer.Append((char) numPixelsInRow);
-  CTabHandle cTabHandle = GetCTable(72);
-  if (!cTabHandle) return NS_ERROR_FAILURE;
-  
-  HLock((Handle) cTabHandle);
-  CTabPtr colTable = *cTabHandle;
-  RGBColor rgbCol;
-  PRUint8 redValue, greenValue, blueValue;
-  
-  for (PRUint32 index = 0; index < pb.ioDTReqCount; index ++)
-  {
-
-  	// each byte in bitmapData needs to be converted from an 8 bit system color into 
-    // 24 bit RGB data which our special icon image decoder can understand.
-    ColorSpec colSpec =  colTable->ctTable[ bitmapData[index]];
-    rgbCol = colSpec.rgb;
-    
-    redValue = rgbCol.red & 0xff;
-    greenValue = rgbCol.green & 0xff;
-    blueValue = rgbCol.blue & 0xff;
-    
-    // for some reason the image code on the mac expects each RGB pixel value to be padded with a preceding byte.
-    // so add the padding here....
-    iconBuffer.Append((char) 0);
-    iconBuffer.Append((char) redValue);
-    iconBuffer.Append((char) greenValue);
-    iconBuffer.Append((char) blueValue);
-  }
-  
-  
-  HUnlock((Handle) cTabHandle);
-  DisposeCTable(cTabHandle);
-  nsMemory::Free(bitmapData);
-  
-  // now that the color bitmask is taken care of, we need to do the same thing again for the transparency
-  // bit mask....
-  if (filePath && !nsCRT::strcmp(filePath, "large"))
-  {
-    pb.ioDTReqCount = kLargeIconSize;
-    pb.ioIconType = kLargeIcon;
-  }
-  else
-  {
-    pb.ioDTReqCount = kSmallIconSize;
-    pb.ioIconType = kSmallIcon; 
-  }
-  
-  // allocate a buffer large enough to handle the icon
-  bitmapData = (PRUint8 *) nsMemory::Alloc (pb.ioDTReqCount);
-  pb.ioDTBuffer = (Ptr) bitmapData;
-  err = PBDTGetIcon(&pb, false);
-  PRUint32 index = pb.ioDTReqCount/2;
-  while (index < pb.ioDTReqCount)
-  {
-   iconBuffer.Append((char) bitmapData[index]);
-   iconBuffer.Append((char) bitmapData[index + 1]);
-   if (numPixelsInRow == 32)
-   {
-     iconBuffer.Append((char) bitmapData[index + 2]);
-     iconBuffer.Append((char) bitmapData[index + 3]);
-     index += 4;
-   }
-   else
-   {
-    iconBuffer.Append((char) 255); // 2 bytes of padding
-    iconBuffer.Append((char) 255);
-    index += 2;
-   }
-  }
-  
-  nsMemory::Free(bitmapData);
-  
-  // turn our nsString into a stream looking object...
-  aListener->OnStartRequest(this, ctxt);
-
- // turn our string into a stream...
- nsCOMPtr<nsISupports> streamSupports;
- NS_NewByteInputStream(getter_AddRefs(streamSupports), iconBuffer.get(), iconBuffer.Length());
-
- nsCOMPtr<nsIInputStream> inputStr (do_QueryInterface(streamSupports));
- aListener->OnDataAvailable(this, ctxt, inputStr, 0, iconBuffer.Length());
- aListener->OnStopRequest(this, ctxt, NS_OK, nsnull);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
-{
-  *aLoadAttributes = mLoadAttributes;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
-{
-  mLoadAttributes = aLoadAttributes;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetContentType(char* *aContentType) 
-{
-  if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-  *aContentType = nsCRT::strdup("image/icon");
-  if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIconChannel::SetContentType(const char *aContentType)
-{
-  //It doesn't make sense to set the content-type on this type
-  // of channel...
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsIconChannel::GetContentLength(PRInt32 *aContentLength)
-{
-  *aContentLength = mContentLength;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetContentLength(PRInt32 aContentLength)
-{
-  NS_NOTREACHED("nsIconChannel::SetContentLength");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-  *aLoadGroup = mLoadGroup;
-  NS_IF_ADDREF(*aLoadGroup);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-  mLoadGroup = aLoadGroup;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
-{
-  *aOwner = mOwner.get();
-  NS_IF_ADDREF(*aOwner);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
-{
-  mOwner = aOwner;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-  *aNotificationCallbacks = mCallbacks.get();
-  NS_IF_ADDREF(*aNotificationCallbacks);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-  mCallbacks = aNotificationCallbacks;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-  *aSecurityInfo = nsnull;
-  return NS_OK;
-}
-

mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.h

@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Scott MacGregor <mscott@netscape.com>
- */
-
-#ifndef nsIconChannel_h___
-#define nsIconChannel_h___
-
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIURI.h"
-
-class nsIconChannel : public nsIChannel
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIREQUEST
-  NS_DECL_NSICHANNEL
-
-  nsIconChannel();
-  virtual ~nsIconChannel();
-
-  nsresult Init(nsIURI* uri);
-
-protected:
-  nsCOMPtr<nsIURI> mUrl;
-  nsCOMPtr<nsIURI> mOriginalURI;
-  PRUint32         mLoadAttributes;
-  PRInt32          mContentLength;
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
-  nsCOMPtr<nsISupports>  mOwner; 
-  nsresult mStatus;
-};
-
-#endif /* nsIconChannel_h___ */

mozilla/modules/libpr0n/decoders/icon/makefile.win

@@ -1,62 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Scott MacGregor <mscott@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-DIR=win
-
-MODULE			= imgicon
-LIBRARY_NAME	= imgicon
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsIconDecoder.obj \
-		.\$(OBJDIR)\nsIconModule.obj  \
-    .\$(OBJDIR)\nsIconProtocolHandler.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR)               \
-	$(DIST)\lib\xpcom.lib    \
-	$(DIST)\lib\gkgfxwin.lib \
-  $(DIST)\lib\imgiconwin_s.lib \
-	$(NULL)
-
-WIN_LIBS= shell32.lib
-
-INCS = $(INCS)                                         \
-        -I$(DEPTH)\dist\include                        \
-        -I$(DEPTH)\modules\libpr0n\decoders\icon\win   \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/icon/nsIconDecoder.cpp

@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Scott MacGregor <mscott@netscape.com>
- *
- */
-
-#include "nsIconDecoder.h"
-#include "nsIInputStream.h"
-#include "imgIContainer.h"
-#include "imgIContainerObserver.h"
-#include "nspr.h"
-#include "nsIComponentManager.h"
-#include "nsRect.h"
-
-NS_IMPL_THREADSAFE_ADDREF(nsIconDecoder);
-NS_IMPL_THREADSAFE_RELEASE(nsIconDecoder);
-
-NS_INTERFACE_MAP_BEGIN(nsIconDecoder)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIOutputStream)
-   NS_INTERFACE_MAP_ENTRY(nsIOutputStream)
-   NS_INTERFACE_MAP_ENTRY(imgIDecoder)
-NS_INTERFACE_MAP_END_THREADSAFE
-
-nsIconDecoder::nsIconDecoder()
-{
-  NS_INIT_ISUPPORTS();
-}
-
-nsIconDecoder::~nsIconDecoder()
-{ }
-
-
-/** imgIDecoder methods **/
-
-NS_IMETHODIMP nsIconDecoder::Init(imgIRequest *aRequest)
-{
-  mRequest = aRequest;
-
-  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
-
-  aRequest->GetImage(getter_AddRefs(mImage));
-
-  mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-  if (!mFrame) return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconDecoder::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mRequest;
-  NS_ADDREF(*aRequest);
-  return NS_OK;
-}
-
-/** nsIOutputStream methods **/
-
-NS_IMETHODIMP nsIconDecoder::Close()
-{
-  if (mObserver) 
-  {
-    mObserver->OnStopFrame(nsnull, nsnull, mFrame);
-    mObserver->OnStopContainer(nsnull, nsnull, mImage);
-    mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconDecoder::Flush()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-  nsresult rv;
-
-  char *buf = (char *)PR_Malloc(count);
-  if (!buf) return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
- 
-  // read the data from the input stram...
-  PRUint32 readLen;
-  rv = inStr->Read(buf, count, &readLen);
-
-  char *data = buf;
-
-  if (NS_FAILED(rv)) return rv;
-
-  // since WriteFrom is only called once, go ahead and fire the on start notifications..
-
-  mObserver->OnStartDecode(nsnull, nsnull);
-  PRUint32 i = 0;
-  // Read size
-  PRInt32 w, h;
-  w = data[0];
-  h = data[1];
-
-  data += 2;
-
-  readLen -= i + 2;
-
-  mImage->Init(w, h, mObserver);
-  if (mObserver)
-    mObserver->OnStartContainer(nsnull, nsnull, mImage);
-
-  mFrame->Init(0, 0, w, h, gfxIFormats::RGB_A1);
-  mImage->AppendFrame(mFrame);
-  if (mObserver)
-    mObserver->OnStartFrame(nsnull, nsnull, mFrame);
-  
-  PRUint32 bpr, abpr;
-  nscoord width, height;
-  mFrame->GetImageBytesPerRow(&bpr);
-  mFrame->GetAlphaBytesPerRow(&abpr);
-  mFrame->GetWidth(&width);
-  mFrame->GetHeight(&height);
-  
-  i = 0;
-  PRInt32 rownum = 0;  // XXX this better not have a decimal
-  
-  PRInt32 wroteLen = 0;
-
-  do 
-  {
-    PRUint8 *line = (PRUint8*)data + i*bpr;
-    mFrame->SetImageData(line, bpr, (rownum++)*bpr);
-
-    nsRect r(0, rownum, width, 1);
-    mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
-
-    wroteLen += bpr ;
-    i++;
-  } while(rownum < height);
-
-
- // now we want to send in the alpha data...
- for (rownum = 0; rownum < height; rownum ++)
- {
-  PRUint8 * line = (PRUint8*) data + abpr * rownum + height*bpr;
-  mFrame->SetAlphaData(line, abpr, (rownum)*abpr);   
- } 
-
-  PR_FREEIF(buf);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/modules/libpr0n/decoders/icon/nsIconDecoder.h

@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-#ifndef nsIconDecoder_h__
-#define nsIconDecoder_h__
-
-#include "imgIDecoder.h"
-
-#include "nsCOMPtr.h"
-
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-#include "gfxIImageFrame.h"
-#include "imgIRequest.h"
-
-#define NS_ICONDECODER_CID                           \
-{ /* FFC08380-256C-11d5-9905-001083010E9B */         \
-     0xffc08380,                                     \
-     0x256c,                                         \
-     0x11d5,                                         \
-    { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b }   \
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-// The icon decoder is a decoder specifically tailored for loading icons 
-// from the OS. We've defined our own little format to represent these icons
-// and this decoder takes that format and converts it into 24-bit RGB with alpha channel
-// support. It was modeled a bit off the PPM decoder.
-//
-// Assumptions about the decoder:
-// (1) We receive ALL of the data from the icon channel in one OnDataAvailable call. We don't
-//     support multiple ODA calls yet.
-// (2) the format of the incoming data is as follows:
-//     The first two bytes contain the width and the height of the icon. 
-//     Followed by 3 bytes per pixel for the color bitmap row after row. (for heigh * width * 3 bytes)
-//     Followed by bit mask data (used for transparency on the alpha channel). 
-//
-//
-//////////////////////////////////////////////////////////////////////////////////////////////
-
-class nsIconDecoder : public imgIDecoder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsIconDecoder();
-  virtual ~nsIconDecoder();
-
-private:
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<gfxIImageFrame> mFrame;
-  nsCOMPtr<imgIRequest> mRequest;
-  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
-};
-
-#endif // nsIconDecoder_h__

mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsIconDecoder.h"
-#include "nsIconProtocolHandler.h"
-
-// objects that just require generic constructors
-/******************************************************************************
- * Protocol CIDs
- */
-#define NS_ICONPROTOCOL_CID   { 0xd0f9db12, 0x249c, 0x11d5, { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } } 
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconDecoder)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
-
-static nsModuleComponentInfo components[] =
-{
-  { "icon decoder",
-    NS_ICONDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/icon",
-    nsIconDecoderConstructor, },
-
-   { "Icon Protocol Handler",      
-      NS_ICONPROTOCOL_CID,
-      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "icon",
-      nsIconProtocolHandlerConstructor
-    }
-};
-
-NS_IMPL_NSGETMODULE("nsIconDecoderModule", components)
-

mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp

@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Scott MacGregor <mscott@netscape.com>
- */
-
-#include "nsIconChannel.h"
-#include "nsIconProtocolHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-
-static NS_DEFINE_CID(kStandardURICID, NS_STANDARDURL_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsIconProtocolHandler::nsIconProtocolHandler() 
-{
-  NS_INIT_REFCNT();
-}
-
-nsIconProtocolHandler::~nsIconProtocolHandler() 
-{}
-
-NS_IMPL_ISUPPORTS2(nsIconProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference)
-
-    
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP nsIconProtocolHandler::GetScheme(char* *result) 
-{
-  *result = nsCRT::strdup("icon");
-  if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconProtocolHandler::GetDefaultPort(PRInt32 *result) 
-{
-  *result = 0;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **result) 
-{
-  nsresult rv;
-
-  // no concept of a relative icon url
-  NS_ASSERTION(!aBaseURI, "base url passed into icon protocol handler");
-  nsCOMPtr<nsIURI> url = do_CreateInstance(kStandardURICID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  rv = url->SetSpec((char*)aSpec);
-  *result = url;
-  NS_IF_ADDREF(*result);
-  return rv;
-}
-
-NS_IMETHODIMP nsIconProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result)
-{
-  nsCOMPtr<nsIChannel> channel;
-  NS_NEWXPCOM(channel, nsIconChannel);
-
-  if (channel)
-    NS_STATIC_CAST(nsIconChannel*,NS_STATIC_CAST(nsIChannel*, channel))->Init(url);
-
-  *result = channel;
-  NS_IF_ADDREF(*result);
-
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libpr0n/decoders/icon/win/makefile.win

@@ -1,46 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org 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.
-#
-# Contributor(s): 
-#  Scott MacGregor <mscott@netscape.com>
-
-DEPTH=..\..\..\..\..
-MODULE=imgicon
-
-LIBRARY_NAME=imgiconwin_s
-
-CPP_OBJS=\
-        .\$(OBJDIR)\nsIconChannel.obj  	\
-         $(NULL)
-
-INCS = $(INCS)                  \
-        -I$(DEPTH)\dist\include \
-        -I..\       	         	\
-		$(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-         
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-

mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp

@@ -1,377 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-
-#include "nsIconChannel.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsMimeTypes.h"
-#include "nsMemory.h"
-#include "nsIStringStream.h"
-#include "nsIURL.h"
-#include "nsNetUtil.h"
-
-// we need windows.h to read out registry information...
-#include <windows.h>
-#include <shellapi.h>
-
-// nsIconChannel methods
-nsIconChannel::nsIconChannel()
-{
-  NS_INIT_REFCNT();
-  mStatus = NS_OK;
-}
-
-nsIconChannel::~nsIconChannel() 
-{}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsIconChannel, 
-                              nsIChannel, 
-                              nsIRequest)
-
-nsresult nsIconChannel::Init(nsIURI* uri)
-{
-  nsresult rv;
-  NS_ASSERTION(uri, "no uri");
-  mUrl = uri;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP nsIconChannel::GetName(PRUnichar* *result)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::IsPending(PRBool *result)
-{
-  NS_NOTREACHED("nsIconChannel::IsPending");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
-{
-  *status = mStatus;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
-{
-  NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
-  nsresult rv = NS_ERROR_FAILURE;
-
-  mStatus = status;
-  return rv;
-}
-
-NS_IMETHODIMP nsIconChannel::Suspend(void)
-{
-  NS_NOTREACHED("nsIconChannel::Suspend");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::Resume(void)
-{
-  NS_NOTREACHED("nsIconChannel::Resume");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
-{
-  *aURI = mOriginalURI ? mOriginalURI : mUrl;
-  NS_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
-{
-  mOriginalURI = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
-{
-  *aURI = mUrl;
-  NS_IF_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetURI(nsIURI* aURI)
-{
-  mUrl = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIconChannel::Open(nsIInputStream **_retval)
-{
-  return NS_ERROR_FAILURE;
-}
-
-void InvertRows(unsigned char * aInitialBuffer, PRUint32 sizeOfBuffer, PRUint32 numBytesPerRow)
-{
-  PRUint32 numRows = sizeOfBuffer / numBytesPerRow;
-  void * temporaryRowHolder = (void *) nsMemory::Alloc(numBytesPerRow);
-
-  PRUint32 currentRow = 0;
-  PRUint32 lastRow = (numRows - 1) * numBytesPerRow;
-  while (currentRow < lastRow)
-  {
-    // store the current row into a temporary buffer
-    nsCRT::memcpy(temporaryRowHolder, (void *) &aInitialBuffer[currentRow], numBytesPerRow);
-    nsCRT::memcpy((void *) &aInitialBuffer[currentRow], (void *)&aInitialBuffer[lastRow], numBytesPerRow);
-    nsCRT::memcpy((void *) &aInitialBuffer[lastRow], temporaryRowHolder, numBytesPerRow);
-    lastRow -= numBytesPerRow;
-    currentRow += numBytesPerRow;
-  }
-}
-
-NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
-{
-  // get the file name from the url
-  nsXPIDLCString fileName; // will contain a dummy file we'll use to figure out the type of icon desired.
-  nsXPIDLCString filePath; // will contain an optional parameter for small vs. large icon. default is small
-  mUrl->GetHost(getter_Copies(fileName));
-  nsCOMPtr<nsIURL> url (do_QueryInterface(mUrl));
-  if (url)
-    url->GetFileBaseName(getter_Copies(filePath));
-
-  
-  // 1) get a hIcon for the file.
-  SHFILEINFO      sfi;
-  UINT infoFlags = SHGFI_USEFILEATTRIBUTES | SHGFI_ICON;
-  if (filePath && !nsCRT::strcmp(filePath, "large"))
-    infoFlags |= SHGFI_LARGEICON;
-  else // default to small
-    infoFlags |= SHGFI_SMALLICON;
-
-  LONG result= SHGetFileInfo(fileName, FILE_ATTRIBUTE_ARCHIVE, &sfi, sizeof(sfi), infoFlags);
-  if (result > 0 && sfi.hIcon)
-  {
-    // we got a handle to an icon. Now we want to get a bitmap for the icon using GetIconInfo....
-    ICONINFO pIconInfo;
-    result = GetIconInfo(sfi.hIcon, &pIconInfo);
-    if (result > 0)
-    {
-      // now we have the bit map we need to get info about the bitmap
-      BITMAPINFO pBitMapInfo;
-      BITMAPINFOHEADER pBitMapInfoHeader;
-      pBitMapInfo.bmiHeader.biBitCount = 0;
-      pBitMapInfo.bmiHeader.biSize = sizeof(pBitMapInfoHeader);
-
-      HDC pDC = CreateCompatibleDC(NULL); // get a device context for the screen.
-      result = GetDIBits(pDC, pIconInfo.hbmColor, 0, 0, NULL, &pBitMapInfo, DIB_RGB_COLORS);
-      if (result > 0 && pBitMapInfo.bmiHeader.biSizeImage > 0)
-      {
-        // allocate a buffer to hold the bit map....this should be a buffer that's biSizeImage...
-        unsigned char * buffer = (PRUint8 *) nsMemory::Alloc(pBitMapInfo.bmiHeader.biSizeImage);
-        result = GetDIBits(pDC, pIconInfo.hbmColor, 0, pBitMapInfo.bmiHeader.biHeight, (void *) buffer, &pBitMapInfo, DIB_RGB_COLORS);
-        if (result > 0)
-        {
-          PRUint32 bytesPerPixel = pBitMapInfo.bmiHeader.biBitCount / 8;
-          InvertRows(buffer, pBitMapInfo.bmiHeader.biSizeImage, pBitMapInfo.bmiHeader.biWidth * bytesPerPixel);
-          // Convert our little icon buffer which is padded to 4 bytes per pixel into a nice 3 byte per pixel
-          // description.
-          nsCString iconBuffer;
-          iconBuffer.Assign((char) pBitMapInfo.bmiHeader.biWidth);
-          iconBuffer.Append((char) pBitMapInfo.bmiHeader.biHeight);
-          
-          PRInt32 index = 0;
-          if (pBitMapInfo.bmiHeader.biBitCount == 16)
-          {
-            PRUint8 redValue, greenValue, blueValue, partialGreen;
-            while (index < pBitMapInfo.bmiHeader.biSizeImage)
-            {                            
-              DWORD dst=(DWORD) buffer[index];
-              PRUint16 num = 0;
-              num = (PRUint8) buffer[index];
-              num <<= 8;
-              num |= (PRUint8) buffer[index+1];
-
-              //blueValue = (PRUint8)((*dst)&(0x1F));
-              //greenValue = (PRUint8)(((*dst)>>5)&(0x1F));
-              //redValue = (PRUint8)(((*dst)>>10)&(0x1F));
-
-              redValue = ((PRUint32) (((float)(num & 0x7c00) / 0x7c00) * 0xFF0000) & 0xFF0000)>> 16;
-              greenValue =  ((PRUint32)(((float)(num & 0x03E0) / 0x03E0) * 0x00FF00) & 0x00FF00)>> 8;
-              blueValue =  ((PRUint32)(((float)(num & 0x001F) / 0x001F) * 0x0000FF) & 0x0000FF);
-
-              // now we have the right RGB values...
-              iconBuffer.Append((char) redValue);
-              iconBuffer.Append((char) greenValue);
-              iconBuffer.Append((char) blueValue);
-              index += bytesPerPixel;
-            }
-          }
-          else
-          {
-            while (index <pBitMapInfo.bmiHeader.biSizeImage)
-            {
-              iconBuffer.Append((char) buffer[index]);
-              iconBuffer.Append((char) buffer[index+1]);
-              iconBuffer.Append((char) buffer[index+2]);
-              index += bytesPerPixel;
-            }
-          }
-
-          // now we need to tack on the alpha data...which is hbmMask
-          pBitMapInfo.bmiHeader.biBitCount = 0;
-          pBitMapInfo.bmiHeader.biSize = sizeof(pBitMapInfoHeader);
-          result = GetDIBits(pDC, pIconInfo.hbmMask, 0, 0, NULL, &pBitMapInfo, DIB_RGB_COLORS);
-          if (result > 0 && pBitMapInfo.bmiHeader.biSizeImage > 0)
-          {
-            // allocate a buffer to hold the bit map....this should be a buffer that's biSizeImage...
-            unsigned char * maskBuffer = (PRUint8 *) nsMemory::Alloc(pBitMapInfo.bmiHeader.biSizeImage);
-            result = GetDIBits(pDC, pIconInfo.hbmMask, 0, pBitMapInfo.bmiHeader.biHeight, (void *) maskBuffer, &pBitMapInfo, DIB_RGB_COLORS);
-            if (result > 0)
-            {
-              InvertRows(maskBuffer, pBitMapInfo.bmiHeader.biSizeImage, 4);
-              index = 0;
-              // for some reason the bit mask on windows are flipped from the values we really want for transparency. 
-              // So complement each byte in the bit mask.
-              while (index < pBitMapInfo.bmiHeader.biSizeImage)
-              {
-                maskBuffer[index]^=255;
-                index += 1;
-              }
-              iconBuffer.Append((char *) maskBuffer, pBitMapInfo.bmiHeader.biSizeImage);
-            }
-
-            nsMemory::Free(maskBuffer);
-          } // if we have a mask buffer to apply
-
-          // turn our nsString into a stream looking object...
-          aListener->OnStartRequest(this, ctxt);
-
-          // turn our string into a stream...
-          nsCOMPtr<nsISupports> streamSupports;
-          NS_NewByteInputStream(getter_AddRefs(streamSupports), iconBuffer.get(), iconBuffer.Length());
-
-          nsCOMPtr<nsIInputStream> inputStr (do_QueryInterface(streamSupports));
-          aListener->OnDataAvailable(this, ctxt, inputStr, 0, iconBuffer.Length());
-          aListener->OnStopRequest(this, ctxt, NS_OK, nsnull);
-
-        } // if we got valid bits for the main bitmap mask
-        
-        nsMemory::Free(buffer);
-
-      }
-
-      DeleteDC(pDC);
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
-{
-  *aLoadAttributes = mLoadAttributes;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
-{
-  mLoadAttributes = aLoadAttributes;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetContentType(char* *aContentType) 
-{
-  if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-  *aContentType = nsCRT::strdup("image/icon");
-  if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIconChannel::SetContentType(const char *aContentType)
-{
-  //It doesn't make sense to set the content-type on this type
-  // of channel...
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsIconChannel::GetContentLength(PRInt32 *aContentLength)
-{
-  *aContentLength = mContentLength;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetContentLength(PRInt32 aContentLength)
-{
-  NS_NOTREACHED("nsIconChannel::SetContentLength");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-  *aLoadGroup = mLoadGroup;
-  NS_IF_ADDREF(*aLoadGroup);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-  mLoadGroup = aLoadGroup;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
-{
-  *aOwner = mOwner.get();
-  NS_IF_ADDREF(*aOwner);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
-{
-  mOwner = aOwner;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-  *aNotificationCallbacks = mCallbacks.get();
-  NS_IF_ADDREF(*aNotificationCallbacks);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-  mCallbacks = aNotificationCallbacks;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-  *aSecurityInfo = nsnull;
-  return NS_OK;
-}
-

mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h

@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Scott MacGregor <mscott@netscape.com>
- */
-
-#ifndef nsIconChannel_h___
-#define nsIconChannel_h___
-
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIURI.h"
-
-class nsIconChannel : public nsIChannel
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIREQUEST
-  NS_DECL_NSICHANNEL
-
-  nsIconChannel();
-  virtual ~nsIconChannel();
-
-  nsresult Init(nsIURI* uri);
-
-protected:
-  nsCOMPtr<nsIURI> mUrl;
-  nsCOMPtr<nsIURI> mOriginalURI;
-  PRUint32         mLoadAttributes;
-  PRInt32          mContentLength;
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
-  nsCOMPtr<nsISupports>  mOwner; 
-  nsresult mStatus;
-};
-
-#endif /* nsIconChannel_h___ */

mozilla/modules/libpr0n/decoders/jpeg/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgjpeg
-LIBRARY_NAME	= imgjpeg
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom string necko layout jpeg gfx2 imglib2
-
-CPPSRCS		= nsJPEGDecoder.cpp nsJPEGFactory.cpp
-
-EXTRA_DSO_LDOPTS = $(JPEG_LIBS) $(ZLIB_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/jpeg/makefile.win

@@ -1,52 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imgjpeg
-LIBRARY_NAME	= imgjpeg
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsJPEGDecoder.obj \
-		.\$(OBJDIR)\nsJPEGFactory.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\jpeg3250.lib \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp

@@ -1,829 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- */
-
-#include "nsJPEGDecoder.h"
-
-#include "nsIInputStream.h"
-
-#include "nspr.h"
-
-#include "nsCRT.h"
-
-#include "nsIComponentManager.h"
-
-#include "imgIContainerObserver.h"
-
-
-#include "ImageLogging.h"
-
-
-NS_IMPL_ISUPPORTS2(nsJPEGDecoder, imgIDecoder, nsIOutputStream)
-
-
-#if defined(PR_LOGGING)
-PRLogModuleInfo *gJPEGlog = PR_NewLogModule("JPEGDecoder");
-#else
-#define gJPEGlog
-#endif
-
-
-
-void PR_CALLBACK init_source (j_decompress_ptr jd);
-boolean PR_CALLBACK fill_input_buffer (j_decompress_ptr jd);
-void PR_CALLBACK skip_input_data (j_decompress_ptr jd, long num_bytes);
-void PR_CALLBACK term_source (j_decompress_ptr jd);
-void PR_CALLBACK my_error_exit (j_common_ptr cinfo);
-
-/* Normal JFIF markers can't have more bytes than this. */
-#define MAX_JPEG_MARKER_LENGTH  (((PRUint32)1 << 16) - 1)
-
-
-/* Possible states for JPEG source manager */
-enum data_source_state {
-    READING_BACK = 0, /* Must be zero for init purposes */
-    READING_NEW
-};
-
-/*
- *  Implementation of a JPEG src object that understands our state machine
- */
-typedef struct {
-  /* public fields; must be first in this struct! */
-  struct jpeg_source_mgr pub;
-
-  nsJPEGDecoder *decoder;
-
-} decoder_source_mgr;
-
-
-nsJPEGDecoder::nsJPEGDecoder()
-{
-  NS_INIT_ISUPPORTS();
-
-  mState = JPEG_HEADER;
-  mFillState = READING_BACK;
-
-  mSamples = nsnull;
-  mSamples3 = nsnull;
-  mRGBPadRow = nsnull;
-  mRGBPadRowLength = 0;
-
-  mBytesToSkip = 0;
-  
-  memset(&mInfo, 0, sizeof(jpeg_decompress_struct));
-
-  mCompletedPasses = 0;
-
-  mBuffer = nsnull;
-  mBufferLen = mBufferSize = 0;
-
-  mBackBuffer = nsnull;
-  mBackBufferLen = mBackBufferSize = mBackBufferUnreadLen = 0;
-
-}
-
-nsJPEGDecoder::~nsJPEGDecoder()
-{
-  if (mBuffer)
-    PR_Free(mBuffer);
-  if (mBackBuffer)
-    PR_Free(mBackBuffer);
-  if (mRGBPadRow)
-    PR_Free(mRGBPadRow);
-}
-
-
-/** imgIDecoder methods **/
-
-/* void init (in imgIRequest aRequest); */
-NS_IMETHODIMP nsJPEGDecoder::Init(imgIRequest *aRequest)
-{
-  mRequest = aRequest;
-  mObserver = do_QueryInterface(mRequest);
-
-  aRequest->GetImage(getter_AddRefs(mImage));
-
-  /* We set up the normal JPEG error routines, then override error_exit. */
-  mInfo.err = jpeg_std_error(&mErr.pub);
-  /*   mInfo.err = jpeg_std_error(&mErr.pub); */
-  mErr.pub.error_exit = my_error_exit;
-  /* Establish the setjmp return context for my_error_exit to use. */
-  if (setjmp(mErr.setjmp_buffer)) {
-    /* If we get here, the JPEG code has signaled an error.
-     * We need to clean up the JPEG object, close the input file, and return.
-     */
-    return NS_ERROR_FAILURE;
-  }
-
-  /* Step 1: allocate and initialize JPEG decompression object */
-  jpeg_create_decompress(&mInfo);
-  
-  decoder_source_mgr *src;
-  if (mInfo.src == NULL) {
-    //mInfo.src = PR_NEWZAP(decoder_source_mgr);
-    src = PR_NEWZAP(decoder_source_mgr);
-    if (!src) {
-      return PR_FALSE;
-    }
-    mInfo.src = (struct jpeg_source_mgr *) src;
-  }
-
-  /* Step 2: specify data source (eg, a file) */
-
-  /* Setup callback functions. */
-  src->pub.init_source = init_source;
-  src->pub.fill_input_buffer = fill_input_buffer;
-  src->pub.skip_input_data = skip_input_data;
-  src->pub.resync_to_restart = jpeg_resync_to_restart;
-  src->pub.term_source = term_source;
-
-  src->decoder = this;
-
-
-
-  return NS_OK;
-}
-
-/* readonly attribute imgIRequest request; */
-NS_IMETHODIMP nsJPEGDecoder::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mRequest;
-  NS_ADDREF(*aRequest);
-  return NS_OK;
-}
-
-
-
-
-
-
-/** nsIOutputStream methods **/
-
-/* void close (); */
-NS_IMETHODIMP nsJPEGDecoder::Close()
-{
-  PR_LOG(gJPEGlog, PR_LOG_DEBUG,
-         ("[this=%p] nsJPEGDecoder::Close\n", this));
-
-  if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
-    NS_WARNING("Never finished decoding the JPEG.");
-
-  /* Step 8: Release JPEG decompression object */
-
-  /* This is an important step since it will release a good deal of memory. */
-  jpeg_destroy_decompress(&mInfo);
-
-  return NS_OK;
-}
-
-/* void flush (); */
-NS_IMETHODIMP nsJPEGDecoder::Flush()
-{
-  LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::Flush");
-
-  PRUint32 ret;
-  if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
-    return this->WriteFrom(nsnull, 0, &ret);
-
-  return NS_OK;
-}
-
-/* unsigned long write (in string buf, in unsigned long count); */
-NS_IMETHODIMP nsJPEGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
-NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-  LOG_SCOPE_WITH_PARAM(gJPEGlog, "nsJPEGDecoder::WriteFrom", "count", count);
-
-  /* We use our private extension JPEG error handler.
-   * Note that this struct must live as long as the main JPEG parameter
-   * struct, to avoid dangling-pointer problems.
-   */
-  // XXX above what is this?
-
-
-  if (inStr) {
-    if (!mBuffer) {
-      mBuffer = (JOCTET *)PR_Malloc(count);
-      mBufferSize = count;
-    } else if (count > mBufferSize) {
-      mBuffer = (JOCTET *)PR_Realloc(mBuffer, count);
-      mBufferSize = count;
-    }
-
-    nsresult rv = inStr->Read((char*)mBuffer, count, &mBufferLen);
-    *_retval = mBufferLen;
-
-    //nsresult rv = mOutStream->WriteFrom(inStr, count, _retval);
-
-    NS_ASSERTION(NS_SUCCEEDED(rv), "nsJPEGDecoder::WriteFrom -- mOutStream->WriteFrom failed");
-  }
-  // else no input stream.. Flush() ?
-
-
-  nsresult error_code = NS_ERROR_FAILURE;
-  /* Return here if there is a fatal error. */
-  if ((error_code = setjmp(mErr.setjmp_buffer)) != 0) {
-    return error_code;
-  }
-
-
-  PR_LOG(gJPEGlog, PR_LOG_DEBUG,
-         ("[this=%p] nsJPEGDecoder::WriteFrom -- processing JPEG data\n", this));
-
-  decoder_source_mgr *src = NS_REINTERPRET_CAST(decoder_source_mgr *, mInfo.src);
-
-  switch (mState) {
-  case JPEG_HEADER:
-  {
-    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_HEADER case");
-
-    /* Step 3: read file parameters with jpeg_read_header() */
-    if (jpeg_read_header(&mInfo, TRUE) == JPEG_SUSPENDED)
-      return NS_OK; /* I/O suspension */
-
-    /*
-     * Don't allocate a giant and superfluous memory buffer
-     * when the image is a sequential JPEG.
-     */
-    mInfo.buffered_image = jpeg_has_multiple_scans(&mInfo);
-
-    /* Used to set up image size so arrays can be allocated */
-    jpeg_calc_output_dimensions(&mInfo);
-
-    mObserver->OnStartDecode(nsnull, nsnull);
-
-    mImage->Init(mInfo.image_width, mInfo.image_height, mObserver);
-    mObserver->OnStartContainer(nsnull, nsnull, mImage);
-
-    mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-    gfx_format format;
-#ifdef XP_PC
-    format = gfxIFormats::BGR;
-#else
-    format = gfxIFormats::RGB;
-#endif
-    mFrame->Init(0, 0, mInfo.image_width, mInfo.image_height, format);
-    mImage->AppendFrame(mFrame);
-    mObserver->OnStartFrame(nsnull, nsnull, mFrame);
-
-
-    /*
-     * Make a one-row-high sample array that will go away
-     * when done with image. Always make it big enough to
-     * hold an RGB row.  Since this uses the IJG memory
-     * manager, it must be allocated before the call to
-     * jpeg_start_compress().
-     */
-    int row_stride;
-
-    if(mInfo.output_components == 1)
-      row_stride = mInfo.output_width;
-    else
-      row_stride = mInfo.output_width * 4; // use 4 instead of mInfo.output_components
-                                           // so we don't have to fuss with byte alignment.
-                                           // Mac wants 4 anyways.
-
-    mSamples = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo,
-                                           JPOOL_IMAGE,
-                                           row_stride, 1);
-
-#if defined(XP_PC) || defined(XP_MAC)
-    // allocate buffer to do byte flipping if needed
-    if (mInfo.output_components == 3) {
-      mRGBPadRow = (PRUint8*) PR_MALLOC(row_stride);
-      mRGBPadRowLength = row_stride;
-      memset(mRGBPadRow, 0, mRGBPadRowLength);
-    }
-#endif
-
-    /* Allocate RGB buffer for conversion from greyscale. */
-    if (mInfo.output_components != 3) {
-      row_stride = mInfo.output_width * 4;
-      mSamples3 = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo,
-                                              JPOOL_IMAGE,
-                                              row_stride, 1);
-    }
-
-    mState = JPEG_START_DECOMPRESS;
-  }
-  case JPEG_START_DECOMPRESS:
-  {
-    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_START_DECOMPRESS case");
-    /* Step 4: set parameters for decompression */
-
-    /* FIXME -- Should reset dct_method and dither mode
-     * for final pass of progressive JPEG
-     */
-    mInfo.dct_method = JDCT_FASTEST;
-    mInfo.dither_mode = JDITHER_ORDERED;
-    mInfo.do_fancy_upsampling = FALSE;
-    mInfo.enable_2pass_quant = FALSE;
-    mInfo.do_block_smoothing = TRUE;
-
-    /* Step 5: Start decompressor */
-    if (jpeg_start_decompress(&mInfo) == FALSE)
-      return NS_OK; /* I/O suspension */
-
-    /* If this is a progressive JPEG ... */
-    if (mInfo.buffered_image) {
-      mState = JPEG_DECOMPRESS_PROGRESSIVE;
-    } else {
-      mState = JPEG_DECOMPRESS_SEQUENTIAL;
-    }
-
-  }
-
-  case JPEG_DECOMPRESS_SEQUENTIAL:
-  {
-    if (mState == JPEG_DECOMPRESS_SEQUENTIAL)
-    {
-      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_SEQUENTIAL case");
-
-      if (OutputScanlines(-1) == PR_FALSE)
-        return NS_OK; /* I/O suspension */
-
-      /* If we've completed image output ... */
-      NS_ASSERTION(mInfo.output_scanline == mInfo.output_height, "We didn't process all of the data!");
-      mState = JPEG_DONE;    
-    }
-  }
-
-
-  case JPEG_DECOMPRESS_PROGRESSIVE:
-  {
-    if (mState == JPEG_DECOMPRESS_PROGRESSIVE)
-    {
-      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_PROGRESSIVE case");
-
-      int status;
-      do {
-        status = jpeg_consume_input(&mInfo);
-      } while (!((status == JPEG_SUSPENDED) ||
-                 (status == JPEG_REACHED_EOI)));
-
-      switch (status) {
-        case JPEG_REACHED_EOI:
-          // End of image
-          mState = JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT;
-          break;
-        case JPEG_SUSPENDED:
-          PR_LOG(gJPEGlog, PR_LOG_DEBUG,
-                 ("[this=%p] nsJPEGDecoder::WriteFrom -- suspending\n", this));
-
-          return NS_OK; /* I/O suspension */
-        default:
-          printf("got someo other state!?\n");
-      }
-    }
-  }
-
-  case JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT:
-  {
-    if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT)
-    {
-      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT case");
-
-      // XXX progressive? ;)
-      // not really progressive according to the state machine... -saari
-      jpeg_start_output(&mInfo, mInfo.input_scan_number);
-      if (OutputScanlines(-1) == PR_FALSE)
-        return NS_OK; /* I/O suspension */
-      jpeg_finish_output(&mInfo);
-      mState = JPEG_DONE;
-    }
-  }
-
-  case JPEG_DONE:
-  {
-    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_DONE case");
-
-    /* Step 7: Finish decompression */
-
-    if (jpeg_finish_decompress(&mInfo) == FALSE)
-      return NS_OK; /* I/O suspension */
-
-    mState = JPEG_SINK_NON_JPEG_TRAILER;
-
-    /* we're done dude */
-    break;
-  }
-  case JPEG_SINK_NON_JPEG_TRAILER:
-    PR_LOG(gJPEGlog, PR_LOG_DEBUG,
-           ("[this=%p] nsJPEGDecoder::WriteFrom -- entering JPEG_SINK_NON_JPEG_TRAILER case\n", this));
-
-    break;
-  }
-
-  return NS_OK;
-}
-
-
-int
-nsJPEGDecoder::OutputScanlines(int num_scanlines)
-{
-  int pass = 0;
-  
-  if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT)
-      pass = -1;
-  else
-      pass = mCompletedPasses + 1;
-
-  while ((mInfo.output_scanline < mInfo.output_height) && num_scanlines--) {
-      JSAMPROW samples;
-      
-      /* Request one scanline.  Returns 0 or 1 scanlines. */
-      int ns = jpeg_read_scanlines(&mInfo, mSamples, 1);
-      
-      if (ns != 1) {
-        return PR_FALSE; /* suspend */
-      }
-
-      /* If grayscale image ... */
-      if (mInfo.output_components == 1) {
-        JSAMPLE j;
-        JSAMPLE *j1 = mSamples[0];
-        const JSAMPLE *j1end = j1 + mInfo.output_width;
-        JSAMPLE *j3 = mSamples3[0];
-
-        /* Convert from grayscale to RGB. */
-        while (j1 < j1end) {
-#ifdef XP_MAC
-          j = *j1++;
-          j3[0] = 0;
-          j3[1] = j;
-          j3[2] = j;
-          j3[3] = j;
-          j3 += 4;
-#else
-          j = *j1++;
-          j3[0] = j;
-          j3[1] = j;
-          j3[2] = j;
-          j3 += 3;
-#endif
-        }
-        samples = mSamples3[0];
-      } else {
-        /* 24-bit color image */
-#ifdef XP_PC
-        memset(mRGBPadRow, 0, mInfo.output_width * 4);
-        PRUint8 *ptrOutputBuf = mRGBPadRow;
-
-        JSAMPLE *j1 = mSamples[0];
-        for (PRUint32 i=0;i<mInfo.output_width;++i) {
-          ptrOutputBuf[2] = *j1++;
-          ptrOutputBuf[1] = *j1++;
-          ptrOutputBuf[0] = *j1++;
-          ptrOutputBuf += 3;
-        }
-
-        samples = mRGBPadRow;
-#else
-#ifdef XP_MAC
-        memset(mRGBPadRow, 0, mInfo.output_width * 4);
-        PRUint8 *ptrOutputBuf = mRGBPadRow;
-
-        JSAMPLE *j1 = mSamples[0];
-        for (PRUint32 i=0;i<mInfo.output_width;++i) {
-          ptrOutputBuf[0] = 0;
-          ptrOutputBuf[1] = *j1++;
-          ptrOutputBuf[2] = *j1++;
-          ptrOutputBuf[3] = *j1++;
-          ptrOutputBuf += 4;
-        }
-
-        samples = mRGBPadRow;
-#else
-        samples = mSamples[0];
-#endif
-#endif
-      }
-
-      PRUint32 bpr;
-      mFrame->GetImageBytesPerRow(&bpr);
-      mFrame->SetImageData(
-        samples,             // data
-        bpr,                 // length
-        (mInfo.output_scanline-1) * bpr); // offset
-
-      nsRect r(0, mInfo.output_scanline, mInfo.output_width, 1);
-      mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
-
-  }
-
-  return PR_TRUE;
-}
-
-
-/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
-NS_IMETHODIMP nsJPEGDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean nonBlocking; */
-NS_IMETHODIMP nsJPEGDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsJPEGDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsIOutputStreamObserver observer; */
-NS_IMETHODIMP nsJPEGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsJPEGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
-
-
-/* Override the standard error method in the IJG JPEG decoder code. */
-void PR_CALLBACK
-my_error_exit (j_common_ptr cinfo)
-{
-  nsresult error_code = NS_ERROR_FAILURE;
-  decoder_error_mgr *err = (decoder_error_mgr *) cinfo->err;
-
-#if 0
-#ifdef DEBUG
-/*ptn fix later */
-  if (il_debug >= 1) {
-      char buffer[JMSG_LENGTH_MAX];
-
-      /* Create the message */
-      (*cinfo->err->format_message) (cinfo, buffer);
-
-      ILTRACE(1,("%s\n", buffer));
-  }
-#endif
-
-
-  /* Convert error to a browser error code */
-  if (cinfo->err->msg_code == JERR_OUT_OF_MEMORY)
-      error_code = MK_OUT_OF_MEMORY;
-  else
-      error_code = MK_IMAGE_LOSSAGE;
-#endif
-
-  char buffer[JMSG_LENGTH_MAX];
-
-  /* Create the message */
-  (*cinfo->err->format_message) (cinfo, buffer);
-
-  fprintf(stderr, "my_error_exit()\n%s\n", buffer);
-
-  /* Return control to the setjmp point. */
-  longjmp(err->setjmp_buffer, error_code);
-}
-
-/******************************************************************************/
-/*-----------------------------------------------------------------------------
- * This is the callback routine from the IJG JPEG library used to supply new
- * data to the decompressor when its input buffer is exhausted.  It juggles
- * multiple buffers in an attempt to avoid unnecessary copying of input data.
- *
- * (A simpler scheme is possible: It's much easier to use only a single
- * buffer; when fill_input_buffer() is called, move any unconsumed data
- * (beyond the current pointer/count) down to the beginning of this buffer and
- * then load new data into the remaining buffer space.  This approach requires
- * a little more data copying but is far easier to get right.)
- *
- * At any one time, the JPEG decompressor is either reading from the necko
- * input buffer, which is volatile across top-level calls to the IJG library,
- * or the "backtrack" buffer.  The backtrack buffer contains the remaining
- * unconsumed data from the necko buffer after parsing was suspended due
- * to insufficient data in some previous call to the IJG library.
- *
- * When suspending, the decompressor will back up to a convenient restart
- * point (typically the start of the current MCU). The variables
- * next_input_byte & bytes_in_buffer indicate where the restart point will be
- * if the current call returns FALSE.  Data beyond this point must be
- * rescanned after resumption, so it must be preserved in case the decompressor
- * decides to backtrack.
- *
- * Returns:
- *  TRUE if additional data is available, FALSE if no data present and
- *   the JPEG library should therefore suspend processing of input stream
- *---------------------------------------------------------------------------*/
-
-/******************************************************************************/
-/* data source manager method 
-/******************************************************************************/
-
-
-/******************************************************************************/
-/* data source manager method 
-	Initialize source.  This is called by jpeg_read_header() before any
-	data is actually read.  May leave
-	bytes_in_buffer set to 0 (in which case a fill_input_buffer() call
-	will occur immediately).
-*/
-void PR_CALLBACK
-init_source (j_decompress_ptr jd)
-{
-}
-
-/******************************************************************************/
-/* data source manager method
-	Skip num_bytes worth of data.  The buffer pointer and count should
-	be advanced over num_bytes input bytes, refilling the buffer as
-	needed.  This is used to skip over a potentially large amount of
-	uninteresting data (such as an APPn marker).  In some applications
-	it may be possible to optimize away the reading of the skipped data,
-	but it's not clear that being smart is worth much trouble; large
-	skips are uncommon.  bytes_in_buffer may be zero on return.
-	A zero or negative skip count should be treated as a no-op.
-*/
-void PR_CALLBACK
-skip_input_data (j_decompress_ptr jd, long num_bytes)
-{
-  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
-
-  if (num_bytes > (long)src->pub.bytes_in_buffer) {
-    /*
-     * Can't skip it all right now until we get more data from
-     * network stream. Set things up so that fill_input_buffer
-     * will skip remaining amount.
-     */
-    src->decoder->mBytesToSkip = (size_t)num_bytes - src->pub.bytes_in_buffer;
-    src->pub.next_input_byte += src->pub.bytes_in_buffer;
-    src->pub.bytes_in_buffer = 0;
-
-  } else {
-    /* Simple case. Just advance buffer pointer */
-
-    src->pub.bytes_in_buffer -= (size_t)num_bytes;
-    src->pub.next_input_byte += num_bytes;
-  }
-}
-
-
-/******************************************************************************/
-/* data source manager method
-	This is called whenever bytes_in_buffer has reached zero and more
-	data is wanted.  In typical applications, it should read fresh data
-	into the buffer (ignoring the current state of next_input_byte and
-	bytes_in_buffer), reset the pointer & count to the start of the
-	buffer, and return TRUE indicating that the buffer has been reloaded.
-	It is not necessary to fill the buffer entirely, only to obtain at
-	least one more byte.  bytes_in_buffer MUST be set to a positive value
-	if TRUE is returned.  A FALSE return should only be used when I/O
-	suspension is desired.
-*/
-boolean PR_CALLBACK
-fill_input_buffer (j_decompress_ptr jd)
-{
-  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
-
-  unsigned char *new_buffer = (unsigned char *)src->decoder->mBuffer;
-  PRUint32 new_buflen = src->decoder->mBufferLen;
-  PRUint32 bytesToSkip = src->decoder->mBytesToSkip;
-
-  switch(src->decoder->mFillState) {
-  case READING_BACK:
-    {
-      if (!new_buffer || new_buflen == 0)
-        return PR_FALSE; /* suspend */
-
-      src->decoder->mBufferLen = 0;
-
-      if (bytesToSkip != 0) {
-        if (bytesToSkip < new_buflen) {
-          /* All done skipping bytes; Return what's left. */
-          new_buffer += bytesToSkip;
-          new_buflen -= bytesToSkip;
-          src->decoder->mBytesToSkip = 0;
-        } else {
-          /* Still need to skip some more data in the future */
-          src->decoder->mBytesToSkip -= (size_t)new_buflen;
-          return PR_FALSE; /* suspend */
-        }
-      }
-
-      src->decoder->mBackBufferUnreadLen = src->pub.bytes_in_buffer;
-
-      src->pub.next_input_byte = new_buffer;
-      src->pub.bytes_in_buffer = (size_t)new_buflen;
-      src->decoder->mFillState = READING_NEW;
-
-      return PR_TRUE;
-    }
-    break;
-
-  case READING_NEW:
-    {
-      if (src->pub.next_input_byte != src->decoder->mBuffer) {
-        /* Backtrack data has been permanently consumed. */
-        src->decoder->mBackBufferUnreadLen = 0;
-        src->decoder->mBackBufferLen = 0;
-      }
-
-      /* Save remainder of netlib buffer in backtrack buffer */
-      PRUint32 new_backtrack_buflen = src->pub.bytes_in_buffer + src->decoder->mBackBufferLen;
-
-
-      /* Make sure backtrack buffer is big enough to hold new data. */
-      if (src->decoder->mBackBufferSize < new_backtrack_buflen) {
-
-        /* Round up to multiple of 16 bytes. */
-        PRUint32 roundup_buflen = ((new_backtrack_buflen + 15) >> 4) << 4;
-        if (src->decoder->mBackBufferSize) {
-            src->decoder->mBackBuffer =
-          (JOCTET *)PR_REALLOC(src->decoder->mBackBuffer, roundup_buflen);
-        } else {
-          src->decoder->mBackBuffer = (JOCTET*)PR_MALLOC(roundup_buflen);
-        }
-
-        /* Check for OOM */
-        if (!src->decoder->mBackBuffer) {
-#if 0
-          j_common_ptr cinfo = (j_common_ptr)(&src->js->jd);
-          cinfo->err->msg_code = JERR_OUT_OF_MEMORY;
-          my_error_exit(cinfo);
-#endif
-        }
-          
-        src->decoder->mBackBufferSize = (size_t)roundup_buflen;
-
-        /* Check for malformed MARKER segment lengths. */
-        if (new_backtrack_buflen > MAX_JPEG_MARKER_LENGTH) {
-          my_error_exit((j_common_ptr)(&src->decoder->mInfo));
-        }
-      }
-
-
-      /* Copy remainder of netlib buffer into backtrack buffer. */
-      nsCRT::memmove(src->decoder->mBackBuffer + src->decoder->mBackBufferLen,
-                     src->pub.next_input_byte,
-                     src->pub.bytes_in_buffer);
-
-
-      /* Point to start of data to be rescanned. */
-      src->pub.next_input_byte = src->decoder->mBackBuffer + src->decoder->mBackBufferLen - src->decoder->mBackBufferUnreadLen;
-      src->pub.bytes_in_buffer += src->decoder->mBackBufferUnreadLen;
-      src->decoder->mBackBufferLen = (size_t)new_backtrack_buflen;
-    
-      src->decoder->mFillState = READING_BACK;
-
-      return PR_FALSE;
-    }
-    break;
-  }
-
-  return PR_FALSE;
-}
-
-/******************************************************************************/
-/* data source manager method */
-/*
- * Terminate source --- called by jpeg_finish_decompress() after all
- * data has been read to clean up JPEG source manager. NOT called by 
- * jpeg_abort() or jpeg_destroy().
- */
-void PR_CALLBACK
-term_source (j_decompress_ptr jd)
-{
-  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
-
-  if (src->decoder->mObserver) {
-    src->decoder->mObserver->OnStopFrame(nsnull, nsnull, src->decoder->mFrame);
-    src->decoder->mObserver->OnStopContainer(nsnull, nsnull, src->decoder->mImage);
-    src->decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-
-    /* No work necessary here */
-}

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h

@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef nsJPEGDecoder_h__
-#define nsJPEGDecoder_h__
-
-#include "imgIDecoder.h"
-
-#include "nsCOMPtr.h"
-
-#include "imgIContainer.h"
-#include "gfxIImageFrame.h"
-#include "imgIDecoderObserver.h"
-#include "imgIRequest.h"
-#include "nsIInputStream.h"
-#include "nsIPipe.h"
-
-extern "C" {
-#include "jpeglib.h"
-}
-
-#include <setjmp.h>
-
-#define NS_JPEGDECODER_CID \
-{ /* 5871a422-1dd2-11b2-ab3f-e2e56be5da9c */         \
-     0x5871a422,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0xab, 0x3f, 0xe2, 0xe5, 0x6b, 0xe5, 0xda, 0x9c} \
-}
-
-typedef struct {
-    struct jpeg_error_mgr pub;  /* "public" fields for IJG library*/
-    jmp_buf setjmp_buffer;      /* For handling catastropic errors */
-} decoder_error_mgr;
-
-
-typedef enum {
-    JPEG_HEADER,                          /* Reading JFIF headers */
-    JPEG_START_DECOMPRESS,
-    JPEG_DECOMPRESS_PROGRESSIVE,          /* Output progressive pixels */
-    JPEG_DECOMPRESS_SEQUENTIAL,           /* Output sequential pixels */
-    JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT,
-    JPEG_DONE,
-    JPEG_SINK_NON_JPEG_TRAILER,          /* Some image files have a */
-                                         /* non-JPEG trailer */
-    JPEG_ERROR    
-} jstate;
-
-class nsJPEGDecoder : public imgIDecoder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsJPEGDecoder();
-  virtual ~nsJPEGDecoder();
-
-  PRBool FillInput(j_decompress_ptr jd);
-
-  PRUint32 mBytesToSkip;
-
-protected:
-  int OutputScanlines(int num_scanlines);
-
-public:
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<gfxIImageFrame> mFrame;
-  nsCOMPtr<imgIRequest> mRequest;
-
-  nsCOMPtr<imgIDecoderObserver> mObserver;
-
-  struct jpeg_decompress_struct mInfo;
-  decoder_error_mgr mErr;
-  jstate mState;
-
-  JSAMPARRAY mSamples;
-  JSAMPARRAY mSamples3;
-  PRUint8*   mRGBPadRow;
-  PRUint32   mRGBPadRowLength;
-
-  PRInt32 mCompletedPasses;
-  PRInt32 mPasses;
-
-  int mFillState;
-
-  JOCTET *mBuffer;
-  PRUint32 mBufferLen;  // amount of data currently in mBuffer
-  PRUint32 mBufferSize; // size in bytes what mBuffer was created with
-
-  JOCTET *mBackBuffer;
-  PRUint32 mBackBufferLen; // Offset of end of active backtrack data
-  PRUint32 mBackBufferSize; // size in bytes what mBackBuffer was created with
-  PRUint32 mBackBufferUnreadLen; // amount of data currently in mBackBuffer
-
-
-
-};
-
-#endif // nsJPEGDecoder_h__

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsJPEGDecoder.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsJPEGDecoder)
-
-static nsModuleComponentInfo components[] =
-{
-  { "ppm decoder",
-    NS_JPEGDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/jpeg",
-    nsJPEGDecoderConstructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsJPEGDecoderModule", components)
-

mozilla/modules/libpr0n/decoders/jpeg/win32.order

@@ -1,16 +0,0 @@
-?Release@nsJPEGDecoder@@UAGKXZ ; 172
-?AddRef@nsJPEGDecoder@@UAGKXZ ; 172
-?fill_input_buffer@@YAEPAUjpeg_decompress_struct@@@Z ; 126
-?skip_input_data@@YAXPAUjpeg_decompress_struct@@J@Z ; 109
-?WriteFrom@nsJPEGDecoder@@UAGIPAVnsIInputStream@@IPAI@Z ; 106
-?OutputScanlines@nsJPEGDecoder@@IAEHH@Z ; 93
-?init_source@@YAXPAUjpeg_decompress_struct@@@Z ; 86
-??1nsJPEGDecoder@@UAE@XZ ; 86
-?Close@nsJPEGDecoder@@UAGIXZ ; 86
-?term_source@@YAXPAUjpeg_decompress_struct@@@Z ; 86
-?Init@nsJPEGDecoder@@UAGIPAVimgIRequest@@@Z ; 86
-??0nsJPEGDecoder@@QAE@XZ ; 86
-?Flush@nsJPEGDecoder@@UAGIXZ ; 86
-?QueryInterface@nsJPEGDecoder@@UAGIABUnsID@@PAPAX@Z ; 86
-??_EnsJPEGDecoder@@UAEPAXI@Z ; 86
-_NSGetModule ; 1

mozilla/modules/libpr0n/decoders/makefile.win

@@ -1,26 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH=..\..\..
-
-DIRS = ppm gif png jpeg
-
-!include $(DEPTH)\config\rules.mak

mozilla/modules/libpr0n/decoders/png/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgpng
-LIBRARY_NAME	= imgpng
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom necko layout png gfx2 imglib2
-
-CPPSRCS		= nsPNGDecoder.cpp nsPNGFactory.cpp
-
-EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/png/makefile.win

@@ -1,53 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imgpng
-LIBRARY_NAME	= imgpng
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsPNGDecoder.obj \
-		.\$(OBJDIR)\nsPNGFactory.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\png.lib \
-	$(DIST)\lib\zlib.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp

@@ -1,553 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- */
-
-#include "nsPNGDecoder.h"
-
-#include "nsIInputStream.h"
-
-#include "nspr.h"
-
-#include "nsIComponentManager.h"
-
-#include "png.h"
-
-#include "nsIStreamObserver.h"
-
-#include "nsRect.h"
-
-#include "nsMemory.h"
-
-#include "imgIContainerObserver.h"
-
-// XXX we need to be sure to fire onStopDecode messages to mObserver in error cases.
-
-
-NS_IMPL_ISUPPORTS2(nsPNGDecoder, imgIDecoder, nsIOutputStream)
-
-
-nsPNGDecoder::nsPNGDecoder()
-{
-  NS_INIT_ISUPPORTS();
-
-  mPNG = nsnull;
-  mInfo = nsnull;
-  colorLine = 0;
-  alphaLine = 0;
-  interlacebuf = 0;
-}
-
-nsPNGDecoder::~nsPNGDecoder()
-{
-  if (colorLine)
-    nsMemory::Free(colorLine);
-  if (alphaLine)
-    nsMemory::Free(alphaLine);
-  if (interlacebuf)
-    nsMemory::Free(interlacebuf);
-}
-
-
-/** imgIDecoder methods **/
-
-/* void init (in imgIRequest aRequest); */
-NS_IMETHODIMP nsPNGDecoder::Init(imgIRequest *aRequest)
-{
-  mRequest = aRequest;
-  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
-
-  aRequest->GetImage(getter_AddRefs(mImage));
-
-  /* do png init stuff */
-
-  /* Initialize the container's source image header. */
-  /* Always decode to 24 bit pixdepth */
-
-
-  mPNG = png_create_read_struct(PNG_LIBPNG_VER_STRING, 
-                                NULL, NULL, 
-                                NULL);
-  if (!mPNG) {
-    return NS_ERROR_FAILURE;
-  }
-
-  mInfo = png_create_info_struct(mPNG);
-  if (!mInfo) {
-    png_destroy_read_struct(&mPNG, NULL, NULL);
-    return NS_ERROR_FAILURE;
-  }
-
-  /* use ic as libpng "progressive pointer" (retrieve in callbacks) */
-  png_set_progressive_read_fn(mPNG, NS_STATIC_CAST(png_voidp, this), nsPNGDecoder::info_callback, nsPNGDecoder::row_callback, nsPNGDecoder::end_callback);
-
-  return NS_OK;
-}
-
-
-/* readonly attribute imgIRequest request; */
-NS_IMETHODIMP nsPNGDecoder::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mRequest;
-  NS_ADDREF(*aRequest);
-  return NS_OK;
-}
-
-
-
-
-
-
-/** nsIOutputStream methods **/
-
-/* void close (); */
-NS_IMETHODIMP nsPNGDecoder::Close()
-{
-  if (mPNG)
-    png_destroy_read_struct(&mPNG, mInfo ? &mInfo : NULL, NULL);
-
-  return NS_OK;
-}
-
-/* void flush (); */
-NS_IMETHODIMP nsPNGDecoder::Flush()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long write (in string buf, in unsigned long count); */
-NS_IMETHODIMP nsPNGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-static NS_METHOD ReadDataOut(nsIInputStream* in,
-                             void* closure,
-                             const char* fromRawSegment,
-                             PRUint32 toOffset,
-                             PRUint32 count,
-                             PRUint32 *writeCount)
-{
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, closure);
-
-  // we need to do the setjmp here otherwise bad things will happen
-  if (setjmp(decoder->mPNG->jmpbuf)) {
-    png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
-    // is this NS_ERROR_FAILURE enough?
-
-    decoder->mRequest->Cancel(NS_BINDING_ABORTED); // XXX is this the correct error ?
-
-    return NS_ERROR_FAILURE;
-  }
-
-  *writeCount = decoder->ProcessData((unsigned char*)fromRawSegment, count);
-  return NS_OK;
-}
-
-PRUint32 nsPNGDecoder::ProcessData(unsigned char *data, PRUint32 count)
-{
-  png_process_data(mPNG, mInfo, data, count);
-
-  return count; // we always consume all the data
-}
-
-/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
-NS_IMETHODIMP nsPNGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-//  PRUint32 sourceOffset = *_retval;
-
-  inStr->ReadSegments(ReadDataOut, this, count, _retval);
-
-  return NS_OK;
-}
-
-/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
-NS_IMETHODIMP nsPNGDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean nonBlocking; */
-NS_IMETHODIMP nsPNGDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsPNGDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsIOutputStreamObserver observer; */
-NS_IMETHODIMP nsPNGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsPNGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
-
-
-
-
-
-
-
-
-void
-nsPNGDecoder::info_callback(png_structp png_ptr, png_infop info_ptr)
-{
-/*  int number_passes;   NOT USED  */
-  png_uint_32 width, height;
-  int bit_depth, color_type, interlace_type, compression_type, filter_type;
-  int channels;
-  double LUT_exponent, CRT_exponent = 2.2, display_exponent, aGamma;
-
-  png_bytep trans=NULL;
-  int num_trans =0;
-
-  /* always decode to 24-bit RGB or 32-bit RGBA  */
-  png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
-               &interlace_type, &compression_type, &filter_type);
-
-  if (color_type == PNG_COLOR_TYPE_PALETTE)
-    png_set_expand(png_ptr);
-
-  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-    png_set_expand(png_ptr);
-
-  if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-    png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL);
-    png_set_expand(png_ptr);
-  }
-
-  if (bit_depth == 16)
-    png_set_strip_16(png_ptr);
-
-  if (color_type == PNG_COLOR_TYPE_GRAY ||
-      color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      png_set_gray_to_rgb(png_ptr);
-
-
-#ifdef XP_PC
-  // windows likes BGR
-  png_set_bgr(png_ptr);
-#endif
-
-  /* set up gamma correction for Mac, Unix and (Win32 and everything else)
-   * using educated guesses for display-system exponents; do preferences
-   * later */
-
-#if defined(XP_MAC)
-  LUT_exponent = 1.8 / 2.61;
-#elif defined(XP_UNIX)
-# if defined(__sgi)
-  LUT_exponent = 1.0 / 1.7;   /* typical default for SGI console */
-# elif defined(NeXT)
-  LUT_exponent = 1.0 / 2.2;   /* typical default for NeXT cube */
-# else
-  LUT_exponent = 1.0;         /* default for most other Unix workstations */
-# endif
-#else
-  LUT_exponent = 1.0;         /* virtually all PCs and most other systems */
-#endif
-
-  /* (alternatively, could check for SCREEN_GAMMA environment variable) */
-  display_exponent = LUT_exponent * CRT_exponent;
-
-  if (png_get_gAMA(png_ptr, info_ptr, &aGamma))
-      png_set_gamma(png_ptr, display_exponent, aGamma);
-  else
-      png_set_gamma(png_ptr, display_exponent, 0.45455);
-
-  /* let libpng expand interlaced images */
-  if (interlace_type == PNG_INTERLACE_ADAM7) {
-      /* number_passes = */
-      png_set_interlace_handling(png_ptr);
-  }
-
-  /* now all of those things we set above are used to update various struct
-   * members and whatnot, after which we can get channels, rowbytes, etc. */
-  png_read_update_info(png_ptr, info_ptr);
-  channels = png_get_channels(png_ptr, info_ptr);
-  PR_ASSERT(channels == 3 || channels == 4);
-
-  /*---------------------------------------------------------------*/
-  /* copy PNG info into imagelib structs (formerly png_set_dims()) */
-  /*---------------------------------------------------------------*/
-
-  PRInt32 alpha_bits = 1;
-
-  if (channels > 3) {
-    /* check if alpha is coming from a tRNS chunk and is binary */
-    if (num_trans) {
-      /* if it's not a indexed color image, tRNS means binary */
-      if (color_type == PNG_COLOR_TYPE_PALETTE) {
-        for (int i=0; i<num_trans; i++) {
-          if ((trans[i] != 0) && (trans[i] != 255)) {
-            alpha_bits = 8;
-            break;
-          }
-        }
-      }
-    } else {
-      alpha_bits = 8;
-    }
-  }
-
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartDecode(nsnull, nsnull);
-
-  // since the png is only 1 frame, initalize the container to the width and height of the frame
-  decoder->mImage->Init(width, height, decoder->mObserver);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartContainer(nsnull, nsnull, decoder->mImage);
-
-  decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-#if 0
-  // XXX should we longjmp to png_ptr->jumpbuf here if we failed?
-  if (!decoder->mFrame)
-    return NS_ERROR_FAILURE;
-#endif
-
-  gfx_format format;
-
-  if (channels == 3) {
-    format = gfxIFormats::RGB;
-  } else if (channels > 3) {
-    if (alpha_bits == 8) {
-      decoder->mImage->GetPreferredAlphaChannelFormat(&format);
-    } else if (alpha_bits == 1) {
-      format = gfxIFormats::RGB_A1;
-    }
-  }
-
-#ifdef XP_PC
-  // XXX this works...
-  format += 1; // RGB to BGR
-#endif
-
-  // then initalize the frame and append it to the container
-  decoder->mFrame->Init(0, 0, width, height, format);
-
-  decoder->mImage->AppendFrame(decoder->mFrame);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartFrame(nsnull, nsnull, decoder->mFrame);
-
-  PRUint32 bpr, abpr;
-  decoder->mFrame->GetImageBytesPerRow(&bpr);
-  decoder->mFrame->GetAlphaBytesPerRow(&abpr);
-  decoder->colorLine = (PRUint8 *)nsMemory::Alloc(bpr);
-  if (channels > 3)
-    decoder->alphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
-
-  if (interlace_type == PNG_INTERLACE_ADAM7) {
-    decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels*width*height);
-    decoder->ibpr = channels*width;
-    if (!decoder->interlacebuf) {
-//      return NS_ERROR_FAILURE;
-    }            
-  }
-
-  return;
-}
-
-
-
-
-
-void
-nsPNGDecoder::row_callback(png_structp png_ptr, png_bytep new_row,
-                           png_uint_32 row_num, int pass)
-{
-  /* libpng comments:
-   *
-   * this function is called for every row in the image.  If the
-   * image is interlacing, and you turned on the interlace handler,
-   * this function will be called for every row in every pass.
-   * Some of these rows will not be changed from the previous pass.
-   * When the row is not changed, the new_row variable will be NULL.
-   * The rows and passes are called in order, so you don't really
-   * need the row_num and pass, but I'm supplying them because it
-   * may make your life easier.
-   *
-   * For the non-NULL rows of interlaced images, you must call
-   * png_progressive_combine_row() passing in the row and the
-   * old row.  You can call this function for NULL rows (it will
-   * just return) and for non-interlaced images (it just does the
-   * memcpy for you) if it will make the code easier.  Thus, you
-   * can just do this for all cases:
-   *
-   *    png_progressive_combine_row(png_ptr, old_row, new_row);
-   *
-   * where old_row is what was displayed for previous rows.  Note
-   * that the first pass (pass == 0 really) will completely cover
-   * the old row, so the rows do not have to be initialized.  After
-   * the first pass (and only for interlaced images), you will have
-   * to pass the current row, and the function will combine the
-   * old row and the new row.
-   */
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
-
-  PRUint32 bpr, abpr;
-  decoder->mFrame->GetImageBytesPerRow(&bpr);
-  decoder->mFrame->GetAlphaBytesPerRow(&abpr);
-
-  png_bytep line;
-  if (decoder->interlacebuf) {
-    line = decoder->interlacebuf+(row_num*decoder->ibpr);
-    png_progressive_combine_row(png_ptr, line, new_row);
-  }
-  else
-    line = new_row;
-
-  if (new_row) {
-    nscoord width;
-    decoder->mFrame->GetWidth(&width);
-    PRUint32 iwidth = width;
-
-    gfx_format format;
-    decoder->mFrame->GetFormat(&format);
-    PRUint8 *aptr, *cptr;
-
-// The mac specific ifdefs in the code below are there to make sure we
-// always fill in 4 byte pixels right now, which is what the mac always
-// allocates for its pixel buffers in true color mode. This will change
-// when we start storing images with color palettes when they don't need
-// true color support (GIFs).
-    switch (format) {
-    case gfxIFormats::RGB:
-    case gfxIFormats::BGR:
-#ifdef XP_MAC
-        cptr = decoder->colorLine;
-        for (PRUint32 x=0; x<iwidth; x++) {
-          *cptr++ = 0;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-        }
-        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
-#else
-        decoder->mFrame->SetImageData((PRUint8*)line, bpr, row_num*bpr);
-#endif
-      break;
-    case gfxIFormats::RGB_A1:
-    case gfxIFormats::BGR_A1:
-      {
-        cptr = decoder->colorLine;
-        aptr = decoder->alphaLine;
-        memset(aptr, 0, abpr);
-        for (PRUint32 x=0; x<iwidth; x++) {
-#ifdef XP_MAC
-          *cptr++ = 0;
-#endif
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          if (*line++) {
-            aptr[x>>3] |= 1<<(7-x&0x7);
-          }
-        }
-        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
-        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
-      }
-      break;
-    case gfxIFormats::RGB_A8:
-    case gfxIFormats::BGR_A8:
-      {
-        cptr = decoder->colorLine;
-        aptr = decoder->alphaLine;
-        for (PRUint32 x=0; x<iwidth; x++) {
-#ifdef XP_MAC
-          *cptr++ = 0;
-#endif
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *aptr++ = *line++;
-        }
-        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
-        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
-      }
-      break;
-    case gfxIFormats::RGBA:
-    case gfxIFormats::BGRA:
-#ifdef XP_MAC
-      {
-        cptr = decoder->colorLine;
-        aptr = decoder->alphaLine;
-        for (PRUint32 x=0; x<iwidth; x++) {
-          *cptr++ = 0;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *aptr++ = *line++;
-        }
-        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
-        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
-      }
-#else
-      decoder->mFrame->SetImageData(line, bpr, row_num*bpr);
-#endif
-      break;
-    }
-
-    nsRect r(0, row_num, width, 1);
-    decoder->mObserver->OnDataAvailable(nsnull, nsnull, decoder->mFrame, &r);
-  }
-}
-
-
-
-void
-nsPNGDecoder::end_callback(png_structp png_ptr, png_infop info_ptr)
-{
-  /* libpng comments:
-   *
-   * this function is called when the whole image has been read,
-   * including any chunks after the image (up to and including
-   * the IEND).  You will usually have the same info chunk as you
-   * had in the header, although some data may have been added
-   * to the comments and time fields.
-   *
-   * Most people won't do much here, perhaps setting a flag that
-   * marks the image as finished.
-   */
-
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
-
-  if (decoder->mObserver) {
-    decoder->mObserver->OnStopFrame(nsnull, nsnull, decoder->mFrame);
-    decoder->mObserver->OnStopContainer(nsnull, nsnull, decoder->mImage);
-    decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-
-}
-

mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.h

@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef nsPNGDecoder_h__
-#define nsPNGDecoder_h__
-
-#include "imgIDecoder.h"
-
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-#include "gfxIImageFrame.h"
-#include "imgIRequest.h"
-
-
-#include "nsCOMPtr.h"
-
-#include "png.h"
-
-#define NS_PNGDECODER_CID \
-{ /* 36fa00c2-1dd2-11b2-be07-d16eeb4c50ed */         \
-     0x36fa00c2,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0xbe, 0x07, 0xd1, 0x6e, 0xeb, 0x4c, 0x50, 0xed} \
-}
-
-class nsPNGDecoder : public imgIDecoder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsPNGDecoder();
-  virtual ~nsPNGDecoder();
-
-PR_STATIC_CALLBACK(void)
-info_callback(png_structp png_ptr, png_infop info_ptr);
-PR_STATIC_CALLBACK(void)
-row_callback(png_structp png_ptr, png_bytep new_row,
-             png_uint_32 row_num, int pass);
-
-PR_STATIC_CALLBACK(void)
-end_callback(png_structp png_ptr, png_infop info_ptr);
-
-  inline PRUint32 ProcessData(unsigned char *data, PRUint32 count);
-
-
-public:
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<gfxIImageFrame> mFrame;
-  nsCOMPtr<imgIRequest> mRequest;
-  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
-
-  png_structp mPNG;
-  png_infop mInfo;
-  PRUint8 *colorLine, *alphaLine;
-  PRUint8 *interlacebuf;
-  PRUint32 ibpr;
-};
-
-#endif // nsPNGDecoder_h__

mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp

@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsPNGDecoder.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPNGDecoder)
-
-static nsModuleComponentInfo components[] =
-{
-  { "PNG decoder",
-    NS_PNGDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/png",
-    nsPNGDecoderConstructor, },
-  { "PNG decoder",
-    NS_PNGDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/x-png",
-    nsPNGDecoderConstructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsPNGDecoderModule", components)
-

mozilla/modules/libpr0n/decoders/ppm/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgppm
-LIBRARY_NAME	= imgppm
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom layout necko gfx2 imglib2
-
-CPPSRCS		= nsPPMDecoder.cpp nsPPMFactory.cpp
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/ppm/makefile.win

@@ -1,51 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imgppm
-LIBRARY_NAME	= imgppm
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsPPMDecoder.obj \
-		.\$(OBJDIR)\nsPPMFactory.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp

@@ -1,305 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- */
-
-#include "nsPPMDecoder.h"
-
-#include "nsIInputStream.h"
-#include "imgIContainer.h"
-#include "imgIContainerObserver.h"
-
-#include "nspr.h"
-
-#include "nsIComponentManager.h"
-
-#include "nsRect.h"
-
-NS_IMPL_ISUPPORTS2(nsPPMDecoder, imgIDecoder, nsIOutputStream)
-
-
-nsPPMDecoder::nsPPMDecoder()
-{
-  NS_INIT_ISUPPORTS();
-  mDataReceived = 0;
-  mDataWritten = 0;
-
-  mDataLeft = 0;
-  mPrevData = nsnull;
-}
-
-nsPPMDecoder::~nsPPMDecoder()
-{
-
-}
-
-
-/** imgIDecoder methods **/
-
-/* void init (in imgIRequest aRequest); */
-NS_IMETHODIMP nsPPMDecoder::Init(imgIRequest *aRequest)
-{
-  mRequest = aRequest;
-
-  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
-
-  aRequest->GetImage(getter_AddRefs(mImage));
-
-  mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-  if (!mFrame)
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}
-
-/* readonly attribute imgIRequest request; */
-NS_IMETHODIMP nsPPMDecoder::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mRequest;
-  NS_ADDREF(*aRequest);
-  return NS_OK;
-}
-
-
-
-
-
-
-/** nsIOutputStream methods **/
-
-/* void close (); */
-NS_IMETHODIMP nsPPMDecoder::Close()
-{
-  if (mObserver) {
-    mObserver->OnStopFrame(nsnull, nsnull, mFrame);
-    mObserver->OnStopContainer(nsnull, nsnull, mImage);
-    mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-  
-  return NS_OK;
-}
-
-/* void flush (); */
-NS_IMETHODIMP nsPPMDecoder::Flush()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long write (in string buf, in unsigned long count); */
-NS_IMETHODIMP nsPPMDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-static char *__itoa(int n)
-{
-	char *s;
-	int i, j, sign, tmp;
-	
-	/* check sign and convert to positive to stringify numbers */
-	if ( (sign = n) < 0)
-		n = -n;
-	i = 0;
-	s = (char*) malloc(sizeof(char));
-	
-	/* grow string as needed to add numbers from powers of 10 
-     * down till none left 
-     */
-	do
-	{
-		s = (char*) realloc(s, (i+1)*sizeof(char));
-		s[i++] = n % 10 + '0';  /* '0' or 30 is where ASCII numbers start */
-		s[i] = '\0';
-	}
-	while( (n /= 10) > 0);	
-	
-	/* tack on minus sign if we found earlier that this was negative */
-	if (sign < 0)
-	{
-		s = (char*) realloc(s, (i+1)*sizeof(char));
-		s[i++] = '-';
-	}
-	s[i] = '\0';
-	
-	/* pop numbers (and sign) off of string to push back into right direction */
-	for (i = 0, j = strlen(s) - 1; i < j; i++, j--)
-	{
-		tmp = s[i];
-		s[i] = s[j];
-		s[j] = tmp;
-	}
-	
-	return s;
-}
-
-
-/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
-NS_IMETHODIMP nsPPMDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-  nsresult rv;
-
-  char *buf = (char *)PR_Malloc(count + mDataLeft);
-  if (!buf)
-    return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
-
-  
-  // read the data from the input stram...
-  PRUint32 readLen;
-  rv = inStr->Read(buf+mDataLeft, count, &readLen);
-
-  PRUint32 dataLen = readLen + mDataLeft;
-
-  if (mPrevData) {
-    strncpy(buf, mPrevData, mDataLeft);
-    PR_Free(mPrevData);
-    mPrevData = nsnull;
-    mDataLeft = 0;
-  }
-
-  char *data = buf;
-
-  if (NS_FAILED(rv)) return rv;
-
-  if (mDataReceived == 0) {
-
-    mObserver->OnStartDecode(nsnull, nsnull);
-
-    // Check the magic number
-    char type;
-    if ((sscanf(data, "P%c\n", &type) !=1) || (type != '6')) {
-      return NS_ERROR_FAILURE;
-    }
-    int i = 3;
-    data += i;
-
-#if 0
-    // XXX
-    // Ignore comments
-    while ((input = fgetc(f)) == '#')
-      fgets(junk, 512, f);
-    ungetc(input, f);
-#endif
-
-    // Read size
-    int w, h, mcv;
-
-    if (sscanf(data, "%d %d\n%d\n", &w, &h, &mcv) != 3) {
-      return NS_ERROR_FAILURE;
-    }
-    char *ws = __itoa(w), *hs = __itoa(h), *mcvs = __itoa(mcv);
-    int j = strlen(ws) + strlen(hs) + strlen(mcvs) + 3;
-    data += j;
-//    free(ws);
-//    free(hs);
-//    free(mcvs);
-
-    readLen -= i + j;
-    dataLen = readLen; // since this is the first pass, we don't have any data waiting that we need to keep track of
-
-    mImage->Init(w, h, mObserver);
-    if (mObserver)
-      mObserver->OnStartContainer(nsnull, nsnull, mImage);
-
-    mFrame->Init(0, 0, w, h, gfxIFormats::RGB);
-    mImage->AppendFrame(mFrame);
-    if (mObserver)
-      mObserver->OnStartFrame(nsnull, nsnull, mFrame);
-  }
-
-  PRUint32 bpr;
-  nscoord width;
-  mFrame->GetImageBytesPerRow(&bpr);
-  mFrame->GetWidth(&width);
-
-  // XXX ceil?
-  PRUint32 real_bpr = width * 3;
-  
-  PRUint32 i = 0;
-  PRUint32 rownum = mDataWritten / real_bpr;  // XXX this better not have a decimal
-  
-  PRUint32 wroteLen = 0;
-
-  if (readLen > real_bpr) {
-
-    do {
-      PRUint8 *line = (PRUint8*)data + i*real_bpr;
-      mFrame->SetImageData(line, real_bpr, (rownum++)*bpr);
-
-      nsRect r(0, rownum, width, 1);
-      mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
-
-
-      wroteLen += real_bpr ;
-      i++;
-    } while(dataLen >= real_bpr * (i+1));
-
-  }
-  
-  mDataReceived += readLen;  // don't double count previous data that is in 'dataLen'
-  mDataWritten += wroteLen;
-
-  PRUint32 dataLeft = dataLen - wroteLen;
-
-  if (dataLeft > 0) {
-    if (mPrevData) {
-      mPrevData = (char *)PR_Realloc(mPrevData, mDataLeft + dataLeft);
-      strncpy(mPrevData + mDataLeft, data+wroteLen, dataLeft);
-      mDataLeft += dataLeft;
-
-    } else {
-      mDataLeft = dataLeft;
-      mPrevData = (char *)PR_Malloc(mDataLeft);
-      strncpy(mPrevData, data+wroteLen, mDataLeft);
-    }
-  }
-
-  PR_FREEIF(buf);
-
-  return NS_OK;
-}
-
-/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
-NS_IMETHODIMP nsPPMDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean nonBlocking; */
-NS_IMETHODIMP nsPPMDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsPPMDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsIOutputStreamObserver observer; */
-NS_IMETHODIMP nsPPMDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsPPMDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-

mozilla/modules/libpr0n/decoders/ppm/nsPPMDecoder.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef nsPPMDecoder_h__
-#define nsPPMDecoder_h__
-
-#include "imgIDecoder.h"
-
-#include "nsCOMPtr.h"
-
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-#include "gfxIImageFrame.h"
-#include "imgIRequest.h"
-
-#define NS_PPMDECODER_CID \
-{ /* e90bfa06-1dd1-11b2-8217-f38fe5d431a2 */         \
-     0xe90bfa06,                                     \
-     0x1dd1,                                         \
-     0x11b2,                                         \
-    {0x82, 0x17, 0xf3, 0x8f, 0xe5, 0xd4, 0x31, 0xa2} \
-}
-
-class nsPPMDecoder : public imgIDecoder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsPPMDecoder();
-  virtual ~nsPPMDecoder();
-
-private:
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<gfxIImageFrame> mFrame;
-  nsCOMPtr<imgIRequest> mRequest;
-  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
-
-  PRUint32 mDataReceived;
-  PRUint32 mDataWritten;
-
-  PRUint32 mDataLeft;
-  char *mPrevData;
-};
-
-#endif // nsPPMDecoder_h__

mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsPPMDecoder.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPPMDecoder)
-
-static nsModuleComponentInfo components[] =
-{
-  { "ppm decoder",
-    NS_PPMDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/x-portable-pixmap",
-    nsPPMDecoderConstructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsPPMDecoderModule", components)
-

mozilla/modules/libpr0n/public/ImageLogging.h

@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "prlog.h"
-
-#include "nsString.h"
-
-#if defined(PR_LOGGING)
-extern PRLogModuleInfo *gImgLog;
-
-class LogScope {
-public:
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s {ENTER}\n",
-                                   mFrom, mFunc.get()));
-  }
-
-  /* const char * constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
-           const nsLiteralCString &paramName, const char *paramValue) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%s\") {ENTER}\n",
-                                   mFrom, mFunc.get(),
-                                   paramName.get(),
-                                   paramValue));
-  }
-
-  /* void ptr constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
-           const nsLiteralCString &paramName, const void *paramValue) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=%p) {ENTER}\n",
-                                   mFrom, mFunc.get(),
-                                   paramName.get(),
-                                   paramValue));
-  }
-
-  /* PRInt32 constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
-           const nsLiteralCString &paramName, PRInt32 paramValue) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%d\") {ENTER}\n",
-                                   mFrom, mFunc.get(),
-                                   paramName.get(),
-                                   paramValue));
-  }
-
-  /* PRUint32 constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
-           const nsLiteralCString &paramName, PRUint32 paramValue) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%d\") {ENTER}\n",
-                                   mFrom, mFunc.get(),
-                                   paramName.get(),
-                                   paramValue));
-  }
-
-
-  ~LogScope() {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s {EXIT}\n",
-                                   mFrom, mFunc.get()));
-  }
-
-private:
-  PRLogModuleInfo *mLog;
-  void *mFrom;
-  nsCAutoString mFunc;
-};
-
-
-#define LOG_SCOPE(l, s) \
-  LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
-                                         NS_STATIC_CAST(void *, this), \
-                                         NS_LITERAL_CSTRING(s))
-
-#define LOG_SCOPE_WITH_PARAM(l, s, pn, pv) \
-  LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
-                                         NS_STATIC_CAST(void *, this), \
-                                         NS_LITERAL_CSTRING(s),        \
-                                         NS_LITERAL_CSTRING(pn), pv)
-
-#else
-#define LOG_SCOPE(l, s)
-#define LOG_SCOPE_WITH_PARAM(l, s, pn, pv)
-#endif

mozilla/modules/libpr0n/public/MANIFEST

@@ -1 +0,0 @@
-ImageLogging.h 

mozilla/modules/libpr0n/public/MANIFEST_IDL

@@ -1,6 +0,0 @@
-imgIContainer.idl
-imgIContainerObserver.idl
-imgIDecoder.idl
-imgIDecoderObserver.idl
-imgILoader.idl
-imgIRequest.idl

mozilla/modules/libpr0n/public/Makefile.in

@@ -1,41 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imglib2
-
-EXPORTS		= ImageLogging.h
-
-XPIDLSRCS	= imgIContainer.idl         \
-						imgIContainerObserver.idl \
-						imgIDecoder.idl           \
-						imgIDecoderObserver.idl	  \
-						imgILoader.idl            \
-						imgIRequest.idl
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/public/imgIContainer.idl

@@ -1,109 +0,0 @@
-/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "gfxtypes.idl"
-#include "gfxIFormats.idl"
-
-interface gfxIImageFrame;
-interface nsIEnumerator;
-interface imgIContainerObserver;
-
-/**
- * gfxIImageContainer interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see "gfx2"
- */
-[scriptable, uuid(5e8405a4-1dd2-11b2-8385-bc8e3446cad3)]
-interface imgIContainer : nsISupports
-{
-  /**
-   * Create a new \a aWidth x \a aHeight sized image container.
-   *
-   * @param aWidth The width of the container in which all the
-   *               gfxIImageFrame children will fit.
-   * @param aHeight The height of the container in which all the
-   *                gfxIImageFrame children will fit.
-   * @param aObserver Observer to send animation notifications to.
-   */
-  void init(in nscoord aWidth,
-            in nscoord aHeight,
-            in imgIContainerObserver aObserver);
-
-
-  /* this should probably be on the device context (or equiv) */
-  readonly attribute gfx_format preferredAlphaChannelFormat;
-
-  /**
-   * The width of the container rectangle.
-   */
-  readonly attribute nscoord width;
-
-  /**
-   * The height of the container rectangle.
-   */
-  readonly attribute nscoord height;
-
-
-  /**
-   * Get the current frame that would be drawn if the image was to be drawn now
-   */
-  readonly attribute gfxIImageFrame currentFrame;
-
-
-  readonly attribute unsigned long numFrames;
-
-  gfxIImageFrame getFrameAt(in unsigned long index);
-
-  /**
-   * Adds \a item to the end of the list of frames.
-   * @param item frame to add.
-   */
-  void appendFrame(in gfxIImageFrame item);
-
-  void removeFrame(in gfxIImageFrame item);
-
-  /* notification when the current frame is done decoding */
-  void endFrameDecode(in unsigned long framenumber, in unsigned long timeout);
-  
-  /* notification that the entire image has been decoded */
-  void decodingComplete();
-  
-  nsIEnumerator enumerate();
-
-  void clear();
-
-  void startAnimation();
-
-  void stopAnimation();
-
-  /* animation stuff */
-
-  /**
-   * number of times to loop the image.
-   * @note -1 means forever.
-   */
-  attribute long loopCount;
-};

mozilla/modules/libpr0n/public/imgIContainerObserver.idl

@@ -1,46 +0,0 @@
-/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "gfxtypes.idl"
-
-%{C++
-#include "nsRect.h"
-%}
-
-interface imgIContainer;
-
-interface gfxIImageFrame;
-
-/**
- * imgIContainerObserver interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- */
-[uuid(153f1518-1dd2-11b2-b9cd-b16eb63e0471)]
-interface imgIContainerObserver : nsISupports
-{
-  [noscript] void frameChanged(in imgIContainer aContainer, in nsISupports aCX,
-                               in gfxIImageFrame aFrame, in nsRect aDirtyRect);
-};

mozilla/modules/libpr0n/public/imgIDecoder.idl

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "nsIOutputStream.idl"
-#include "gfxtypes.idl"
-
-interface imgIRequest;
-
-/**
- * imgIDecoder interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see imagelib2
- */
-[scriptable, uuid(9eebf43a-1dd1-11b2-953e-f1782f4cbad3)]
-interface imgIDecoder : nsIOutputStream
-{
-  /**
-   * Initalize an image decoder.
-   * @param aRequest the request that owns the decoder.
-   *
-   * @note The decode should QI \a aRequest to an imgIDecoderObserver
-   * and should send decoder notifications to the request.
-   * The decoder should always pass NULL as the first two parameters to
-   * all of the imgIDecoderObserver APIs.
-   */
-  void init(in imgIRequest aRequest);
-
-  /// allows access to the nsIImage we have to put bits in to.
-  readonly attribute imgIRequest request;
-};

mozilla/modules/libpr0n/public/imgIDecoderObserver.idl

@@ -1,80 +0,0 @@
-/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgIContainerObserver.idl"
-
-interface imgIRequest;
-interface imgIContainer;
-interface gfxIImageFrame;
-
-%{C++
-#include "nsRect.h"
-%}
-
-/**
- * imgIDecoderObserver interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see imagelib2
- */
-[scriptable, uuid(350163d2-1dd2-11b2-9e69-89959ecec1f3)]
-interface imgIDecoderObserver : imgIContainerObserver
-{
-  /**
-   * called as soon as the image begins getting decoded
-   */
-  void onStartDecode(in imgIRequest aRequest, in nsISupports cx);
-
-  /**
-   * called once the image has been inited and therefore has a width and height
-   */
-  void onStartContainer(in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer);
-
-  /**
-   * called when each frame is created
-   */
-  void onStartFrame(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame);
-
-  /**
-   * called when some part of the frame has new data in it
-   */
-  [noscript] void onDataAvailable(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame, [const] in nsRect aRect);
-
-  /**
-   * called when a frame is finished decoding
-   */
-  void onStopFrame(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame);
-
-  /**
-   * probably not needed.  called right before onStopDecode
-   */
-  void onStopContainer(in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer);
-
-  /**
-   * called when the decoder is dying off
-   */
-  void onStopDecode(in imgIRequest aRequest, in nsISupports cx,
-                    in nsresult status, in wstring statusArg);
-
-};

mozilla/modules/libpr0n/public/imgILoader.idl

@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "gfxtypes.idl"
-
-interface imgIDecoderObserver;
-interface imgIRequest;
-
-interface nsIChannel;
-interface nsILoadGroup;
-interface nsIStreamListener;
-interface nsIURI;
-
-interface nsISimpleEnumerator;
-
-/**
- * imgILoader interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see imagelib2
- */
-[scriptable, uuid(4c8cf1e0-1dd2-11b2-aff9-c51cdbfcb6da)]
-interface imgILoader : nsISupports
-{
-  /**
-   * Start the load and decode of an image.
-   * @param uri the URI to load
-   * @param aObserver the observer
-   * @param cx some random data
-   */
-  imgIRequest loadImage(in nsIURI uri, in nsILoadGroup aLoadGroup, in imgIDecoderObserver aObserver, in nsISupports cx);
-
-  /**
-   * Start the load and decode of an image.
-   * @param uri the URI to load
-   * @param aObserver the observer
-   * @param cx some random data
-   */
-  imgIRequest loadImageWithChannel(in nsIChannel aChannel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener aListener);
-};

mozilla/modules/libpr0n/public/imgIRequest.idl

@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "nsIRequest.idl"
-
-interface imgIContainer;
-interface imgIDecoderObserver;
-interface nsIURI;
-
-/**
- * imgIRequest interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see imagelib2
- */
-[scriptable, uuid(ccf705f6-1dd1-11b2-82ef-e18eccf7f7ec)]
-interface imgIRequest : nsIRequest
-{
-  /**
-   * the image container...
-   * @return the image object associated with the request.
-   * @attention NEED DOCS
-   */
-  readonly attribute imgIContainer image;
-
-  /**
-   * Bits set in the return value from imageStatus
-   * @name statusflags
-   */
-  //@{
-  const long STATUS_NONE             = 0x0;
-  const long STATUS_SIZE_AVAILABLE   = 0x1;
-  const long STATUS_LOAD_COMPLETE    = 0x2;
-  const long STATUS_ERROR            = 0x4;
-  //@}
-
-  /**
-   * something
-   * @attention NEED DOCS
-   */
-  readonly attribute unsigned long imageStatus;
-
-  readonly attribute nsIURI URI;
-
-  readonly attribute imgIDecoderObserver decoderObserver;
-};
-
-%{C++
-
-/**
- * imagelib specific nsresult success and error codes
- */
-#define NS_IMAGELIB_SUCCESS_LOAD_FINISHED   NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_IMGLIB, 0)
-
-#define NS_IMAGELIB_ERROR_FAILURE           NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 5)
-#define NS_IMAGELIB_ERROR_NO_DECODER        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 6)
-
-%}

mozilla/modules/libpr0n/public/makefile.win

@@ -1,43 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH		= ..\..\..
-
-include <$(DEPTH)/config/config.mak>
-
-MODULE		= imglib2
-XPIDL_MODULE	= imglib2
-
-EXPORTS		= ImageLogging.h
-
-XPIDLSRCS	= \
-		.\imgIContainer.idl \
-		.\imgIContainerObserver.idl \
-		.\imgIDecoder.idl \
-		.\imgIDecoderObserver.idl \
-		.\imgILoader.idl \
-		.\imgIRequest.idl \
-		$(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/modules/libpr0n/src/DummyChannel.cpp

@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "DummyChannel.h"
-
-#include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
-
-
-NS_IMPL_ISUPPORTS1(DummyChannel, nsIChannel)
-
-DummyChannel::DummyChannel(imgIRequest *aRequest, nsILoadGroup *aLoadGroup) :
-  mRequest(aRequest),
-  mLoadGroup(aLoadGroup),
-  mLoadFlags(nsIChannel::LOAD_NORMAL)
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-DummyChannel::~DummyChannel()
-{
-  /* destructor code */
-}
-
-/* attribute nsIURI originalURI; */
-NS_IMETHODIMP DummyChannel::GetOriginalURI(nsIURI * *aOriginalURI)
-{
-  return mRequest->GetURI(aOriginalURI);
-}
-NS_IMETHODIMP DummyChannel::SetOriginalURI(nsIURI * aOriginalURI)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* attribute nsIURI URI; */
-NS_IMETHODIMP DummyChannel::GetURI(nsIURI * *aURI)
-{
-  return mRequest->GetURI(aURI);
-}
-NS_IMETHODIMP DummyChannel::SetURI(nsIURI * aURI)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* attribute nsISupports owner; */
-NS_IMETHODIMP DummyChannel::GetOwner(nsISupports * *aOwner)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP DummyChannel::SetOwner(nsISupports * aOwner)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsILoadGroup loadGroup; */
-NS_IMETHODIMP DummyChannel::GetLoadGroup(nsILoadGroup * *aLoadGroup)
-{
-  *aLoadGroup = mLoadGroup;
-  NS_IF_ADDREF(*aLoadGroup);
-  return NS_OK;
-}
-NS_IMETHODIMP DummyChannel::SetLoadGroup(nsILoadGroup * aLoadGroup)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* attribute nsLoadFlags loadAttributes; */
-NS_IMETHODIMP DummyChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
-{
-  *aLoadAttributes = mLoadFlags;
-  return NS_OK;
-}
-NS_IMETHODIMP DummyChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
-{
-  mLoadFlags = aLoadAttributes;
-  return NS_OK;
-}
-
-/* attribute nsIInterfaceRequestor notificationCallbacks; */
-NS_IMETHODIMP DummyChannel::GetNotificationCallbacks(nsIInterfaceRequestor * *aNotificationCallbacks)
-{
-    return NS_OK;
-}
-NS_IMETHODIMP DummyChannel::SetNotificationCallbacks(nsIInterfaceRequestor * aNotificationCallbacks)
-{
-    return NS_OK;
-}
-
-/* readonly attribute nsISupports securityInfo; */
-NS_IMETHODIMP DummyChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute string contentType; */
-NS_IMETHODIMP DummyChannel::GetContentType(char * *aContentType)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP DummyChannel::SetContentType(const char * aContentType)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute long contentLength; */
-NS_IMETHODIMP DummyChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP DummyChannel::SetContentLength(PRInt32 aContentLength)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIInputStream open (); */
-NS_IMETHODIMP DummyChannel::Open(nsIInputStream **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void asyncOpen (in nsIStreamListener listener, in nsISupports ctxt); */
-NS_IMETHODIMP DummyChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/modules/libpr0n/src/DummyChannel.h

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef DummyChannel_h__
-#define DummyChannel_h__
-
-#include "nsIChannel.h"
-#include "nsIRequest.h"
-#include "nsILoadGroup.h"
-
-#include "imgIRequest.h"
-
-#include "nsCOMPtr.h"
-
-class DummyChannel : public nsIChannel
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSICHANNEL
-  NS_FORWARD_NSIREQUEST(mRequest->)
-
-  DummyChannel(imgIRequest *aRequest, nsILoadGroup *aLoadGroup);
-  ~DummyChannel();
-
-private:
-  /* additional members */
-  nsCOMPtr<imgIRequest> mRequest;
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-
-  nsLoadFlags mLoadFlags;
-};
-
-#endif
-

mozilla/modules/libpr0n/src/ImageCache.cpp

@@ -1,166 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "ImageCache.h"
-
-#ifdef MOZ_NEW_CACHE
-
-#include "prlog.h"
-
-#if defined(PR_LOGGING)
-extern PRLogModuleInfo *gImgLog;
-#else
-#define gImgLog
-#endif
-
-#include "nsXPIDLString.h"
-#include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
-
-#include "nsICache.h"
-#include "nsICacheService.h"
-#include "nsICacheSession.h"
-#include "nsICacheEntryDescriptor.h"
-
-static nsCOMPtr<nsICacheSession> gSession = nsnull;
-
-ImageCache::ImageCache()
-{
-  /* member initializers and constructor code */
-}
-
-ImageCache::~ImageCache()
-{
-  /* destructor code */
-}
-
-void GetCacheSession(nsICacheSession **_retval)
-{
-  if (!gSession) {
-    nsCOMPtr<nsICacheService> cacheService(do_GetService("@mozilla.org/network/cache-service;1"));
-    NS_ASSERTION(cacheService, "Unable to get the cache service");
-
-    cacheService->CreateSession("images", nsICache::NOT_STREAM_BASED, PR_FALSE, getter_AddRefs(gSession));
-    NS_ASSERTION(gSession, "Unable to create a cache session");
-  }
-
-  *_retval = gSession;
-  NS_IF_ADDREF(*_retval);
-}
-
-
-void ImageCache::Shutdown()
-{
-  gSession = nsnull;
-}
-
-PRBool ImageCache::Put(nsIURI *aKey, imgRequest *request, nsICacheEntryDescriptor **aEntry)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("ImageCache::Put\n"));
-
-  nsresult rv;
-
-  nsCOMPtr<nsICacheSession> ses;
-  GetCacheSession(getter_AddRefs(ses));
-
-  nsXPIDLCString spec;
-  aKey->GetSpec(getter_Copies(spec));
-
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-
-  rv = ses->OpenCacheEntry(spec, nsICache::ACCESS_WRITE, getter_AddRefs(entry));
-
-  if (!entry || NS_FAILED(rv))
-    return PR_FALSE;
-
-  entry->SetCacheElement(NS_STATIC_CAST(nsISupports *, NS_STATIC_CAST(imgIRequest*, request)));
-
-  entry->MarkValid();
-
-  *aEntry = entry;
-  NS_ADDREF(*aEntry);
-
-  return PR_TRUE;
-}
-
-PRBool ImageCache::Get(nsIURI *aKey, imgRequest **aRequest, nsICacheEntryDescriptor **aEntry)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-       ("ImageCache::Get\n"));
-
-  nsresult rv;
-
-  nsCOMPtr<nsICacheSession> ses;
-  GetCacheSession(getter_AddRefs(ses));
-
-  nsXPIDLCString spec;
-  aKey->GetSpec(getter_Copies(spec));
-
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-
-  rv = ses->OpenCacheEntry(spec, nsICache::ACCESS_READ, getter_AddRefs(entry));
-
-  if (!entry || NS_FAILED(rv))
-    return PR_FALSE;
-
-  nsCOMPtr<nsISupports> sup;
-  entry->GetCacheElement(getter_AddRefs(sup));
-
-  nsCOMPtr<imgIRequest> req(do_QueryInterface(sup));
-  *aRequest = NS_REINTERPRET_CAST(imgRequest*, req.get());
-  NS_IF_ADDREF(*aRequest);
-
-  *aEntry = entry;
-  NS_ADDREF(*aEntry);
-
-  return PR_TRUE;
-}
-
-
-PRBool ImageCache::Remove(nsIURI *aKey)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("ImageCache::Remove\n"));
-
-  nsresult rv;
-
-  nsCOMPtr<nsICacheSession> ses;
-  GetCacheSession(getter_AddRefs(ses));
-
-  nsXPIDLCString spec;
-  aKey->GetSpec(getter_Copies(spec));
-
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-
-  rv = ses->OpenCacheEntry(spec, nsICache::ACCESS_READ, getter_AddRefs(entry));
-
-  if (!entry || NS_FAILED(rv))
-    return PR_FALSE;
-
-  entry->Doom();
-
-  return PR_TRUE;
-}
-
-#endif /* MOZ_NEW_CACHE */

mozilla/modules/libpr0n/src/ImageCache.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef ImageCache_h__
-#define ImageCache_h__
-
-#include "nsIURI.h"
-#include "imgRequest.h"
-#include "prtypes.h"
-
-#ifdef MOZ_NEW_CACHE
-#include "nsICacheEntryDescriptor.h"
-#else
-class nsICacheEntryDescriptor;
-#endif
-
-
-class ImageCache
-{
-public:
-#ifdef MOZ_NEW_CACHE
-  ImageCache();
-  ~ImageCache();
-
-  static void Shutdown(); // for use by the factory
-
-  /* additional members */
-  static PRBool Put(nsIURI *aKey, imgRequest *request, nsICacheEntryDescriptor **aEntry);
-  static PRBool Get(nsIURI *aKey, imgRequest **aRequest, nsICacheEntryDescriptor **aEntry);
-  static PRBool Remove(nsIURI *aKey);
-
-#else
-
-  ImageCache()  { }
-  ~ImageCache() { }
-
-  static void Shutdown() { }
-
-  /* additional members */
-  static PRBool Put(nsIURI *aKey, imgRequest *request, nsICacheEntryDescriptor **aEntry) {
-    return PR_FALSE;
-  }
-  static PRBool Get(nsIURI *aKey, imgRequest **aRequest, nsICacheEntryDescriptor **aEntry) {
-    return PR_FALSE;
-  }
-  static PRBool Remove(nsIURI *aKey) {
-    return PR_FALSE;
-  }
-#endif /* MOZ_NEW_CACHE */
-};
-
-#endif

mozilla/modules/libpr0n/src/ImageFactory.cpp

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "imgContainer.h"
-#include "imgLoader.h"
-#include "imgRequest.h"
-#include "imgRequestProxy.h"
-
-#include "ImageCache.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(imgContainer)
-NS_GENERIC_FACTORY_CONSTRUCTOR(imgLoader)
-NS_GENERIC_FACTORY_CONSTRUCTOR(imgRequest)
-NS_GENERIC_FACTORY_CONSTRUCTOR(imgRequestProxy)
-
-static nsModuleComponentInfo components[] =
-{
-  { "image container",
-    NS_IMGCONTAINER_CID,
-    "@mozilla.org/image/container;1",
-    imgContainerConstructor, },
-  { "image loader",
-    NS_IMGLOADER_CID,
-    "@mozilla.org/image/loader;1",
-    imgLoaderConstructor, },
-  { "image request",
-    NS_IMGREQUEST_CID,
-    "@mozilla.org/image/request/real;1",
-    imgRequestConstructor, },
-  { "image request proxy",
-    NS_IMGREQUESTPROXY_CID,
-    "@mozilla.org/image/request/proxy;1",
-    imgRequestProxyConstructor, },
-};
-
-PR_STATIC_CALLBACK(void)
-ImageModuleDestructor(nsIModule *self)
-{
-  ImageCache::Shutdown();
-}
-
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsImageLib2Module", components, ImageModuleDestructor)

mozilla/modules/libpr0n/src/Makefile.in

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imglib2
-LIBRARY_NAME	= imglib2
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom string necko nkcache layout timer gfx2
-
-CPPSRCS		= \
-			DummyChannel.cpp \
-			ImageCache.cpp   \
-			ImageFactory.cpp \
-			imgContainer.cpp \
-			imgLoader.cpp    \
-			imgRequest.cpp   \
-			imgRequestProxy.cpp
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/src/imgContainer.cpp

@@ -1,555 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- *   Chris Saari <saari@netscape.com>
- */
-
-#include "imgContainer.h"
-
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "gfxIImageFrame.h"
-#include "nsIImage.h"
-
-NS_IMPL_ISUPPORTS3(imgContainer, imgIContainer, nsITimerCallback,imgIDecoderObserver)
-
-//******************************************************************************
-imgContainer::imgContainer()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-  mCurrentDecodingFrameIndex = 0;
-  mCurrentAnimationFrameIndex = 0;
-  mCurrentFrameIsFinishedDecoding = PR_FALSE;
-  mDoneDecoding = PR_FALSE;
-  mAnimating = PR_FALSE;
-  mObserver = nsnull;
-}
-
-//******************************************************************************
-imgContainer::~imgContainer()
-{
-  if (mTimer)
-    mTimer->Cancel();
-    
-  /* destructor code */
-  mFrames.Clear();
-}
-
-//******************************************************************************
-/* void init (in nscoord aWidth, in nscoord aHeight, in imgIContainerObserver aObserver); */
-NS_IMETHODIMP imgContainer::Init(nscoord aWidth, nscoord aHeight, imgIContainerObserver *aObserver)
-{
-  if (aWidth <= 0 || aHeight <= 0) {
-    NS_WARNING("error - negative image size\n");
-    return NS_ERROR_FAILURE;
-  }
-
-  mSize.SizeTo(aWidth, aHeight);
-
-  mObserver = getter_AddRefs(NS_GetWeakReference(aObserver));
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute gfx_format preferredAlphaChannelFormat; */
-NS_IMETHODIMP imgContainer::GetPreferredAlphaChannelFormat(gfx_format *aFormat)
-{
-  /* default.. platform's should probably overwrite this */
-  *aFormat = gfxIFormats::RGB_A8;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute nscoord width; */
-NS_IMETHODIMP imgContainer::GetWidth(nscoord *aWidth)
-{
-  *aWidth = mSize.width;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute nscoord height; */
-NS_IMETHODIMP imgContainer::GetHeight(nscoord *aHeight)
-{
-  *aHeight = mSize.height;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute gfxIImageFrame currentFrame; */
-NS_IMETHODIMP imgContainer::GetCurrentFrame(gfxIImageFrame * *aCurrentFrame)
-{
-  if(mCompositingFrame)
-    return mCompositingFrame->QueryInterface(NS_GET_IID(gfxIImageFrame), (void**)aCurrentFrame); // addrefs again
-  else
-    return this->GetFrameAt(mCurrentAnimationFrameIndex, aCurrentFrame);
-}
-
-//******************************************************************************
-/* readonly attribute unsigned long numFrames; */
-NS_IMETHODIMP imgContainer::GetNumFrames(PRUint32 *aNumFrames)
-{
-  return mFrames.Count(aNumFrames);
-}
-
-//******************************************************************************
-/* gfxIImageFrame getFrameAt (in unsigned long index); */
-NS_IMETHODIMP imgContainer::GetFrameAt(PRUint32 index, gfxIImageFrame **_retval)
-{
-  nsISupports *sup = mFrames.ElementAt(index); // addrefs
-  if (!sup)
-    return NS_ERROR_FAILURE;
-
-  nsresult rv;
-  rv = sup->QueryInterface(NS_GET_IID(gfxIImageFrame), (void**)_retval); // addrefs again
-
-  NS_RELEASE(sup);
-
-  return rv;
-}
-
-//******************************************************************************
-/* void appendFrame (in gfxIImageFrame item); */
-NS_IMETHODIMP imgContainer::AppendFrame(gfxIImageFrame *item)
-{
-  // If we don't have a composite frame already allocated, make sure that our container
-  // size is the same the frame size. Otherwise, we'll either need the composite frame
-  // for animation compositing (GIF) or for filling in with a background color.
-  // XXX IMPORTANT: this means that the frame should be initialized BEFORE appending to container
-  PRUint32 numFrames;
-  this->GetNumFrames(&numFrames);
-  
-  if(!mCompositingFrame) {
-    nsRect frameRect;
-    item->GetRect(frameRect);
-    // We used to create a compositing frame if any frame was smaller than the logical
-    // image size. You could create a single frame that was 10x10 in the middle of
-    // an 20x20 logical screen and have the extra screen space filled by the image 
-    // background color. However, it turns out that neither NS4.x nor IE correctly
-    // support this, and as a result there are many GIFs out there that look "wrong"
-    // when this is correctly supported. So for now, we only create a compositing frame
-    // if we have more than one frame in the image.
-    if(/*(frameRect.x != 0) ||
-       (frameRect.y != 0) ||
-       (frameRect.width != mSize.width) ||
-       (frameRect.height != mSize.height) ||*/
-       (numFrames >= 1)) // Not sure if I want to create a composite frame for every anim. Could be smarter.
-    {
-      mCompositingFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-      mCompositingFrame->Init(0, 0, mSize.width, mSize.height, gfxIFormats::RGB); 
-      nsCOMPtr<nsIImage> img(do_GetInterface(mCompositingFrame));
-      img->SetDecodedRect(0, 0, mSize.width, mSize.height);
-      
-      nsCOMPtr<gfxIImageFrame> firstFrame;
-      this->GetFrameAt(0, getter_AddRefs(firstFrame));
-      firstFrame->DrawTo(mCompositingFrame, 0, 0, mSize.width, mSize.height);
-    }
-  }
-  // If this is our second frame, init a timer so we don't display
-  // the next frame until the delay timer has expired for the current
-  // frame.
-
-  if (!mTimer && (numFrames >= 1)) {
-      PRInt32 timeout;
-      nsCOMPtr<gfxIImageFrame> currentFrame;
-      this->GetFrameAt(mCurrentDecodingFrameIndex, getter_AddRefs(currentFrame));
-      currentFrame->GetTimeout(&timeout);
-      if (timeout != -1 &&
-         timeout >= 0) { // -1 means display this frame forever
-        
-        if(mAnimating) {
-          // Since we have more than one frame we need a timer
-          mTimer = do_CreateInstance("@mozilla.org/timer;1");
-          mTimer->Init(
-            NS_STATIC_CAST(nsITimerCallback*, this), 
-            timeout, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK);
-        }
-      }
-  }
- 
-  if (numFrames > 0) mCurrentDecodingFrameIndex++;
-
-  mCurrentFrameIsFinishedDecoding = PR_FALSE;
-
-  return mFrames.AppendElement(NS_STATIC_CAST(nsISupports*, item));
-}
-
-//******************************************************************************
-/* void removeFrame (in gfxIImageFrame item); */
-NS_IMETHODIMP imgContainer::RemoveFrame(gfxIImageFrame *item)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void endFrameDecode (in gfxIImageFrame item, in unsigned long timeout); */
-NS_IMETHODIMP imgContainer::EndFrameDecode(PRUint32 aFrameNum, PRUint32 aTimeout)
-{
-  // It is now okay to start the timer for the next frame in the animation
-  mCurrentFrameIsFinishedDecoding = PR_TRUE;
-
-  nsCOMPtr<gfxIImageFrame> currentFrame;
-  this->GetFrameAt(aFrameNum-1, getter_AddRefs(currentFrame));
-  currentFrame->SetTimeout(aTimeout);
-      
-  if (!mTimer && mAnimating){
-    PRUint32 numFrames;
-    this->GetNumFrames(&numFrames);
-    if (numFrames > 1) {
-        if (aTimeout != -1 &&
-            aTimeout >= 0) { // -1 means display this frame forever
-
-          mAnimating = PR_TRUE;
-          mTimer = do_CreateInstance("@mozilla.org/timer;1");
-      
-          mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this),
-                     aTimeout, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK);
-        }
-    }
-  }
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void decodingComplete (); */
-NS_IMETHODIMP imgContainer::DecodingComplete(void)
-{
-  mDoneDecoding = PR_TRUE;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* nsIEnumerator enumerate (); */
-NS_IMETHODIMP imgContainer::Enumerate(nsIEnumerator **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void clear (); */
-NS_IMETHODIMP imgContainer::Clear()
-{
-  return mFrames.Clear();
-}
-
-//******************************************************************************
-/* void startAnimation () */
-NS_IMETHODIMP imgContainer::StartAnimation()
-{
-  mAnimating = PR_TRUE;
-        
-  if (mTimer)
-    return NS_OK;
-
-  PRUint32 numFrames;
-  this->GetNumFrames(&numFrames);
-
-  if (numFrames > 1) {
-    PRInt32 timeout;
-    nsCOMPtr<gfxIImageFrame> currentFrame;
-    this->GetCurrentFrame(getter_AddRefs(currentFrame));
-    if (currentFrame) {
-      currentFrame->GetTimeout(&timeout);
-      if (timeout != -1 &&
-          timeout >= 0) { // -1 means display this frame forever
-
-        mAnimating = PR_TRUE;
-        if(!mTimer) mTimer = do_CreateInstance("@mozilla.org/timer;1");
-      
-        mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this),
-                     timeout, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK);
-      }
-    } else {
-      // XXX hack.. the timer notify code will do the right thing, so just get that started
-      mAnimating = PR_TRUE;
-      if(!mTimer) mTimer = do_CreateInstance("@mozilla.org/timer;1");
-      
-      mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this),
-                   100, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK);
-    }
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void stopAnimation (); */
-NS_IMETHODIMP imgContainer::StopAnimation()
-{
-  mAnimating = PR_FALSE;
-  
-  if (!mTimer)
-    return NS_OK;
-
-  mTimer->Cancel();
-  
-  mTimer = nsnull;
-
-  // don't bother trying to change the frame (to 0, etc.) here.
-  // No one is listening.
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* attribute long loopCount; */
-NS_IMETHODIMP imgContainer::GetLoopCount(PRInt32 *aLoopCount)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP imgContainer::SetLoopCount(PRInt32 aLoopCount)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
-NS_IMETHODIMP_(void) imgContainer::Notify(nsITimer *timer)
-{
-  NS_ASSERTION(mTimer == timer, "uh");
-
-  if(!mAnimating || !mTimer)
-    return;
-
-  nsCOMPtr<imgIContainerObserver> observer(do_QueryReferent(mObserver));
-  if (!observer) {
-    // the imgRequest that owns us is dead, we should die now too.
-    this->StopAnimation();
-    return;
-  }
-
-  nsCOMPtr<gfxIImageFrame> nextFrame;
-  PRInt32 timeout = 100;
-  PRUint32 numFrames;
-  GetNumFrames(&numFrames);
-  if(!numFrames)
-    return;
-  
-  // If we're done decoding the next frame, go ahead and display it now and reinit
-  // the timer with the next frame's delay time.
-  PRUint32 previousAnimationFrameIndex = mCurrentAnimationFrameIndex;
-  if (mCurrentFrameIsFinishedDecoding && !mDoneDecoding) {
-    // If we have the next frame in the sequence set the timer callback from it
-    GetFrameAt(mCurrentAnimationFrameIndex+1, getter_AddRefs(nextFrame));
-    if (nextFrame) {
-      // Go to next frame in sequence
-      nextFrame->GetTimeout(&timeout);
-      mCurrentAnimationFrameIndex++;
-    } else {
-      // twiddle our thumbs
-      GetFrameAt(mCurrentAnimationFrameIndex, getter_AddRefs(nextFrame));
-      if(!nextFrame) return;
-      
-      nextFrame->GetTimeout(&timeout);
-    }
-  } else if (mDoneDecoding){
-    if ((numFrames-1) == mCurrentAnimationFrameIndex) {
-      // Go back to the beginning of the animation
-      GetFrameAt(0, getter_AddRefs(nextFrame));
-      if(!nextFrame) return;
-      
-      mCurrentAnimationFrameIndex = 0;
-      nextFrame->GetTimeout(&timeout);
-    } else {
-      mCurrentAnimationFrameIndex++;
-      GetFrameAt(mCurrentAnimationFrameIndex, getter_AddRefs(nextFrame));
-      if(!nextFrame) return;
-      
-      nextFrame->GetTimeout(&timeout);
-    }
-  } else {
-    GetFrameAt(mCurrentAnimationFrameIndex, getter_AddRefs(nextFrame));
-    if(!nextFrame) return;
-  }
-
-  if(timeout >= 0)
-    mTimer->SetDelay(timeout);
-  else
-    this->StopAnimation();
-    
-    
-  nsRect dirtyRect;
-
-  // update the composited frame
-  if(mCompositingFrame && (previousAnimationFrameIndex != mCurrentAnimationFrameIndex)) {
-    nsCOMPtr<gfxIImageFrame> frameToUse;
-    DoComposite(getter_AddRefs(frameToUse), &dirtyRect, previousAnimationFrameIndex, mCurrentAnimationFrameIndex);
-
-    // do notification to FE to draw this frame, but hand it the compositing frame
-    observer->FrameChanged(this, nsnull, mCompositingFrame, &dirtyRect);
-  } 
-  else {
-    nextFrame->GetRect(dirtyRect);
-
-    // do notification to FE to draw this frame
-    observer->FrameChanged(this, nsnull, nextFrame, &dirtyRect);
-  }
-
-
-}
-//******************************************************************************
-// DoComposite gets called when the timer for animation get fired and we have to
-// update the composited frame of the animation.
-void imgContainer::DoComposite(gfxIImageFrame** aFrameToUse, nsRect* aDirtyRect, PRInt32 aPrevFrame, PRInt32 aNextFrame)
-{
-  NS_ASSERTION(aDirtyRect, "DoComposite aDirtyRect is null");
-  NS_ASSERTION(mCompositingFrame, "DoComposite mCompositingFrame is null");
-  
-  *aFrameToUse = nsnull;
-  
-  PRUint32 numFrames;
-  this->GetNumFrames(&numFrames);
-  PRInt32 nextFrameIndex = aNextFrame;
-  PRInt32 prevFrameIndex = aPrevFrame;
-  
-  if(nextFrameIndex >= numFrames) nextFrameIndex = numFrames-1;
-  if(prevFrameIndex >= numFrames) prevFrameIndex = numFrames-1;
-  
-  nsCOMPtr<gfxIImageFrame> prevFrame;
-  this->GetFrameAt(prevFrameIndex, getter_AddRefs(prevFrame));
-  PRInt32 prevFrameDisposalMethod;
-  prevFrame->GetFrameDisposalMethod(&prevFrameDisposalMethod);
-  
-  nsCOMPtr<gfxIImageFrame> nextFrame;
-  this->GetFrameAt(nextFrameIndex, getter_AddRefs(nextFrame));
-  
-  PRInt32 x;
-  PRInt32 y;
-  PRInt32 width;
-  PRInt32 height;
-  nextFrame->GetX(&x);
-  nextFrame->GetY(&y);
-  nextFrame->GetWidth(&width);
-  nextFrame->GetHeight(&height);
-  
-  switch (prevFrameDisposalMethod) {
-    default:
-    case 0: // DISPOSE_NOT_SPECIFIED
-    case 1: // DISPOSE_KEEP Leave previous frame in the framebuffer
-      mCompositingFrame->QueryInterface(NS_GET_IID(gfxIImageFrame), (void**)aFrameToUse); // addrefs again
-      //XXX blit into the composite frame too!!!
-      nextFrame->DrawTo(mCompositingFrame, x, y, width, height);
-          
-      // we're drawing only the updated frame
-      (*aDirtyRect).x = x;
-      (*aDirtyRect).y = y;
-      (*aDirtyRect).width = width;
-      (*aDirtyRect).height = height;
-    break;
-    
-    case 2: // DISPOSE_OVERWRITE_BGCOLOR Overwrite with background color
-      //XXX overwrite mCompositeFrame with background color
-      gfx_color backgroundColor;
-      nextFrame->GetBackgroundColor(&backgroundColor);
-      //XXX Do background color overwrite of mCompositeFrame here
-      
-      // blit next frame into this clean slate
-      nextFrame->DrawTo(mCompositingFrame, x, y, width, height);
-      
-      // In this case we need to blit the whole composite frame  
-      (*aDirtyRect).x = 0;
-      (*aDirtyRect).y = 0;
-      (*aDirtyRect).width = mSize.width;
-      (*aDirtyRect).height = mSize.height;
-      mCompositingFrame->QueryInterface(NS_GET_IID(gfxIImageFrame), (void**)aFrameToUse); // addrefs again
-    break;
-    
-    case 4: // DISPOSE_OVERWRITE_PREVIOUS Save-under
-      //XXX Reblit previous composite into frame buffer
-      // 
-      (*aDirtyRect).x = 0;
-      (*aDirtyRect).y = 0;
-      (*aDirtyRect).width = mSize.width;
-      (*aDirtyRect).height = mSize.height;
-    break;
-  }
-  
-  // Get the next frame's disposal method, if it is it DISPOSE_OVER, save off
-  // this mCompositeFrame for reblitting when this timer gets fired again and
-  // we 
-  PRInt32 nextFrameDisposalMethod;
-  nextFrame->GetFrameDisposalMethod(&nextFrameDisposalMethod);
-  //XXX if(nextFrameDisposalMethod == 4)
-  // blit mPreviousCompositeFrame with this frame
-}
-//******************************************************************************
-/* void onStartDecode (in imgIRequest aRequest, in nsISupports cx); */
-NS_IMETHODIMP imgContainer::OnStartDecode(imgIRequest *aRequest, nsISupports *cx)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void onStartContainer (in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer); */
-NS_IMETHODIMP imgContainer::OnStartContainer(imgIRequest *aRequest, nsISupports *cx, imgIContainer *aContainer)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void onStartFrame (in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame); */
-NS_IMETHODIMP imgContainer::OnStartFrame(imgIRequest *aRequest, nsISupports *cx, gfxIImageFrame *aFrame)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* [noscript] void onDataAvailable (in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame, [const] in nsRect aRect); */
-NS_IMETHODIMP imgContainer::OnDataAvailable(imgIRequest *aRequest, nsISupports *cx, gfxIImageFrame *aFrame, const nsRect * aRect)
-{
-  if(mCompositingFrame && !mCurrentDecodingFrameIndex) {
-    // Update the composite frame
-    PRInt32 x;
-    aFrame->GetX(&x);
-    aFrame->DrawTo(mCompositingFrame, x, aRect->y, aRect->width, aRect->height);
-  }
-    return NS_OK;
-}
-
-//******************************************************************************
-/* void onStopFrame (in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame); */
-NS_IMETHODIMP imgContainer::OnStopFrame(imgIRequest *aRequest, nsISupports *cx, gfxIImageFrame *aFrame)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void onStopContainer (in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer); */
-NS_IMETHODIMP imgContainer::OnStopContainer(imgIRequest *aRequest, nsISupports *cx, imgIContainer *aContainer)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void onStopDecode (in imgIRequest aRequest, in nsISupports cx, in nsresult status, in wstring statusArg); */
-NS_IMETHODIMP imgContainer::OnStopDecode(imgIRequest *aRequest, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* [noscript] void frameChanged (in imgIContainer aContainer, in nsISupports aCX, in gfxIImageFrame aFrame, in nsRect aDirtyRect); */
-NS_IMETHODIMP imgContainer::FrameChanged(imgIContainer *aContainer, nsISupports *aCX, gfxIImageFrame *aFrame, nsRect * aDirtyRect)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-

mozilla/modules/libpr0n/src/imgContainer.h

@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- *   Chris Saari <saari@netscape.com>
- */
-
-#ifndef __imgContainer_h__
-#define __imgContainer_h__
-
-#include "imgIContainer.h"
-
-#include "imgIContainerObserver.h"
-
-#include "nsSize.h"
-
-#include "nsSupportsArray.h"
-
-#include "nsCOMPtr.h"
-#include "nsITimer.h"
-#include "nsITimerCallback.h"
-#include "imgIDecoderObserver.h"
-
-#include "gfxIImageFrame.h"
-
-#include "nsWeakReference.h"
-
-#define NS_IMGCONTAINER_CID \
-{ /* 5e04ec5e-1dd2-11b2-8fda-c4db5fb666e0 */         \
-     0x5e04ec5e,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0x8f, 0xda, 0xc4, 0xdb, 0x5f, 0xb6, 0x66, 0xe0} \
-}
-
-class imgContainer : public imgIContainer,
-                     public nsITimerCallback,
-                     public imgIDecoderObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGICONTAINER
-  NS_DECL_IMGIDECODEROBSERVER
-  NS_DECL_IMGICONTAINEROBSERVER
-
-  NS_IMETHOD_(void) Notify(nsITimer *timer);
-
-  imgContainer();
-  virtual ~imgContainer();
-
-private:
-  /* additional members */
-  nsSupportsArray mFrames;
-  nsSize mSize;
-  PRUint32 mCurrentDecodingFrameIndex; // 0 to numFrames-1
-  PRUint32 mCurrentAnimationFrameIndex; // 0 to numFrames-1
-  PRBool   mCurrentFrameIsFinishedDecoding;
-  PRBool   mDoneDecoding;
-  PRBool   mAnimating;
-  
-  nsWeakPtr mObserver;
-
-  // GIF specific bits
-  nsCOMPtr<nsITimer> mTimer;
-  
-  // GIF animations will use the mCompositingFrame to composite images
-  // and just hand this back to the caller when it is time to draw the frame.
-  nsCOMPtr<gfxIImageFrame> mCompositingFrame;
-  
-  // Private function for doing the frame compositing of animations and in cases
-  // where there is a backgound color and single frame placed withing a larger
-  // logical screen size. Smart GIF compressors may do this to save space.
-  void DoComposite(gfxIImageFrame** aFrameToUse, nsRect* aDirtyRect,
-                   PRInt32 aPrevFrame, PRInt32 aNextFrame);
-};
-
-#endif /* __imgContainer_h__ */
-

mozilla/modules/libpr0n/src/imgLoader.cpp

@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgLoader.h"
-
-#include "imgIRequest.h"
-
-#include "nsIServiceManager.h"
-
-#include "nsIChannel.h"
-#include "nsIIOService.h"
-#include "nsILoadGroup.h"
-#include "nsIStreamListener.h"
-#include "nsIURI.h"
-
-#include "imgRequest.h"
-#include "imgRequestProxy.h"
-
-#include "ImageCache.h"
-
-#include "nsXPIDLString.h"
-
-#include "nsCOMPtr.h"
-
-#include "ImageLogging.h"
-
-NS_IMPL_ISUPPORTS1(imgLoader, imgILoader)
-
-imgLoader::imgLoader()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-imgLoader::~imgLoader()
-{
-  /* destructor code */
-}
-
-/* imgIRequest loadImage (in nsIURI uri, in nsILoadGroup aLoadGroup, in imgIDecoderObserver aObserver, in nsISupports cx); */
-NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, nsILoadGroup *aLoadGroup, imgIDecoderObserver *aObserver, nsISupports *cx, imgIRequest **_retval)
-{
-  NS_ASSERTION(aURI, "imgLoader::LoadImage -- NULL URI pointer");
-
-  if (!aURI)
-    return NS_ERROR_NULL_POINTER;
-
-#if defined(PR_LOGGING)
-  nsXPIDLCString spec;
-  aURI->GetSpec(getter_Copies(spec));
-  LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::LoadImage", "aURI", spec.get());
-#endif
-
-  imgRequest *request = nsnull;
-
-#ifdef MOZ_NEW_CACHE
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-  ImageCache::Get(aURI, &request, getter_AddRefs(entry)); // addrefs request
-
-  if (request && entry && aLoadGroup) {
-    /* this isn't exactly what I want here.  This code will re-doom every cache hit in a document while
-       it is force reloading.  So for multiple copies of an image on a page, when you force reload, this
-       will cause you to get seperate loads for each copy of the image... this sucks.
-     */
-    PRUint32 flags = 0;
-    PRBool doomRequest = PR_FALSE;
-    aLoadGroup->GetDefaultLoadAttributes(&flags);
-    if (flags & nsIChannel::FORCE_RELOAD)
-      doomRequest = PR_TRUE;
-    else {
-      nsCOMPtr<nsIRequest> r;
-      aLoadGroup->GetDefaultLoadRequest(getter_AddRefs(r));
-      if (r) {
-        nsCOMPtr<nsIChannel> c(do_QueryInterface(r));
-        if (c) {
-          c->GetLoadAttributes(&flags);
-          if (flags & nsIChannel::FORCE_RELOAD)
-            doomRequest = PR_TRUE;
-        }
-      }
-    }
-
-    if (doomRequest) {
-      entry->Doom(); // doom this thing.
-      entry = nsnull;
-      NS_RELEASE(request);
-      request = nsnull;
-    }
-  }
-#endif
-
-  if (!request) {
-    /* no request from the cache.  do a new load */
-    LOG_SCOPE(gImgLog, "imgLoader::LoadImage |cache miss|");
-
-    nsCOMPtr<nsIIOService> ioserv(do_GetService("@mozilla.org/network/io-service;1"));
-    if (!ioserv) return NS_ERROR_FAILURE;
-
-    nsCOMPtr<nsIChannel> newChannel;
-    ioserv->NewChannelFromURI(aURI, getter_AddRefs(newChannel));
-    if (!newChannel) return NS_ERROR_FAILURE;
-
-    if (aLoadGroup) {
-      PRUint32 flags;
-      aLoadGroup->GetDefaultLoadAttributes(&flags);
-      newChannel->SetLoadAttributes(flags);
-    }
-
-    NS_NEWXPCOM(request, imgRequest);
-    if (!request) return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(request);
-
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::LoadImage -- Created new imgRequest [request=%p]\n", this, request));
-
-#ifdef MOZ_NEW_CACHE
-    ImageCache::Put(aURI, request, getter_AddRefs(entry));
-#endif
-
-#ifdef MOZ_NEW_CACHE
-    request->Init(newChannel, entry);
-#else
-    request->Init(newChannel, nsnull);
-#endif
-
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::LoadImage -- Calling channel->AsyncOpen()\n", this));
-
-    // XXX are we calling this too early?
-    newChannel->AsyncOpen(NS_STATIC_CAST(nsIStreamListener *, request), nsnull);
-
-  } else {
-    /* request found in cache.  use it */
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::LoadImage |cache hit| [request=%p]\n",
-            this, request));
-  }
-
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgLoader::LoadImage -- creating proxy request.\n", this));
-
-  imgRequestProxy *proxyRequest;
-  NS_NEWXPCOM(proxyRequest, imgRequestProxy);
-  if (!proxyRequest) return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(proxyRequest);
-
-  // init adds itself to imgRequest's list of observers
-  proxyRequest->Init(request, aLoadGroup, aObserver, cx);
-
-  NS_RELEASE(request);
-
-  *_retval = NS_STATIC_CAST(imgIRequest*, proxyRequest);
-  NS_ADDREF(*_retval);
-
-  NS_RELEASE(proxyRequest);
-
-  return NS_OK;
-}
-
-/* imgIRequest loadImageWithChannel(in nsIChannel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */
-NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderObserver *aObserver, nsISupports *cx, nsIStreamListener **listener, imgIRequest **_retval)
-{
-  NS_ASSERTION(channel, "imgLoader::LoadImageWithChannel -- NULL channel pointer");
-
-  imgRequest *request = nsnull;
-
-  nsCOMPtr<nsIURI> uri;
-  channel->GetOriginalURI(getter_AddRefs(uri));
-
-#ifdef MOZ_NEW_CACHE
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-  ImageCache::Get(uri, &request, getter_AddRefs(entry)); // addrefs request
-#endif
-  if (request) {
-    // we have this in our cache already.. cancel the current (document) load
-
-    // XXX
-    // if *listener is null when we return here, the caller should probably cancel
-    // the channel instead of us doing it here.
-    channel->Cancel(NS_BINDING_ABORTED); // this should fire an OnStopRequest
-
-    *listener = nsnull; // give them back a null nsIStreamListener
-  } else {
-    NS_NEWXPCOM(request, imgRequest);
-    if (!request) return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(request);
-
-#ifdef MOZ_NEW_CACHE
-    ImageCache::Put(uri, request, getter_AddRefs(entry));
-#endif
-
-#ifdef MOZ_NEW_CACHE
-    request->Init(channel, entry);
-#else
-    request->Init(channel, nsnull);
-#endif
-
-    *listener = NS_STATIC_CAST(nsIStreamListener*, request);
-    NS_IF_ADDREF(*listener);
-  }
-
-  imgRequestProxy *proxyRequest;
-  NS_NEWXPCOM(proxyRequest, imgRequestProxy);
-  if (!proxyRequest) return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(proxyRequest);
-
-  // init adds itself to imgRequest's list of observers
-  proxyRequest->Init(request, nsnull, aObserver, cx);
-
-  NS_RELEASE(request);
-
-  *_retval = NS_STATIC_CAST(imgIRequest*, proxyRequest);
-  NS_ADDREF(*_retval);
-
-  NS_RELEASE(proxyRequest);
-
-  return NS_OK;
-}

mozilla/modules/libpr0n/src/imgLoader.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgILoader.h"
-
-#ifdef LOADER_THREADSAFE
-#include "prlock.h"
-#endif
-
-#define NS_IMGLOADER_CID \
-{ /* 9f6a0d2e-1dd1-11b2-a5b8-951f13c846f7 */         \
-     0x9f6a0d2e,                                     \
-     0x1dd1,                                         \
-     0x11b2,                                         \
-    {0xa5, 0xb8, 0x95, 0x1f, 0x13, 0xc8, 0x46, 0xf7} \
-}
-
-class imgLoader : public imgILoader
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGILOADER
-
-  imgLoader();
-  virtual ~imgLoader();
-
-private:
-};

mozilla/modules/libpr0n/src/imgRequest.cpp

@@ -1,821 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgRequest.h"
-
-#include "nsIAtom.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIHTTPChannel.h"
-#include "nsIInputStream.h"
-
-#include "imgILoader.h"
-#include "nsIComponentManager.h"
-
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-
-#include "nsString.h"
-#include "nsXPIDLString.h"
-
-#include "gfxIImageFrame.h"
-
-#ifdef MOZ_NEW_CACHE
-#include "nsICachingChannel.h"
-#endif
-#include "ImageCache.h"
-
-#include "ImageLogging.h"
-
-#if defined(PR_LOGGING)
-PRLogModuleInfo *gImgLog = PR_NewLogModule("imgRequest");
-#endif
-
-NS_IMPL_ISUPPORTS7(imgRequest, imgIRequest, nsIRequest,
-                   imgIDecoderObserver, imgIContainerObserver,
-                   nsIStreamListener, nsIStreamObserver,
-                   nsISupportsWeakReference)
-
-imgRequest::imgRequest() : 
-  mObservers(0), mLoading(PR_FALSE), mProcessing(PR_FALSE), mStatus(imgIRequest::STATUS_NONE), mState(0)
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-imgRequest::~imgRequest()
-{
-  /* destructor code */
-}
-
-
-nsresult imgRequest::Init(nsIChannel *aChannel, nsICacheEntryDescriptor *aCacheEntry)
-{
-  // XXX we should save off the thread we are getting called on here so that we can proxy all calls to mDecoder to it.
-
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::Init\n", this));
-
-  NS_ASSERTION(!mImage, "imgRequest::Init -- Multiple calls to init");
-  NS_ASSERTION(aChannel, "imgRequest::Init -- No channel");
-
-  mChannel = aChannel;
-
-#ifdef MOZ_NEW_CACHE
-  mCacheEntry = aCacheEntry;
-#endif
-
-  // XXX do not init the image here.  this has to be done from the image decoder.
-  mImage = do_CreateInstance("@mozilla.org/image/container;1");
-
-  return NS_OK;
-}
-
-nsresult imgRequest::AddObserver(imgIDecoderObserver *observer)
-{
-  LOG_SCOPE_WITH_PARAM(gImgLog, "imgRequest::AddObserver", "observer", observer);
-
-  mObservers.AppendElement(NS_STATIC_CAST(void*, observer));
-
-  // OnStartDecode
-  if (mState & onStartDecode)
-    observer->OnStartDecode(nsnull, nsnull);
-
-  // OnStartContainer
-  if (mState & onStartContainer)
-    observer->OnStartContainer(nsnull, nsnull, mImage);
-
-  // Send frame messages (OnStartFrame, OnDataAvailable, OnStopFrame)
-  PRUint32 nframes;
-  mImage->GetNumFrames(&nframes);
-
-  if (nframes > 0) {
-    nsCOMPtr<gfxIImageFrame> frame;
-    
-    // Is this a single frame image?
-    if (nframes == 1) {
-      // Get the first frame
-      mImage->GetFrameAt(0, getter_AddRefs(frame));
-      NS_ASSERTION(frame, "GetFrameAt gave back a null frame!");
-    } else if (nframes > 1) {
-      /* multiple frames, we'll use the current one */
-      mImage->GetCurrentFrame(getter_AddRefs(frame));
-      NS_ASSERTION(frame, "GetCurrentFrame gave back a null frame!");
-    }
-    
-    // OnStartFrame
-    observer->OnStartFrame(nsnull, nsnull, frame);
-    
-    if (!(mState & onStopContainer)) {
-      // OnDataAvailable
-      nsRect r;
-      frame->GetRect(r);  // XXX we shouldn't send the whole rect here
-      observer->OnDataAvailable(nsnull, nsnull, frame, &r);
-    } else {
-      // OnDataAvailable
-      nsRect r;
-      frame->GetRect(r);  // We're done loading this image, send the the whole rect
-      observer->OnDataAvailable(nsnull, nsnull, frame, &r);
-      
-      // OnStopFrame
-      observer->OnStopFrame(nsnull, nsnull, frame);
-    }
-  }
-
-  // OnStopContainer
-  if (mState & onStopContainer)
-    observer->OnStopContainer(nsnull, nsnull, mImage);
-
-  nsresult status;
-  if (mStatus & imgIRequest::STATUS_LOAD_COMPLETE)
-    status = NS_IMAGELIB_SUCCESS_LOAD_FINISHED;
-  else if (mStatus & imgIRequest::STATUS_ERROR)
-    status = NS_IMAGELIB_ERROR_FAILURE;
-
-  // OnStopDecode
-  if (mState & onStopDecode)
-    observer->OnStopDecode(nsnull, nsnull, status, nsnull);
-
-  if (mImage && (mObservers.Count() == 1)) {
-    PRUint32 nframes;
-    mImage->GetNumFrames(&nframes);
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgRequest::AddObserver -- starting animation\n", this));
-
-    mImage->StartAnimation();
-  }
-
-  if (mState & onStopRequest) {
-    nsCOMPtr<nsIStreamObserver> ob(do_QueryInterface(observer));
-    PR_ASSERT(observer);
-    ob->OnStopRequest(nsnull, nsnull, status, nsnull);
-  } 
-
-  return NS_OK;
-}
-
-nsresult imgRequest::RemoveObserver(imgIDecoderObserver *observer, nsresult status)
-{
-  LOG_SCOPE_WITH_PARAM(gImgLog, "imgRequest::RemoveObserver", "observer", observer);
-
-  mObservers.RemoveElement(NS_STATIC_CAST(void*, observer));
-
-  if (mObservers.Count() == 0) {
-    if (mImage) {
-      PRUint32 nframes;
-      mImage->GetNumFrames(&nframes);
-      if (nframes > 1) {
-        PR_LOG(gImgLog, PR_LOG_DEBUG,
-               ("[this=%p] imgRequest::RemoveObserver -- stopping animation\n", this));
-
-        mImage->StopAnimation();
-      }
-    }
-
-    if (mChannel && mLoading) {
-      PR_LOG(gImgLog, PR_LOG_DEBUG,
-             ("[this=%p] imgRequest::RemoveObserver -- load in progress.  canceling\n", this));
-
-      this->RemoveFromCache();
-      this->Cancel(NS_BINDING_ABORTED);
-
-      if (!(mState & onStopDecode)) {
-        // make sure that observer gets an onStopRequest message sent to it
-        observer->OnStopDecode(nsnull, nsnull, NS_IMAGELIB_ERROR_FAILURE, nsnull);
-      }
-
-      if (!(mState & onStopRequest)) {
-        // make sure that observer gets an onStopRequest message sent to it
-        nsCOMPtr<nsIStreamObserver> ob(do_QueryInterface(observer));
-        PR_ASSERT(observer);
-        ob->OnStopRequest(nsnull, nsnull, NS_BINDING_ABORTED, nsnull);
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-PRBool imgRequest::RemoveFromCache()
-{
-  LOG_SCOPE(gImgLog, "imgRequest::RemoveFromCache");
-
-#ifdef MOZ_NEW_CACHE
-
-  if (mCacheEntry) {
-    mCacheEntry->Doom();
-    mCacheEntry = nsnull;
-  } else {
-    NS_WARNING("imgRequest::RemoveFromCache -- no entry!");
-  }
-
-#endif
-
-  return PR_TRUE;
-}
-
-
-/**  nsIRequest / imgIRequest methods **/
-
-/* readonly attribute wstring name; */
-NS_IMETHODIMP imgRequest::GetName(PRUnichar * *aName)
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::GetName");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean isPending (); */
-NS_IMETHODIMP imgRequest::IsPending(PRBool *_retval)
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::IsPending");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* readonly attribute nsresult status; */
-NS_IMETHODIMP imgRequest::GetStatus(nsresult *aStatus)
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::GetStatus");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void cancel (in nsresult status); */
-NS_IMETHODIMP imgRequest::Cancel(nsresult status)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::Cancel");
-
-  if (mImage) {
-    PRUint32 nframes;
-    mImage->GetNumFrames(&nframes);
-    if (nframes > 1) {
-      PR_LOG(gImgLog, PR_LOG_DEBUG,
-             ("[this=%p] imgRequest::RemoveObserver -- stopping animation\n", this));
-
-      mImage->StopAnimation();
-    }
-  }
-
-  if (mChannel && mLoading)
-    mChannel->Cancel(NS_BINDING_ABORTED); // should prolly use status here
-
-  return NS_OK;
-}
-
-/* void suspend (); */
-NS_IMETHODIMP imgRequest::Suspend()
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::Suspend");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void resume (); */
-NS_IMETHODIMP imgRequest::Resume()
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::Resume");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/** imgIRequest methods **/
-
-/* readonly attribute imgIContainer image; */
-NS_IMETHODIMP imgRequest::GetImage(imgIContainer * *aImage)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::GetImage\n", this));
-
-  *aImage = mImage;
-  NS_IF_ADDREF(*aImage);
-  return NS_OK;
-}
-
-/* readonly attribute unsigned long imageStatus; */
-NS_IMETHODIMP imgRequest::GetImageStatus(PRUint32 *aStatus)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::GetImageStatus\n", this));
-
-  *aStatus = mStatus;
-  return NS_OK;
-}
-
-/* readonly attribute nsIURI URI; */
-NS_IMETHODIMP imgRequest::GetURI(nsIURI **aURI)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::GetURI\n", this));
-
-  if (mChannel)
-    return mChannel->GetOriginalURI(aURI);
-  else if (mURI) {
-    *aURI = mURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute imgIDecoderObserver decoderObserver; */
-NS_IMETHODIMP imgRequest::GetDecoderObserver(imgIDecoderObserver **aDecoderObserver)
-{
-  return NS_ERROR_FAILURE;
-}
-
-
-/** imgIContainerObserver methods **/
-
-/* [noscript] void frameChanged (in imgIContainer container, in nsISupports cx, in gfxIImageFrame newframe, in nsRect dirtyRect); */
-NS_IMETHODIMP imgRequest::FrameChanged(imgIContainer *container, nsISupports *cx, gfxIImageFrame *newframe, nsRect * dirtyRect)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::FrameChanged");
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->FrameChanged(container, cx, newframe, dirtyRect);
-  }
-
-  return NS_OK;
-}
-
-/** imgIDecoderObserver methods **/
-
-/* void onStartDecode (in imgIRequest request, in nsISupports cx); */
-NS_IMETHODIMP imgRequest::OnStartDecode(imgIRequest *request, nsISupports *cx)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStartDecode");
-
-  mState |= onStartDecode;
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStartDecode(request, cx);
-  }
-
-  return NS_OK;
-}
-
-/* void onStartContainer (in imgIRequest request, in nsISupports cx, in imgIContainer image); */
-NS_IMETHODIMP imgRequest::OnStartContainer(imgIRequest *request, nsISupports *cx, imgIContainer *image)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStartContainer");
-
-  mState |= onStartContainer;
-
-  mStatus |= imgIRequest::STATUS_SIZE_AVAILABLE;
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStartContainer(request, cx, image);
-  }
-
-  return NS_OK;
-}
-
-/* void onStartFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
-NS_IMETHODIMP imgRequest::OnStartFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStartFrame");
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStartFrame(request, cx, frame);
-  }
-
-  return NS_OK;
-}
-
-/* [noscript] void onDataAvailable (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame, [const] in nsRect rect); */
-NS_IMETHODIMP imgRequest::OnDataAvailable(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame, const nsRect * rect)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnDataAvailable");
-
-  nsCOMPtr<imgIDecoderObserver> container = do_QueryInterface(mImage);
-  container->OnDataAvailable(request, cx, frame, rect);
-  
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnDataAvailable(request, cx, frame, rect);
-  }
-
-  return NS_OK;
-}
-
-/* void onStopFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
-NS_IMETHODIMP imgRequest::OnStopFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
-{
-  NS_ASSERTION(frame, "imgRequest::OnStopFrame called with NULL frame");
-
-  LOG_SCOPE(gImgLog, "imgRequest::OnStopFrame");
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-#ifdef MOZ_NEW_CACHE
-  if (mCacheEntry) {
-    PRUint32 cacheSize = 0;
-
-    mCacheEntry->GetDataSize(&cacheSize);
-
-    PRUint32 imageSize = 0;
-    PRUint32 alphaSize = 0;
-
-    frame->GetImageDataLength(&imageSize);
-    frame->GetAlphaDataLength(&alphaSize);
-
-    mCacheEntry->SetDataSize(cacheSize + imageSize + alphaSize);
-  }
-#endif
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStopFrame(request, cx, frame);
-  }
-
-  return NS_OK;
-}
-
-/* void onStopContainer (in imgIRequest request, in nsISupports cx, in imgIContainer image); */
-NS_IMETHODIMP imgRequest::OnStopContainer(imgIRequest *request, nsISupports *cx, imgIContainer *image)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStopContainer");
-
-  mState |= onStopContainer;
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStopContainer(request, cx, image);
-  }
-
-  return NS_OK;
-}
-
-/* void onStopDecode (in imgIRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
-NS_IMETHODIMP imgRequest::OnStopDecode(imgIRequest *aRequest, nsISupports *aCX, nsresult aStatus, const PRUnichar *aStatusArg)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStopDecode");
-
-  if (mState & onStopDecode) {
-    NS_WARNING("OnStopDecode called multiple times.");
-    return NS_OK;
-  }
-
-  mState |= onStopDecode;
-
-  if (!(mStatus & imgIRequest::STATUS_ERROR) && NS_FAILED(aStatus))
-    mStatus |= imgIRequest::STATUS_ERROR;
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  nsresult status;
-  if (mStatus & imgIRequest::STATUS_LOAD_COMPLETE)
-    status = NS_IMAGELIB_SUCCESS_LOAD_FINISHED;
-  else if (mStatus & imgIRequest::STATUS_ERROR)
-    status = NS_IMAGELIB_ERROR_FAILURE;
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStopDecode(aRequest, aCX, status, aStatusArg);
-  }
-
-  return NS_OK;
-}
-
-
-
-
-
-
-/** nsIStreamObserver methods **/
-
-/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStartRequest");
-
-  NS_ASSERTION(!mDecoder, "imgRequest::OnStartRequest -- we already have a decoder");
-  NS_ASSERTION(!mLoading, "imgRequest::OnStartRequest -- we are loading again?");
-
-  /* set our loading flag to true */
-  mLoading = PR_TRUE;
-
-  /* notify our kids */
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *iob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (iob) {
-      nsCOMPtr<nsIStreamObserver> ob(do_QueryInterface(iob));
-      if (ob) ob->OnStartRequest(aRequest, ctxt);
-    }
-  }
-
-  /* do our real work */
-  nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
-
-  if (!mChannel) {
-    PR_LOG(gImgLog, PR_LOG_ALWAYS,
-           (" `->  Channel already stopped or no channel!?.\n"));
-
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsIHTTPChannel> httpChannel(do_QueryInterface(chan));
-  if (httpChannel) {
-    PRUint32 httpStatus;
-    httpChannel->GetResponseStatus(&httpStatus);
-    if (httpStatus == 404) {
-      PR_LOG(gImgLog, PR_LOG_DEBUG,
-             ("[this=%p] imgRequest::OnStartRequest -- http status = 404. canceling.\n", this));
-
-      mStatus |= imgIRequest::STATUS_ERROR;
-      this->Cancel(NS_BINDING_ABORTED);
-      this->RemoveFromCache();
-
-      return NS_BINDING_ABORTED;
-    }
-
-  }
-
-  /* get the expires info */
-#if defined(MOZ_NEW_CACHE)
-  if (mCacheEntry) {
-    nsCOMPtr<nsICachingChannel> cacheChannel(do_QueryInterface(chan));
-    if (cacheChannel) {
-      nsCOMPtr<nsISupports> cacheToken;
-      cacheChannel->GetCacheToken(getter_AddRefs(cacheToken));
-      if (cacheToken) {
-        nsCOMPtr<nsICacheEntryDescriptor> entryDesc(do_QueryInterface(cacheToken));
-        if (entryDesc) {
-          PRUint32 expiration;
-          /* get the expiration time from the caching channel's token */
-          entryDesc->GetExpirationTime(&expiration);
-
-          /* set the expiration time on our entry */
-          mCacheEntry->SetExpirationTime(expiration);
-        }
-      }
-    }
-  }
-#endif
-
-  return NS_OK;
-}
-
-/* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult status, in wstring statusArg); */
-NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt, nsresult status, const PRUnichar *statusArg)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::OnStopRequest\n", this));
-
-  NS_ASSERTION(mChannel && mLoading, "imgRequest::OnStopRequest -- received multiple OnStopRequest");
-
-  mState |= onStopRequest;
-
-  /* set our loading flag to false */
-  mLoading = PR_FALSE;
-
-  /* set our processing flag to false */
-  mProcessing = PR_FALSE;
-
-#ifdef MOZ_NEW_CACHE
-  /* break the cycle from the cache entry. */
-  mCacheEntry = nsnull;
-#endif
-
-  if (NS_FAILED(status)) {
-    mStatus |= imgIRequest::STATUS_ERROR;
-    this->RemoveFromCache();
-    this->Cancel(status); // stops animations
-  } else {
-    mStatus |= imgIRequest::STATUS_LOAD_COMPLETE;
-  }
-
-  mChannel->GetOriginalURI(getter_AddRefs(mURI));
-  mChannel = nsnull; // we no longer need the channel
-
-  if (mDecoder) {
-    mDecoder->Flush();
-    mDecoder->Close();
-    mDecoder = nsnull; // release the decoder so that it can rest peacefully ;)
-  }
-
-  /* notify the kids */
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    void *item = NS_STATIC_CAST(void *, mObservers[i]);
-    if (item) {
-      imgIDecoderObserver *iob = NS_STATIC_CAST(imgIDecoderObserver*, item);
-      if (iob) {
-        nsCOMPtr<nsIStreamObserver> ob(do_QueryInterface(iob));
-        if (ob) ob->OnStopRequest(aRequest, ctxt, status, statusArg);
-      }
-    }
-  }
-
-  // if there was an error loading the image, (mState & onStopDecode) won't be true.
-  // Send an onStopDecode message
-  if (!(mState & onStopDecode)) {
-    this->OnStopDecode(nsnull, nsnull, status, statusArg);
-  }
-
-  return NS_OK;
-}
-
-
-
-
-/* prototype for this defined below */
-static NS_METHOD sniff_mimetype_callback(nsIInputStream* in, void* closure, const char* fromRawSegment,
-                                         PRUint32 toOffset, PRUint32 count, PRUint32 *writeCount);
-
-
-/** nsIStreamListener methods **/
-
-/* void onDataAvailable (in nsIRequest request, in nsISupports ctxt, in nsIInputStream inStr, in unsigned long sourceOffset, in unsigned long count); */
-NS_IMETHODIMP imgRequest::OnDataAvailable(nsIRequest *aRequest, nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::OnDataAvailable\n", this));
-
-  NS_ASSERTION(mChannel, "imgRequest::OnDataAvailable -- no channel!");
-
-
-  if (!mProcessing) {
-    /* set our processing flag to true if this is the first OnDataAvailable() */
-    mProcessing = PR_TRUE;
-
-    /* look at the first few bytes and see if we can tell what the data is from that
-     * since servers tend to lie. :(
-     */
-    PRUint32 out;
-    inStr->ReadSegments(sniff_mimetype_callback, this, count, &out);
-
-#ifdef NS_DEBUG
-    /* NS_WARNING if the content type from the channel isn't the same if the sniffing */
-#endif
-
-    if (!mContentType.get()) {
-      nsXPIDLCString contentType;
-      nsresult rv = mChannel->GetContentType(getter_Copies(contentType));
-
-      if (NS_FAILED(rv)) {
-        PR_LOG(gImgLog, PR_LOG_ERROR,
-               ("[this=%p] imgRequest::OnStartRequest -- Content type unavailable from the channel\n",
-                this));
-
-        this->RemoveFromCache();
-
-        return NS_BINDING_ABORTED; //NS_BASE_STREAM_CLOSED;
-      }
-
-      mContentType = contentType;
-    }
-
-#if defined(PR_LOGGING)
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgRequest::OnStartRequest -- Content type is %s\n", this, mContentType.get()));
-#endif
-
-    nsCAutoString conid("@mozilla.org/image/decoder;2?type=");
-    conid += mContentType.get();
-
-    mDecoder = do_CreateInstance(conid);
-
-    if (!mDecoder) {
-      PR_LOG(gImgLog, PR_LOG_WARNING,
-             ("[this=%p] imgRequest::OnStartRequest -- Decoder not available\n", this));
-
-      // no image decoder for this mimetype :(
-      this->Cancel(NS_BINDING_ABORTED);
-      this->RemoveFromCache();
-
-      // XXX notify the person that owns us now that wants the imgIContainer off of us?
-      return NS_IMAGELIB_ERROR_NO_DECODER;
-    }
-
-    mDecoder->Init(NS_STATIC_CAST(imgIRequest*, this));
-
-  }
-
-  if (!mDecoder) {
-    PR_LOG(gImgLog, PR_LOG_WARNING,
-           ("[this=%p] imgRequest::OnDataAvailable -- no decoder\n", this));
-
-    return NS_BASE_STREAM_CLOSED;
-  }
-
-  PRUint32 wrote;
-  nsresult rv = mDecoder->WriteFrom(inStr, count, &wrote);
-
-  return NS_OK;
-}
-
-static NS_METHOD sniff_mimetype_callback(nsIInputStream* in,
-                                         void* closure,
-                                         const char* fromRawSegment,
-                                         PRUint32 toOffset,
-                                         PRUint32 count,
-                                         PRUint32 *writeCount)
-{
-  imgRequest *request = NS_STATIC_CAST(imgRequest*, closure);
-
-  NS_ASSERTION(request, "request is null!");
-
-  if (count > 0)
-    request->SniffMimeType(fromRawSegment, count);
-
-  *writeCount = 0;
-  return NS_ERROR_FAILURE;
-}
-
-void
-imgRequest::SniffMimeType(const char *buf, PRUint32 len)
-{
-  /* Is it a GIF? */
-  if (len >= 4 && !nsCRT::strncmp(buf, "GIF8", 4))  {
-    mContentType = NS_LITERAL_CSTRING("image/gif");
-    return;
-  }
-
-  /* or a PNG? */
-  if (len >= 4 && ((unsigned char)buf[0]==0x89 &&
-                   (unsigned char)buf[1]==0x50 &&
-                   (unsigned char)buf[2]==0x4E &&
-                   (unsigned char)buf[3]==0x47))
-  { 
-    mContentType = NS_LITERAL_CSTRING("image/png");
-    return;
-  }
-
-  /* maybe a JPEG (JFIF)? */
-  /* JFIF files start with SOI APP0 but older files can start with SOI DQT
-   * so we test for SOI followed by any marker, i.e. FF D8 FF
-   * this will also work for SPIFF JPEG files if they appear in the future.
-   *
-   * (JFIF is 0XFF 0XD8 0XFF 0XE0 <skip 2> 0X4A 0X46 0X49 0X46 0X00)
-   */
-  if (len >= 3 &&
-     ((unsigned char)buf[0])==0xFF &&
-     ((unsigned char)buf[1])==0xD8 &&
-     ((unsigned char)buf[2])==0xFF)
-  {
-    mContentType = NS_LITERAL_CSTRING("image/jpeg");
-    return;
-  }
-
-  /* or how about ART? */
-  /* ART begins with JG (4A 47). Major version offset 2.
-   * Minor version offset 3. Offset 4 must be NULL.
-   */
-  if (len >= 5 &&
-   ((unsigned char) buf[0])==0x4a &&
-   ((unsigned char) buf[1])==0x47 &&
-   ((unsigned char) buf[4])==0x00 )
-  {
-    mContentType = NS_LITERAL_CSTRING("image/x-jg");
-    return;
-  }
-
-  /* none of the above?  I give up */
-}

mozilla/modules/libpr0n/src/imgRequest.h

@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef imgRequest_h__
-#define imgRequest_h__
-
-#include "imgIRequest.h"
-
-#include "nsIRunnable.h"
-
-#include "nsIChannel.h"
-#include "nsIURI.h"
-#include "imgIContainer.h"
-#include "imgIDecoder.h"
-#include "imgIDecoderObserver.h"
-#include "nsIStreamListener.h"
-#include "nsCOMPtr.h"
-
-#include "nsVoidArray.h"
-#include "nsWeakReference.h"
-
-#include "nsString.h"
-
-#ifdef MOZ_NEW_CACHE
-#include "nsICacheEntryDescriptor.h"
-#else
-class nsICacheEntryDescriptor;
-#endif
-
-#define NS_IMGREQUEST_CID \
-{ /* 9f733dd6-1dd1-11b2-8cdf-effb70d1ea71 */         \
-     0x9f733dd6,                                     \
-     0x1dd1,                                         \
-     0x11b2,                                         \
-    {0x8c, 0xdf, 0xef, 0xfb, 0x70, 0xd1, 0xea, 0x71} \
-}
-
-enum {
-  onStartDecode = 0x1,
-  onStartContainer = 0x2,
-  onStopContainer = 0x4,
-  onStopDecode = 0x8,
-  onStopRequest = 0x16
-};
-
-class imgRequest : public imgIRequest,
-                   public imgIDecoderObserver, 
-                   public nsIStreamListener,
-                   public nsSupportsWeakReference
-{
-public:
-  imgRequest();
-  virtual ~imgRequest();
-
-  /* additional members */
-  nsresult Init(nsIChannel *aChannel, nsICacheEntryDescriptor *aCacheEntry);
-  nsresult AddObserver(imgIDecoderObserver *observer);
-  nsresult RemoveObserver(imgIDecoderObserver *observer, nsresult status);
-
-  PRBool RemoveFromCache();
-
-  void SniffMimeType(const char *buf, PRUint32 len);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIREQUEST
-  NS_DECL_NSIREQUEST
-  NS_DECL_IMGIDECODEROBSERVER
-  NS_DECL_IMGICONTAINEROBSERVER
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSISTREAMOBSERVER
-
-private:
-  nsCOMPtr<nsIChannel> mChannel;
-  nsCOMPtr<nsIURI> mURI;
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<imgIDecoder> mDecoder;
-
-  nsVoidArray mObservers;
-
-  PRBool mLoading;
-  PRBool mProcessing;
-
-  PRUint32 mStatus;
-  PRUint32 mState;
-
-  nsCString mContentType;
-
-#ifdef MOZ_NEW_CACHE
-  nsCOMPtr<nsICacheEntryDescriptor> mCacheEntry; /* we hold on to this to this so long as we have observers */
-#endif
-};
-
-#endif

mozilla/modules/libpr0n/src/imgRequestProxy.cpp

@@ -1,316 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgRequestProxy.h"
-
-#include "nsXPIDLString.h"
-
-#include "nsIInputStream.h"
-#include "imgILoader.h"
-#include "nsIComponentManager.h"
-
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-
-#include "imgRequest.h"
-
-#include "nsString.h"
-
-#include "DummyChannel.h"
-
-#include "nspr.h"
-
-#include "ImageLogging.h"
-
-NS_IMPL_ISUPPORTS5(imgRequestProxy, imgIRequest, nsIRequest, imgIDecoderObserver, imgIContainerObserver, nsIStreamObserver)
-
-imgRequestProxy::imgRequestProxy() :
-  mCanceled(PR_FALSE)
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-imgRequestProxy::~imgRequestProxy()
-{
-  /* destructor code */
-
-  // XXX pav
-  // it isn't the job of the request proxy to cancel itself.
-  // if your object goes away and you want to cancel the load, then do it yourself.
-
-  // cancel here for now until i make this work right like the above comment
-  Cancel(NS_ERROR_FAILURE);
-}
-
-
-
-nsresult imgRequestProxy::Init(imgRequest *request, nsILoadGroup *aLoadGroup, imgIDecoderObserver *aObserver, nsISupports *cx)
-{
-  PR_ASSERT(request);
-
-  LOG_SCOPE_WITH_PARAM(gImgLog, "imgRequestProxy::Init", "request", request);
-
-  mOwner = NS_STATIC_CAST(imgIRequest*, request);
-
-  mObserver = aObserver;
-  // XXX we should save off the thread we are getting called on here so that we can proxy all calls to mDecoder to it.
-
-  mContext = cx;
-
-  // XXX we should only create a channel, etc if the image isn't finished loading already.
-
-  nsISupports *inst = nsnull;
-  inst = new DummyChannel(this, aLoadGroup);
-  NS_ADDREF(inst);
-  nsresult res = inst->QueryInterface(NS_GET_IID(nsIChannel), getter_AddRefs(mDummyChannel));
-  NS_RELEASE(inst);
-
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  mDummyChannel->GetLoadGroup(getter_AddRefs(loadGroup));
-  if (loadGroup) {
-    loadGroup->AddRequest(mDummyChannel, cx);
-  }
-
-  request->AddObserver(this);
-
-  return NS_OK;
-}
-
-/**  nsIRequest / imgIRequest methods **/
-
-/* readonly attribute wstring name; */
-NS_IMETHODIMP imgRequestProxy::GetName(PRUnichar * *aName)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean isPending (); */
-NS_IMETHODIMP imgRequestProxy::IsPending(PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* readonly attribute nsresult status; */
-NS_IMETHODIMP imgRequestProxy::GetStatus(nsresult *aStatus)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void cancel (in nsresult status); */
-NS_IMETHODIMP imgRequestProxy::Cancel(nsresult status)
-{
-  if (mCanceled)
-    return NS_ERROR_FAILURE;
-
-  LOG_SCOPE(gImgLog, "imgRequestProxy::Cancel");
-
-  mCanceled = PR_TRUE;
-
-  NS_ASSERTION(mOwner, "canceling request proxy twice");
-
-  nsresult rv = NS_REINTERPRET_CAST(imgRequest*, mOwner.get())->RemoveObserver(this, status);
-
-  mOwner = nsnull;
-
-  return rv;
-}
-
-/* void suspend (); */
-NS_IMETHODIMP imgRequestProxy::Suspend()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void resume (); */
-NS_IMETHODIMP imgRequestProxy::Resume()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/**  imgIRequest methods **/
-
-/* readonly attribute imgIContainer image; */
-NS_IMETHODIMP imgRequestProxy::GetImage(imgIContainer * *aImage)
-{
-  if (!mOwner)
-    return NS_ERROR_FAILURE;
-
-  return mOwner->GetImage(aImage);
-}
-
-/* readonly attribute unsigned long imageStatus; */
-NS_IMETHODIMP imgRequestProxy::GetImageStatus(PRUint32 *aStatus)
-{
-  if (!mOwner) {
-    *aStatus = imgIRequest::STATUS_ERROR;
-    return NS_ERROR_FAILURE;
-  }
-
-  return mOwner->GetImageStatus(aStatus);
-}
-
-/* readonly attribute nsIURI URI; */
-NS_IMETHODIMP imgRequestProxy::GetURI(nsIURI **aURI)
-{
-  if (!mOwner)
-    return NS_ERROR_FAILURE;
-
-  return mOwner->GetURI(aURI);
-}
-
-/* readonly attribute imgIDecoderObserver decoderObserver; */
-NS_IMETHODIMP imgRequestProxy::GetDecoderObserver(imgIDecoderObserver **aDecoderObserver)
-{
-  *aDecoderObserver = mObserver;
-  NS_IF_ADDREF(*aDecoderObserver);
-  return NS_OK;
-}
-
-
-/** imgIContainerObserver methods **/
-
-/* [noscript] void frameChanged (in imgIContainer container, in nsISupports cx, in gfxIImageFrame newframe, in nsRect dirtyRect); */
-NS_IMETHODIMP imgRequestProxy::FrameChanged(imgIContainer *container, nsISupports *cx, gfxIImageFrame *newframe, nsRect * dirtyRect)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::FrameChanged\n", this));
-
-  if (mObserver)
-    mObserver->FrameChanged(container, mContext, newframe, dirtyRect);
-
-  return NS_OK;
-}
-
-/** imgIDecoderObserver methods **/
-
-/* void onStartDecode (in imgIRequest request, in nsISupports cx); */
-NS_IMETHODIMP imgRequestProxy::OnStartDecode(imgIRequest *request, nsISupports *cx)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStartDecode\n", this));
-
-  if (mObserver)
-    mObserver->OnStartDecode(this, mContext);
-
-  return NS_OK;
-}
-
-/* void onStartContainer (in imgIRequest request, in nsISupports cx, in imgIContainer image); */
-NS_IMETHODIMP imgRequestProxy::OnStartContainer(imgIRequest *request, nsISupports *cx, imgIContainer *image)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStartContainer\n", this));
-
-  if (mObserver)
-    mObserver->OnStartContainer(this, mContext, image);
-
-  return NS_OK;
-}
-
-/* void onStartFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
-NS_IMETHODIMP imgRequestProxy::OnStartFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStartFrame\n", this));
-
-  if (mObserver)
-    mObserver->OnStartFrame(this, mContext, frame);
-
-  return NS_OK;
-}
-
-/* [noscript] void onDataAvailable (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame, [const] in nsRect rect); */
-NS_IMETHODIMP imgRequestProxy::OnDataAvailable(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame, const nsRect * rect)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnDataAvailable\n", this));
-
-  if (mObserver)
-    mObserver->OnDataAvailable(this, mContext, frame, rect);
-
-  return NS_OK;
-}
-
-/* void onStopFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
-NS_IMETHODIMP imgRequestProxy::OnStopFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStopFrame\n", this));
-
-  if (mObserver)
-    mObserver->OnStopFrame(this, mContext, frame);
-
-  return NS_OK;
-}
-
-/* void onStopContainer (in imgIRequest request, in nsISupports cx, in imgIContainer image); */
-NS_IMETHODIMP imgRequestProxy::OnStopContainer(imgIRequest *request, nsISupports *cx, imgIContainer *image)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStopContainer\n", this));
-
-  if (mObserver)
-    mObserver->OnStopContainer(this, mContext, image);
-
-  return NS_OK;
-}
-
-/* void onStopDecode (in imgIRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
-NS_IMETHODIMP imgRequestProxy::OnStopDecode(imgIRequest *request, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStopDecode\n", this));
-
-  if (mObserver)
-    mObserver->OnStopDecode(this, mContext, status, statusArg);
-
-  return NS_OK;
-}
-
-
-
-
-
-/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP imgRequestProxy::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
-{
-  return NS_OK;
-}
-
-/* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult statusCode, in wstring statusText); */
-NS_IMETHODIMP imgRequestProxy::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult statusCode, const PRUnichar *statusText)
-{
-  if (!mDummyChannel)
-    return NS_OK;
-
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  mDummyChannel->GetLoadGroup(getter_AddRefs(loadGroup));
-  if (loadGroup) {
-    loadGroup->RemoveRequest(mDummyChannel, mContext, statusCode, statusText);
-  }
-  mDummyChannel = nsnull;
-
-  return NS_OK;
-}
-

mozilla/modules/libpr0n/src/imgRequestProxy.h

@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * 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.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgRequest.h"
-#include "imgIDecoderObserver.h"
-
-#include "imgIContainer.h"
-#include "imgIDecoder.h"
-#include "nsIStreamObserver.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsCOMPtr.h"
-
-#define NS_IMGREQUESTPROXY_CID \
-{ /* 20557898-1dd2-11b2-8f65-9c462ee2bc95 */         \
-     0x20557898,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0x8f, 0x65, 0x9c, 0x46, 0x2e, 0xe2, 0xbc, 0x95} \
-}
-
-class imgRequestProxy : public imgIRequest,
-                        public imgIDecoderObserver,
-                        public nsIStreamObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIREQUEST
-  NS_DECL_NSIREQUEST
-  NS_DECL_IMGIDECODEROBSERVER
-  NS_DECL_IMGICONTAINEROBSERVER
-  NS_DECL_NSISTREAMOBSERVER
-
-  imgRequestProxy();
-  virtual ~imgRequestProxy();
-
-  /* additional members */
-  nsresult Init(imgRequest *request, nsILoadGroup *aLoadGroup, imgIDecoderObserver *aObserver, nsISupports *cx);
-
-private:
-  nsCOMPtr<imgIDecoderObserver> mObserver;
-
-  nsCOMPtr<nsISupports> mContext;
-
-  nsCOMPtr<imgIRequest> mOwner;
-
-  nsCOMPtr<nsIChannel> mDummyChannel;
-
-  PRBool mCanceled;
-};

mozilla/modules/libpr0n/src/makefile.win

@@ -1,56 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# 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.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imglib2
-LIBRARY_NAME	= imglib2
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\DummyChannel.obj \
-		.\$(OBJDIR)\ImageCache.obj \
-		.\$(OBJDIR)\ImageFactory.obj \
-		.\$(OBJDIR)\imgContainer.obj \
-		.\$(OBJDIR)\imgLoader.obj \
-		.\$(OBJDIR)\imgRequest.obj \
-		.\$(OBJDIR)\imgRequestProxy.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/src/win32.order

@@ -1,90 +0,0 @@
-?AddRef@imgRequestProxy@@UAGKXZ ; 143798
-?Release@imgContainer@@UAGKXZ ; 120291
-?OnDataAvailable@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@PBUnsRect@@@Z ; 84442
-?QueryInterface@imgContainer@@UAGIABUnsID@@PAPAX@Z ; 76980
-?OnDataAvailable@imgContainer@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@PBUnsRect@@@Z ; 75604
-?OnDataAvailable@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@PBUnsRect@@@Z ; 75604
-?AddRef@DummyChannel@@UAGKXZ ; 45629
-?QueryInterface@DummyChannel@@UAGIABUnsID@@PAPAX@Z ; 45310
-?GetImage@imgRequest@@UAGIPAPAVimgIContainer@@@Z ; 41814
-?Release@DummyChannel@@UAGKXZ ; 41716
-?GetImage@imgRequestProxy@@UAGIPAPAVimgIContainer@@@Z ; 40453
-?GetFrameAt@imgContainer@@UAGIIPAPAVgfxIImageFrame@@@Z ; 39613
-?GetHeight@imgContainer@@UAGIPAH@Z ; 32348
-?Release@imgRequest@@UAGKXZ ; 31603
-?AddRef@imgRequest@@UAGKXZ ; 31603
-?GetNumFrames@imgContainer@@UAGIPAI@Z ; 28342
-?GetImageStatus@imgRequestProxy@@UAGIPAI@Z ; 27464
-?Release@imgRequestProxy@@UAGKXZ ; 23383
-?GetCurrentFrame@imgContainer@@UAGIPAPAVgfxIImageFrame@@@Z ; 19319
-?QueryInterface@imgRequest@@UAGIABUnsID@@PAPAX@Z ; 16120
-?assign_assuming_AddRef@nsCOMPtr_base@@IAEXPAVnsISupports@@@Z ; 13764
-?FrameChanged@imgRequestProxy@@UAGIPAVimgIContainer@@PAVnsISupports@@PAVgfxIImageFrame@@PAUnsRect@@@Z ; 13455
-?QueryInterface@imgRequestProxy@@UAGIABUnsID@@PAPAX@Z ; 10170
-?Notify@imgContainer@@UAGXPAVnsITimer@@@Z ; 9611
-??0nsQueryReferent@@QAE@PAVnsIWeakReference@@PAI@Z ; 9611
-?FrameChanged@imgRequest@@UAGIPAVimgIContainer@@PAVnsISupports@@PAVgfxIImageFrame@@PAUnsRect@@@Z ; 9609
-?DoComposite@imgContainer@@AAEXPAPAVgfxIImageFrame@@PAUnsRect@@HH@Z ; 9608
-?GetLoadAttributes@DummyChannel@@UAGIPAI@Z ; 8258
-?Cancel@imgRequestProxy@@UAGII@Z ; 7509
-?GetLoadGroup@DummyChannel@@UAGIPAPAVnsILoadGroup@@@Z ; 7456
-?GetURI@imgRequest@@UAGIPAPAVnsIURI@@@Z ; 5395
-?GetURI@imgRequestProxy@@UAGIPAPAVnsIURI@@@Z ; 5395
-?GetCacheSession@@YAXPAPAVnsICacheSession@@@Z ; 5165
-?GetWidth@imgContainer@@UAGIPAH@Z ; 4675
-?Release@imgLoader@@UAGKXZ ; 3791
-?AddObserver@imgRequest@@QAEIPAVimgIDecoderObserver@@@Z ; 3789
-?Get@ImageCache@@SAHPAVnsIURI@@PAPAVimgRequest@@PAPAVnsICacheEntryDescriptor@@@Z ; 3789
-?RemoveObserver@imgRequest@@QAEIPAVimgIDecoderObserver@@I@Z ; 3789
-?Init@imgRequestProxy@@QAEIPAVimgRequest@@PAVnsILoadGroup@@PAVimgIDecoderObserver@@PAVnsISupports@@@Z ; 3789
-?QueryInterface@imgLoader@@UAGIABUnsID@@PAPAX@Z ; 3789
-??0imgRequestProxy@@QAE@XZ ; 3789
-??0DummyChannel@@QAE@PAVimgIRequest@@PAVnsILoadGroup@@@Z ; 3789
-?LoadImage@imgLoader@@UAGIPAVnsIURI@@PAVnsILoadGroup@@PAVimgIDecoderObserver@@PAVnsISupports@@PAPAVimgIRequest@@@Z ; 3789
-??1imgRequestProxy@@UAE@XZ ; 3667
-??1DummyChannel@@QAE@XZ ; 3667
-??_EimgRequestProxy@@UAEPAXI@Z ; 3667
-?OnStopRequest@imgRequestProxy@@UAGIPAVnsIRequest@@PAVnsISupports@@IPBG@Z ; 3667
-?OnStopDecode@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@IPBG@Z ; 3652
-?OnStartContainer@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVimgIContainer@@@Z ; 3652
-?OnStopContainer@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVimgIContainer@@@Z ; 3652
-?OnStartDecode@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@@Z ; 3652
-?OnStopFrame@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@@Z ; 3491
-?OnStartFrame@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@@Z ; 3491
-?OnStartRequest@imgRequestProxy@@UAGIPAVnsIRequest@@PAVnsISupports@@@Z ; 2714
-?OnStopFrame@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@@Z ; 2082
-?AppendFrame@imgContainer@@UAGIPAVgfxIImageFrame@@@Z ; 2082
-?OnStartFrame@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@@Z ; 2082
-?EndFrameDecode@imgContainer@@UAGIII@Z ; 1996
-?StartAnimation@imgContainer@@UAGIXZ ; 1747
-?OnDataAvailable@imgRequest@@UAGIPAVnsIRequest@@PAVnsISupports@@PAVnsIInputStream@@II@Z ; 1415
-??0imgContainer@@QAE@XZ ; 1376
-??1imgRequest@@UAE@XZ ; 1376
-?OnStopRequest@imgRequest@@UAGIPAVnsIRequest@@PAVnsISupports@@IPBG@Z ; 1376
-?Init@imgRequest@@QAEIPAVnsIChannel@@PAVnsICacheEntryDescriptor@@@Z ; 1376
-??1imgContainer@@UAE@XZ ; 1376
-?Put@ImageCache@@SAHPAVnsIURI@@PAVimgRequest@@PAPAVnsICacheEntryDescriptor@@@Z ; 1376
-??_GimgRequest@@UAEPAXI@Z ; 1376
-??_EimgContainer@@UAEPAXI@Z ; 1376
-??0imgRequest@@QAE@XZ ; 1376
-?OnStartRequest@imgRequest@@UAGIPAVnsIRequest@@PAVnsISupports@@@Z ; 1367
-?OnStartContainer@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVimgIContainer@@@Z ; 1361
-?Init@imgContainer@@UAGIHHPAVimgIContainerObserver@@@Z ; 1361
-?OnStartDecode@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@@Z ; 1361
-?SniffMimeType@imgRequest@@QAEXPBDI@Z ; 1361
-?OnStopContainer@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVimgIContainer@@@Z ; 1361
-?OnStopDecode@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@IPBG@Z ; 1361
-?GetContentType@DummyChannel@@UAGIPAPAD@Z ; 1275
-?DecodingComplete@imgContainer@@UAGIXZ ; 1275
-?Cancel@DummyChannel@@UAGII@Z ; 122
-?StopAnimation@imgContainer@@UAGIXZ ; 121
-?GetDecoderObserver@imgRequestProxy@@UAGIPAPAVimgIDecoderObserver@@@Z ; 84
-??0nsGetInterface@@QAE@PAVnsISupports@@PAI@Z ; 77
-_NSGetModule ; 1
-??_EimgLoader@@UAEPAXI@Z ; 1
-??1imgLoader@@UAE@XZ ; 1
-?Shutdown@ImageCache@@SAXXZ ; 1
-??0imgLoader@@QAE@XZ ; 1
-?do_GetService@@YA?BVnsGetServiceByContractID@@PBDPAI@Z ; 1
-?Cancel@imgRequest@@UAGII@Z ; 1
-?RemoveFromCache@imgRequest@@QAEHXZ ; 1

mozilla/xpinstall/packager/windows/browser.jst

@@ -0,0 +1,239 @@
+function createShortcuts() 
+{
+  var subkey;
+  var valname;
+  var szStartMenuPrograms;
+  var szStartMenu;
+  var szFolderDesktop;
+  var szFolderQuickLaunch;
+  var szFolderSendTo;
+  var winreg;
+  var fWindows;
+  var fTemp;
+  var fCommunicator;
+  var fileExe;
+  var scExeDesc;
+  var scProfileDesc;
+  var scProfileDescParam;
+  var scFolderName;
+  var fFolderPath;
+  var fFolderPathStr;
+  var is_winnt;
+  var szCurrentVersion;
+
+  winreg               = getWinRegistry();
+  fWindows             = getFolder("Windows");
+  fCommunicator        = getFolder("Communicator");
+  fTemp                = fCommunicator + "\\mozilla.exe";
+  fileExe              = getFolder("file:///", fTemp);
+  scExeDesc            = "Mozilla Seamonkey";
+  scProfileDesc        = "Profile Manager";
+  scProfileDescParam   = "-ProfileManager";
+  scFolderName         = "Mozilla Seamonkey";
+  if(winreg != null) 
+  {
+    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
+    subkey              = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
+    valname             = "Program Folder Path";
+    fFolderPathStr      = winreg.getValueString(subkey, valname);
+    if((fFolderPathStr == "") || (fFolderPathStr == null))
+    {
+      /* determine if the script is running under NT or not */
+      winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
+      subkey              = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
+      valname             = "CurrentVersion";
+      szCurrentVersion    = winreg.getValueString(subkey, valname);
+      logComment("szCurrentVersion: " + szCurrentVersion);
+      if((szCurrentVersion == "") || (szCurrentVersion == null))
+      {
+        is_winnt = false;
+      }
+      else
+      {
+        is_winnt = true;
+      }
+
+      if(is_winnt == false)
+      {
+        logComment("is_winnt is false: " + is_winnt);
+
+        winreg.setRootKey(winreg.HKEY_CURRENT_USER);
+        subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
+        valname             = "Programs";
+        szStartMenuPrograms = winreg.getValueString(subkey, valname);
+        valname             = "Start Menu";
+        szStartMenu         = winreg.getValueString(subkey, valname);
+        valname             = "Desktop";
+        szFolderDesktop     = winreg.getValueString(subkey, valname);
+      }
+      else
+      {
+        logComment("is_winnt is true: " + is_winnt);
+
+        winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
+        subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
+        valname             = "Common Programs";
+        szStartMenuPrograms = winreg.getValueString(subkey, valname);
+        valname             = "Common Start Menu";
+        szStartMenu         = winreg.getValueString(subkey, valname);
+        valname             = "Common Desktop";
+        szFolderDesktop     = winreg.getValueString(subkey, valname);
+      }
+
+      winreg.setRootKey(winreg.HKEY_CURRENT_USER);
+      subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
+      valname             = "SendTo";
+      szFolderSendTo      = winreg.getValueString(subkey, valname);
+
+      subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GrpConv\\MapGroups";
+      valname             = "Quick Launch";
+      szFolderQuickLaunch = winreg.getValueString(subkey, valname);
+
+      fTemp        = szStartMenuPrograms + "\\" + scFolderName;
+      fFolderPath  = getFolder("file:///", fTemp);
+
+      logComment("Folder StartMenuPrograms: " + szStartMenuPrograms);
+      logComment("Folder StartMenu: "         + szStartMenu);
+      logComment("Folder FolderDesktop: "     + szFolderDesktop);
+      logComment("Folder FolderSendTo: "      + szFolderSendTo);
+      logComment("Folder FolderQuickLaunch: " + szFolderQuickLaunch);
+    }
+    else
+    {
+      /* convert the path string to a path folder object */
+      fFolderPath = getFolder("file:///", fFolderPathStr);
+    }
+
+    logComment("fileExe: "                  + fileExe);
+    logComment("fFolderPath: "              + fFolderPath);
+    logComment("scExeDesc: "                + scExeDesc);
+    logComment("fCommunicator : "           + fCommunicator);
+
+    /* explicitly create the fFolderPath even though the windowsShortcut function creates the folder.
+     * This is so that the folder creation gets logged for uninstall to remove it. */
+    File.dirCreate(fFolderPath);
+
+    /* create the shortcuts */
+    File.windowsShortcut(fileExe, fFolderPath, scExeDesc,     fCommunicator,  "",                 fileExe, 0);
+    File.windowsShortcut(fileExe, fFolderPath, scProfileDesc, fCommunicator,  scProfileDescParam, fileExe, 0);
+
+    /* set the Program Folder Path in the Mozilla key in the Windows Registry */
+    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
+    subkey  = "SOFTWARE\\Mozilla";
+    winreg.createKey(subkey,"");
+
+    valname = "CurrentVersion";
+    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey";
+    winreg.createKey(subkey,"");
+
+    valname = "CurrentVersion";
+    value   = "$UserAgent$";
+    err     = winreg.setValueString(subkey, valname, value);
+
+    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$";
+    winreg.createKey(subkey,"");
+
+    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
+    winreg.createKey(subkey,"");
+
+    valname = "Program Folder Path";
+    value   = fFolderPath;
+    err     = winreg.setValueString(subkey, valname, value);
+
+  }
+  else
+  {
+    logComment("winreg is null");
+  }
+}
+
+function updateWinReg()
+{
+  //Notes:
+  // can't use a double backslash before subkey - Windows already puts it in.
+  // subkeys have to exist before values can be put in.
+  var winreg = getWinRegistry();
+  var subkey;  //the name of the subkey you are poking around in
+  var valname; // the name of the value you want to look at
+  var value;   //the data in the value you want to look at.
+
+  if(winreg != null) 
+  {
+    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
+    subkey  = "SOFTWARE\\Mozilla";
+    winreg.createKey(subkey,"");
+
+    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey";
+    winreg.createKey(subkey,"");
+
+    valname = "CurrentVersion";
+    value   = "$UserAgent$";
+    err     = winreg.setValueString(subkey, valname, value);
+
+    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$";
+    winreg.createKey(subkey,"");
+
+    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
+    winreg.createKey(subkey,"");
+
+    valname = "Install Directory";
+    value   = fCommunicator;
+    err     = winreg.setValueString(subkey, valname, value);
+
+    // set the App Paths key here
+    subkey  = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\mozilla.exe";
+    winreg.createKey(subkey,"");
+    valname = "";
+    value   = fCommunicator + "\\mozilla.exe";
+    err     = winreg.setValueString(subkey, valname, value);
+
+    valname = "Path";
+    value   = fCommunicator;
+    err     = winreg.setValueString(subkey, valname, value);
+  }
+}
+
+// main
+var srDest;
+var err;
+var fCommunicator;
+var fWindowsSystem;
+var fileComponentRegStr;
+var fileComponentReg;
+
+srDest = $SpaceRequired$:bin;
+err    = startInstall("Mozilla Seamonkey", "Browser", "$Version$"); 
+logComment("startInstall: " + err);
+
+fCommunicator   = getFolder("Communicator");
+fWindowsSystem  = getFolder("Win System");
+logComment("fCommunicator: " + fCommunicator);
+
+if(verifyDiskSpace(fCommunicator, srDest) == true)
+{
+  setPackageFolder(fCommunicator);
+  err = addDirectory("",
+                     "$Version$",
+                     "bin",              // dir name in jar to extract 
+                     fCommunicator,      // Where to put this file (Returned from GetFolder) 
+                     "",                 // subdir name to create relative to fCommunicator
+                     true);              // Force Flag 
+  logComment("addDirectory() of Program returned: " + err);
+
+  // check return value
+  if(!checkError(err))
+  {
+    fileComponentRegStr = fCommunicator + "\\component.reg";
+    fileComponentReg    = getFolder("file:///", fileComponentRegStr);
+    err                 = fileDelete(fileComponentReg);
+    logComment("fileDelete() returned: " + err);
+
+    updateWinReg();
+    createShortcuts();
+
+    err = finalizeInstall(); 
+    logComment("finalizeInstall() returned: " + err);
+  }
+}
+
+// end main

mozilla/xpinstall/packager/windows/config.it

@@ -0,0 +1,494 @@
+[General]
+; Run Mode values:
+;   Normal - Shows all dialogs.  Requires user input.
+;   Auto   - Shows some dialogs, but none requiring user input.  It will
+;            automatically install the product using default values.
+;   Silent - Show no dialogs at all.  It will install product using default
+;            values.
+Run Mode=Normal
+
+Product Name=Mozilla Seamonkey
+
+; Destination Path values:
+;   PROGRAMFILESDIR
+;   WINDISK
+;   WINDIR
+;   WINSYSDIR
+Path=[PROGRAMFILESDIR]\Mozilla\Seamonkey
+
+; Program Folder Path values:
+;   COMMON_STARTUP
+;   COMMON_PROGRAMS
+;   COMMON_STARTMENU
+;   COMMON_DESKTOP
+;
+;   PERSONAL_STARTUP
+;   PERSONAL_PROGRAMS
+;   PERSONAL_STARTMENU
+;   PERSONAL_DESKTOP
+;
+;   PERSONAL_APPDATA
+;   PERSONAL_CACHE
+;   PERSONAL_COOKIES
+;   PERSONAL_FAVORITES
+;   PERSONAL_FONTS
+;   PERSONAL_HISTORY
+;   PERSONAL_NETHOOD
+;   PERSONAL_PERSONAL
+;   PERSONAL_PRINTHOOD (supported only under Windows NT)
+;   PERSONAL_RECENT
+;   PERSONAL_SENDTO
+;   PERSONAL_TEMPLATES
+;
+;   PROGRAMFILESDIR
+;   COMMONFILESDIR
+;   MEDIAPATH
+;   CONFIGPATH (supported only under Windows95 and Windows98)
+;   DEVICEPATH
+Program Folder Name=Mozilla Seamonkey
+Program Folder Path=[COMMON_PROGRAMS]
+
+; Default Setup Type values:
+;   Setup Type 0 - first radio button (default)
+;   Setup Type 1 - second radio button
+;   Setup Type 2 - third radio button
+;   Setup Type 3 - fourth radio button (usually the Custom option)
+Default Setup Type=Setup Type 0
+
+; Default Font Size is 32
+; Default Font Color is WHITE (of BLACK and GREEN)
+; Default Font Shadow is TRUE
+Setup Title0=Mozilla Seamonkey Pr2 Setup
+Setup Title0 Font Size=
+Setup Title0 Font Color=
+Setup Title0 Font Shadow=TRUE
+Setup Title1=Build $Version$
+Setup Title1 Font Size=12
+Setup Title1 Font Color=BLACK
+Setup Title1 Font Shadow=FALSE
+Setup Title2=
+Setup Title2 Font Size=
+Setup Title2 Font Color=
+Setup Title2 Font Shadow=TRUE
+
+; HKey:              valid decryptable setup keys are [Mozilla Seamonkey CurrentVersion]
+;                    and [Mozilla Seamonkey CurrentVersion].
+; Decrypt HKey:      there are times when '[' and ']' are valid part of windows registry key names.
+; Contains Filename: tells setup that the path contains filename needed to be removed before
+;                    using it as a path.
+; Verify Existance:  FILE or PATH
+;
+[Locate Previous Product Path0]
+HRoot=HKEY_LOCAL_MACHINE
+HKey=[Netscape Seamonkey CurrentVersion]\Main
+Name=Install Directory
+Decrypt HKey=TRUE
+Contains Filename=FALSE
+Verify Existance=
+
+; This section checks for legacy files.
+; If the file(s), indicated by the Filename= key, is found to have a version of less than the value
+; indicated by the Version= key, then display the string in the Message= key.
+[Legacy Check0]
+Filename=[SETUP PATH]\mozilla.exe
+Version=6.0.0.0
+Message=Setup has detected an old version of Mozilla in the chosen destination directory that may pose compatibility issues.  It is highly recommended that a different destination directory be used.  Would you like to choose a different directory?
+
+[Dialog Welcome]
+Show Dialog=TRUE
+Title=Welcome
+Message0=Welcome to %s Setup.
+Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
+Message2=Click Cancel to quit Setup and then close any programs you have running.  Click Next to continue the Setup program.
+
+[Dialog License]
+Show Dialog=FALSE
+Title=Software License Agreement
+License File=license.txt
+Message0=Please read the following license agreement.  Use the scroll bar to view the rest of this agreement.
+Message1=Click Accept if you accept the terms of the preceeding license agreement.  If No is clicked, setup will quit.
+
+[Dialog Setup Type]
+Show Dialog=TRUE
+Title=Setup Type
+Message0=Click the type of setup you prefer, then click Next.
+Readme Filename=readme.txt
+Readme App=notepad.exe
+
+; at least one Setup Type needs to be set, and up to 4 can be
+; set (Setup Type0, Setup Type1, Setup Type2, Setup Type3).
+[Setup Type0]
+Description Short=B&ase
+Description Long=Program will be installed with the minimal options.
+
+; List of components to install/enable for this Setup Type.
+; All other components not listed here will be disabled if
+; this Setup Type is selected.
+C0=Component0
+C1=Component1
+
+[Setup Type1]
+Description Short=C&omplete
+Description Long=Program will be installed with the most common options.
+
+; List of components to install/enable for this Setup Type.
+; All other components not listed here will be disabled if
+; this Setup Type is selected.
+C0=Component0
+C1=Component1
+C2=Component2
+
+[Setup Type2]
+Description Short=C&ustom
+Description Long=You may choose the options you want to install.  Recommended for advanced users only.
+;Description Short=&Pro
+;Description Long=Program will be installed with all the options available.
+
+; List of components to install/enable for this Setup Type.
+; All other components not listed here will be disabled if
+; this Setup Type is selected.
+C0=Component0
+C1=Component1
+C2=Component2
+
+;[Setup Type3]
+;Description Short=C&ustom
+;Description Long=You may choose the options you want to install.  Recommended for advanced users.
+
+; List of components to install/enable for this Setup Type.
+; All other components not listed here will be disabled if
+; this Setup Type is selected.
+;C0=Component0
+;C1=Component1
+;C2=Component2
+;C3=Component3
+
+[Dialog Select Components]
+Show Dialog=TRUE
+Title=Select Components
+Message0=The browser is always installed.  Select or clear the additional components you want to install.
+
+[Dialog Windows Integration]
+Show Dialog=FALSE
+Title=Windows Integration
+Message0=Check the Mozilla Preference options you would like Setup to perform.
+Message1=These settings allow you to set default Internet preferences for browsing and searching.  They affect browsers installed on your machine, including Mozilla Communicator and Microsoft Internet Explorer.
+
+; Only a maximum of 4 "Windows Integration-Item"s are allowded.  Each Item
+; shows up as a checkbox in the Windows Integration dialog.
+[Windows Integration-Item0]
+CheckBoxState=FALSE
+Description=Make Mozilla Communicator my default Internet browser
+Archive=
+
+[Windows Integration-Item1]
+CheckBoxState=FALSE
+Description=Make Mozilla Netcenter my home page
+Archive=
+
+[Windows Integration-Item2]
+CheckBoxState=FALSE
+Description=Use Mozilla Netcenter to search the Web
+Archive=
+
+[Dialog Program Folder]
+Show Dialog=TRUE
+Title=Select Program Folder
+Message0=Setup will add program icons to the Program Folder listed below.  You may type a new folder name, or select one from the Existing Folder list.  Click Install to begin installation.
+
+[Dialog Site Selector]
+Show Dialog=FALSE
+Title=Site Selector
+Message0=Select the region you wish to download from, or leave it on Default for Setup to automatically determine the best place to download from relative to where you are.
+
+[Dialog Start Install]
+Show Dialog=FALSE
+Title=Start Install
+Message0=Setup has enough information to start copying the program files.  If you want to review or change settings, click Back.  If you are satisfied with the current settings, click Install to begin copying files.
+
+[Dialog Reboot]
+; Show Dialog values are:
+;   TRUE  - Always show
+;   FALSE - Don't show unless at least one component has its reboot show value set
+;           to TRUE.  This will not show even if some files were in use and a reboot
+;           is necessary.
+;   AUTO  - Don't show unless a component has its reboot show value set to
+;           TRUE or there was at least one file in use and a reboot is
+;           is required for the file to be replaced correctly.
+Show Dialog=AUTO
+
+; These SmartDownload sections contain information to configure SmartDownload.
+; The info is applied to all components to be downloaded.
+[SmartDownload-Netscape Install]
+;core_file=base.zip
+;core_dir=[SETUP PATH]
+no_ads=true
+silent=false
+execution=false
+confirm_install=false
+;extract_msg=Uncompressing Seamonkey.  Please wait...
+
+[SmartDownload-Proxy]
+
+[SmartDownload-Execution]
+exe=
+exe_param=
+
+[Check Instance0]
+Class Name=NetscapeWindowClass
+Window Name=
+Message=Setup has detected that an instance of Seamonkey is currently running.  Please quit Seamonkey before continuing Setup.
+
+[Check Instance1]
+Process Name=psm.exe
+Message=Setup has detected that an instance of Personal Security Manager is currently running.  Personal Security Manager will quit by itself when there are no other applications running that require it.  A reboot might be necessary.  Setup will then be able to continue.
+
+; These are the components to be offered to the user (shown in the Select
+; Components dialog) for installation.
+; There is no limit to the number of components to install.
+[Component0]
+Description Short=Mozilla Xpinstall Engine
+Description Long=Install Engine
+Archive=core.xpi
+$InstallSize$:core
+$InstallSizeSystem$
+$InstallSizeArchive$:core.xpi
+;Dependency0=
+Dependee0=Mozilla Seamonkey
+; Attributes can be the following values:
+;   SELECTED  - the component is selected to be installed by default.
+;   INVISIBLE - the component is not shown in the Select Components dialog.
+Attributes=SELECTED|INVISIBLE
+; url keys can be as many as needed.  url0 is attempted first.  if it fails,
+; the next url key is tried in sequential order.
+; The url should not contain the filename.  Setup will assemble the complete url
+; using the url keys and the Archive key.
+Domain0=$Domain$
+Server Path0=$ServerPath$
+
+[Component1]
+Description Short=Mozilla Seamonkey
+Description Long=Browser software for the internet
+Archive=browser.xpi
+$InstallSize$:browser
+$InstallSizeSystem$
+$InstallSizeArchive$:browser.xpi
+;Dependency0=
+; Attributes can be the following values:
+;   SELECTED  - the component is selected to be installed by default.
+;   INVISIBLE - the component is not shown in the Select Components dialog.
+Attributes=SELECTED|DISABLED
+; url keys can be as many as needed.  url0 is attempted first.  if it fails,
+; the next url key is tried in sequential order.
+; The url should not contain the filename.  Setup will assemble the complete url
+; using the url keys and the Archive key.
+Domain0=$Domain$
+Server Path0=$ServerPath$
+;url0=$URLPath$
+
+[Component2]
+Description Short=Mail & News
+Description Long=Seamonkey Mail && News
+Archive=mail.xpi
+$InstallSize$:mail
+$InstallSizeSystem$
+$InstallSizeArchive$:mail.xpi
+;Dependency0=
+; Attributes can be the following values:
+;   SELECTED  - the component is selected to be installed by default.
+;   INVISIBLE - the component is not shown in the Select Components dialog.
+Attributes=SELECTED
+Parameter=
+; url keys can be as many as needed.  url0 is attempted first.  if it fails,
+; the next url key is tried in sequential order.
+; The url should not contain the filename.  Setup will assemble the complete url
+; using the url keys and the Archive key.
+Domain0=$Domain$
+Server Path0=$ServerPath$
+;url0=$URLPath$
+
+[Core]
+Source=[XPI PATH]\core.xpi
+Destination=[WIZTEMP]\core.ns
+$InstallSize$:core
+Cleanup=TRUE
+Message=Preparing Install, please wait...
+
+[Redirect]
+Status=Enabled
+url0=$RedirIniUrl$
+Description=
+Message=
+
+; The Timing key needs to be one of the following values:
+;   pre download     - process before any files have been downloaded.
+;   post download    - process after all files have been downloaded.
+;   pre core         - process before the core file has been uncompressed.
+;   post core        - process after the core file has been uncompressed.
+;   pre smartupdate  - process before the smartupdate engine has been launched.
+;   post smartupdate - process after the smartupdate engine has been launched.
+;   pre launchapp    - process before the launching of executables.
+;   post launchapp   - process after the launching of executables.
+;   depend reboot    - process depending on if a reboot is necessary or not.
+;                      if reboot is necessary, installer can set it up so
+;                      the app runs once upon windows reboot.
+
+;Uncompress FileX sections
+;[Uncompress File0]
+;Timing=post download
+;Source=[XPI PATH]\core.xpi
+;Destination=[SETUP PATH]
+;Message=Configuring Seamonkey, please wait...
+
+;[Uncompress File1]
+;Timing=post download
+;Source=[XPI PATH]\extratest.xpi
+;Destination=[SETUP PATH]
+;Message=Configuring Extra test files, please wait...
+
+;Move FileX sections
+;[Move File0]
+;Timing=post download
+;Source=[SETUP PATH]\bin\*
+;Destination=[SETUP PATH]\program
+
+;[Move File1]
+;Timing=post download
+;Source=[SETUP PATH]\ftmain\*
+;Destination=[SETUP PATH]\program
+
+;Copy FileX sections
+[Copy File0]
+Timing=post launchapp
+Source=[JRE BIN PATH]\npjava*.dll
+Destination=[SETUP PATH]\Plugins
+Fail If Exists=FALSE
+
+;[Copy File1]
+;Timing=post launchapp
+;Source=[TEMP]\xtratest\bin\*.*
+;Destination=[SETUP PATH]
+;Fail If Exists=FALSE
+
+;[Copy File1]
+;Timing=post download
+;Source=[SETUP PATH]\bin\*.exe
+;Destination=[TEMP]
+;Fail If Exists=
+
+;Create DirectoryX sections
+[Create Directory0]
+Timing=post download
+Destination=[SETUP PATH]\Plugins
+
+;[Create Directory1]
+;Timing=post download
+;Destination=[TEMP]\Test\temp
+
+;Delete FileX sections
+[Delete File0]
+Timing=post download
+Destination=[COMMON_PROGRAMS]\Mozilla Seamonkey\Mozilla AppRunner.lnk
+
+;Remove DirectoryX sections
+;[Remove Directory0]
+;Timing=post launchapp
+;Destination=[TEMP]\xtratest
+;Remove subdirs=TRUE
+
+;RunAppX sections
+[RunApp0]
+Timing=depend reboot
+Wait=FALSE
+Target=[SETUP PATH]\mozilla.exe
+Parameters=-installer
+WorkingDir=[SETUP PATH]
+
+[Windows Registry0]
+Root Key=HKEY_LOCAL_MACHINE
+Key=Software\Mozilla\Mozilla Seamonkey\$UserAgent$\Main
+Name=Program Folder Path
+Name Value=[Default Folder]
+Type=REG_SZ
+Decrypt Key=FALSE
+Decrypt Name=FALSE
+Decrypt Name Value=TRUE
+Overwrite Key=TRUE
+Overwrite Name=TRUE
+Timing=pre smartupdate
+
+; Values for Show Folder:
+;   HIDE             Hides the window and activates another window.
+;   MAXIMIZE         Maximizes the specified window.
+;   MINIMIZE         Minimizes the specified window and activates the next
+;                    top-level window in the z-order.
+;   RESTORE          Activates and displays the window. If the window is
+;                    minimized or maximized, Windows restores it to its
+;                    original size and position. An application should specify
+;                    this flag when restoring a minimized window.
+;   SHOW             Activates the window and displays it in its current size
+;                    and position.
+;   SHOWMAXIMIZED    Activates the window and displays it as a maximized
+;                    window.
+;   SHOWMINIMIZED    Activates the window and displays it as a minimized
+;                    window.
+;   SHOWMINNOACTIVE  Displays the window as a minimized window. The active
+;                    window remains active.
+;   SHOWNA           Displays the window in its current state. The active
+;                    window remains active.
+;   SHOWNOACTIVATE   Displays a window in its most recent size and position.
+;                    The active window remains active.
+;   SHOWNORMAL       Activates and displays a window. If the window is
+;                    minimized or maximized, Windows restores it to its
+;                    original size and position. An application should specify
+;                    this flag when displaying the window for the first time.
+[Program Folder0]
+Timing=post smartupdate
+Show Folder=SHOW
+Program Folder=[Default Folder]
+
+;[Program Folder0-Shortcut0]
+;File=[SETUP PATH]\mozilla.exe
+;Arguments=
+;Working Dir=[SETUP PATH]
+;Description=Mozilla Seamonkey
+;Icon Path=[SETUP PATH]\mozilla.exe
+;Icon Id=0
+
+;[Program Folder0-Shortcut1]
+;File=[SETUP PATH]\mozilla.exe
+;Arguments=-ProfileManager
+;Working Dir=[SETUP PATH]
+;Description=Profile Manager
+;Icon Path=[SETUP PATH]\mozilla.exe
+;Icon Id=0
+
+;[Program Folder0-Shortcut2]
+;File=[SETUP PATH]\bin\Net2fone.exe
+;Arguments=
+;Working Dir=[SETUP PATH]
+;Description=Net2Fone
+;Icon Path=[SETUP PATH]\bin\Net2fone.exe
+;Icon Id=0
+
+;[Program Folder1]
+;Timing=post download
+;Show Folder=SHOW
+;Program Folder=[Default Folder]\lala land
+
+;[Program Folder1-Shortcut0]
+;File=c:\bin\getver.exe
+;Arguments=
+;Working Dir=[TEMP]
+;Description=Getver Test
+;Icon Path=[WINDISK]\4nt\4nt.exe
+;Icon Id=0
+
+;[Program Folder1-Shortcut1]
+;File=c:\perl\bin\perl.exe
+;Arguments=
+;Working Dir=[WINSYS]
+;Description=Perl
+;Icon Path=c:\perl\bin\perl.exe
+;Icon Id=0
+

mozilla/xpinstall/packager/windows/core.jst

@@ -0,0 +1,41 @@
+// main
+var srDest;
+var err;
+var communicatorFolder;
+var fWindowsSystem;
+var fileComponentRegStr;
+var fileComponentReg;
+
+srDest = $SpaceRequired$:bin;
+err    = startInstall("Mozilla XPCom", "XPCom", "$Version$"); 
+logComment("startInstall: " + err);
+
+communicatorFolder = getFolder("Communicator");
+fWindowsSystem     = getFolder("Win System");
+logComment("communicatorFolder: " + communicatorFolder);
+
+if(verifyDiskSpace(communicatorFolder, srDest) == true)
+{
+  setPackageFolder(communicatorFolder);
+  err = addDirectory("",
+                     "$Version$",
+                     "bin",              // dir name in jar to extract 
+                     communicatorFolder, // Where to put this file (Returned from GetFolder) 
+                     "",                 // subdir name to create relative to communicatorFolder
+                     true);              // Force Flag 
+  logComment("addDirectory() of Program returned: " + err);
+
+  // check return value
+  if(!checkError(err))
+  {
+    fileComponentRegStr = communicatorFolder + "\\component.reg";
+    fileComponentReg    = getFolder("file:///", fileComponentRegStr);
+    err                 = fileDelete(fileComponentReg);
+    logComment("fileDelete() returned: " + err);
+
+    err = finalizeInstall(); 
+    logComment("finalizeInstall() returned: " + err);
+  }
+}
+
+// end main

mozilla/xpinstall/packager/windows/editor.jst

@@ -0,0 +1,18 @@
+var err = StartInstall("Mozilla Editor", "Seamonkey", "$Version$"); 
+LogComment("StartInstall: " + err);
+
+var communicatorFolder = Install.GetFolder("Communicator");
+LogComment("communicatorFolder: " + communicatorFolder);
+
+err = AddDirectory("Program",
+                   "$Version$",
+                   "bin",              // fileName in jar, 
+                   communicatorFolder, // Where to put this file (Returned from GetFolder) 
+                   "",                 // fileName in jar, 
+                   true);              // Force Flag 
+
+LogComment("AddDirectory() returned: " + err);
+
+err = FinalizeInstall(); 
+LogComment("FinalizeInstall() returned: " + err);
+

mozilla/xpinstall/packager/windows/mail.jst

@@ -0,0 +1,34 @@
+// main
+var srDest;
+var err;
+var communicatorFolder;
+
+srDest = $SpaceRequired$:bin;
+err    = startInstall("Mozilla Mail", "Mail", "$Version$"); 
+logComment("startInstall: " + err);
+// check return value
+checkError(err);
+
+communicatorFolder = getFolder("Communicator");
+logComment("communicatorFolder: " + communicatorFolder);
+
+if(verifyDiskSpace(communicatorFolder, srDest) == true)
+{
+  setPackageFolder(communicatorFolder);
+  err = addDirectory("",
+                     "$Version$",
+                     "bin",              // dir name in jar to extract 
+                     communicatorFolder, // Where to put this file (Returned from GetFolder) 
+                     "",                 // subdir name to create relative to communicatorFolder
+                     true);              // Force Flag 
+  logComment("addDirectory() returned: " + err);
+
+  // check return value
+  if(!checkError(err))
+  {
+    err = finalizeInstall(); 
+    logComment("finalizeInstall() returned: " + err);
+  }
+}
+
+// end main

mozilla/xpinstall/packager/windows/makeall.pl

@@ -0,0 +1,134 @@
+#!c:\perl\bin\perl
+# 
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Sean Su <ssu@netscape.com>
+# 
+
+#
+# This perl script builds the xpi, config.ini, and js files.
+#
+
+# Make sure there are at least four arguments
+if($#ARGV < 2)
+{
+  die "usage: $0 <default version> <staging path> <dist install path>
+
+       default version   : y2k compliant based date version.
+                           ie: 5.0.0.2000040413
+
+       staging path      : full path to where the components are staged at
+
+       dist install path : full path to where the dist install dir is at.
+                           ie: d:\\builds\\mozilla\\dist\\win32_o.obj\\install
+       \n";
+}
+
+$inDefaultVersion     = $ARGV[0];
+$inStagePath          = $ARGV[1];
+$inDistPath           = $ARGV[2];
+
+$inRedirIniUrl        = "ftp://not.needed.com/because/the/xpi/files/will/be/located/in/the/same/dir/as/the/installer";
+$inXpiUrl             = "ftp://not.needed.com/because/the/xpi/files/will/be/located/in/the/same/dir/as/the/installer";
+
+$seiFileNameGeneric   = "nsinstall.exe";
+$seiFileNameSpecific  = "mozilla-win32-installer.exe";
+$userAgent            = "5.0b2 (en)";
+
+# Check for existance of staging path
+if(!(-e "$inStagePath"))
+{
+  die "invalid path: $inStagePath\n";
+}
+
+# Make sure inDestPath exists
+if(!(-e "$inDistPath"))
+{
+  mkdir ("$inDestPath",0775);
+}
+
+# Make .js files
+MakeJsFile("core");
+MakeJsFile("browser");
+MakeJsFile("mail");
+
+# Make .xpi files
+MakeXpiFile("core");
+MakeXpiFile("browser");
+MakeXpiFile("mail");
+
+MakeConfigFile();
+
+if(-e "$inDistPath\\setup")
+{
+  unlink <$inDistPath\\setup\\*>;
+}
+else
+{
+  mkdir ("$inDistPath\\setup",0775);
+}
+
+# Copy the setup files to the dist setup directory.
+system("xcopy /f config.ini                 $inDistPath\\");
+system("xcopy /f config.ini                 $inDistPath\\setup\\");
+system("xcopy /f $inDistPath\\setup.exe     $inDistPath\\setup\\");
+system("xcopy /f $inDistPath\\setuprsc.dll  $inDistPath\\setup\\");
+
+# build the self-extracting .exe file.
+print "\nbuilding self-extracting installer ($seiFileNameSpecific)...\n";
+system("copy $inDistPath\\$seiFileNameGeneric $inDistPath\\$seiFileNameSpecific");
+system("$inDistPath\\nszip.exe $inDistPath\\$seiFileNameSpecific $inDistPath\\setup\\*.* $inDistPath\\xpi\\*.*");
+
+print " done!\n";
+
+# end of script
+exit(0);
+
+sub MakeConfigFile
+{
+  # Make config.ini file
+  if(system("perl makecfgini.pl config.it $inDefaultVersion \"$userAgent\" $inStagePath $inDistPath\\xpi $inRedirIniUrl $inXpiUrl") != 0)
+  {
+    exit(1);
+  }
+}
+
+sub MakeJsFile
+{
+  my($componentName) = @_;
+
+  # Make .js file
+  if(system("perl makejs.pl $componentName.jst $inDefaultVersion \"$userAgent\" $inStagePath\\$componentName") != 0)
+  {
+    exit(1);
+  }
+}
+
+sub MakeXpiFile
+{
+  my($componentName) = @_;
+
+  # Make .xpi file
+  if(system("perl makexpi.pl $componentName $inStagePath $inDistPath\\xpi") != 0)
+  {
+    exit(1);
+  }
+}
+

mozilla/xpinstall/packager/windows/makecfgini.pl

@@ -0,0 +1,277 @@
+#!c:\perl\bin\perl
+# 
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Sean Su <ssu@netscape.com>
+# 
+
+#
+# This perl script parses the input file for special variables
+# in the format of $Variable$ and replace it with the appropriate
+# value(s).
+#
+# Input: .it file
+#             - which is a .ini template
+#
+#        version
+#             - version to display on the blue background
+#
+#        UserAgent
+#             - user agent to use in the windows registry.  should be the same as the one
+#               built into the browser (ie "6.0b2 (en)")
+#
+#        Path to staging area
+#             - path on where the seamonkey built bits are staged to
+#
+#        xpi path
+#             - path on where xpi files will be located at
+#
+#        redirect file url
+#             - url to where the redirect.ini file will be staged at.
+#               Either ftp:// or http:// can be used
+#               ie: ftp://ftp.netscape.com/pub/seamonkey
+#
+#        xpi url
+#             - url to where the .xpi files will be staged at.
+#               Either ftp:// or http:// can be used
+#               ie: ftp://ftp.netscape.com/pub/seamonkey/xpi
+#
+#   ie: perl makecfgini.pl config.it 5.0.0.1999120608 "5.0b1 (en)" k:\windows\32bit\5.0 d:\builds\mozilla\dist\win32_o.obj\install\xpi ftp://ftp.netscape.com/pub/seamonkey/windows/32bit/x86/1999-09-13-10-M10 ftp://ftp.netscape.com/pub/seamonkey/windows/32bit/x86/1999-09-13-10-M10/xpi
+#
+#
+
+# Make sure there are at least two arguments
+if($#ARGV < 6)
+{
+  die "usage: $0 <.it file> <version> <UserAgent> <staging path> <.xpi path> <redirect file url> <xpi url>
+
+       .it file      : input ini template file
+
+       version       : version to be shown in setup.  Typically the same version
+                       as show in mozilla.exe.
+
+       UserAgent     : user agent to use in the windows registry.  should be the same as the one
+                       built into the browser (ie \"6.0b2 (en)\")
+
+       staging path  : path to where the components are staged at
+
+       .xpi path     : path to where the .xpi files have been built to
+                       ie: d:\\builds\\mozilla\\dist\\win32_o.obj\\install\\xpi
+
+       redirect file : url to where the redirect.ini file will be staged at.
+       url             Either ftp:// or http:// can be used
+                       ie: ftp://ftp.netscape.com/pub/seamonkey
+       xpi url       : url to where the .xpi files will be staged at.
+                       Either ftp:// or http:// can be used
+                       ie: ftp://ftp.netscape.com/pub/seamonkey/xpi
+       \n";
+}
+
+$inItFile         = $ARGV[0];
+$inVersion        = $ARGV[1];
+$inUserAgent      = $ARGV[2];
+$inStagePath      = $ARGV[3];
+$inXpiPath        = $ARGV[4];
+$inRedirIniUrl    = $ARGV[5];
+$inUrl            = $ARGV[6];
+
+$inDomain;
+$inServerPath;
+
+($inDomain, $inServerPath) = ParseDomainAndPath($inUrl);
+
+# Get the name of the file replacing the .it extension with a .ini extension
+@inItFileSplit    = split(/\./,$inItFile);
+$outIniFile       = $inItFileSplit[0];
+$outIniFile      .= ".ini";
+
+# Open the input file
+open(fpInIt, $inItFile) || die "\ncould not open $ARGV[0]: $!\n";
+
+# Open the output file
+open(fpOutIni, ">$outIniFile") || die "\nCould not open $outIniFile: $!\n";
+
+print "\n Making $outIniFile...\n";
+
+# While loop to read each line from input file
+while($line = <fpInIt>)
+{
+  # For each line read, search and replace $InstallSize$ with the calculated size
+  if($line =~ /\$InstallSize\$/i)
+  {
+    $installSize          = 0;
+    $installSizeSystem    = 0;
+
+    # split read line by ":" deliminator
+    @colonSplit = split(/:/, $line);
+    if($#colonSplit >= 0)
+    {
+      $componentName    = $colonSplit[1];
+      chop($componentName);
+
+      $installSize      = OutputInstallSize("$inStagePath\\$componentName");
+
+      # special oji consideration here.  Since it's an installer that 
+      # seamonkey installer will be calling, the disk space allocation
+      # needs to be adjusted by an expansion factor of 3.62.
+      if($componentName =~ /oji/i)
+      {
+        $installSize = int($installSize * 3.62);
+      }
+    }
+
+    # Read the next line to calculate for the "Install Size System="
+    if($line = <fpInIt>)
+    {
+      if($line =~ /\$InstallSizeSystem\$/i)
+      {
+        $installSizeSystem = OutputInstallSizeSystem($line, "$inStagePath\\$componentName");
+      }
+    }
+
+    $installSize -= $installSizeSystem;
+    print fpOutIni "Install Size=$installSize\n";
+    print fpOutIni "Install Size System=$installSizeSystem\n";
+  }
+  elsif($line =~ /\$InstallSizeArchive\$/i)
+  {
+    $installSizeArchive = 0;
+
+    # split read line by ":" deliminator
+    @colonSplit = split(/:/, $line);
+    if($#colonSplit >= 0)
+    {
+      $componentName = $colonSplit[1];
+      chop($componentName);
+
+      $installSizeArchive = OutputInstallSizeArchive("$inXpiPath\\$componentName");
+    }
+
+    print fpOutIni "Install Size Archive=$installSizeArchive\n";
+  }
+  else
+  {
+    # For each line read, search and replace $Version$ with the version passed in
+    $line =~ s/\$Version\$/$inVersion/i;
+    $line =~ s/\$Domain\$/$inDomain/i;
+    $line =~ s/\$ServerPath\$/$inServerPath/i;
+    $line =~ s/\$RedirIniUrl\$/$inRedirIniUrl/i;
+    $line =~ s/\$UserAgent\$/$inUserAgent/i;
+    print fpOutIni $line;
+  }
+}
+
+print " done!\n";
+
+# end of script
+exit(0);
+
+sub ParseDomainAndPath()
+{
+  my($aUrl) = @_;
+  my($aDomain, $aServerPath);
+
+  @slashSplit = split(/\//, $aUrl);
+  if($#slashSplit >= 0)
+  {
+    for($i = 0; $i <= $#slashSplit; $i++)
+    {
+      if($i <= 2)
+      {
+        if($aDomain eq "")
+        {
+          $aDomain = "$slashSplit[$i]";
+        }
+        else
+        {
+          $aDomain = "$aDomain/$slashSplit[$i]";
+        }
+      }
+      else
+      {
+        if($aServerPath eq "")
+        {
+          $aServerPath = "/$slashSplit[$i]";
+        }
+        else
+        {
+          $aServerPath = "$aServerPath/$slashSplit[$i]";
+        }
+      }
+    }
+  }
+
+  return($aDomain, $aServerPath);
+}
+
+sub OutputInstallSize()
+{
+  my($inPath) = @_;
+  my($installSize);
+
+  print "   calculating size for $inPath\n";
+  $installSize    = `ds32.exe /D /L0 /A /S /C 32768 $inPath`;
+  $installSize   += 32768; # take into account install.js
+  $installSize    = int($installSize / 1024);
+  $installSize   += 1;
+  return($installSize);
+}
+
+sub OutputInstallSizeArchive()
+{
+  my($inPath) = @_;
+  my($installSizeArchive);
+  my($dev, $ino, $mode, $nlink, $uid, $gui, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks);
+
+  print "   calculating size for $inPath\n";
+  ($dev, $ino, $mode, $nlink, $uid, $gui, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat $inPath;
+  $installSizeArchive   += 32768; # take into account install.js
+  $installSizeArchive    = int($size / 1024);
+  $installSizeArchive   += 1;
+  return($installSizeArchive);
+}
+
+sub OutputInstallSizeSystem()
+{
+  my($inLine, $inPath) = @_;
+  my($installSizeSystem) = 0;
+
+  # split read line by ":" deliminator
+  @colonSplit = split(/:/, $inLine);
+  if($#colonSplit >= 0)
+  {
+    # split line by "," deliminator
+    @commaSplit = split(/\,/, $colonSplit[1]);
+    if($#commaSplit >= 0)
+    {
+      foreach(@commaSplit)
+      {
+        # calculate the size of component installed using ds32.exe in Kbytes
+        print "   calculating size for $inPath\\$_";
+        $installSizeSystem += `ds32.exe /D /L0 /A /S /C 32768 $inPath\\$_`;
+      }
+    }
+  }
+
+  $installSizeSystem  = int($installSizeSystem / 1024);
+  $installSizeSystem += 1;
+  return($installSizeSystem);
+}
+

mozilla/xpinstall/packager/windows/makejs.pl

@@ -0,0 +1,122 @@
+#!c:\perl\bin\perl
+# 
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Sean Su <ssu@netscape.com>
+# 
+
+#
+# This perl script parses the input file for special variables
+# in the format of $Variable$ and replace it with the appropriate
+# value(s).
+#
+# Input: .jst file              - which is a .js template
+#        default version        - a julian date in the form of:
+#                                 major.minor.release.yydoy
+#                                 ie: 5.0.0.99256
+#        user agent             - user agent of product
+#        component staging path - path to where the components are staged at
+#
+#        ie: perl makejs.pl core.jst 5.0.0.99256
+#
+
+# Make sure there are at least two arguments
+if($#ARGV < 3)
+{
+  die "usage: $0 <.jst file> <default version> <UserAgent> <staging path>
+
+       .jst file              : .js template input file
+       default version        : default julian base version number to use in the
+                                form of: major.minor.release.yydoy
+                                ie: 5.0.0.99256
+       user agent             : user agent of product (5.0b1 [en])
+       component staging path : path to where this component is staged at
+                                ie: z:\\stage\\windows\\32bit\\en\\5.0\\core
+       \n";
+}
+
+$inJstFile        = $ARGV[0];
+$inVersion        = $ARGV[1];
+$inUserAgent      = $ARGV[2];
+$inStagePath      = $ARGV[3];
+
+# Get the name of the file replacing the .jst extension with a .js extension
+@inJstFileSplit   = split(/\./,$inJstFile);
+$outJsFile        = $inJstFileSplit[0];
+$outJsFile       .= ".js";
+$outTempFile      = $inJstFileSplit[0];
+$outTempFile     .= ".template";
+
+system("copy ..\\common\\share.t $outTempFile");
+system("cat $inJstFile >> $outTempFile");
+
+# Open the input .template file
+open(fpInTemplate, $outTempFile) || die "\ncould not open $outTempFile: $!\n";
+
+# Open the output .js file
+open(fpOutJs, ">$outJsFile") || die "\nCould not open $outJsFile: $!\n";
+
+# While loop to read each line from input file
+while($line = <fpInTemplate>)
+{
+  # For each line read, search and replace $Version$ with the version passed in
+  if($line =~ /\$Version\$/i)
+  {
+    $line =~ s/\$Version\$/$inVersion/i;
+  }
+  elsif($line =~ /\$UserAgent\$/i)
+  {
+    $line =~ s/\$UserAgent\$/$inUserAgent/i;
+  }
+  elsif($line =~ /\$SpaceRequired\$/i) # For each line read, search and replace $InstallSize$ with the calculated size
+  {
+    $spaceRequired = 0;
+
+    # split read line by ":" deliminator
+    @colonSplit = split(/:/, $line);
+    if($#colonSplit > 0)
+    {
+      @semiColonSplit = split(/;/, $colonSplit[1]);
+      $subDir         = $semiColonSplit[0];
+      $spaceRequired  = GetSpaceRequired("$inStagePath\\$subDir");
+      $line =~ s/\$SpaceRequired\$:$subDir/$spaceRequired/i;
+    }
+    else
+    {
+      $spaceRequired = GetSpaceRequired("$inStagePath");
+      $line =~ s/\$SpaceRequired\$/$spaceRequired/i;
+    }
+  }
+
+  print fpOutJs $line;
+}
+
+sub GetSpaceRequired()
+{
+  my($inPath) = @_;
+  my($spaceRequired);
+
+  print "   calulating size for $inPath\n";
+  $spaceRequired    = `ds32.exe /D /L0 /A /S /C 32768 $inPath`;
+  $spaceRequired    = int($spaceRequired / 1024);
+  $spaceRequired   += 1;
+  return($spaceRequired);
+}
+

mozilla/xpinstall/packager/windows/makexpi.pl

@@ -0,0 +1,114 @@
+#!c:\perl\bin\perl
+# 
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Sean Su <ssu@netscape.com>
+# 
+
+#
+# This perl script creates .xpi files given component input name
+#
+# Input: component name
+#             - name of the component directory located in the staging path
+#        staging path
+#             - path to where the built files are staged at
+#        dest path
+#             - path to where the .xpi files are are to be created at.
+#               ** MUST BE AN ABSOLUTE PATH, NOT A RELATIVE PATH **
+#
+#   ie: perl makexpi.pl core z:\exposed\windows\32bit\en\5.0 d:\build\mozilla\dist\win32_o.obj\install\working
+#
+
+use File::Copy;
+use Cwd;
+
+# Make sure there are at least three arguments
+if($#ARGV < 2)
+{
+  die "usage: $0 <component name> <staging path> <dest path>
+
+       component name : name of component directory within staging path
+       staging path   : path to where the components are staged at
+       dest path      : path to where the .xpi files are to be created at
+       \n";
+}
+
+$inComponentName  = $ARGV[0];
+$inStagePath      = $ARGV[1];
+$inDestPath       = $ARGV[2];
+
+# check for existance of staging component path
+if(!(-e "$inStagePath\\$inComponentName"))
+{
+  die "invalid path: $inStagePath\\$inComponentName\n";
+}
+
+# check for existance of .js script
+if(!(-e "$inComponentName.js"))
+{
+  die "missing .js script: $inComponentName.js\n";
+}
+
+# delete component .xpi file
+if(-e "$inDestPath\\$inComponentName.xpi")
+{
+  unlink("$inDestPath\\$inComponentName.xpi");
+}
+if(-e "$inStagePath\\$incomponentName\\$inComponentName.xpi")
+{
+  unlink("$inDestPath\\$inComponentName.xpi");
+}
+
+# delete install.js
+if(-e "install.js")
+{
+  unlink("install.js");
+}
+
+# make sure inDestPath exists
+if(!(-e "$inDestPath"))
+{
+  system("mkdir $inDestPath");
+}
+
+print "\n Making $inComponentName.xpi...\n";
+
+$saveCwdir = cwd();
+
+# change directory to where the files are, else zip will store
+# unwanted path information.
+chdir("$inStagePath\\$inComponentName");
+system("zip -r $inDestPath\\$inComponentName.xpi *");
+chdir("$saveCwdir");
+
+copy("$inComponentName.js", "install.js");
+system("zip -g $inDestPath\\$inComponentName.xpi install.js");
+
+# delete install.js
+if(-e "install.js")
+{
+  unlink("install.js");
+}
+
+print " done!\n";
+
+# end of script
+exit(0);
+

mozilla/xpinstall/packager/windows/rdir.pl

@@ -0,0 +1,111 @@
+#!c:\perl\bin\perl
+# 
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Sean Su <ssu@netscape.com>
+# 
+
+use Cwd;
+
+if($#ARGV < 0)
+{
+    print_usage();
+    exit(1);
+}
+
+print "removing directory:\n";
+for($i = 0; $i <= $#ARGV; $i++)
+{
+    print "  $ARGV[$i]";
+    remove_dir_structure($ARGV[$i]);
+    print "\n";
+}
+
+exit(0);
+# end
+
+sub remove_dir_structure
+{
+    my($curr_dir) = @_;
+    $save_cwd     = cwd();
+    $save_cwd     =~ s/\//\\/g;
+    if((-e "$curr_dir") && (-d "$curr_dir"))
+    {
+        remove_all_dir($curr_dir);
+        chdir($save_cwd);
+        remove_directory($curr_dir);
+        print " done!";
+    }
+    else
+    {
+        if(!(-e "$curr_dir"))
+        {
+            print "\n";
+            print "$curr_dir does not exist!";
+        }
+        elsif(!(-d "$curr_dir"))
+        {
+            print "\n";
+            print "$curr_dir is not a valid directory!";
+        }
+    }
+}
+
+sub remove_all_dir
+{
+    my($curr_dir) = @_;
+    my(@dirlist);
+    my($dir);
+
+    chdir("$curr_dir");
+    @dirlist = <*>;
+    foreach $dir (@dirlist)
+    {
+        if(-d "$dir")
+        {
+            print ".";
+            remove_all_dir($dir);
+        }
+    }
+    chdir("..");
+    remove_directory($curr_dir);
+}
+
+sub remove_directory
+{
+    my($directory) = @_;
+    my($save_cwd);
+
+    $save_cwd = cwd();
+    $save_cwd =~ s/\//\\/g;
+
+    if(-e "$directory")
+    {
+        chdir($directory);
+        unlink <*>; # remove files
+        chdir($save_cwd);
+        rmdir $directory;         # remove directory
+    }
+}
+
+sub print_usage
+{
+    print "usage: $0 <dir1> [dir2 dir3...]\n";
+}

mozilla/xpinstall/src/Makefile.in

@@ -0,0 +1,83 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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.
+#
+# Contributor(s): 
+#     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
+LIBRARY_NAME	= xpinstall
+SHORT_LIBNAME	= xpinstal
+IS_COMPONENT	= 1
+
+EXTRA_DSO_LIBS	= jsdom
+
+REQUIRES	= dom js netlib raptor xpcom
+
+# XXX shouldn't need to export this
+EXPORTS		= nsXPITriggerInfo.h
+
+CPPSRCS		= \
+		nsInstall.cpp \
+		nsInstallTrigger.cpp \
+		nsInstallVersion.cpp \
+		nsInstallFolder.cpp \
+		nsJSInstall.cpp \
+		nsJSFile.cpp \
+		nsJSInstallTriggerGlobal.cpp \
+		nsJSInstallVersion.cpp \
+		nsSoftwareUpdate.cpp \
+		nsSoftwareUpdateRun.cpp \
+		nsInstallFile.cpp \
+		nsInstallDelete.cpp \
+		nsInstallExecute.cpp \
+		nsInstallPatch.cpp \
+		nsInstallUninstall.cpp \
+		nsInstallResources.cpp \
+		nsTopProgressNotifier.cpp \
+		nsLoggingProgressNotifier.cpp \
+		ScheduledTasks.cpp \
+		nsInstallProgressDialog.cpp \
+		nsXPITriggerInfo.cpp \
+		nsXPInstallManager.cpp \
+		nsInstallFileOpItem.cpp \
+		nsJSFileSpecObj.cpp \
+		$(NULL)
+
+LOCAL_INCLUDES	= -I$(srcdir)/../public
+
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_REGISTRY_LIBS) \
+		-L$(DIST)/bin \
+		$(EXTRA_DSO_LIBS) \
+		$(MOZ_JS_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpinstall/src/PatchableAppleSingle.cpp

@@ -0,0 +1,924 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     Douglas Turner <dougt@netscape.com>
+ */
+#include "PatchableAppleSingle.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec);
+OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec);
+
+OSErr PAS_encodeResource(FSSpec *inFile, short outRefNum);
+OSErr PAS_decodeResource(PASEntry *entry, FSSpec *outFile, short inRefNum);
+
+OSErr PAS_encodeMisc(FSSpec *inFile, short outRefNum);
+OSErr PAS_decodeMisc(PASEntry *entry, FSSpec *outFile, short inRefNum);
+
+OSErr PAS_encodeData(FSSpec *inFile, short outRefNum);
+OSErr PAS_decodeData(PASEntry *entry, FSSpec *outFile, short inRefNum);
+
+OSErr PAS_encodeHeader(short refnum);
+OSErr PAS_decodeHeader(short refNum, PASHeader *header);
+
+
+unsigned long PAS_getDataSize(FSSpec *spec);
+short PAS_getResourceID(Handle resource);
+
+OSErr PAS_flattenResource(ResType type, short *ids, long count, short source, short dest);
+OSErr PAS_unflattenResource(PASResource *pasRes, Ptr buffer);
+
+void PAS_sortTypes(short sourceRefNum, ResType **resTypePtr, long *count);
+void PAS_sortIDs(short sourceRefNum, OSType theType, short **IdPtr, long *count);
+void PAS_bubbleSortResType(ResType *types, long count);
+void PAS_bubbleSortIDS(short *ids, long count);
+
+OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec)
+{
+	OSErr		err;
+	short		outRefNum;
+	
+	PASEntry 	dataEntry, miscEntry, resourceEntry;
+	long		sizeOfEntry;
+
+
+	if (inSpec == NULL || outSpec == NULL)
+		return paramErr;
+		
+
+	memset(&dataEntry, 0, sizeof(PASEntry));
+	memset(&miscEntry, 0, sizeof(PASEntry));
+	memset(&resourceEntry, 0, sizeof(PASEntry));
+	
+	FSpDelete( outSpec ) ;
+	
+	err = FSpCreate( outSpec, kCreator, kType ,smSystemScript );
+	
+	if (err != noErr) 	return err;
+	
+	
+	err = FSpOpenDF(outSpec, fsRdWrPerm, &outRefNum);
+	
+	if (err != noErr)  goto error;
+	
+
+	// Write Out Header
+		
+	err = PAS_encodeHeader(outRefNum);
+	if (err != noErr)  goto error;
+	
+	/* Why am I using three (3)?
+		
+		E stand for entry.
+		
+	   The data for the entry is after the THREE headers 
+	
+		|---------|----|----|----|---------------------->
+		   header    E    E    E
+	
+	*/
+	
+	
+	// Write Out Data Entry 
+	dataEntry.entryID		=	ePas_Data;
+	dataEntry.entryLength	=	PAS_getDataSize(inSpec);
+	dataEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry));
+	
+	sizeOfEntry			=	sizeof(PASEntry);
+	if(dataEntry.entryLength < 0)
+	{
+		err	= dataEntry.entryLength;
+		goto error;
+	}
+	
+	err = FSWrite(outRefNum, &sizeOfEntry, &dataEntry);
+	if (err != noErr) 	goto error;
+	
+	
+	
+	// Write Out Misc Entry 
+	miscEntry.entryID		=	ePas_Misc;
+	miscEntry.entryLength	=	sizeof(PASMiscInfo);
+	miscEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry)) + dataEntry.entryLength;
+
+	sizeOfEntry			=	sizeof(PASEntry);
+	err = FSWrite(outRefNum, &sizeOfEntry, &miscEntry);
+	if (err != noErr) 	goto error;
+	
+	
+	// Write Out Resource Entry 
+	resourceEntry.entryID		=	ePas_Resource;
+	resourceEntry.entryLength	=	-1;
+	resourceEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry)) + dataEntry.entryLength + miscEntry.entryLength;
+
+
+	sizeOfEntry			=	sizeof(PASEntry);
+	err = FSWrite(outRefNum, &sizeOfEntry, &resourceEntry);
+	if (err != noErr) 	goto error;
+	
+	err =  PAS_encodeData(inSpec, outRefNum);	
+	if (err != noErr) 	goto error;
+	
+	
+	err =  PAS_encodeMisc(inSpec, outRefNum);	
+	if (err != noErr) 	goto error;
+	
+	err =  PAS_encodeResource(inSpec, outRefNum);	
+	
+	if (err == kResFileNotOpened)
+	{
+		// there was no resource fork
+		err = noErr;
+	}
+	else if (err != noErr)
+	{
+		goto error;
+	}
+		
+	FSClose(outRefNum);
+	
+	return noErr;
+	
+	
+	
+error:
+		
+		
+	if (outRefNum != kResFileNotOpened)
+	{
+		FSClose(outRefNum);
+	}
+		
+	FSpDelete( outSpec ) ;
+	 
+	return err;
+
+}
+
+
+
+OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec)
+{
+	OSErr		err;
+	short		inRefNum;
+	
+	PASHeader	header;
+	
+	PASEntry 	dataEntry, miscEntry, resourceEntry;
+	long		sizeOfEntry;
+
+	if (inSpec == NULL || outSpec == NULL)
+		return paramErr;
+		
+		
+	FSpDelete( outSpec ) ;
+	
+	err = FSpCreate( outSpec, kCreator, kType ,smSystemScript );
+	
+	if (err != noErr) 	return err;
+	
+	
+	
+	err = FSpOpenDF(inSpec, fsRdPerm, &inRefNum);
+	
+	if (err != noErr)  goto error;
+
+	
+	// Read Header 
+		
+	err	= PAS_decodeHeader(inRefNum, &header);
+	if (err != noErr)  goto error;
+	
+	if(	header.magicNum != PAS_MAGIC_NUM ||
+		header.versionNum != PAS_VERSION)
+	{
+		err = -1;
+		goto error;
+	}
+	
+	
+	
+	// Read Data Entry 
+	
+	
+	err = SetFPos(inRefNum, fsFromStart, sizeof(PASHeader));
+	if (err != noErr) 	goto error;
+	
+	sizeOfEntry			=	sizeof(PASEntry);
+
+	err = FSRead(inRefNum, &sizeOfEntry, &dataEntry);
+	if (err != noErr) 	goto error;
+	
+	
+	
+	
+	// Read Misc Entry 
+	
+	
+	err = SetFPos(inRefNum, fsFromStart, (sizeof(PASHeader) + sizeof(PASEntry)));
+	if (err != noErr) 	goto error;
+	
+	sizeOfEntry			=	sizeof(PASEntry);
+
+	err = FSRead(inRefNum, &sizeOfEntry, &miscEntry);
+	if (err != noErr) 	goto error;
+	
+
+	// Read Resource Entry 
+	
+	
+	err = SetFPos(inRefNum, fsFromStart, (sizeof(PASHeader) + (2 * sizeof(PASEntry)))) ;
+	if (err != noErr) 	goto error;
+	
+	sizeOfEntry			=	sizeof(PASEntry);
+
+	err = FSRead(inRefNum, &sizeOfEntry, &resourceEntry);
+	if (err != noErr) 	goto error;
+
+
+
+
+
+	err =  PAS_decodeData(&dataEntry, outSpec, inRefNum);	
+	if (err != noErr) 	goto error;
+
+	err =  PAS_decodeMisc(&miscEntry, outSpec, inRefNum);
+	if (err != noErr) 	goto error;
+
+	err =  PAS_decodeResource(&resourceEntry, outSpec, inRefNum);	
+	if (err == kResFileNotOpened)
+	{
+		// there was no resource fork
+		err = noErr;
+	}
+	else if (err != noErr)
+	{
+		goto error;
+	}
+
+	
+	FSClose(inRefNum);
+	
+	return noErr;
+	
+	
+	
+error:
+
+	if (inRefNum != kResFileNotOpened)
+	{
+		FSClose(inRefNum);
+	}
+		
+	FSpDelete( outSpec ) ;
+	
+	return err;
+	
+}
+
+
+
+
+#pragma mark -
+
+
+OSErr PAS_encodeResource(FSSpec *inFile, short outRefNum)
+{
+	OSErr 			err;	
+	short			inRefNum;
+	PASResFork		resInfo;
+	SInt32			currentWrite;
+	
+	ResType 		*resTypes;
+	long			typeCount;
+	
+	short			*ids;
+	long			idCount;
+	
+	short			oldResFile;
+	
+	oldResFile=CurResFile();
+	inRefNum = FSpOpenResFile(inFile, fsRdPerm);
+	if (inRefNum < noErr)	return inRefNum;
+
+	UseResFile(inRefNum);
+		
+	memset(&resInfo, 0, sizeof(PASResFork));   
+	
+	PAS_sortTypes(inRefNum, &resTypes, &typeCount);
+
+	resInfo.NumberOfTypes	=	typeCount;
+	
+	currentWrite	= sizeof(PASResFork);
+	
+	err = FSWrite(outRefNum, &currentWrite, &resInfo);
+	if (err != noErr)	return err;
+	
+	for (typeCount = 0; ((typeCount < resInfo.NumberOfTypes) && (err == noErr)); typeCount++)
+	{
+		PAS_sortIDs(inRefNum, resTypes[typeCount], &ids, &idCount);
+		err = PAS_flattenResource(resTypes[typeCount], ids, idCount, inRefNum, outRefNum);
+		DisposePtr((Ptr)ids);
+	}
+	
+	DisposePtr((Ptr)resTypes);
+	
+	
+	UseResFile(oldResFile);		
+	CloseResFile(inRefNum);
+	
+	return err;
+}
+
+OSErr PAS_decodeResource(PASEntry *entry, FSSpec *outFile, short inRefNum)
+{
+	OSErr 			err = noErr;	
+	short			outRefNum;
+	PASResFork		info;
+	SInt32			infoSize;
+	short			oldResFile;
+	
+	PASResource		pasRes;
+	SInt32			pasResSize;
+	
+	long			bufSize;
+	Handle			buffer;
+	long			counter=0;
+	
+	infoSize	=	sizeof(PASResFork);
+	
+	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
+	if (err != noErr)	return err;
+
+	err	= FSRead( inRefNum, &infoSize, &info);
+	if (err != noErr)	return err;
+
+	if(infoSize != sizeof(PASResFork))
+	{
+		err = -1;
+		goto error;
+	}
+	
+	oldResFile=CurResFile();
+	
+	outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);
+	if (outRefNum < noErr)	return outRefNum;
+				
+	UseResFile(outRefNum);
+	
+	
+	while (1)
+	{
+		pasResSize	=	sizeof(PASResource);
+		err	= FSRead( inRefNum, &pasResSize, &pasRes);
+		
+		if (err != noErr)
+		{
+			if(err == eofErr)
+				err = noErr;
+				
+			break;
+		}
+		
+		bufSize	=	pasRes.length;
+		buffer	=	NewHandle(bufSize);
+		HLock(buffer);
+		
+		if(buffer == NULL)
+		{
+			//  if we did not get our memory, try updateresfile 
+		
+			HUnlock(buffer);
+
+
+			UpdateResFile(outRefNum);
+			counter=0;
+			
+			buffer	=	NewHandle(bufSize);
+			HLock(buffer);
+			
+			if(buffer == NULL)
+			{
+				err = memFullErr;
+				break;
+			}
+		}
+		
+		err	= FSRead( inRefNum, &bufSize, &(**buffer));
+		if (err != noErr && err != eofErr)	break;
+		
+		AddResource(buffer, pasRes.attrType, pasRes.attrID, pasRes.attrName);
+		WriteResource(buffer);
+		
+		SetResAttrs(buffer, pasRes.attr);
+		ChangedResource(buffer);	
+		WriteResource(buffer);
+		
+		ReleaseResource(buffer);	
+		
+		if (counter++ > 100)
+		{
+			UpdateResFile(outRefNum);
+			counter=0;
+		}
+	
+	}
+
+error:
+		
+	UseResFile(oldResFile);	
+	CloseResFile(outRefNum);
+		
+	return err;
+}
+
+#pragma mark -
+
+OSErr PAS_encodeMisc(FSSpec *inFile, short outRefNum)
+{
+	OSErr 		err;	
+	short		inRefNum;
+	PASMiscInfo	infoBlock;
+	FInfo		fInfo;
+	SInt32		currentRead;
+	
+	err = FSpOpenDF(inFile, fsRdPerm, &inRefNum);
+	if (err != noErr)	return err;
+	
+	memset(&infoBlock, 0, sizeof(PASMiscInfo));   
+	
+	err = FSpGetFInfo(inFile, &fInfo);
+	if (err != noErr)	return err;
+	
+	infoBlock.fileType		=	fInfo.fdType;
+	infoBlock.fileCreator	=	fInfo.fdCreator;
+	infoBlock.fileFlags		=	fInfo.fdFlags;
+	
+		
+	FSClose(inRefNum);
+	
+	
+	inRefNum = FSpOpenResFile(inFile, fsRdPerm);
+	if (inRefNum > noErr)
+	{
+		infoBlock.fileHasResFork	= 1;
+		infoBlock.fileResAttrs 		= GetResFileAttrs(inRefNum);
+		FSClose(inRefNum);
+	}
+	else
+	{
+		infoBlock.fileHasResFork	= 0;
+		infoBlock.fileResAttrs 		= 0;
+	}
+	currentRead	= sizeof(PASMiscInfo);
+	
+	err = FSWrite(outRefNum, &currentRead, &infoBlock);
+	if (err != noErr)	return err;
+		
+	CloseResFile(inRefNum);
+	
+	return noErr;
+}
+
+
+OSErr PAS_decodeMisc(PASEntry *entry, FSSpec *outFile, short inRefNum)
+{
+	OSErr 		err = noErr;	
+	short		outRefNum;
+	PASMiscInfo	info;
+	SInt32		infoSize;
+	FInfo		theFInfo;
+		
+	
+	infoSize	=	sizeof(PASMiscInfo);
+	
+	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
+	if (err != noErr)	return err;
+
+	err	= FSRead( inRefNum, &infoSize, &info);
+	if (err != noErr)	return err;
+
+	if(infoSize != sizeof(PASMiscInfo))
+	{
+		return -1;
+	}
+
+	err = FSpOpenDF(outFile, fsRdWrPerm, &outRefNum);
+	if (err != noErr)	return err;
+	
+	memset(&theFInfo, 0, sizeof(FInfo));   
+		
+	theFInfo.fdType		=	info.fileType;
+	theFInfo.fdCreator	=	info.fileCreator;	
+	theFInfo.fdFlags	=	info.fileFlags;
+	
+	err = FSpSetFInfo(outFile, &theFInfo);
+	if (err != noErr)	return err;
+		
+	FSClose(outRefNum);
+	
+	if (info.fileHasResFork)
+	{
+		outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);
+		if (outRefNum < noErr)
+		{
+			// maybe it does not have one!
+			
+			FSpCreateResFile(outFile, info.fileCreator, info.fileType, smSystemScript);
+			
+			outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);	
+			if (outRefNum < noErr) 
+			{
+				return outRefNum;
+			}
+		}
+		
+		SetResFileAttrs(outRefNum, info.fileResAttrs);
+		
+		
+		CloseResFile(outRefNum);
+	}	
+	
+	
+	if(info.fileType == 'APPL')
+	{
+		// we need to add applications to the desktop database.
+		
+/*	FIX :: need to find DTSetAPPL() function	
+		err = DTSetAPPL( NULL,
+                    	 outFile->vRefNum,
+			             info.fileCreator,
+			             outFile->parID,
+                         outFile->name);
+*/	}
+	
+	
+	return err;
+	
+	
+
+}
+
+#pragma mark -
+
+OSErr PAS_encodeData(FSSpec *inFile, short outRefNum)
+{
+	OSErr 		err;	
+	short		inRefNum;
+	Ptr 		buffer;
+	SInt32 		currentRead = 	PAS_BUFFER_SIZE;
+		
+	buffer	=	NewPtr(currentRead);
+
+	err = FSpOpenDF(inFile, fsRdPerm, &inRefNum);
+	if (err != noErr)	return err;
+	
+	while ( currentRead > 0 )
+    {
+		err	= FSRead( inRefNum, &currentRead, buffer);
+		if (err != noErr && err != eofErr)	return err;
+		
+		err = FSWrite(outRefNum, &currentRead, buffer);
+		if (err != noErr)	return err;
+	}
+	
+	FSClose(inRefNum);
+	
+	DisposePtr(buffer);
+	
+	return noErr;
+}
+
+OSErr PAS_decodeData(PASEntry *entry, FSSpec *outFile, short inRefNum)
+{
+	OSErr 		err;	
+	short		outRefNum;
+	Ptr 		buffer;
+	SInt32 		currentWrite = 	PAS_BUFFER_SIZE;
+	SInt32		totalSize;
+	
+	
+	buffer = NewPtr(currentWrite);
+	
+	
+	err = FSpOpenDF(outFile, fsRdWrPerm, &outRefNum);
+	if (err != noErr)	return err;
+	
+	
+	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
+	if (err != noErr)	return err;
+	
+	err = SetFPos(outRefNum, fsFromStart, 0 );
+	if (err != noErr)	return err;
+	
+	totalSize = (*entry).entryLength;
+	
+	while(totalSize > 0)
+	{	
+		currentWrite = PAS_BUFFER_SIZE;
+
+		if (totalSize < currentWrite)
+		{
+			currentWrite = totalSize;
+		}
+
+		err	= FSRead( inRefNum, &currentWrite, buffer);
+		if (err != noErr && err != eofErr)	return err;
+	
+		err = FSWrite(outRefNum, &currentWrite, buffer);
+		if (err != noErr)	return err;
+		
+		totalSize = totalSize - currentWrite;
+
+	}
+	
+	FSClose(outRefNum);
+	
+	DisposePtr(buffer);
+	
+	return noErr;
+
+}
+
+#pragma mark -
+
+OSErr PAS_encodeHeader(short refnum)
+{
+	PASHeader 	header;
+	long		sizeOfHeader;
+	OSErr		err;
+	
+	
+	sizeOfHeader = sizeof(PASHeader);
+		
+	memset(&header, 0, sizeOfHeader);   
+	
+	header.magicNum 	= PAS_MAGIC_NUM;
+	header.versionNum 	= PAS_VERSION;
+	header.numEntries 	= 3;
+	
+	// Write Out Header 
+	err = FSWrite(refnum, &sizeOfHeader, &header);
+	
+	return err;
+
+}
+
+OSErr PAS_decodeHeader(short refNum, PASHeader *header)
+{
+	OSErr 	err;
+	long 	sizeOfHeader = sizeof(PASHeader);
+	
+	memset(header, 0, sizeOfHeader);   
+	
+	err = FSRead(refNum, &sizeOfHeader, header);
+	
+	return err;
+}
+
+#pragma mark -
+
+
+unsigned long PAS_getDataSize(FSSpec *spec)
+{
+	short		refNum;
+	OSErr		err;
+	Str255 		temp;	
+	CInfoPBRec 	cbrec;
+	err = FSpOpenDF(spec, fsRdPerm, &refNum);
+
+	memcpy( temp, spec->name, spec->name[0] + 1);
+
+	cbrec.hFileInfo.ioNamePtr 		= temp;
+	cbrec.hFileInfo.ioDirID 		= spec->parID;
+	cbrec.hFileInfo.ioVRefNum 		= spec->vRefNum;
+	cbrec.hFileInfo.ioFDirIndex     = 0;
+
+	err = PBGetCatInfoSync(&cbrec);
+	FSClose(refNum);
+	
+	if(err != noErr)
+	{
+		cbrec.hFileInfo.ioFlLgLen = err;
+	}
+
+	return (cbrec.hFileInfo.ioFlLgLen);
+}
+
+short PAS_getResourceID(Handle resource)
+{
+	ResType			theType;
+	Str255			name;
+	short			theID;
+	
+	memset(&name, 0, sizeof(Str255));  
+			
+	GetResInfo(resource, &theID, &theType, name);
+	
+	return theID;
+}
+
+
+#pragma mark -
+OSErr PAS_flattenResource(ResType type, short *ids, long count, short source, short dest)
+{
+	long 			idIndex;
+	
+	
+	Handle			resToCopy;
+	long			handleLength;
+	
+	PASResource		pasResource;
+	long			pasResLen;
+	
+	OSErr			err;
+	
+	for (idIndex=0; idIndex < count; idIndex++)
+	{
+		if( (type == 'SIZE') && ( ids[idIndex] == 1 || ids[idIndex] == 0  ) )
+		{
+			/* 	
+				We do not want to encode/flatten SIZE 0 or 1 because this
+				is the resource that the user can modify.  Most applications
+				will not be affected if we remove these resources
+			*/
+		}
+		else
+		{	
+			resToCopy=Get1Resource(type,ids[idIndex]);
+					
+			if(!resToCopy)	
+			{
+				return resNotFound;
+			}	
+				
+			memset(&pasResource, 0, sizeof(PASResource));	
+				
+			GetResInfo(	resToCopy, 	
+						&pasResource.attrID, 
+						&pasResource.attrType, 
+						pasResource.attrName);	
+			
+			pasResource.attr = GetResAttrs(resToCopy);
+			
+			DetachResource(resToCopy);	
+			HLock(resToCopy);
+			
+			pasResource.length 	= GetHandleSize(resToCopy);
+			handleLength 		= pasResource.length;
+			
+			pasResLen			=	sizeof(PASResource);
+			
+			err = FSWrite(dest, &pasResLen, &pasResource);
+			
+			if(err != noErr) 
+			{
+				return err;
+			}
+			
+			err = FSWrite(dest, &handleLength, &(**resToCopy));
+
+			if(err != noErr) 
+			{
+				return err;
+			}
+			
+			HUnlock(resToCopy);
+			DisposeHandle(resToCopy);		
+		}
+	}
+	
+	
+	return noErr;
+}
+
+
+#pragma mark -
+
+void PAS_sortTypes(short sourceRefNum, ResType **resTypePtr, long *count)
+{
+	short				oldRef;
+	short				typeIndex;
+	short				numberOfTypes;
+		
+	*count	=	-1;
+	
+	oldRef = CurResFile();
+		
+	UseResFile(sourceRefNum);
+
+	numberOfTypes = Count1Types();
+	
+	*resTypePtr	=	(ResType*) NewPtrClear( numberOfTypes * sizeof(OSType) );
+	
+	for (typeIndex=1; typeIndex <= numberOfTypes; typeIndex++)
+	{
+		Get1IndType(&(*resTypePtr)[typeIndex-1], typeIndex);
+	}
+	
+	UseResFile(oldRef);
+	
+	PAS_bubbleSortResType(*resTypePtr, numberOfTypes);
+	
+	*count = numberOfTypes;
+}	
+
+
+void PAS_sortIDs(short sourceRefNum, OSType theType, short **IdPtr, long *count)
+{
+	short				oldRef;
+	Handle				theHandle;
+	short				resCount;
+	short				resIndex;
+	
+	*count	=	-1;
+	
+	oldRef = CurResFile();
+		
+	UseResFile(sourceRefNum);
+
+	resCount = Count1Resources(theType);
+	
+	*IdPtr	=	(short*) NewPtrClear( resCount * sizeof(short) );
+	
+	for (resIndex=1; resIndex <= resCount; resIndex++)
+	{
+		theHandle = Get1IndResource(theType, resIndex);
+		
+		if(theHandle == NULL) return;
+	
+		(*IdPtr)[resIndex-1] = PAS_getResourceID(theHandle);
+		
+		ReleaseResource(theHandle);
+	}
+	
+	UseResFile(oldRef);
+	
+	PAS_bubbleSortIDS(*IdPtr, resCount);
+	
+	
+	*count = resCount;
+}
+
+#pragma mark -
+
+void
+PAS_bubbleSortResType(ResType *types, long count)
+{
+	long 	x, y;
+	OSType	temp;
+	
+	for (x=0; x < count-1; x++)      
+	{
+    	for (y=0; y < count-x-1; y++)        
+		{
+        	if (types[y] > types[y+1])        
+	        {  
+				temp=types[y];  
+            	types[y]=types[y+1];  
+            	types[y+1]=temp;        
+        	} 
+		}
+	}
+}
+
+void
+PAS_bubbleSortIDS(short *ids, long count)
+{
+	long 	x, y;
+	short	temp;
+	
+	for (x=0; x < count-1; x++)      
+	{
+    	for (y=0; y < count-x-1; y++)        
+		{
+        	if (ids[y] > ids[y+1])        
+	        {  
+				temp=ids[y];  
+            	ids[y]=ids[y+1];  
+            	ids[y+1]=temp;        
+        	} 
+		}
+	}
+}

mozilla/xpinstall/src/PatchableAppleSingle.h

@@ -0,0 +1,117 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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

@@ -0,0 +1,481 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nscore.h"
+#include "nsFileSpec.h"
+#include "nsFileStream.h"
+#include "nsInstall.h" // for error codes
+#include "prmem.h"
+#include "ScheduledTasks.h"
+
+
+
+static nsresult 
+GetPersistentStringFromSpec(const nsFileSpec& inSpec, char **string)
+{
+    if (!string) return NS_ERROR_NULL_POINTER;
+
+    nsCOMPtr<nsIFileSpec> spec;
+#ifdef XP_MAC
+    nsFileSpec interim = inSpec.GetFSSpec(); /* XXX get rid of mError in nsFileSpec */
+    nsresult rv = NS_NewFileSpecWithSpec(interim, getter_AddRefs(spec));
+#else
+    nsresult rv = NS_NewFileSpecWithSpec(inSpec, getter_AddRefs(spec));
+#endif
+    if (NS_SUCCEEDED(rv)) {
+        rv = spec->GetPersistentDescriptorString(string);
+    } 
+    else {
+        *string = nsnull;
+    }
+    return rv;
+}
+
+
+
+
+
+#ifdef _WINDOWS
+#include <sys/stat.h>
+#include <windows.h>
+
+PRInt32 ReplaceExistingWindowsFile(const nsFileSpec& currentSpec, const nsFileSpec& finalSpec)
+{
+    // this routine is now for DOS-based windows only. WinNT should 
+    // be taken care of by the XP code
+    //
+    // NOTE for WINNT:
+    //
+    // the MOVEFILE_DELAY_UNTIL_REBOOT option doesn't work on
+    // NT 3.51 SP4 or on NT 4.0 until SP2. On the broken versions
+    // of NT 4.0 Microsoft warns using it can lead to an irreparably 
+    // corrupt  windows' registry "after an unknown number of calls".
+    // Time to reinstall windows when that happens.
+    //
+    // I don't want to risk it, I also don't want two separate code
+    // paths to test, so we do it the lame way on all NT systems
+    // until such time as there are few enough old revs around to
+    // make it worth switching back to MoveFileEx().
+
+    PRInt32 err = -1;
+
+    /* Get OS version info */
+    DWORD dwVersion = GetVersion();
+
+    /* Get build numbers for Windows NT or Win32s */
+
+    if (dwVersion > 0x80000000)
+    {
+        // 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
+
+        char* final   = strdup(finalSpec.GetNativePathCString());
+        char* current = strdup(currentSpec.GetNativePathCString());
+
+        strlen = GetShortPathName( (LPCTSTR)current, (LPTSTR)Src, (DWORD)sizeof(Src) );
+        if ( strlen > 0 ) 
+        {
+            free(current);
+            current   = strdup(Src);
+        }
+
+        strlen = GetShortPathName( (LPCTSTR) final, (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
+
+
+
+
+PRInt32 DeleteFileNowOrSchedule(const nsFileSpec& filename)
+{
+
+    PRInt32 result = nsInstall::SUCCESS;
+
+    filename.Delete(PR_FALSE);
+    if (filename.Exists())
+    {
+        // could not delete, schedule it for later
+
+        RKEY newkey;
+        HREG reg;
+        REGERR  err;
+        result = nsInstall::UNEXPECTED_ERROR;
+
+        err = NR_RegOpen("", &reg) ;
+        if ( err == REGERR_OK )
+        {
+            err = NR_RegAddKey(reg,ROOTKEY_PRIVATE,REG_DELETE_LIST_KEY,&newkey);
+            if ( err == REGERR_OK )
+            {
+                char    valname[20];
+                char*   fnamestr = nsnull;
+
+                err = NR_RegGetUniqueName( reg, valname, sizeof(valname) );
+                if ( err == REGERR_OK )
+                {
+                    nsresult rv;
+                    rv = GetPersistentStringFromSpec( filename, &fnamestr );
+                    if ( NS_SUCCEEDED(rv) && fnamestr )
+                    {
+
+                        err = NR_RegSetEntry( reg, newkey, valname, 
+                                              REGTYPE_ENTRY_BYTES, 
+                                              (void*)fnamestr, 
+                                              strlen(fnamestr)+1);
+
+                        if ( err == REGERR_OK )
+                            result = nsInstall::REBOOT_NEEDED;
+                    }
+                }
+            }
+
+            NR_RegClose(reg);
+        }
+    }
+
+    return result;
+}
+
+
+
+
+PRInt32 ReplaceFileNow(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
+{
+    // replacement file must exist, doomed file doesn't have to
+    if ( !replacementFile.Exists() )
+        return nsInstall::DOES_NOT_EXIST;
+
+    // don't have to do anything if the files are the same
+    if ( replacementFile == doomedFile )
+        return nsInstall::SUCCESS;
+
+
+    PRInt32 result = nsInstall::ACCESS_DENIED;
+
+    // first try to rename the doomed file out of the way (if it exists)
+    char*   leafname;
+    nsFileSpec tmpFile( doomedFile );
+    if ( tmpFile.Exists() )
+    {
+        tmpFile.MakeUnique();
+        leafname = tmpFile.GetLeafName();
+        tmpFile = doomedFile;
+        tmpFile.Rename( leafname );
+        nsCRT::free( leafname );
+    }
+
+
+    // if doomedFile is gone move new file into place
+    nsresult rv;
+    if ( !doomedFile.Exists() )
+    {
+        nsFileSpec parentofFinalFile;
+        nsFileSpec parentofReplacementFile;
+
+        doomedFile.GetParent(parentofFinalFile);
+        replacementFile.GetParent(parentofReplacementFile);
+
+        // XXX looks dangerous, the replacement file name may NOT be unique in the
+        // target directory if we have to move it! Either we should never move the
+        // files like this (i.e. error if not in the same dir) or we need to take
+        // a little more care in the move.
+        if(parentofReplacementFile != parentofFinalFile)
+        {
+            NS_WARN_IF_FALSE( 0, "File unpacked into a non-dest dir" );
+            rv = replacementFile.MoveToDir(parentofFinalFile);
+        }
+        else
+        	rv = NS_OK;
+        	
+        leafname = doomedFile.GetLeafName();
+        if ( NS_SUCCEEDED(rv) )
+            rv = replacementFile.Rename( leafname );
+
+        if ( NS_SUCCEEDED(rv) ) 
+        {
+            // we replaced the old file OK, now we have to
+            // get rid of it permanently
+            result = DeleteFileNowOrSchedule( tmpFile );
+        }
+        else
+        {
+            // couldn't rename file, try to put old file back
+            tmpFile.Rename( leafname );
+        }
+        nsCRT::free( leafname );
+    }
+
+    return result;
+}
+
+
+
+
+
+PRInt32 ReplaceFileNowOrSchedule(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
+{
+    PRInt32 result = ReplaceFileNow( replacementFile, doomedFile );
+
+    if ( result == nsInstall::ACCESS_DENIED )
+    {
+        // if we couldn't replace the file schedule it for later
+#ifdef _WINDOWS
+        if ( ReplaceExistingWindowsFile(replacementFile, doomedFile) == 0 )
+            return nsInstall::REBOOT_NEEDED;
+#endif
+
+        RKEY    listkey;
+        RKEY    filekey;
+        HREG    reg;
+        REGERR  err;
+
+        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
+        {
+            err = NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &listkey );
+            if ( err == REGERR_OK ) 
+            {
+                char     valname[20];
+                char*    fsrc = nsnull;
+                char*    fdest = nsnull;
+                REGERR   err2;
+                nsresult rv, rv2;
+
+                err = NR_RegGetUniqueName( reg, valname, sizeof(valname) );
+                if ( err == REGERR_OK )
+                {
+                    err = NR_RegAddKey( reg, listkey, valname, &filekey );
+                    if ( REGERR_OK == err )
+                    {
+                        rv = GetPersistentStringFromSpec(replacementFile, &fsrc);
+                        rv2 = GetPersistentStringFromSpec(doomedFile, &fdest);
+                        if ( NS_SUCCEEDED(rv) && NS_SUCCEEDED(rv2) )
+                        {
+
+                            err = NR_RegSetEntry( reg, filekey, 
+                                                  REG_REPLACE_SRCFILE,
+                                                  REGTYPE_ENTRY_BYTES, 
+                                                  (void*)fsrc, 
+                                                  strlen(fsrc));
+
+                            err2 = NR_RegSetEntry(reg, filekey,
+                                                  REG_REPLACE_DESTFILE,
+                                                  REGTYPE_ENTRY_BYTES,
+                                                  (void*)fdest,
+                                                  strlen(fdest));
+
+                            if ( err == REGERR_OK && err2 == REGERR_OK )
+                                result = nsInstall::REBOOT_NEEDED;
+                            else
+                                NR_RegDeleteKey( reg, listkey, valname );
+                        }
+
+                        if (NS_SUCCEEDED(rv))
+                            nsCRT::free(fsrc);
+
+                        if (NS_SUCCEEDED(rv2))
+                            nsCRT::free(fdest);
+                    }
+                }
+            }
+
+            NR_RegClose(reg);
+        }
+    }
+
+    return result;
+}
+
+
+
+
+//-----------------------------------------------------------------------------
+//
+//          STARTUP: DO SCHEDULED ACTIONS
+//
+//-----------------------------------------------------------------------------
+
+void DeleteScheduledFiles(HREG);
+void ReplaceScheduledFiles(HREG);
+
+void PerformScheduledTasks(HREG reg)
+{
+    DeleteScheduledFiles( reg );
+    ReplaceScheduledFiles( reg );
+}
+
+
+
+void DeleteScheduledFiles( HREG reg )
+{
+    REGERR  err;
+    RKEY    key;
+    REGENUM state = 0;
+
+    /* perform scheduled file deletions  */
+    if (REGERR_OK == NR_RegGetKey(reg,ROOTKEY_PRIVATE,REG_DELETE_LIST_KEY,&key))
+    {
+        // the delete key exists, so we loop through its children
+        // and try to delete all the listed files
+
+        char    namebuf[MAXREGNAMELEN];
+        char    valbuf[MAXREGPATHLEN];
+
+        nsFileSpec              doomedFile;
+        nsCOMPtr<nsIFileSpec>   spec;
+
+        nsresult rv = NS_NewFileSpec(getter_AddRefs(spec));
+        if (NS_SUCCEEDED(rv))
+        {
+            while (REGERR_OK == NR_RegEnumEntries( reg, key, &state, namebuf,
+                                                   sizeof(namebuf), 0 ) )
+            {
+                uint32 bufsize = sizeof(valbuf); // gets changed, must reset
+                err = NR_RegGetEntry( reg, key, namebuf, valbuf, &bufsize );
+                if ( err == REGERR_OK )
+                {
+                    // no need to check return value of 
+                    // SetPersistentDescriptorString, it's always NS_OK
+                    spec->SetPersistentDescriptorString(valbuf);
+                    rv = spec->GetFileSpec(&doomedFile);
+                    if (NS_SUCCEEDED(rv)) 
+                    {
+                        doomedFile.Delete(PR_FALSE);
+                        if ( !doomedFile.Exists() )
+                        {
+                            // deletion successful, don't have to retry
+                            NR_RegDeleteEntry( reg, key, namebuf );
+                        }
+                    }
+                }
+            }
+
+            /* delete list node if empty */
+            state = 0;
+            err = NR_RegEnumEntries(reg, key, &state, namebuf, sizeof(namebuf), 0);
+            if ( err == REGERR_NOMORE )
+            {
+                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY);
+            }
+        }
+    }
+}
+
+
+
+void ReplaceScheduledFiles( HREG reg )
+{
+    RKEY    key;
+
+    /* replace files if any listed */
+    if (REGERR_OK == NR_RegGetKey(reg,ROOTKEY_PRIVATE,REG_REPLACE_LIST_KEY,&key))
+    {
+        char keyname[MAXREGNAMELEN];
+        char doomedFile[MAXREGPATHLEN];
+        char srcFile[MAXREGPATHLEN];
+
+        nsFileSpec              doomedSpec;
+        nsFileSpec              srcSpec;
+        nsCOMPtr<nsIFileSpec>   src;
+        nsCOMPtr<nsIFileSpec>   dest;
+        nsresult                rv1, rv2;
+
+        rv1 = NS_NewFileSpec(getter_AddRefs(src));
+        rv2 = NS_NewFileSpec(getter_AddRefs(dest));
+        if (NS_SUCCEEDED(rv1) && NS_SUCCEEDED(rv2))
+        {
+            uint32 bufsize;
+            REGENUM state = 0;
+            while (REGERR_OK == NR_RegEnumSubkeys( reg, key, &state, 
+                                   keyname, sizeof(keyname), REGENUM_CHILDREN))
+            {
+                bufsize = sizeof(srcFile);
+                REGERR err1 = NR_RegGetEntry( reg, (RKEY)state,
+                                    REG_REPLACE_SRCFILE, srcFile, &bufsize);
+
+                bufsize = sizeof(doomedFile);
+                REGERR err2 = NR_RegGetEntry( reg, (RKEY)state,
+                                    REG_REPLACE_DESTFILE, doomedFile, &bufsize);
+
+                if ( err1 == REGERR_OK && err2 == REGERR_OK )
+                {
+                    src->SetPersistentDescriptorString(srcFile);
+                    rv1 = src->GetFileSpec(&srcSpec);
+
+                    dest->SetPersistentDescriptorString(doomedFile);
+                    rv2 = dest->GetFileSpec(&doomedSpec);
+
+                    if (NS_SUCCEEDED(rv1) && NS_SUCCEEDED(rv2))
+                    {
+                        // finally now try to do the replace
+                        PRInt32 result = ReplaceFileNow( srcSpec, doomedSpec );
+
+                        if ( result == nsInstall::DOES_NOT_EXIST ||
+                             result == nsInstall::SUCCESS )
+                        {
+                            // This one is done
+                            NR_RegDeleteKey( reg, key, keyname );
+                        }
+                    }
+                }
+            }
+
+
+            /* delete list node if empty */
+            state = 0;
+            if (REGERR_NOMORE == NR_RegEnumSubkeys( reg, key, &state, keyname,
+                                          sizeof(keyname), REGENUM_CHILDREN ))
+            {
+                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY);
+            }
+        }
+    }
+}

mozilla/xpinstall/src/ScheduledTasks.h

@@ -0,0 +1,44 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#ifndef __SCHEDULEDTASKS_H__
+#define __SCHEDULEDTASKS_H__
+
+
+#include "NSReg.h"
+//#include "mozreg.h"
+#include "nsFileSpec.h"
+
+PR_BEGIN_EXTERN_C
+
+PRInt32 DeleteFileNowOrSchedule(const nsFileSpec& filename);
+PRInt32 ReplaceFileNowOrSchedule(nsFileSpec& tmpfile, nsFileSpec& target );
+
+
+void PerformScheduledTasks(HREG reg);
+
+PR_END_EXTERN_C
+
+#endif

mozilla/xpinstall/src/gdiff.h

@@ -0,0 +1,139 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.org 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.
+ *
+ * Contributor(s): 
+ */
+/*--------------------------------------------------------------
+ * 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

@@ -0,0 +1,106 @@
+
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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.
+#
+# Contributor(s): 
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH=..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MAKE_OBJ_TYPE = DLL
+MODULE=xpinstal
+XPIDL_MODULE=xpinstall
+
+DLL=.\$(OBJDIR)\$(MODULE).dll
+
+DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
+
+LCFLAGS =          \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+
+LLIBS =                                \
+        $(DIST)\lib\xpcom.lib          \
+        $(DIST)\lib\js3250.lib         \
+        $(DIST)\lib\jsdombase_s.lib    \
+        $(DIST)\lib\jsdomevents_s.lib  \
+		$(DIST)\lib\zlib.lib           \
+        $(DIST)\lib\strres.lib         \
+        $(LIBNSPR)                     \
+        $(DIST)\lib\mozreg.lib         \
+        $(NULL)
+
+
+OBJS =                                          \
+       .\$(OBJDIR)\nsInstall.obj                \
+       .\$(OBJDIR)\nsInstallTrigger.obj         \
+       .\$(OBJDIR)\nsInstallVersion.obj         \
+       .\$(OBJDIR)\nsInstallFolder.obj          \
+       .\$(OBJDIR)\nsJSInstall.obj              \
+       .\$(OBJDIR)\nsJSFile.obj                 \
+       .\$(OBJDIR)\nsJSInstallTriggerGlobal.obj \
+       .\$(OBJDIR)\nsJSInstallVersion.obj       \
+       .\$(OBJDIR)\nsSoftwareUpdate.obj         \
+       .\$(OBJDIR)\nsSoftwareUpdateRun.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)\nsXPITriggerInfo.obj         \
+       .\$(OBJDIR)\nsXPInstallManager.obj       \
+       .\$(OBJDIR)\nsInstallFileOpItem.obj      \
+       .\$(OBJDIR)\nsWinShortcut.obj            \
+	   .\$(OBJDIR)\nsJSFileSpecObj.obj          \
+#     .\$(OBJDIR)\nsUpdateNotification.obj     \
+       $(NULL)
+
+WIN_LIBS=                                       \
+       ole32.lib                                \
+       $(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) $(DIST)\lib\$(MODULE).lib
+        $(RM) $(DIST)\bin\components\$(MODULE).dll
+

mozilla/xpinstall/src/nsAppleSingleDecoder.cpp

@@ -0,0 +1,744 @@
+/* -*- 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.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/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) 1999
+ * Netscape Communications Corporation. All Rights Reserved.  
+ * 
+ * Contributors:
+ *     Samir Gehani <sgehani@netscape.com>
+ */
+
+
+#ifndef _NS_APPLESINGLEDECODER_H_
+	#include "nsAppleSingleDecoder.h"
+#endif
+
+#include "MoreFilesExtras.h"
+#include "MoreDesktopMgr.h"
+#include "IterateDirectory.h"
+#include "nsISupportsUtils.h"
+
+/*----------------------------------------------------------------------*
+ *   Constructors/Destructor
+ *----------------------------------------------------------------------*/
+MOZ_DECL_CTOR_COUNTER(nsAppleSingleDecoder);
+
+nsAppleSingleDecoder::nsAppleSingleDecoder(FSSpec *inSpec, FSSpec *outSpec)
+: mInSpec(NULL), 
+  mOutSpec(NULL),
+  mInRefNum(0),
+  mRenameReqd(false)
+{
+    MOZ_COUNT_CTOR(nsAppleSingleDecoder);
+
+    if (inSpec && outSpec)
+	{
+		/* merely point to FSSpecs, not own 'em */
+		mInSpec = inSpec;
+		mOutSpec = outSpec;
+	}
+}
+
+nsAppleSingleDecoder::nsAppleSingleDecoder()
+: mInSpec(NULL), 
+  mOutSpec(NULL),
+  mInRefNum(0),
+  mRenameReqd(false)
+{
+    MOZ_COUNT_CTOR(nsAppleSingleDecoder);
+}
+
+nsAppleSingleDecoder::~nsAppleSingleDecoder()
+{
+	/* not freeing FSSpecs since we don't own 'em */
+    MOZ_COUNT_DTOR(nsAppleSingleDecoder);
+}
+
+
+/*----------------------------------------------------------------------*
+ *   Public methods
+ *----------------------------------------------------------------------*/
+OSErr
+nsAppleSingleDecoder::Decode()
+{
+	OSErr		err = noErr;
+ 	ASHeader 	header;
+ 	long		bytesRead = sizeof(header);
+ 	
+ 	// param check
+ 	if (!mInSpec || !mOutSpec)
+ 		return paramErr;
+ 		
+ 	// check for existence	
+ 	FSSpec tmp;
+	err = FSMakeFSSpec(mInSpec->vRefNum, mInSpec->parID, mInSpec->name, &tmp);
+	if (err == fnfErr)
+		return err;
+		
+	MAC_ERR_CHECK(FSpOpenDF( mInSpec, fsRdPerm, &mInRefNum ));
+	MAC_ERR_CHECK(FSRead( mInRefNum, &bytesRead, &header ));
+	
+	if ( (bytesRead != sizeof(header)) ||
+		 (header.magicNum != 0x00051600) ||
+		 (header.versionNum != 0x00020000) ||
+		 (header.numEntries == 0) ) // empty file?
+		 return -1;
+	
+	// create the outSpec which we'll rename correctly later
+	err = FSMakeFSSpec( mInSpec->vRefNum, mInSpec->parID, "\pdecode", mOutSpec );
+	if (err!=noErr && err!=fnfErr)
+		return err;
+	MAC_ERR_CHECK(FSMakeUnique( mOutSpec ));
+	MAC_ERR_CHECK(FSpCreate( mOutSpec, 'MOZZ', '????', 0 ));
+	
+	
+	/* Loop through the entries, processing each.
+	** Set the time/date stamps last, because otherwise they'll 
+	** be destroyed	when we write.
+	*/	
+	{
+		Boolean hasDateEntry = false;
+		ASEntry dateEntry;
+		long offset;
+		ASEntry entry;
+		
+		for ( int i=0; i < header.numEntries; i++ )
+		{	
+			offset = sizeof( ASHeader ) + sizeof( ASEntry ) * i;
+			MAC_ERR_CHECK(SetFPos( mInRefNum, fsFromStart, offset ));
+			
+			bytesRead = sizeof(entry);
+			MAC_ERR_CHECK(FSRead( mInRefNum, &bytesRead, &entry ));
+			if (bytesRead != sizeof(entry))
+				return -1;
+				
+ 			if ( entry.entryID == AS_FILEDATES )
+ 			{
+ 				hasDateEntry = true;
+ 				dateEntry = entry;
+ 			}
+ 			else
+	 			MAC_ERR_CHECK(ProcessASEntry( entry ));
+		}
+		if ( hasDateEntry )
+			MAC_ERR_CHECK(ProcessASEntry( dateEntry ));
+	}
+	
+	// close the inSpec
+	FSClose( mInRefNum );
+	
+	// rename if need be
+	if (mRenameReqd)
+	{
+		FSSpec old;		// delete old version of target file
+		
+		FSMakeFSSpec(mInSpec->vRefNum, mInSpec->parID, mInSpec->name, &old);
+		MAC_ERR_CHECK(FSpDelete(&old));
+		MAC_ERR_CHECK(FSpRename(mOutSpec, mInSpec->name));
+		
+		// reflect change in outSpec
+		nsAppleSingleDecoder::PLstrncpy( mOutSpec->name, mInSpec->name, mInSpec->name[0] );
+		mOutSpec->name[0] = mInSpec->name[0];
+		mRenameReqd = false; // XXX redundant reinit?
+	}
+	
+ 	return err;
+}
+
+OSErr
+nsAppleSingleDecoder::Decode(FSSpec *inSpec, FSSpec *outSpec)
+{
+	OSErr 	err = noErr;
+	
+	// param check
+	if (inSpec && outSpec)
+	{
+		mInSpec = inSpec;		// reinit
+		mOutSpec = outSpec;
+		mRenameReqd = false; 
+	}
+	else
+		return paramErr;
+		
+	err = Decode();
+	
+	return err;
+}
+
+pascal void
+DecodeDirIterateFilter(const CInfoPBRec * const cpbPtr, Boolean *quitFlag, void *yourDataPtr)
+{	
+	OSErr					err = noErr;
+	FSSpec 					currFSp, outFSp;
+	nsAppleSingleDecoder* 	thisObj = NULL;
+	Boolean					isDir = false;
+	long					dummy;
+	
+	// param check
+	if (!yourDataPtr || !cpbPtr || !quitFlag)
+		return;
+		
+	*quitFlag = false;
+	
+	// extract 'this' -- an nsAppleSingleDecoder instance
+	thisObj = (nsAppleSingleDecoder*) yourDataPtr;
+	
+	// make an FSSpec from the CInfoPBRec*
+	err = FSMakeFSSpec(cpbPtr->hFileInfo.ioVRefNum, cpbPtr->hFileInfo.ioFlParID, 
+						cpbPtr->hFileInfo.ioNamePtr, &currFSp);
+	if (err == noErr)
+	{
+		FSpGetDirectoryID(&currFSp, &dummy, &isDir);
+		
+		// if current FSSpec is file
+		if (!isDir)
+		{
+			// if file is in AppleSingle format
+			if (nsAppleSingleDecoder::IsAppleSingleFile(&currFSp))
+			{
+				// decode file
+				thisObj->Decode(&currFSp, &outFSp);
+			}
+		}
+		else
+		{
+			// else if current FSSpec is folder ignore
+			// XXX never reached?
+			return;
+		}
+	}
+}
+
+OSErr 
+nsAppleSingleDecoder::DecodeFolder(FSSpec *aFolder)
+{
+	OSErr	err = noErr;
+	long	dummy;
+	Boolean	isDir = false;
+	
+	// check that FSSpec is folder
+	if (aFolder)
+	{
+		FSpGetDirectoryID(aFolder, &dummy, &isDir);
+		if (!isDir)
+			return dirNFErr;
+	}
+	
+	// recursively enumerate contents of folder (maxLevels=0 means recurse all)
+	FSpIterateDirectory(aFolder, 0, DecodeDirIterateFilter, (void*)this);
+			
+	return err;
+}
+
+Boolean
+nsAppleSingleDecoder::IsAppleSingleFile(FSSpec *inSpec)
+{
+	OSErr	err;
+	Boolean bAppleSingle = false;
+	short	inRefNum;
+	UInt32	magic;
+	long 	bytesRead = sizeof(magic);
+	
+	// param checks
+	if (!inSpec)
+		return false;
+		
+	// check for existence
+	FSSpec tmp;
+	err = FSMakeFSSpec(inSpec->vRefNum, inSpec->parID, inSpec->name, &tmp);
+	if (err!=noErr)
+		return false;
+	
+	// open and read the magic number len bytes	
+	err = FSpOpenDF( inSpec, fsRdPerm, &inRefNum );
+	if (err!=noErr)
+		return false;
+		
+	err = FSRead( inRefNum, &bytesRead, &magic );
+	if (err!=noErr)
+		return false;
+		
+	FSClose(inRefNum);
+	if (bytesRead != sizeof(magic))
+		return false;
+
+	// check if bytes read match magic number	
+	bAppleSingle = (magic == 0x00051600);
+	return bAppleSingle;
+}
+
+
+/*----------------------------------------------------------------------*
+ *   Private methods
+ *----------------------------------------------------------------------*/
+OSErr
+nsAppleSingleDecoder::ProcessASEntry(ASEntry inEntry)
+{
+	switch (inEntry.entryID)
+	{
+		case AS_DATA:
+			return ProcessDataFork( inEntry );
+			break;
+		case AS_RESOURCE:
+			return ProcessResourceFork( inEntry );
+			break;
+		case AS_REALNAME:
+			ProcessRealName( inEntry );
+			break;
+			// return 0;	// Ignore these errors in ASD   <--- XXX remove
+		case AS_COMMENT:
+//			return ProcessComment( inEntry );
+			break;
+		case AS_ICONBW:
+//			return ProcessIconBW( inEntry );
+			break;
+		case AS_ICONCOLOR:
+//			return ProcessIconColor( inEntry );
+			break;
+		case AS_FILEDATES:
+			return ProcessFileDates( inEntry );
+			break;
+		case AS_FINDERINFO:
+			return ProcessFinderInfo( inEntry );
+			break;
+		case AS_MACINFO:
+			return ProcessMacInfo( inEntry );
+			break;
+		case AS_PRODOSINFO:
+		case AS_MSDOSINFO:
+		case AS_AFPNAME:
+		case AS_AFPINFO:
+		case AS_AFPDIRID:
+		default:
+			return 0;
+	}
+	return 0;
+}
+
+OSErr
+nsAppleSingleDecoder::ProcessDataFork(ASEntry inEntry)
+{
+	OSErr	err = noErr;
+	SInt16	refNum;
+	
+	/* Setup the files */
+	err = FSpOpenDF (mOutSpec, fsWrPerm,  &refNum);
+
+	if ( err == noErr )
+		err = EntryToMacFile( inEntry, refNum );
+	
+	FSClose( refNum );
+	return err;
+}
+
+OSErr
+nsAppleSingleDecoder::ProcessResourceFork(ASEntry inEntry)
+{
+	OSErr	err = noErr;
+	SInt16	refNum;
+		
+	err = FSpOpenRF(mOutSpec, fsWrPerm,  &refNum);
+
+	if ( err == noErr )
+		err = EntryToMacFile( inEntry, refNum );
+	
+	FSClose( refNum );
+	return err;
+}
+
+OSErr
+nsAppleSingleDecoder::ProcessRealName(ASEntry inEntry)
+{
+	OSErr	err = noErr;
+	Str255	newName;
+	long	bytesRead;
+	
+	if ( inEntry.entryLength > 32 )	/* Max file name length for the Mac */
+		return -1;
+
+	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
+	
+	bytesRead = inEntry.entryLength;
+	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &newName[1]));
+	if (bytesRead != inEntry.entryLength)
+		return -1;
+		
+	newName[0] = inEntry.entryLength;
+	err = FSpRename(mOutSpec, newName);
+	if (err == dupFNErr)
+	{
+		// if we are trying to rename temp decode file to src name, rename later
+		if (nsAppleSingleDecoder::PLstrcmp(newName, mInSpec->name))
+		{
+			mRenameReqd = true;
+			return noErr;
+		}
+		
+		FSSpec old;		// delete old version of target file
+		
+		FSMakeFSSpec(mOutSpec->vRefNum, mOutSpec->parID, newName, &old);
+		MAC_ERR_CHECK(FSpDelete(&old));
+		MAC_ERR_CHECK(FSpRename(mOutSpec, newName));
+	}
+	nsAppleSingleDecoder::PLstrncpy( mOutSpec->name, newName, inEntry.entryLength );
+	mOutSpec->name[0] = inEntry.entryLength;
+
+	return err;
+}
+
+OSErr
+nsAppleSingleDecoder::ProcessFileDates(ASEntry inEntry)
+{
+	OSErr		err = noErr;
+	ASFileDates dates;
+	long		bytesRead;
+	
+	if ( inEntry.entryLength != sizeof(dates) )	/* Max file name length for the Mac */
+		return -1;
+	
+	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
+	
+	bytesRead = inEntry.entryLength;
+	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &dates));
+	if (bytesRead != inEntry.entryLength)
+		return -1;
+		
+	Str31 name;
+	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
+	name[0] = mOutSpec->name[0];
+	CInfoPBRec pb;
+	pb.hFileInfo.ioNamePtr = &name[0];
+	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
+	pb.hFileInfo.ioDirID = mOutSpec->parID;
+	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
+	err = PBGetCatInfoSync(&pb);
+	if ( err != noErr )
+		return -1;
+#define YR_2000_SECONDS 3029529600
+	pb.hFileInfo.ioFlCrDat = dates.create + YR_2000_SECONDS;
+	pb.hFileInfo.ioFlMdDat = dates.modify + YR_2000_SECONDS;
+	pb.hFileInfo.ioFlBkDat = dates.backup + YR_2000_SECONDS;
+	/* Not sure if mac has the last access time */
+	
+	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
+	name[0] = mOutSpec->name[0];
+	pb.hFileInfo.ioNamePtr = name;
+	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
+	pb.hFileInfo.ioDirID = mOutSpec->parID;
+	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
+	err = PBSetCatInfo(&pb, false);
+	
+	return err;
+}
+
+OSErr
+nsAppleSingleDecoder::ProcessFinderInfo(ASEntry inEntry)
+{
+	OSErr			err = noErr;
+	ASFinderInfo 	info;
+	long			bytesRead;
+	
+	if (inEntry.entryLength != sizeof( ASFinderInfo ))
+		return -1;
+
+	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
+
+	bytesRead = sizeof(info);
+	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &info));
+	if (bytesRead != inEntry.entryLength)
+		return -1;
+		
+	err = FSpSetFInfo(mOutSpec, &info.ioFlFndrInfo);
+	if (err!=noErr && err!=fnfErr)
+		return err;
+
+	Str31 name;
+	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
+	name[0] = mOutSpec->name[0];
+	CInfoPBRec pb;
+	pb.hFileInfo.ioNamePtr = name;
+	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
+	pb.hFileInfo.ioDirID = mOutSpec->parID;
+	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
+	MAC_ERR_CHECK(PBGetCatInfoSync(&pb));
+	
+	pb.hFileInfo.ioNamePtr = name;
+	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
+	pb.hFileInfo.ioDirID = mOutSpec->parID;
+	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
+	pb.hFileInfo.ioFlXFndrInfo = info.ioFlXFndrInfo;
+	err = PBSetCatInfo(&pb, false);
+    
+    
+
+    if (info.ioFlFndrInfo.fdType == 'APPL')
+    {
+        // need to register in desktop database or bad things will happen
+
+        DTSetAPPL(  NULL, 
+                    mOutSpec->vRefNum,
+                    info.ioFlFndrInfo.fdCreator,
+                    mOutSpec->parID,
+                    mOutSpec->name );
+
+    }
+
+
+	return err;
+}
+
+OSErr
+nsAppleSingleDecoder::ProcessMacInfo(ASEntry inEntry)
+{
+	OSErr		err = noErr;
+	ASMacInfo 	info;
+	long 		bytesRead;
+	
+	if (inEntry.entryLength != sizeof( ASMacInfo ))
+		return -1;
+
+	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
+
+	bytesRead = sizeof(info);
+	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &info));
+	if (bytesRead != inEntry.entryLength)
+		return -1;
+	
+	Str31 name;
+	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
+	name[0] = mOutSpec->name[0];
+	CInfoPBRec pb;
+	pb.hFileInfo.ioNamePtr = name;
+	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
+	pb.hFileInfo.ioDirID = mOutSpec->parID;
+	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
+	MAC_ERR_CHECK(PBGetCatInfoSync(&pb));
+	
+	pb.hFileInfo.ioNamePtr = name;
+	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
+	pb.hFileInfo.ioDirID = mOutSpec->parID;
+	pb.hFileInfo.ioFlAttrib = info.ioFlAttrib;
+	err = PBSetCatInfo(&pb, false);
+	
+	return err;
+}
+
+OSErr
+nsAppleSingleDecoder::EntryToMacFile(ASEntry inEntry, UInt16 inTargetSpecRefNum)
+{
+#define BUFFER_SIZE 8192
+
+	OSErr	err = noErr;
+	char 	buffer[BUFFER_SIZE];
+	long 	totalRead = 0, bytesRead, bytesToWrite;
+
+	MAC_ERR_CHECK(SetFPos( mInRefNum, fsFromStart, inEntry.entryOffset ));
+
+	while ( totalRead < inEntry.entryLength )
+	{
+// Should we yield in here?
+		bytesRead = BUFFER_SIZE;
+		err = FSRead( mInRefNum, &bytesRead, buffer );
+		if (err!=noErr && err!=eofErr)
+			return err;
+			
+		if ( bytesRead <= 0 )
+			return -1;
+		bytesToWrite = totalRead + bytesRead > inEntry.entryLength ? 
+									inEntry.entryLength - totalRead :
+									bytesRead;
+
+		totalRead += bytesRead;
+		MAC_ERR_CHECK(FSWrite(inTargetSpecRefNum, &bytesToWrite, buffer));
+	}	
+	
+	return err;
+}
+
+OSErr DTSetAPPL(Str255 volName,
+                short vRefNum,
+                OSType creator,
+                long applParID,
+                Str255 applName)
+{
+    OSErr err;
+    DTPBRec *pb = NULL;
+    short dtRefNum;
+    short realVRefNum;
+    Boolean newDTDatabase;
+    /* get the real vRefnum */
+    err = DetermineVRefNum(volName, vRefNum, &realVRefNum);
+    if (err == noErr)
+    {
+        err = DTOpen(volName, vRefNum, &dtRefNum, &newDTDatabase);
+        if (err == noErr && !newDTDatabase)
+        {
+            pb = (DTPBRec*) NewPtrClear( sizeof(DTPBRec) );
+            
+            if (pb==NULL) return -1;
+
+            pb->ioNamePtr      =   applName;
+            pb->ioDTRefNum     =   dtRefNum;
+            pb->ioDirID        =   applParID;
+            pb->ioFileCreator  =   creator;
+
+            err = PBDTAddAPPLSync(pb);
+            
+            if (pb) DisposePtr((Ptr)pb);
+        }        
+    }
+    return err;
+}
+
+OSErr
+nsAppleSingleDecoder::FSMakeUnique(FSSpec *ioSpec)
+{
+	OSErr			err = noErr;
+	Boolean 		bUnique = false;
+	FSSpec			tmp;
+	long				uniqueID = 0;
+	Str255			name;
+	short			i, j;
+	unsigned char	puniqueID[16];
+	char			*cuniqueIDPtr;
+
+	// grab suggested name from in-out FSSpec
+	nsAppleSingleDecoder::PLstrncpy(name, ioSpec->name, ioSpec->name[0]);
+	name[0] = ioSpec->name[0];
+	
+	for (i=0; i<65536; i++)		// prevent infinite loop
+	{	
+		if (!bUnique)
+		{
+			err = FSMakeFSSpec( ioSpec->vRefNum, ioSpec->parID, name, &tmp );
+			if (err == fnfErr)
+			{
+				bUnique = true;
+				break;
+			}
+			else if (err == noErr)	// file already exists
+			{
+				// grab suggested name from in-out FSSpec
+				nsAppleSingleDecoder::PLstrncpy(name, ioSpec->name, ioSpec->name[0]);
+				name[0] = ioSpec->name[0];
+				
+				// attempt to create a new unique file name
+				nsAppleSingleDecoder::PLstrncat( name, "\p-", 1 );
+				
+				// tack on digit(s)
+				cuniqueIDPtr = nsAppleSingleDecoder::ltoa(uniqueID++);
+				puniqueID[0] = strlen(cuniqueIDPtr);
+				for (j=0; j<strlen(cuniqueIDPtr); j++)
+				{
+					puniqueID[j+1] = cuniqueIDPtr[j];
+				}
+				
+				nsAppleSingleDecoder::PLstrncat( name, puniqueID, puniqueID[0] );
+				DisposePtr((Ptr)cuniqueIDPtr);
+			}
+			else
+				return err;
+		}
+	}
+	
+	// put back unique name into in-out FSSpec
+	nsAppleSingleDecoder::PLstrncpy(ioSpec->name, name, name[0]);
+	ioSpec->name[0] = name[0];
+	
+	return noErr;
+}		
+
+/*----------------------------------------------------------------------*
+ *   Utilities
+ *----------------------------------------------------------------------*/
+char *
+nsAppleSingleDecoder::ltoa(long n)
+{
+	char *s;
+	int i, j, sign, tmp;
+	
+	/* check sign and convert to positive to stringify numbers */
+	if ( (sign = n) < 0)
+		n = -n;
+	i = 0;
+	s = (char*) malloc(sizeof(char));
+	
+	/* grow string as needed to add numbers from powers of 10 down till none left */
+	do
+	{
+		s = (char*) realloc(s, (i+1)*sizeof(char));
+		s[i++] = n % 10 + '0';  /* '0' or 30 is where ASCII numbers start from */
+		s[i] = '\0';
+	}
+	while( (n /= 10) > 0);	
+	
+	/* tack on minus sign if we found earlier that this was negative */
+	if (sign < 0)
+	{
+		s = (char*) realloc(s, (i+1)*sizeof(char));
+		s[i++] = '-';
+	}
+	s[i] = '\0';
+	
+	/* pop numbers (and sign) off of string to push back into right direction */
+	for (i = 0, j = strlen(s) - 1; i < j; i++, j--)
+	{
+		tmp = s[i];
+		s[i] = s[j];
+		s[j] = tmp;
+	}
+	
+	return s;
+}
+
+StringPtr 	
+nsAppleSingleDecoder::PLstrncpy(StringPtr dst, ConstStr255Param src, short max)
+{
+	int srcLen = src[0];
+	if (srcLen > max)
+		srcLen = max;
+	dst[0] = srcLen;	
+	memcpy(&dst[1], &src[1], srcLen);
+	return dst;	
+}
+
+StringPtr 	
+nsAppleSingleDecoder::PLstrncat(StringPtr dst, ConstStr255Param src, short max)
+{
+	int srcLen = src[0], dstLen = dst[0];
+	if (srcLen > max)
+		srcLen = max;
+	dst[0] += srcLen;
+	memcpy(&dst[dstLen+1], &src[1], srcLen);
+	return dst;
+}
+
+Boolean
+nsAppleSingleDecoder::PLstrcmp(StringPtr str1, StringPtr str2)
+{
+	Boolean	bEqual = true;
+	
+	// check for same length
+	if (str1[0] == str2[0])
+	{
+		// verify mem blocks match
+		if (0 != memcmp(&str1[1], &str2[1], str1[0]))
+			bEqual = false;
+	}
+	else
+		bEqual = false;
+		
+	return bEqual;
+}

mozilla/xpinstall/src/nsAppleSingleDecoder.h

@@ -0,0 +1,222 @@
+/* -*- 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.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/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) 1999
+ * Netscape Communications Corporation. All Rights Reserved.  
+ * 
+ * Contributors:
+ *     Samir Gehani <sgehani@netscape.com>
+ */
+
+
+/*----------------------------------------------------------------------*
+ *   Implements a simple AppleSingle decoder, as described in RFC1740 
+ *	 http://andrew2.andrew.cmu.edu/rfc/rfc1740.html
+ *----------------------------------------------------------------------*/
+
+#ifndef macintosh
+#error Sorry! This is Mac only functionality!
+#endif
+
+#pragma options align=mac68k
+
+#ifndef _NS_APPLESINGLEDECODER_H_
+#define _NS_APPLESINGLEDECODER_H_
+
+#include <stdlib.h>
+#include <string.h>
+#include <Files.h>
+#include <Errors.h>
+
+
+/*----------------------------------------------------------------------*
+ *   Struct definitions from RFC1740
+ *----------------------------------------------------------------------*/
+typedef struct ASHeader /* header portion of AppleSingle */ 
+{
+    /* AppleSingle = 0x00051600; AppleDouble = 0x00051607 */
+       UInt32 magicNum; 	/* internal file type tag */ 
+       UInt32 versionNum; 	/* format version: 2 = 0x00020000 */ 
+       UInt8 filler[16]; 	/* filler, currently all bits 0 */ 
+       UInt16 numEntries; 	/* number of entries which follow */
+} ASHeader ; /* ASHeader */ 
+
+typedef struct ASEntry /* one AppleSingle entry descriptor */ 
+{
+	UInt32 entryID; 	/* entry type: see list, 0 invalid */
+	UInt32 entryOffset; /* offset, in octets, from beginning */
+	                    /* of file to this entry's data */
+	UInt32 entryLength; /* length of data in octets */
+} ASEntry; /* ASEntry */
+
+typedef struct ASFinderInfo
+{
+	FInfo ioFlFndrInfo; 	/* PBGetFileInfo() or PBGetCatInfo() */
+	FXInfo ioFlXFndrInfo; 	/* PBGetCatInfo() (HFS only) */
+} ASFinderInfo; /* ASFinderInfo */
+
+typedef struct ASMacInfo        /* entry ID 10, Macintosh file information */
+{
+       UInt8 filler[3]; 	/* filler, currently all bits 0 */ 
+       UInt8 ioFlAttrib; 	/* PBGetFileInfo() or PBGetCatInfo() */
+} ASMacInfo;
+
+typedef struct ASFileDates      /* entry ID 8, file dates info */
+{
+	SInt32 create; /* file creation date/time */
+	SInt32 modify; /* last modification date/time */
+	SInt32 backup; /* last backup date/time */
+	SInt32 access; /* last access date/time */
+} ASFileDates; /* ASFileDates */
+
+/* entryID list */
+#define AS_DATA         1 /* data fork */
+#define AS_RESOURCE     2 /* resource fork */
+#define AS_REALNAME     3 /* File's name on home file system */
+#define AS_COMMENT      4 /* standard Mac comment */
+#define AS_ICONBW       5 /* Mac black & white icon */
+#define AS_ICONCOLOR    6 /* Mac color icon */
+   		/*              7       /* not used */
+#define AS_FILEDATES    8 /* file dates; create, modify, etc */
+#define AS_FINDERINFO   9 /* Mac Finder info & extended info */
+#define AS_MACINFO      10 /* Mac file info, attributes, etc */
+#define AS_PRODOSINFO   11 /* Pro-DOS file info, attrib., etc */
+#define AS_MSDOSINFO    12 /* MS-DOS file info, attributes, etc */
+#define AS_AFPNAME      13 /* Short name on AFP server */
+#define AS_AFPINFO      14 /* AFP file info, attrib., etc */
+
+#define AS_AFPDIRID     15 /* AFP directory ID */
+
+
+/*----------------------------------------------------------------------*
+ *   Macros
+ *----------------------------------------------------------------------*/
+#define MAC_ERR_CHECK(_funcCall) 	\
+	err = _funcCall; 				\
+	if (err!=noErr) 				\
+			return err;
+	
+	
+
+class nsAppleSingleDecoder 
+{
+
+public:
+	nsAppleSingleDecoder(FSSpec *inSpec, FSSpec *outSpec);
+	nsAppleSingleDecoder();
+	~nsAppleSingleDecoder();
+		
+	/** 
+	 * Decode
+	 *
+	 * Takes an "in" FSSpec for the source file in AppleSingle
+	 * format to decode and write out to an "out" FSSpec.
+	 * This form is used when the Decode(void) method has already
+	 * been invoked once and this object is reused to decode 
+	 * another AppleSingled file: useful in iteration to avoid
+	 * nsAppleSingleDecoder object instantiation per file.
+	 *
+	 * @param  inSpec 	the AppleSingled file to decode
+	 * @param  outSpec 	the destination file in which the decoded
+	 *					data was written out (empty when passed in
+	 *					and filled on return)
+	 * @return err		a standard MacOS OSErr where noErr means OK
+	 */
+	OSErr Decode(FSSpec *inSpec, FSSpec *outSpec);
+		
+	/**
+	 * Decode
+	 *
+	 * Decodes the AppleSingled file passed in to the constructor
+	 * and writes out the decoded data to the outSpec passed to the 
+	 * constructor.
+	 *
+	 * @return err		a standard MacOS OSErr where noErr = OK
+	 */
+	OSErr Decode();
+	
+    /**
+     * DecodeFolder
+     *
+     * Traverses arbitrarily nested subdirs decoding any files
+     * in AppleSingle format and leaving other files alone.
+     *
+     * @param   aFolder  the folder whose contents to decode
+     * @return  err	     a standard MacOS err (dirNFErr if invalid dir, noErr = OK)
+     */
+    OSErr DecodeFolder(FSSpec *aFolder);
+     
+	/**
+	 * IsAppleSingleFile
+	 *
+	 * Checks the file header to see whether this is an AppleSingle
+	 * version 2 file by matching the magicNum field in the header.
+	 *
+	 * @param  inSpec			the file to check
+	 * @return bAppleSingle		a Boolean where true indicates this is
+	 *							in fact an AppleSingle file
+	 */
+	static Boolean IsAppleSingleFile(FSSpec *inSpec);
+	
+	/**
+	 * String utilities to ensure building standalone
+	 * since Mozilla doesn't use PLStringFuncs.
+	 */
+	static StringPtr PLstrncpy(StringPtr dst, ConstStr255Param src, short max);
+	static StringPtr PLstrncat(StringPtr dst, ConstStr255Param src, short max);
+	static Boolean   PLstrcmp(StringPtr str1, StringPtr str2);
+	
+	/**
+ 	 * ltoa -- long to ascii
+ 	 *
+ 	 * Converts a long to a C string. We allocate 
+ 	 * a string of the appropriate size and the caller
+ 	 * should assume ownership of the returned pointer.
+ 	 */
+	static char *ltoa(long n);
+	
+private:
+	FSSpec	*mInSpec;
+	FSSpec	*mOutSpec;
+	short	mInRefNum;	// cache since it's used through the life of one Decode cycle
+	Boolean	mRenameReqd;
+	
+	OSErr	ProcessASEntry(ASEntry inEntry);	
+	OSErr	ProcessDataFork(ASEntry inEntry);
+	OSErr	ProcessResourceFork(ASEntry inEntry);
+	OSErr	ProcessRealName(ASEntry inEntry);
+	OSErr	ProcessFileDates(ASEntry inEntry);
+	OSErr	ProcessFinderInfo(ASEntry inEntry);
+	OSErr	ProcessMacInfo(ASEntry inEntry);
+	OSErr	EntryToMacFile(ASEntry inEntry, UInt16 inTargetSpecRefNum);
+	
+	OSErr	FSMakeUnique(FSSpec *ioSpec);
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+OSErr DTSetAPPL(Str255 volName,short vRefNum,OSType creator,long applParID,Str255 applName);
+pascal void
+DecodeDirIterateFilter(const CInfoPBRec * const cpbPtr, Boolean *quitFlag, void *yourDataPtr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#pragma options align=reset
+
+#endif /* _NS_APPLESINGLEDECODER_H_ */

mozilla/xpinstall/src/nsInstall.h

@@ -0,0 +1,323 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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 "nsVoidArray.h"
+#include "nsHashtable.h"
+#include "nsCOMPtr.h"
+
+#include "nsSoftwareUpdate.h"
+
+#include "nsInstallObject.h"
+#include "nsInstallVersion.h"
+#include "nsInstallFolder.h"
+
+#include "nsIXPINotifier.h"
+
+#include "nsIStringBundle.h"
+#include "nsILocale.h"
+#include "nsIEventQueueService.h"
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+#include "nsIPersistentProperties.h"
+#include "nsIEnumerator.h"
+#include "nsIZipReader.h"
+
+class nsInstallInfo
+{
+  public:
+    
+    nsInstallInfo( nsIFileSpec*     aFile, 
+                   const PRUnichar* aURL, 
+                   const PRUnichar* aArgs, 
+                   long             aFlags, 
+                   nsIXPINotifier*  aNotifier);
+
+    virtual ~nsInstallInfo();
+
+    nsresult GetLocalFile(nsFileSpec& aSpec);
+
+    void GetURL(nsString& aURL) { aURL = mURL; }
+
+    void GetArguments(nsString& aArgs) { aArgs = mArgs; }
+    
+    long GetFlags() { return mFlags; }
+
+    nsIXPINotifier* GetNotifier() { return mNotifier; };
+    
+  private:
+    
+    nsresult  mError;
+
+    long       mFlags;
+    nsString   mURL;
+    nsString   mArgs;
+
+    nsCOMPtr<nsIFileSpec>       mFile;
+    nsCOMPtr<nsIXPINotifier>    mNotifier;
+};
+
+#ifdef XP_PC
+#define FILESEP '\\'
+#elif defined XP_MAC
+#define FILESEP ':'
+#elif defined XP_BEOS
+#define FILESEP '/'
+#else
+#define FILESEP '/'
+#endif
+
+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_INSTALL_SCRIPT           = -204,
+            NO_CERTIFICATE              = -205,
+            NO_MATCHING_CERTIFICATE     = -206,
+            CANT_READ_ARCHIVE           = -207,
+            INVALID_ARGUMENTS           = -208,
+            ILLEGAL_RELATIVE_PATH       = -209,
+            USER_CANCELLED              = -210,
+            INSTALL_NOT_STARTED         = -211,
+            SILENT_MODE_DENIED          = -212,
+            NO_SUCH_COMPONENT           = -213,
+            DOES_NOT_EXIST              = -214,
+            READ_ONLY                   = -215,
+            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,
+            PACKAGE_FOLDER_NOT_SET      = -224,
+            EXTRACTION_FAILED           = -225,
+            FILENAME_ALREADY_USED       = -226,
+            ABORT_INSTALL               = -227,
+            DOWNLOAD_ERROR              = -228,
+            SCRIPT_ERROR                = -229,
+
+            ALREADY_EXISTS              = -230,
+            IS_FILE                     = -231,
+            SOURCE_DOES_NOT_EXIST       = -232,
+            SOURCE_IS_DIRECTORY         = -233,
+            SOURCE_IS_FILE              = -234,
+            INSUFFICIENT_DISK_SPACE     = -235,
+            FILENAME_TOO_LONG           = -236,
+            
+            OUT_OF_MEMORY               = -299,
+
+            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(nsIZipReader * theJARFile);
+        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 aErrorNumber);
+        
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32 aMode, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aJarSource, PRInt32* aReturn);
+        
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32 aMode, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aJarSource, PRInt32* aReturn);
+        
+        PRInt32    DeleteComponent(const nsString& aRegistryName, PRInt32* aReturn);
+        PRInt32    DeleteFile(nsInstallFolder* aFolder, const nsString& aRelativeFileName, PRInt32* aReturn);
+        PRInt32    DiskSpaceAvailable(const nsString& aFolder, PRInt64* 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, nsInstallFolder** aFolder);
+        PRInt32    GetComponentFolder(const nsString& aComponentName, nsInstallFolder** aFolder);
+        
+        PRInt32    GetFolder(nsInstallFolder& aTargetFolder, const nsString& aSubdirectory, nsInstallFolder** aFolder);
+        PRInt32    GetFolder(const nsString& aTargetFolder, const nsString& aSubdirectory, nsInstallFolder** aFolder);
+        PRInt32    GetFolder(const nsString& aTargetFolder, nsInstallFolder** 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	   LoadResources(JSContext* cx, const nsString& aBaseName, jsval* aReturn);
+        PRInt32    Patch(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    Patch(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    ResetError();
+        PRInt32    SetPackageFolder(nsInstallFolder& aFolder);
+        PRInt32    StartInstall(const nsString& aUserPackageName, const nsString& aPackageName, const nsString& aVersion, PRInt32* aReturn);
+        PRInt32    Uninstall(const nsString& aPackageName, PRInt32* aReturn);
+        
+        PRInt32    FileOpDirCreate(nsInstallFolder& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpDirGetParent(nsInstallFolder& aTarget, nsFileSpec* aReturn);
+        PRInt32    FileOpDirRemove(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpDirRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileCopy(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileDelete(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileExists(nsInstallFolder& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileExecute(nsInstallFolder& aTarget, nsString& aParams, PRInt32* aReturn);
+        PRInt32    FileOpFileGetNativeVersion(nsInstallFolder& aTarget, nsString* aReturn);
+        PRInt32    FileOpFileGetDiskSpaceAvailable(nsInstallFolder& aTarget, PRInt64* aReturn);
+        PRInt32    FileOpFileGetModDate(nsInstallFolder& aTarget, nsFileSpec::TimeStamp* aReturn);
+        PRInt32    FileOpFileGetSize(nsInstallFolder& aTarget, PRUint32* aReturn);
+        PRInt32    FileOpFileIsDirectory(nsInstallFolder& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileIsFile(nsInstallFolder& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileModDateChanged(nsInstallFolder& aTarget, nsFileSpec::TimeStamp& aOldStamp, PRBool* aReturn);
+        PRInt32    FileOpFileMove(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileWindowsShortcut(nsFileSpec& aTarget, nsFileSpec& aShortcutPath, nsString& aDescription, nsFileSpec& aWorkingPath, nsString& aParams, nsFileSpec& aIcon, PRInt32 aIconId, PRInt32* aReturn);
+        PRInt32    FileOpFileMacAlias(nsString& aSourcePath, nsString& aAliasPath, PRInt32* aReturn);
+        PRInt32    FileOpFileUnixLink(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+
+        void       LogComment(nsString& aComment);
+
+        PRInt32    ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedName, nsFileSpec** aRealName);
+        char*      GetResourcedString(const nsString& aResName);
+        void       AddPatch(nsHashKey *aKey, nsFileSpec* fileName);
+        void       GetPatch(nsHashKey *aKey, nsFileSpec** fileName);
+        
+        void       GetJarFileLocation(nsString& aFile);
+        void       SetJarFileLocation(const nsFileSpec& aFile);
+
+        void       GetInstallArguments(nsString& args);
+        void       SetInstallArguments(const nsString& args);
+
+        void       GetInstallURL(nsString& url);
+        void       SetInstallURL(const nsString& url);
+
+        PRBool     GetStatusSent() { return mStatusSent; }
+        PRBool     InInstallTransaction(void) { return mInstalledFiles != nsnull; }
+        
+        PRInt32    Alert(nsString& string);
+        PRInt32    Confirm(nsString& string, PRBool* aReturn);
+        void       InternalAbort(PRInt32 errcode);
+
+        PRInt32    SaveError(PRInt32 errcode);
+
+    private:
+        JSObject*           mScriptObject;
+        
+        JSObject*           mWinRegObject;
+        JSObject*           mWinProfileObject;
+
+        
+        nsFileSpec          mJarFileLocation;
+        nsIZipReader*       mJarFileData;
+        
+        nsString            mInstallArguments;
+        nsString            mInstallURL;
+        nsInstallFolder*    mPackageFolder;
+
+        PRBool              mUserCancelled;
+        PRBool              mStatusSent;
+        
+        PRBool              mUninstallPackage;
+        PRBool              mRegisterPackage;
+        PRBool              mStartInstallCompleted;
+
+        nsString            mRegistryPackageName;   /* Name of the package we are installing */
+        nsString            mUIName;                /* User-readable package name */
+        nsInstallVersion*   mVersionInfo;           /* Component version info */
+        
+        nsVoidArray*        mInstalledFiles;        
+        nsHashtable*        mPatchList;
+        
+        nsIXPINotifier      *mNotifier;
+
+        nsCOMPtr<nsIStringBundle>   mStringBundle;
+
+        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);
+
+        void        CleanUp();
+
+        PRInt32     ExtractDirEntries(const nsString& directory, nsVoidArray *paths);
+
+        PRInt32     ScheduleForInstall(nsInstallObject* ob);
+
+        static void DeleteVector(nsVoidArray* vector);    
+};
+
+#endif

mozilla/xpinstall/src/nsInstallDelete.cpp

@@ -0,0 +1,291 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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"
+
+MOZ_DECL_CTOR_COUNTER(nsInstallDelete);
+
+nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
+                                  nsInstallFolder* folderSpec,
+                                  const nsString& inPartialPath,
+                                  PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    MOZ_COUNT_CTOR(nsInstallDelete);
+
+    if ((folderSpec == nsnull) || (inInstall == nsnull)) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mDeleteStatus = DELETE_FILE;
+    mFinalFile      = nsnull;
+    mRegistryName   = "";
+    
+    nsFileSpec* tmp = folderSpec->GetFileSpec();
+    if (!tmp)
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    mFinalFile = new nsFileSpec(*tmp);
+    if (mFinalFile == nsnull)
+    {
+        *error = nsInstall::OUT_OF_MEMORY;
+        return;
+    }
+    
+    *mFinalFile += inPartialPath;
+
+    *error = ProcessInstallDelete();
+}
+
+nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
+                                  const nsString& inComponentName,
+                                  PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    MOZ_COUNT_CTOR(nsInstallDelete);
+
+    if (inInstall == NULL) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mDeleteStatus = DELETE_COMPONENT;
+    mFinalFile    = nsnull;
+    mRegistryName = inComponentName;
+
+    *error = ProcessInstallDelete();
+}
+
+
+nsInstallDelete::~nsInstallDelete()
+{
+    if (mFinalFile == nsnull)
+        delete mFinalFile;
+
+    MOZ_COUNT_DTOR(nsInstallDelete);
+}
+
+
+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();
+        if (temp)
+        {
+            err = VR_Remove(temp);
+            Recycle(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];
+    char* rsrcVal = nsnull;
+    
+    if (buffer == nsnull || !mInstall)
+        return nsnull;
+
+    if (mDeleteStatus == DELETE_COMPONENT)
+    {
+        char* temp = mRegistryName.ToNewCString();
+        rsrcVal = mInstall->GetResourcedString("DeleteComponent");
+
+        if (rsrcVal)
+        {
+            sprintf( buffer, rsrcVal, temp);
+            nsCRT::free(rsrcVal);
+        }
+        if (temp)
+            Recycle(temp);
+    }
+    else
+    {
+        if (mFinalFile)
+        {
+            rsrcVal = mInstall->GetResourcedString("DeleteComponent");
+
+            if (rsrcVal)
+            {
+                sprintf( buffer, rsrcVal, mFinalFile->GetCString());
+                nsCRT::free(rsrcVal);
+            }
+        }
+    }
+
+    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();
+        
+        if (tempCString == nsnull)
+                return nsInstall::OUT_OF_MEMORY;
+
+        err = VR_InRegistry( tempCString );
+                
+        if (err != REGERR_OK) 
+        {
+            return err;
+        } 
+        else 
+        {
+            char* tempRegistryString;
+
+            tempRegistryString = (char*)PR_Calloc(MAXREGPATHLEN, sizeof(char));
+            
+            if (tempRegistryString == nsnull)
+                return nsInstall::OUT_OF_MEMORY;
+
+            err = VR_GetPath( tempCString , MAXREGPATHLEN, tempRegistryString);
+            
+            if (err == REGERR_OK)
+            {
+                if (mFinalFile)
+                    delete mFinalFile;
+
+                mFinalFile = new nsFileSpec(tempRegistryString);
+                
+                if (mFinalFile == nsnull)
+                    return nsInstall::OUT_OF_MEMORY;
+                
+            }
+
+            PR_FREEIF(tempRegistryString);
+        }
+    }
+    
+    if(tempCString)
+        Recycle(tempCString);
+
+    if (mFinalFile->Exists())
+    {
+        if (mFinalFile->IsFile())
+        {
+            err = nsInstall::SUCCESS;
+        }
+        else
+        {
+            err = nsInstall::IS_DIRECTORY;
+        }
+    }
+    else
+    {
+        err = nsInstall::DOES_NOT_EXIST;
+    }
+
+    return err;
+}
+
+
+
+PRInt32 nsInstallDelete::NativeComplete()
+{
+    NS_WARN_IF_FALSE(mFinalFile->Exists(),"nsInstallDelete::Complete -- file should exist!");
+    if (mFinalFile->Exists())
+    {
+        if (mFinalFile->IsFile())
+        {
+           return DeleteFileNowOrSchedule(*mFinalFile);
+        }
+        else
+        {
+            NS_ASSERTION(0,"nsInstallDelete::Complete -- expected file was a directory!");
+            return nsInstall::IS_DIRECTORY;
+        }
+    }
+    
+    return nsInstall::DOES_NOT_EXIST;
+}
+

mozilla/xpinstall/src/nsInstallDelete.h

@@ -0,0 +1,78 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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,
+                          nsInstallFolder* 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

@@ -0,0 +1,159 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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"
+
+MOZ_DECL_CTOR_COUNTER(nsInstallExecute);
+
+nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
+                                      const nsString& inJarLocation,
+                                      const nsString& inArgs,
+                                      PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    MOZ_COUNT_CTOR(nsInstallExecute);
+
+    if ((inInstall == nsnull) || (inJarLocation.Equals("")) )
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    mJarLocation        = inJarLocation;
+    mArgs               = inArgs;
+    mExecutableFile     = nsnull;
+
+}
+
+
+nsInstallExecute::~nsInstallExecute()
+{
+    if (mExecutableFile)
+        delete mExecutableFile;
+
+    MOZ_COUNT_DTOR(nsInstallExecute);
+}
+
+
+
+PRInt32 nsInstallExecute::Prepare()
+{
+    if (mInstall == NULL || mJarLocation.Equals("")) 
+        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];
+    char* rsrcVal = nsnull;
+
+    if (buffer == nsnull || !mInstall)
+        return nsnull;
+
+    // if the FileSpec is NULL, just us the in jar file name.
+
+    if (mExecutableFile == nsnull)
+    {
+        char *tempString = mJarLocation.ToNewCString();
+        rsrcVal = mInstall->GetResourcedString("Execute");
+
+        if (rsrcVal)
+        {
+            sprintf( buffer, rsrcVal, tempString);
+            nsCRT::free(rsrcVal);
+        }
+        
+        if (tempString)
+            Recycle(tempString);
+    }
+    else
+    {
+        rsrcVal = mInstall->GetResourcedString("Execute");
+
+        if (rsrcVal)
+        {
+            sprintf( buffer, rsrcVal, mExecutableFile->GetCString());
+            nsCRT::free(rsrcVal);
+        }
+    }
+    return buffer;
+}
+
+
+PRBool
+nsInstallExecute::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallExecute::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+

mozilla/xpinstall/src/nsInstallExecute.h

@@ -0,0 +1,73 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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

@@ -0,0 +1,452 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "prprf.h"
+#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
+*/
+
+MOZ_DECL_CTOR_COUNTER(nsInstallFile);
+
+nsInstallFile::nsInstallFile(nsInstall* inInstall,
+                             const nsString& inComponentName,
+                             const nsString& inVInfo,
+                             const nsString& inJarLocation,
+                             nsInstallFolder *folderSpec,
+                             const nsString& inPartialPath,
+                             PRInt32 mode,
+                             PRInt32 *error) 
+  : nsInstallObject(inInstall),
+    mVersionInfo(nsnull),
+    mJarLocation(nsnull),
+    mExtractedFile(nsnull),
+    mFinalFile(nsnull),
+    mVersionRegistryName(nsnull),
+    mReplaceFile(PR_FALSE),
+    mChildFile(PR_TRUE),
+    mUpgradeFile(PR_FALSE),
+    mSkipInstall(PR_FALSE),
+    mMode(mode)
+{
+    MOZ_COUNT_CTOR(nsInstallFile);
+
+    if ((folderSpec == nsnull) || (inInstall == NULL))
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    *error = nsInstall::SUCCESS;
+    
+    /* Check for existence of the newer	version	*/
+#if 0 // XXX need to re-implement force mode in the opposite sense
+
+    char* qualifiedRegNameString = inComponentName.ToNewCString();
+
+    // --------------------------------------------------------------------
+    // we always install if forceInstall is true, or the new file's
+    // version is null, or the file doesn't previously exist.
+    //
+    // IFF it's not force, AND the new file has a version, AND it's been
+    // previously installed, THEN we have to do the version comparing foo.
+    // --------------------------------------------------------------------
+    if ( !(mode & INSTALL_NO_COMPARE ) && (inVInfo !=  "") && 
+          ( VR_ValidateComponent( qualifiedRegNameString ) == 0 ) ) 
+    {
+        nsInstallVersion *newVersion = new nsInstallVersion();
+        
+        if (newVersion == nsnull)
+        {
+            Recycle(qualifiedRegNameString);
+            *error = nsInstall::OUT_OF_MEMORY;
+            return;
+        }
+
+        newVersion->Init(inVInfo);
+        
+        VERSION versionStruct;
+        
+        VR_GetVersion( qualifiedRegNameString, &versionStruct );
+        
+        nsInstallVersion* oldVersion = new nsInstallVersion();
+        
+        if (oldVersion == nsnull)
+        {
+            Recycle(qualifiedRegNameString);
+            delete oldVersion;
+            *error = nsInstall::OUT_OF_MEMORY;
+            return;
+        }
+
+        oldVersion->Init(versionStruct.major,
+                         versionStruct.minor,
+                         versionStruct.release,
+                         versionStruct.build);
+
+        PRInt32 areTheyEqual;
+        newVersion->CompareTo(oldVersion, &areTheyEqual);
+        
+        delete oldVersion;
+        delete newVersion;
+
+        if ( areTheyEqual < 0 )
+        {
+            // the file to be installed is OLDER than what is on disk.
+            // Don't install it.
+            mSkipInstall = PR_TRUE;
+        }
+    }
+
+    Recycle(qualifiedRegNameString);
+#endif
+
+    nsFileSpec* tmp = folderSpec->GetFileSpec();
+    if (!tmp)
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    mFinalFile = new nsFileSpec(*tmp);
+    if (mFinalFile == nsnull)
+    {
+        *error = nsInstall::OUT_OF_MEMORY;
+        return;
+    }
+
+    if ( mFinalFile->Exists() )
+    {
+        // is there a file with the same name as the proposed folder?
+        if ( mFinalFile->IsFile() ) 
+        {
+            *error = nsInstall::FILENAME_ALREADY_USED;
+            return;
+        }
+        // else this directory already exists, so do nothing
+    }
+    else
+    {
+        /* the nsFileSpecMac.cpp operator += requires "this" (the nsFileSpec)
+         * to be an existing dir
+         */
+        int dirPermissions = 0755; // std default for UNIX, ignored otherwise
+        mFinalFile->CreateDir(dirPermissions);
+    }
+
+    *mFinalFile += inPartialPath;
+    
+    mReplaceFile = mFinalFile->Exists();
+    
+    if (mReplaceFile == PR_FALSE)
+    {
+       /* although it appears that we are creating the dir _again_ it is necessary
+        * when inPartialPath has arbitrary levels of nested dirs before the leaf
+        */
+        nsFileSpec parent;
+        mFinalFile->GetParent(parent);
+        nsFileSpec makeDirs(parent.GetCString(), PR_TRUE);
+    }
+
+    mVersionRegistryName    = new nsString(inComponentName);
+    mJarLocation            = new nsString(inJarLocation);
+    mVersionInfo	        = new nsString(inVInfo);
+     
+    if (mVersionRegistryName == nsnull ||
+        mJarLocation         == nsnull ||
+        mVersionInfo         == nsnull )
+    {
+        *error = nsInstall::OUT_OF_MEMORY;
+        return;
+    }
+
+    nsString regPackageName;
+    mInstall->GetRegPackageName(regPackageName);
+    
+    // determine Child status
+    if ( regPackageName.IsEmpty() ) 
+    {
+        // in the "current communicator package" absolute pathnames (start
+        // with slash) indicate shared files -- all others are children
+        mChildFile = ( mVersionRegistryName->CharAt(0) != '/' );
+    } 
+    else 
+    {
+        mChildFile = mVersionRegistryName->Equals( regPackageName,
+                                                   PR_FALSE,
+                                                   regPackageName.Length() );
+    }
+}
+
+
+nsInstallFile::~nsInstallFile()
+{
+    if (mVersionRegistryName)
+        delete mVersionRegistryName;
+  
+    if (mJarLocation)
+        delete mJarLocation;
+  
+    if (mExtractedFile)
+        delete mExtractedFile;
+
+    if (mFinalFile)
+        delete mFinalFile;
+  
+    if (mVersionInfo)
+      delete mVersionInfo;
+
+    MOZ_COUNT_DTOR(nsInstallFile);
+}
+
+/* Prepare
+ * Extracts file out of the JAR archive
+ */
+PRInt32 nsInstallFile::Prepare()
+{
+    if (mSkipInstall)
+        return nsInstall::SUCCESS;
+
+    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull )
+        return nsInstall::INVALID_ARGUMENTS;
+
+    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtractedFile);
+}
+
+/* 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;
+    }
+   
+    if (mSkipInstall)
+        return nsInstall::SUCCESS;
+
+    err = CompleteFileMove();
+    
+    if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
+    {
+        // XXX Don't register individual files for now -- crucial performance
+        // speed up on the Mac, and we'll switch uninstall schemes after beta
+
+        // RegisterInVersionRegistry();
+    }
+    
+    return err;
+
+}
+
+void nsInstallFile::Abort()
+{
+    if (mExtractedFile != nsnull)
+        mExtractedFile->Delete(PR_FALSE);
+}
+
+#define RESBUFSIZE 1024
+char* nsInstallFile::toString()
+{
+    char* buffer = new char[RESBUFSIZE];
+    char* rsrcVal = nsnull;
+    const char* fname = nsnull;
+
+    if (buffer == nsnull || !mInstall)
+        return nsnull;
+    else
+        buffer[0] = '\0';
+    
+    if (mReplaceFile)
+    {
+        rsrcVal = mInstall->GetResourcedString("ReplaceFile");
+    }
+    else if (mSkipInstall)
+    {
+        rsrcVal = mInstall->GetResourcedString("SkipFile");
+    }
+    else
+    {
+        rsrcVal = mInstall->GetResourcedString("InstallFile");
+    }
+
+    if (rsrcVal)
+    {
+        if (mFinalFile)
+            fname = mFinalFile->GetCString();
+
+        PR_snprintf( buffer, RESBUFSIZE, rsrcVal, fname );
+
+        Recycle(rsrcVal);
+    }
+
+    return buffer;
+}
+
+
+PRInt32 nsInstallFile::CompleteFileMove()
+{
+    int result = 0;
+    
+    if (mExtractedFile == nsnull) 
+    {
+        return nsInstall::UNEXPECTED_ERROR;
+    }
+   	
+    if ( *mExtractedFile == *mFinalFile ) 
+    {
+        /* No need to rename, they are the same */
+        result = nsInstall::SUCCESS;
+    } 
+    else 
+    {
+        result = ReplaceFileNowOrSchedule(*mExtractedFile, *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.IsEmpty()) 
+        {
+            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.IsEmpty()) 
+        { 
+            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 PR_TRUE;
+}
+
+/* RegisterPackageNode
+* InstallFile() installs files which need to be registered,
+* hence this function returns true.
+*/
+PRBool
+nsInstallFile::RegisterPackageNode()
+{
+    return PR_TRUE;
+}

mozilla/xpinstall/src/nsInstallFile.h

@@ -0,0 +1,105 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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"
+
+
+/* Global defines for file handling mode bitfield values */
+#define INSTALL_NO_COMPARE        0x1
+#define INSTALL_IF_NEWER          0x2
+#define INSTALL_IF_EQUAL_OR_NEWER 0x4
+
+
+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,
+                        nsInstallFolder *folderSpec,
+                        const nsString& inPartialPath,
+                        PRInt32 mode,
+                        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*   mExtractedFile;	  /* 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 */
+        PRBool      mSkipInstall;    /* if true don't install this file */
+        
+        PRInt32    mMode;            /* an integer used like a bitfield to control *
+                                      * how a file is installed or registered      */
+
+        PRInt32     CompleteFileMove();
+        PRInt32     RegisterInVersionRegistry();
+    
+
+};
+
+#endif /* nsInstallFile_h__ */

mozilla/xpinstall/src/nsInstallFileOpEnums.h

@@ -0,0 +1,42 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.org 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.
+ *
+ * Contributor(s): 
+ */
+
+#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       = 8,
+  NS_FOP_MAC_ALIAS          = 9,
+  NS_FOP_UNIX_LINK          = 10,
+  NS_FOP_FILE_SET_STAT      = 11
+
+} nsInstallFileOpEnums;
+
+#endif /* nsInstallFileOpEnums_h__ */

mozilla/xpinstall/src/nsInstallFileOpItem.h

@@ -0,0 +1,156 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.org 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.
+ *
+ * Contributor(s): 
+ */
+
+#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 */
+    enum 
+    {
+      ACTION_NONE                 = -401,
+      ACTION_SUCCESS              = -402,
+      ACTION_FAILED               = -403
+    };
+
+
+    /* Public Methods */
+    // used by:
+    //   FileOpFileDelete()
+    nsInstallFileOpItem(nsInstall*    installObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        PRInt32       aFlags,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpDirRemove()
+    //   FileOpFileCopy()
+    //   FileOpFileMove()
+    //   FileMacAlias()
+    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:
+    //   FileOpDirRename()
+    //   FileOpFileExecute()
+    //   FileOpFileRename()
+    nsInstallFileOpItem(nsInstall*    aInstallObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   a1,
+                        nsString&     a2,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   WindowsShortcut()
+    nsInstallFileOpItem(nsInstall*     aInstallObj,
+                        PRInt32        aCommand,
+                        nsFileSpec&    aTarget,
+                        nsFileSpec&    aShortcutPath,
+                        nsString&      aDescription,
+                        nsFileSpec&    aWorkingPath,
+                        nsString&      aParams,
+                        nsFileSpec&    aIcon,
+                        PRInt32        aIconId,
+                        PRInt32*       aReturn);
+
+    virtual ~nsInstallFileOpItem();
+
+    PRInt32       Prepare(void);
+    PRInt32       Complete();
+    char*         toString();
+    void          Abort();
+    
+  /* should these be protected? */
+    PRBool        CanUninstall();
+    PRBool        RegisterPackageNode();
+      
+  private:
+    
+    /* Private Fields */
+    
+    nsInstall*    mIObj;        // initiating Install object
+    nsFileSpec*   mSrc;
+    nsFileSpec*   mTarget;
+    nsFileSpec*   mShortcutPath;
+    nsFileSpec*   mWorkingPath;
+    nsFileSpec*   mIcon;
+    nsString*     mDescription;
+    nsString*     mStrTarget;
+    nsString*     mParams;
+    long          mFStat;
+    PRInt32       mFlags;
+    PRInt32       mIconId;
+    PRInt32       mCommand;
+    PRInt32       mAction;
+    
+    /* Private Methods */
+
+    PRInt32       NativeFileOpDirCreatePrepare();
+    PRInt32       NativeFileOpDirCreateAbort();
+    PRInt32       NativeFileOpDirRemovePrepare();
+    PRInt32       NativeFileOpDirRemoveComplete();
+    PRInt32       NativeFileOpDirRenamePrepare();
+    PRInt32       NativeFileOpDirRenameComplete();
+    PRInt32       NativeFileOpDirRenameAbort();
+    PRInt32       NativeFileOpFileCopyPrepare();
+    PRInt32       NativeFileOpFileCopyComplete();
+    PRInt32       NativeFileOpFileCopyAbort();
+    PRInt32       NativeFileOpFileDeletePrepare();
+    PRInt32       NativeFileOpFileDeleteComplete(nsFileSpec *aTarget);
+    PRInt32       NativeFileOpFileExecutePrepare();
+    PRInt32       NativeFileOpFileExecuteComplete();
+    PRInt32       NativeFileOpFileMovePrepare();
+    PRInt32       NativeFileOpFileMoveComplete();
+    PRInt32       NativeFileOpFileMoveAbort();
+    PRInt32       NativeFileOpFileRenamePrepare();
+    PRInt32       NativeFileOpFileRenameComplete();
+    PRInt32       NativeFileOpFileRenameAbort();
+    PRInt32       NativeFileOpWindowsShortcutComplete();
+    PRInt32       NativeFileOpWindowsShortcutAbort();
+    PRInt32       NativeFileOpMacAliasComplete();
+    PRInt32       NativeFileOpMacAliasAbort();
+    PRInt32       NativeFileOpUnixLink();
+
+};
+
+#endif /* nsInstallFileOpItem_h__ */
+

mozilla/xpinstall/src/nsInstallFolder.cpp

@@ -0,0 +1,467 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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 "nsIFileSpec.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  }
+};
+
+
+MOZ_DECL_CTOR_COUNTER(nsInstallFolder);
+
+nsInstallFolder::nsInstallFolder(const nsString& aFolderID)
+{
+    nsInstallFolder( aFolderID, "" );
+}
+
+nsInstallFolder::nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath)
+{
+    MOZ_COUNT_CTOR(nsInstallFolder);
+
+    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.  
+    */
+
+    SetDirectoryPath( aFolderID, aRelativePath );
+
+    // check to see if that worked
+    if ( !mFileSpec )
+    {
+        // it didn't, so aFolderID is not one of the magic strings.
+        // maybe it's already a pathname? If so it had better be a directory
+        // if it already exists...
+        nsFileSpec dirCheck(aFolderID);
+        if ( (dirCheck.Error() == NS_OK) && 
+             ( dirCheck.IsDirectory() || !dirCheck.Exists() ) )
+        {
+            mFileSpec = new nsFileSpec( dirCheck );
+
+            if (mFileSpec && aRelativePath.Length() > 0 )
+            {
+                // we've got a subdirectory to tack on
+                nsString morePath(aRelativePath);
+
+                if ( morePath.Last() != '/' || morePath.Last() != '\\' )
+                    morePath += '/';
+
+                *mFileSpec += morePath;
+            }
+
+            // make sure that the directory is created. 
+            // XXX: **why** are we creating these? they might not be used!
+            nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
+        }
+    }
+}
+
+
+nsInstallFolder::nsInstallFolder(nsInstallFolder& inFolder, const nsString& subString)
+{
+    MOZ_COUNT_CTOR(nsInstallFolder);
+
+    mFileSpec = new nsFileSpec();
+    if (mFileSpec != nsnull)
+    {
+        *mFileSpec = *inFolder.mFileSpec;
+
+        if (!subString.IsEmpty())
+            *mFileSpec += subString;
+    }
+}
+
+
+nsInstallFolder::~nsInstallFolder()
+{
+    if (mFileSpec != nsnull)
+        delete mFileSpec;
+
+    MOZ_COUNT_DTOR(nsInstallFolder);
+}
+
+void 
+nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
+{
+	aDirectoryPath = "";
+    
+    if (mFileSpec != nsnull)
+    {
+        // We want the a NATIVE path.
+       aDirectoryPath.Assign(mFileSpec->GetCString());
+
+       if (mFileSpec->IsDirectory())
+       {
+          if (aDirectoryPath.Last() != FILESEP)
+              aDirectoryPath.Append(FILESEP);
+       }
+    }
+}
+
+void
+nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath)
+{
+    if ( aFolderID.EqualsIgnoreCase("User Pick") )
+    {
+        PickDefaultDirectory();
+        return;
+    }
+    else if ( aFolderID.EqualsIgnoreCase("Installed") )
+    {   
+        // XXX block from users or remove "Installed"
+        // XXX the filespec creation will fail due to unix slashes on Mac
+        mFileSpec = new nsFileSpec(aRelativePath, PR_TRUE);  // creates the directories to the relative path.
+        return;
+    }
+    else
+    {
+        nsresult rv = NS_OK;
+        PRInt32 folderDirSpecID = MapNameToEnum(aFolderID);
+        
+        switch (folderDirSpecID) 
+		{
+            case 100: ///////////////////////////////////////////////////////////  Plugins
+                if (!nsSoftwareUpdate::GetProgramDirectory())
+                {
+                    SetAppShellDirectory(nsSpecialFileSpec::App_PluginsDirectory );
+                }
+                else
+                {
+                    mFileSpec = new nsFileSpec();
+                    if ( !mFileSpec )
+                        rv = NS_ERROR_OUT_OF_MEMORY;
+                    else
+                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
+
+                    if (NS_SUCCEEDED(rv))
+                    {
+#ifdef XP_MAC
+                        *mFileSpec += "Plugins";
+#else
+                        *mFileSpec += "plugins";
+#endif
+                    }
+                    else
+                        mFileSpec = nsnull;
+                }
+                break; 
+
+            case 101: ///////////////////////////////////////////////////////////  Program
+            case 102: ///////////////////////////////////////////////////////////  Communicator
+                if (!nsSoftwareUpdate::GetProgramDirectory())
+                    mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
+                else
+                {
+                    mFileSpec = new nsFileSpec();
+                    if ( !mFileSpec )
+                        rv = NS_ERROR_OUT_OF_MEMORY;
+                    else
+                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
+
+                    if (!NS_SUCCEEDED(rv))
+                        mFileSpec = nsnull;
+                }
+                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
+                {
+                    if (aRelativePath.IsEmpty())
+                    {
+                        mFileSpec = nsnull;
+                        return;
+                    }
+
+                    nsString tempFileURLString = aFolderID;
+                    tempFileURLString += aRelativePath;
+                    mFileSpec = new nsFileSpec( nsFileURL(tempFileURLString) );
+
+                    // file:// is a special case where it returns and does not
+                    // go to the standard relative path code below.  This is
+                    // so that nsFile(Spec|Path) will work properly.  (ie. Passing
+                    // just "file://" to the nsFileSpec && nsFileURL is wrong).
+
+                    return;
+
+                }
+                break;
+
+            case 110: ///////////////////////////////////////////////////////////  Components
+                if (!nsSoftwareUpdate::GetProgramDirectory())
+                    SetAppShellDirectory(nsSpecialFileSpec::App_ComponentsDirectory );
+                else
+                {
+                    mFileSpec = new nsFileSpec();
+                    if ( !mFileSpec )
+                        rv = NS_ERROR_OUT_OF_MEMORY;
+                    else
+                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
+
+                    if (NS_SUCCEEDED(rv))
+                    {
+#ifdef XP_MAC
+                        *mFileSpec += "Components";
+#else
+                        *mFileSpec += "components";
+#endif
+                    }
+                }
+                break;
+            
+            case 111: ///////////////////////////////////////////////////////////  Chrome
+                if (!nsSoftwareUpdate::GetProgramDirectory())
+                    SetAppShellDirectory(nsSpecialFileSpec::App_ChromeDirectory );
+                else
+                {
+                    mFileSpec = new nsFileSpec();
+                    if ( !mFileSpec )
+                        rv = NS_ERROR_OUT_OF_MEMORY;
+                    else
+                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
+
+                    if (NS_SUCCEEDED(rv))
+                    {
+#ifdef XP_MAC
+                        *mFileSpec += "Chrome";
+#else
+                        *mFileSpec += "chrome";
+#endif
+                    }
+                }
+                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_ShutdownDirectory ));
+                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;
+		}
+
+        if (aRelativePath.Length() > 0 && mFileSpec)
+        {
+            nsString tempPath(aRelativePath);
+
+            if (aRelativePath.Last() != '/' || aRelativePath.Last() != '\\')
+                tempPath += '/';
+
+            *mFileSpec += tempPath;
+        }
+    }
+}
+
+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.Equals(""))
+        return -1;
+
+	while ( DirectoryTable[i].directoryName[0] != 0 )
+	{
+		if ( name.EqualsIgnoreCase(DirectoryTable[i].directoryName) )
+			return DirectoryTable[i].folderEnum;
+		i++;
+	}
+	return -1;
+}
+
+void
+nsInstallFolder::SetAppShellDirectory(PRUint32 value)
+{
+    nsIFileSpec* fs = NS_LocateFileOrDirectory(value);
+    if ( fs )
+    {
+        mFileSpec = new nsFileSpec();
+        fs->GetFileSpec(mFileSpec);
+	    NS_RELEASE(fs);
+    }
+}
+
+nsFileSpec*
+nsInstallFolder::GetFileSpec()
+{
+  if (mFileSpec == nsnull)
+    return nsnull;
+  return mFileSpec;
+}
+
+PRInt32
+nsInstallFolder::ToString(nsAutoString* outString)
+{
+  //XXX: May need to fix. Native charset paths will be converted into Unicode when the get to JS
+  //     This will appear to work on Latin-1 charsets but won't work on Mac or other charsets.
+
+  *outString = mFileSpec->GetCString();
+  return NS_OK;
+}

mozilla/xpinstall/src/nsInstallFolder.h

@@ -0,0 +1,61 @@
+/* -*- 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.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.
+ *
+ * Contributor(s): 
+ *     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(nsInstallFolder& inFolder, const nsString& subString);
+       nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath);
+       virtual ~nsInstallFolder();
+
+       void GetDirectoryPath(nsString& aDirectoryPath);
+       nsFileSpec* GetFileSpec();
+       PRInt32 ToString(nsAutoString* outString);
+       
+    private:
+        
+        nsFileSpec*  mFileSpec;
+
+        void         SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath);
+        void         PickDefaultDirectory();
+        PRInt32      MapNameToEnum(const nsString&  name);
+        void         SetAppShellDirectory(PRUint32 value);
+};
+
+
+#endif