This commit was manufactured by cvs2svn to create branch

'PSM_CLIENT_BRENACH'.

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

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/nsGIFModule.cpp

@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.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): 
- *   Chris Saari <saari@netscape.com>
- */
-
-#include "nsGIFDecoder2.h"
-#include "nsIComponentManager.h"
-#include "nsIGenericFactory.h"
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIFDecoder2)
-
-static nsModuleComponentInfo components[] =
-{
-  { "GIF Decoder",
-     NS_GIFDECODER2_CID,
-     "@mozilla.org/image/decoder;2?type=image/gif",
-     nsGIFDecoder2Constructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsGIFModule2", components)
-

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/nsIconProtocolHandler.h

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * 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>
- */
-
-#ifndef nsIconProtocolHandler_h___
-#define nsIconProtocolHandler_h___
-
-#include "nsWeakReference.h"
-#include "nsIProtocolHandler.h"
-
-class nsIconProtocolHandler : public nsIProtocolHandler, public nsSupportsWeakReference
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsIconProtocolHandler methods:
-    nsIconProtocolHandler();
-    virtual ~nsIconProtocolHandler();
-
-protected:
-};
-
-#endif /* nsIconProtocolHandler_h___ */

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/security/Makefile.in

@@ -1,33 +1,31 @@
 #
-# The contents of this file are subject to the Mozilla Public
+# 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/MPL/
-# 
+# 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 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
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
-# 
-# Contributor(s):
+#
+# Contributor(s): 
 #
 
-DEPTH		= ../..
+DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src decoders
+DIRS		= psm
 
 include $(topsrcdir)/config/rules.mk
-
-

mozilla/security/psm/Makefile

@@ -0,0 +1,88 @@
+#! gmake
+#
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+
+psm_RelEng_srvr_bld:
+	cd ../coreconf; gmake
+	cd ../../nsprpub; $(MAKE) OBJDIR_NAME=$(OBJDIR_NAME)
+	cd ../nss; gmake import IMPORTS=dbm/DBM_1_54
+	cd ../nss; gmake 
+ifeq ($(OS_ARCH), WINNT)
+	gmake import IMPORTS=nlslayer/m16
+else
+	gmake import IMPORTS=nlslayer/PR3 RELEASE_TREE=/h/tortoise/export/share/builds/components
+endif
+	cd ui;gmake
+	gmake
+	cd server;gmake build_xpi
+

mozilla/security/psm/Makefile.in

@@ -0,0 +1,118 @@
+#
+# 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): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+
+CORE_DEPTH=$(topsrcdir)/security
+
+include $(CORE_DEPTH)/coreconf/arch.mk
+ifeq (,$(filter-out NetBSD,$(OS_TARGET)))
+include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+else
+include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
+endif
+include $(CORE_DEPTH)/coreconf/prefix.mk
+CPU_TAG = _$(CPU_ARCH)
+LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+CORECONF_OBJDIR=$(OBJDIR_NAME)
+
+include $(DEPTH)/config/autoconf.mk
+
+ifndef MOZ_DEBUG
+OPT_GMAKE_FLAGS = BUILD_OPT=1
+BUILD_OPT=1
+OBJDIR_TAG=_OPT
+endif
+
+DEFAULT_GMAKE_FLAGS = -f Makefile $(OPT_GMAKE_FLAGS) 
+
+CORECONF_INSTALL     = $(DIST)/$(CORECONF_OBJDIR)
+CORECONF_DIST        = $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR)
+DEFAULT_GMAKE_FLAGS += DIST=$(CORECONF_DIST) 
+DEFAULT_GMAKE_FLAGS += SOURCE_LIB_DIR=$(CORECONF_DIST)/lib
+DEFAULT_GMAKE_FLAGS += SOURCE_BIN_DIR=$(CORECONF_DIST)/bin
+DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(CORECONF_DIST)
+
+
+DIRS		= lib
+
+include $(topsrcdir)/config/rules.mk
+
+ABS_topsrcdir	:= $(shell cd $(topsrcdir); pwd)
+
+install::
+ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
+	if test ! -d $(MOZ_BUILD_ROOT)/security/nss; then                   \
+		cp -r $(topsrcdir)/security/nss $(MOZ_BUILD_ROOT)/security; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/coreconf; then              \
+		cp -r $(topsrcdir)/security/coreconf $(MOZ_BUILD_ROOT)/security; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/server; then            \
+		cp -r $(topsrcdir)/security/psm/server $(MOZ_BUILD_ROOT)/security/psm/server; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/ui; then        \
+		cp -r $(topsrcdir)/security/psm/ui $(MOZ_BUILD_ROOT)/security/psm/; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/doc; then       \
+		cp -r $(topsrcdir)/security/psm/doc $(MOZ_BUILD_ROOT)/security/psm/; \
+	fi;
+endif
+	cd $(MOZ_BUILD_ROOT)/security/coreconf; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/nss; gmake $(DEFAULT_GMAKE_FLAGS) moz_import
+	cd $(MOZ_BUILD_ROOT)/security/nss/lib; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/psm/ui; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/psm/server; gmake $(DEFAULT_GMAKE_FLAGS)
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psm $(DIST)/bin/
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata $(DIST)/bin
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/start-psm $(DIST)/bin
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+
+clean clobber clobber_all realclean distclean::
+ifeq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
+	cd $(MOZ_BUILD_ROOT)/security/coreconf; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/nss; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/psm/ui; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/psm/server; gmake $(DEFAULT_GMAKE_FLAGS) clean
+else
+	if test -d $(MOZ_BUILD_ROOT)/security/nss; then \
+		rm -rf $(MOZ_BUILD_ROOT)/security/nss;  \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/coreconf; then    \
+		rm -rf $(MOZ_BUILD_ROOT)/security/coreconf;     \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/server; then  \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/server;   \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/ui; then      \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/ui;       \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/doc; then     \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/doc;      \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR); then      \
+		rm -rf $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR);       \
+	fi;
+endif

mozilla/security/psm/doc/cmcjavascriptapi.html

@@ -0,0 +1,494 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
+   <title>Javascript API for Client Certificate Management</title>
+</head>
+<body>
+<h2><font face="Arial,Helvetica">Netscape Personal Security Manager</font></h2>
+
+<h2><font face="Arial,Helvetica">JavaScript API for Client Certificate Management</font></h2>
+
+Version 0.3 - 10/27/1999
+<br>Comments to: <a href="mailto:psmfeedback@netscape.com?subject=JavaScript%20API%20Feedback">psmfeedback@netscape.com</a>
+<p>This document describes a new JavaScript API for performing user certificate
+management operations within a client. The JavaScript runs in the context
+of a web page operated by a Certificate Authority (CA) or Registration
+Authority (RA). The API allows the CA or RA to instruct the client to perform
+PKI operations such as key generation, certificate request generation,
+key escrow, import of user certificates, key recovery, and revocation requests.
+<p>These properties and methods reflect behavior currently implemented
+in Personal Security Manager 1.0.
+<p>The messages imported by or generated by these JavaScript methods are
+defined in the CRMF, CMMF, and CMC internet drafts.
+<h2>
+<font face="Arial,Helvetica">Overview of New Cert Issuing Process</font></h2>
+
+<ol>
+<li>
+User fills out enrollment form</li>
+
+<li>
+User action initiates script</li>
+
+<li>
+Script calls key generation method</li>
+
+<li>
+Signing and Encryption keys are generated</li>
+
+<li>
+Encryption Private Key is wrapped with public key of Key Recovery Authority
+(KRA) (passed in in the form of a certificate as part of the script, and
+checked against a pre-installed certificate copy in the local certificate
+database)</li>
+
+<li>
+The public keys, wrapped encryption private key, and text string from the
+script (possibly containing naming or enrollment info) are signed by the
+user</li>
+
+<li>
+Signed blob is returned to the script</li>
+
+<li>
+Script submits signed blob and any other necessary info to the CA/RA</li>
+
+<li>
+CA/RA verifies signature on signed blob</li>
+
+<li>
+CA/RA validates identity of user</li>
+
+<li>
+CA/RA sends wrapped encryption private key to KRA</li>
+
+<li>
+KRA sends escrow verification back to CA</li>
+
+<li>
+CA creates and signs certificates</li>
+
+<li>
+CA sends certificates back to Communicator</li>
+</ol>
+
+<h2>
+<font face="Arial,Helvetica">JavaScript API</font></h2>
+
+<h3>
+<font face="Arial,Helvetica">Properties</font></h3>
+<tt>crypto.algorithms.dh.keySizes</tt>
+<br><tt>crypto.algorithms.dsa.keySizes</tt>
+<br><tt>crypto.algorithms.rsa.signing.keySizes</tt>
+<br><tt>crypto.algorithms.rsa.keyEx.keySizes</tt>
+<p><tt>keySizes</tt> is an an array that describes the available key sizes
+for the particular algorithms and operations.
+<p>The table below describes the key sizes that will be supported in the
+US and Export versions of Communicator.
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Algorithm</b></td>
+
+<td ALIGN=CENTER><b>US Version Key Sizes</b></td>
+
+<td ALIGN=CENTER><b>Export Version Key Sizes</b></td>
+</tr>
+
+<tr>
+<td>DSA Signing Only</td>
+
+<td>1024, 2048</td>
+
+<td>1024, 2048</td>
+</tr>
+
+<tr>
+<td>RSA Signing Only</td>
+
+<td>1024, 2048</td>
+
+<td>1024, 2048</td>
+</tr>
+
+<tr>
+<td>RSA Encryption Only</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+
+<tr>
+<td>RSA Dual Use Signing And Encryption</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+
+<tr>
+<td>DH Key Exchange</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+</table>
+
+<h3>
+<font face="Arial,Helvetica">Methods</font></h3>
+
+<h4>
+<font face="Arial,Helvetica">generateCRMFRequest()</font></h4>
+<tt>crmfObject = crypto.generateCRMFRequest(<i>"requestedDN", "regToken",
+"authenticator","escrowAuthorityCert", "KeyGen Done Code",keySize1, "keyParams1",
+"keyGenAlg1",..., keySizeN, "keyParamsN", "keyGenAlgN");</i></tt>
+<p>This method will generate a sequence of CRMF requests that has N requests.&nbsp;
+One request for each key pair that is generated.&nbsp; The first three
+parameters will be applied to every request.&nbsp; the "escrowAuthorityCert"
+parameter will only be used for requests that pertain to a key that is
+being escrowed.&nbsp; After the "escrowAuthorityCert" parameter, the method
+takes some JavaScript code that&nbsp; is invoked when the CRMF request
+is ready. Finally, there are 1 or more sets of key generation arguments.&nbsp;
+Each key generation will be associated with its own request.&nbsp; All
+the requests will have the same DN.
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER VALIGN=TOP><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td><i><tt>"requestedDN"</tt></i></td>
+
+<td>An RFC1485 formatted DN to include in the certificate request.</td>
+</tr>
+
+<tr>
+<td><i><tt>"regToken"</tt></i></td>
+
+<td>A value used to authenticate the user to the RA/CA.</td>
+</tr>
+
+<tr>
+<td><i><tt>"authenticator"</tt></i></td>
+
+<td>A value that the user can authenticate with in the future when their
+private key is not available. Can be used for key recovery or revocation
+requests.</td>
+</tr>
+
+<tr>
+<td><i><tt>"escrowAuthorityCert"</tt></i></td>
+
+<td>If this value is NULL, then no key escrow will be performed. This value
+specifies which KRA certificate should be used to wrap the private key
+being escrowed. The user will be prompted for confirmation whenever a key
+will be escrowed.&nbsp; Only key exchange keys will be escrowed. If a dual
+use key is being generated, it will not be escrowed.&nbsp; The value of
+this argument is a base-64 encoded certificate.</td>
+</tr>
+
+<tr>
+<td><i><tt>"CRMF Generation Done Code"</tt></i></td>
+
+<td>This parameter is JavaScript to execute when the CRMF generation is
+complete.&nbsp;</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>keySizeN</tt></i></td>
+
+<td>The size in bits of the Nth key to generate</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"keyParamsN"</tt></i></td>
+
+<td>This string is an optional algorithm dependent parameter value. For
+Diffie-Hellman it is used to specify p and g parameters.&nbsp; For DSA,
+it will be used to specify pqg. If the key generation requires parameters
+and the value passed in is NULL, then the client will generate the parameters
+on its own. Currently, this value is ignored.</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"keyGenAlgN"</tt></i></td>
+
+<td>Which algorithm the generated key will support. Acceptable values are
+(the mentioned values for keyUsage pertain to the keyUsage value of the
+Certificate Extension that will ultimately be in the issued certificate):&nbsp;
+<ul>
+<li>
+"rsa-ex" - generate an RSA key for key exchange only (This will have keyEncipherment
+set for keyUsage.)</li>
+
+<li>
+"rsa-dual-use" - generate a single RSA key for both signing and encryption.&nbsp;
+(This will have digitalSignature, keyEncipherment, and nonRepudiation set
+for keyUsage.)</li>
+
+<li>
+"rsa-sign" - generate an RSA key for signing only. (This will have digitalSignature
+set for keyUsage.)</li>
+
+<li>
+"rsa-nonrepudiation" - generate a single RSA key for nonRepudiation only.
+(This will have non-repudiation set for keyUsage.)</li>
+
+<li>
+"rsa-sign-nonrepudiation" - generate a single RSA key use for both signing
+and nonRepudiation. (This will have both digitalSignature and nonRepudiation
+set for keyUsage.)</li>
+
+<li>
+"dsa-sign" - generate a single DSA key for signing only. (This will have
+digitalSignature set for keyUsage.)</li>
+
+<li>
+"dsa-nonrepudiation" - generate a single DSA key for nonRepudiation. (This
+will have nonRepudiation set for keyUsage.)</li>
+
+<li>
+"dsa-sign-nonrepudiation" - generate a single DSA key for signing and non-repudiation.
+(This will have digitalSignature and nonRepudiation set for keyUsage.)</li>
+</ul>
+</td>
+</tr>
+</table>
+
+<p>The <b>generateCRMFRequest()</b> method will cause the user to be presented
+with a key generation dialog. The dialog describes the key generation process
+and gives the user the opportunity to cancel the operation.
+<p>The method <b>generateCRMFRequest() </b>will return an instance of a
+CRMF object. The JavaScript passed in as the <i><tt>"CRMF Generation Done
+Code"</tt></i> parameter should look at the attribute <i>request </i>of
+the returned object to get the result of the CRMF generation.
+<p>The string found by accessing <i><tt>crmfObject.request</tt></i> is
+the base-64 encoded CRMF message to be sent to the CA/RA, or an error string.
+The possible error strings are:
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:invalidParameter:XXX"</td>
+
+<td>The parameter XXX was an invalid value.</td>
+</tr>
+
+<tr>
+<td>"error:userCancel"</td>
+
+<td>the user has canceled the key generation operation</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>the software encountered some internal error, such as out of memory</td>
+</tr>
+</table>
+
+<h4>
+<font face="Arial,Helvetica">importUserCertificates()</font></h4>
+<tt><i>resultString</i> = crypto.importUserCertificates(<i>"nicknameString"</i>,
+<i>"certString"</i>,
+<i>allowBackup</i>)</tt>
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"nicknameString"</tt></i></td>
+
+<td>This is the nickname that will be used to describe the certificate
+in the client's certificate management UI.&nbsp; It should serve to uniquely
+identify the certificate to the user. For example, "John Smith's VeriSign
+Class 3 Digital ID" or "John Smith's Ford ID Certificate". However, if
+this certificate has the same DN as one or more certificates that already
+exist in the user's certificate store, the nickname associated with the
+certificate(s) of the same DN in the certificate store is used, and the
+<tt>"nicknameString"</tt> parameter is ignored. If the string is null and
+no certificate with the same DN exists in the user's certificate store,
+Personal Security Manager uses the following pattern to derive the nickname:
+<tt>&lt;Common Name>'s &lt;Issuer Name> ID</tt>.</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"certRepString"</tt></i></td>
+
+<td>This string is the CMMF Certification Response from the CA that contains
+the user's certificate(s). The response is base-64 encoded.</td>
+</tr>
+
+<tr>
+<td><i><tt>allowBackup</tt></i></td>
+
+<td>This is a Boolean argument. It allows the CA or RA to indicate to the
+client whether to force the user to back up a newly issued certificate
+(PKCS #12).</td>
+</tr>
+</table>
+
+<p>The <b>importUserCertificates()</b> method is used to import newly issued
+certificates for the user. The private key for the certificates must already
+reside in the user's personal private key database.
+<p>The request ID in the response being imported must match the request
+ID in the associated Certification Request or Recovery Request.
+<p>If the import operation succeeds, an empty string will be returned.&nbsp;
+If it fails, one of the following error strings will be returned:
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:userCancel"</td>
+
+<td>The user canceled the import operation</td>
+</tr>
+
+<tr>
+<td>"error:invalidCertificate"</td>
+
+<td>One of the certificate packages was incorrectly formatted</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>The software encountered some internal error, such as out of memory</td>
+</tr>
+
+<tr>
+<td>"error:invalidRequestID"</td>
+
+<td>The request ID in the response message does not match any outstanding
+request</td>
+</tr>
+</table>
+
+<h4>
+<font face="Arial,Helvetica">popChallengeResponse()</font></h4>
+<tt><i>resultString</i> = crypto.popChallengeResponse(<i>"challengeString"</i>);</tt>
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER VALIGN=TOP><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"challengeString"</tt></i></td>
+
+<td>A base-64 encoded CMMF POPODecKeyChallContent message. The current
+implementation does not conform to that defined in the CMMF draft, and
+we intend to change this implementation to that defined in the CMC RFC..
+See below for the current implementation.</td>
+</tr>
+</table>
+
+<p>The resultString will either be a base-64 encoded POPODecKeyRespContent
+message, or one of the following error strings:
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:invalidParameter:XXX"</td>
+
+<td>The parameter XXX was an invalid value.</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>the software encountered some internal error, such as out of memory</td>
+</tr>
+</table>
+
+<p><b>Challenge-Response Proof Of Possession</b>
+<p><tt>Expected Input:</tt>
+<p><tt>POPODecKeyChallContent ::= SEQUENCE OF Challenge</tt>
+<br><tt>&nbsp;&nbsp;&nbsp; -- One Challenge per encryption key certification
+request (in the</tt>
+<br><tt>&nbsp;&nbsp;&nbsp; -- same order as these requests appear in FullCertTemplates).</tt>
+<p><tt>Challenge ::= SEQUENCE {</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; owf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+AlgorithmIdentifier&nbsp; OPTIONAL,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- MUST be present in the first
+Challenge; MAY be omitted in any</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- subsequent Challenge in POPODecKeyChallContent
+(if omitted,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- then the owf used in the immediately
+preceding Challenge is</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- to be used).</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; witness&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the result of applying the one-way
+function (owf) to a</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- randomly-generated INTEGER, A.&nbsp;
+[Note that a different</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- INTEGER MUST be used for each
+Challenge.]</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sender&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+GeneralName,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the name of the sender.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; key&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the public key used to encrypt
+the challenge.&nbsp; This will allow</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the client to find the appropriate
+key to do the decryption.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; challenge&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the encryption (under the public
+key for which the cert.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- request is being made) of Rand,
+where Rand is specified as</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp; Rand ::= SEQUENCE
+{</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; INTEGER,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the randomly-generated INTEGER A (above)</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+senderHash&nbsp; OCTET STRING</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the result of applying the one-way function (owf) to</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the sender's general name</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp; }</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the size of "int" must be small
+enough such that "Rand" can be</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- contained within a single PKCS
+#1 encryption block.</tt>
+<br><tt>&nbsp; }</tt>
+<p>&copy; Copyright 1999 Netscape Communications Corporation
+</body>
+</html>

mozilla/security/psm/doc/contents.htm

@@ -0,0 +1,171 @@
+<html><head>
+<title></title>
+
+</HEAD>
+
+
+<FONT FACE="arial, helvetica, sans-serif"  size="-1">
+<a name="TOP">
+<IMG SRC="cartbanner.gif" WIDTH="432" HEIGHT="36" HSPACE="0" VSPACE="0">
+<table bgcolor="#cccccc" width="100%">
+<tr><td><IMG SRC="w.gif" WIDTH=1 HEIGHT=3 BORDER=0></td></tr>
+</table>
+<BR><BR>
+
+
+
+<TABLE CELLPADDING=5 CELLSPACING=2 border=0>
+<TR>
+
+<TD> <a href="help.htm">Next<IMG SRC="next.gif" WIDTH=16 
+
+HEIGHT=14 ALIGN="texttop" BORDER=0></a></FONT></TD>   
+<TD BGCOLOR="#FFFFFF"><a href="contents.htm">Topics</a></FONT></TD>
+
+
+</TR>
+</TABLE>
+</TD></TR> 
+</TABLE>
+
+<BR> <BR>
+
+</a>
+</DIV>
+
+</P>
+<h1>Contents</h1>
+
+<B><a href="help.htm#1024926"> 	
+</B> </A> <p>
+<p><b>
+<a href="help.htm#1057187">
+ Introduction to Personal Security Manager 	
+</a></b><br><DD>
+
+<a href="help.htm#1044573">
+ About Personal Security Manager Help 	
+</a><br><DD>
+
+<a href="help.htm#1043598">
+ What You Can Do with Personal Security Manager 	
+</a><br><DD>
+
+<a href="help.htm#1026014">
+ Understanding Network Security 	
+</a><br>
+<p><b>
+<a href="help.htm#1045279">
+ Information Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1041627">
+ Information About Web Pages 	
+</a><br><DD>
+
+<a href="help.htm#1046060">
+ Information About Stored Email Messages 	
+</a><br><DD>
+
+<a href="help.htm#1046671">
+ Information About Email Messages You Are Composing 	
+</a><br>
+<p><b>
+<a href="help.htm#1030083">
+ Applications Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1030967">
+ Navigator 	
+</a><br><DD>
+
+<a href="help.htm#1031452">
+ Messenger 	
+</a><br><DD>
+
+<a href="help.htm#1031152">
+ Java/JavaScript 	
+</a><br>
+<p><b>
+<a href="help.htm#1030743">
+ Certificates Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1047547">
+ Certificates&#151;Mine 	
+</a><br><DD>
+
+<a href="help.htm#1031428">
+ Certificates&#151;Others 	
+</a><br><DD>
+
+<a href="help.htm#1031432">
+ Certificates&#151;Web Sites 	
+</a><br><DD>
+
+<a href="help.htm#1031434">
+ Certificates&#151;Authorities 	
+</a><br>
+<p><b>
+<a href="help.htm#1036138">
+ Advanced Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1036162">
+ Modules 	
+</a><br><DD>
+
+<a href="help.htm#1036164">
+ Options 	
+</a><br>
+<p><b>
+<a href="help.htm#1056728">
+ Other Personal Security Manager Windows 	
+</a></b><br><DD>
+
+<a href="help.htm#1055385">
+ Certificate Information 	
+</a><br><DD>
+
+<a href="help.htm#1035650">
+ Choose Security Device 	
+</a><br><DD>
+
+<a href="help.htm#1041171">
+ Enrollment Information 	
+</a><br><DD>
+
+<a href="help.htm#1055232">
+ Certificate Renewal 	
+</a><br><DD>
+
+<a href="help.htm#1041200">
+ Choosing a Certificate 	
+</a><br><DD>
+
+<a href="help.htm#1036401">
+ New Certificate Authority 	
+</a><br><DD>
+
+<a href="help.htm#1041248">
+ Web Site Certificates 	
+</a><br><DD>
+
+<a href="help.htm#1036488">
+ Request for Signature 	
+</a><br><FONT FACE="sans-Serif" SIZE=+1>&nbsp;<BR>
+<a href="glossary.htm#996904">
+Glossary 	
+</a>
+</A> </FONT>
+
+<BR><BR><BR>
+
+&copy; Copyright 2000 Netscape Communications Corporation
+</FONT> </CENTER>
+
+<BR>
+
+</BODY>
+
+</HTML>

mozilla/security/psm/doc/glossary.htm

@@ -0,0 +1,417 @@
+<html><head>
+<title></title>
+
+<script languag=javascript> 
+
+  <!-- 
+  if (typeof(crypto.disableRightClick) == "function") { 
+      crypto.disableRightClick(); 
+  } 
+  // --> 
+
+</script>
+</HEAD>
+
+<FONT FACE="arial, helvetica, sans-serif" size="-1">
+<a name="TOP">
+
+<IMG SRC="cartbanner.gif" WIDTH="432" HEIGHT="36" HSPACE="0" VSPACE="0">
+<table bgcolor="#cccccc" width="100%">
+<tr><td><IMG SRC="w.gif" WIDTH=1 HEIGHT=3 BORDER=0></td></tr>
+</table>
+
+<BR><BR>
+<TABLE CELLPADDING=5 CELLSPACING=2 border=0>
+<TR><TD BGCOLOR="#FFFFFF"><a href="help.htm"><IMG SRC="prev.gif" WIDTH=16 
+
+HEIGHT=14 ALIGN="texttop" BORDER=0>Previous</a>
+  </TD>
+
+ 
+<TD BGCOLOR="#FFFFFF"><a href="contents.htm">Topics</a></TD>
+
+
+</TR>
+</TABLE>
+
+<BR> <BR>
+
+</a>
+</DIV>
+
+</P>
+<h1><A NAME="
+"></A><A NAME="996904">
+Glossary 
+</A></h1><dl>
+<A NAME="authentication"></A><A NAME="998782">
+<B>authentication.</B>&nbsp;
+</A><A NAME="1013907">
+Assurance that a party to a computerized transaction is not an impostor. Authentication typically involves the use of a password, certificate, personal identification number (PIN), or other information that can be used to validate identity over a computer network. See also <a href="glossary.htm#1014123">password-based authentication</a>, <a href="glossary.htm#1018581">certificate-based authentication</a>, <a href="glossary.htm#1021054">client authentication</a>, <a href="glossary.htm#1031070">server authentication</a>.<P>
+</A>
+<A NAME="CA"></A><A NAME="1021395">
+<B>CA.</B>&nbsp;
+</A><A NAME="1021418">
+See <a href="glossary.htm#1020903"></a><a href="glossary.htm#1020903">certificate authority (CA)</a>.<P>
+</A>
+<A NAME="CA certificate"></A><A NAME="1017503">
+<B>CA certificate.</B>&nbsp;
+</A><A NAME="1017507">
+A certificate that identifies a certificate authority. See also <a href="glossary.htm#1020903">certificate authority (CA)</a>, <a href="glossary.htm#999541">subordinate CA</a>, <a href="glossary.htm#1015631">root CA</a>.<P>
+</A>
+<A NAME="certificate"></A><A NAME="1018895">
+<B>certificate.</B>&nbsp;
+</A><A NAME="1018896">
+The digital equivalent of an ID card. A certificate specifies the name of an individual, company, or other entity and certifies that a public key, which is included in the certificate, belongs to that entity. When you digitally sign a message or other data, the digital signature for that message is created with the aid of the private key that corresponds to the public key in your certificate. A certificate is issued and digitally signed by a <a href="glossary.htm#1020903">certificate authority (CA)</a>. A certificate's validity can be verified by checking the CA's <a href="glossary.htm#1013995">digital signature</a>. Also called digital ID, digital passport, public-key certificate X.509 certificate, and security certificate. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="certificate authority (CA)"></A><A NAME="1020903">
+<B>certificate authority (CA).</B>&nbsp;
+</A><A NAME="1020904">
+A service that issues a certificate after verifying the identity of the person or entity the certificate is intended to identify. A CA also renews and revokes certificates and generates a list of revoked certificates at regular intervals. CAs can be independent vendors (such as the CAs listed at <a href= "https://certs.netscape.com/client.html" TARGET="_blank">Certificate Authority Services</a>) or a person or organization using certificate-issuing server software (such as Netscape Certificate Management System). See also <a href="glossary.htm#1018895">certificate</a>, <a href="glossary.htm#1019940">certificate revocation list (CRL)</a>.<P>
+</A>
+<A NAME="certificate-based authentication"></A><A NAME="1018581">
+<B>certificate-based authentication.</B>&nbsp;
+</A><A NAME="1018582">
+Verification of identity based on certificates and public-key cryptography. See also <a href="glossary.htm#1014123">password-based authentication</a>.<P>
+</A>
+<A NAME="certificate chain"></A><A NAME="1018500">
+<B>certificate chain.</B>&nbsp;
+</A><A NAME="1019929">
+A hierarchical series of certificates signed by successive certificate authorities. A CA certificate identifies a <a href="glossary.htm#1020903">certificate authority (CA)</a> and is used to sign certificates issued by that authority. A CA certificate can in turn be signed by the CA certificate of a parent CA and so on up to a <a href="glossary.htm#1015631">root CA</a>. <P>
+</A>
+<A NAME="certificate fingerprint"></A><A NAME="1020297">
+<B>certificate fingerprint.</B>&nbsp;
+</A><A NAME="1020326">
+A unique number associated with a certificate. The number is not part of the certificate itself but is produced by applying a mathematical function to the contents of the certificate. If the contents of the certificate change, even by a single character, the function produces a different number. Certificate fingerprints can therefore be used to verify that certificates have not been tampered with.<P>
+</A>
+<A NAME="certificate renewal"></A><A NAME="1031319">
+<B>certificate renewal.</B>&nbsp;
+</A><A NAME="1031323">
+The process of renewing a <a href="glossary.htm#1018895">certificate</a> that is about to expire.<P>
+</A>
+<A NAME="certificate revocation list (CRL)"></A><A NAME="1019940">
+<B>certificate revocation list (CRL).</B>&nbsp;
+</A><A NAME="1021047">
+A list of revoked certificates that is generated and signed by a <a href="glossary.htm#1020903">certificate authority (CA)</a>. You can download the latest CRL to your browser or to a server, then check against it to make sure that certificates are still valid before permitting their use for authentication. <P>
+</A>
+<A NAME="certificate store"></A><A NAME="1023462">
+<B>certificate store.</B>&nbsp;
+</A><A NAME="1032978">
+The collection of certificates, or electronic IDs, maintained by Personal Security Manager on your behalf. These include your own certificates stored on one or more security devices, other people's certificates, web site certificates, and <a href="glossary.htm#1020903"></a>CA certificates. See also <a href="glossary.htm#1020903">certificate authority (CA)</a>, <a href="glossary.htm#1018895">certificate</a>, <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="certificate verification"></A><A NAME="1025527">
+<B>certificate verification.</B>&nbsp;
+</A><A NAME="1025531">
+When Personal Security Manager verifies a certificate, it confirms that the digital signature was created by a CA whose own CA certificate is both present in the certificate store and marked as trusted for issuing that kind of certificate. It also confirms that the certificate being verified has not been marked as untrusted in the certificate store. Finally, if the <a href="glossary.htm#1029304">Online Certificate Status Protocol (OCSP)</a> has been activated (from the Options panel under the Advanced tab), Personal Security Manager also performs an on-line check. It does so by looking up the certificate in a list of valid certificates maintained at a URL that is specified either in the certificate itself or in the OCSP Settings window. If any of these checks fail, Personal Security Manager marks the certificate as unverified and won't recognize the identity it certifies.<P>
+</A>
+<A NAME="cipher"></A><A NAME="1021048">
+<B>cipher.</B>&nbsp;
+</A><A NAME="1021052">
+See <a href="glossary.htm#1019976">cryptographic algorithm</a>.<P>
+</A>
+<A NAME="client"></A><A NAME="1029510">
+<B>client.</B>&nbsp;
+</A><A NAME="1029547">
+Software (such as browser software) that sends requests to and receives information from a <a href="glossary.htm#1029749">server</a>, which is usually running on a different computer. A computer on which client software runs is also described as a client.<P>
+</A>
+<A NAME="client authentication"></A><A NAME="1021054">
+<B>client authentication.</B>&nbsp;
+</A><A NAME="1014557">
+The process of identifying a <a href="glossary.htm#1029510">client</a> to a <a href="glossary.htm#1029749">server</a>, for example with a name and password or with a <a href="glossary.htm#1014561">client SSL certificate</a> and some digitally signed data. See also <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>, <a href="glossary.htm#1031070">server authentication</a>.<P>
+</A>
+<A NAME="client SSL certificate"></A><A NAME="1014561">
+<B>client SSL certificate.</B>&nbsp;
+</A><A NAME="1014562">
+A certificate that a <a href="glossary.htm#1029510">client</a> (for example, browser software such as Netscape Communicator) presents to a <a href="glossary.htm#1029749">server</a> to authenticate the identity of the client (or the identity of the person using the client) using the <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a> protocol. See also <a href="glossary.htm#1021054">client authentication</a>.<P>
+</A>
+<A NAME="cryptographic algorithm"></A><A NAME="1019976">
+<B>cryptographic algorithm.</B>&nbsp;
+</A><A NAME="1019985">
+A set of rules or directions used to perform cryptographic operations such as <a href="glossary.htm#999078">encryption</a> and <a href="glossary.htm#998999">decryption</a>. Sometimes called a <I>cipher.</I><P>
+</A>
+<A NAME="cryptography"></A><A NAME="1026002">
+<B>cryptography.</B>&nbsp;
+</A><A NAME="1026018">
+The art and practice of scrambling (encrypting) and unscrambling (decrypting) information. For example, cryptographic techniques are used to scramble an unscramble information flowing between commercial web sites and your browser. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="decryption"></A><A NAME="998999">
+<B>decryption.</B>&nbsp;
+</A><A NAME="999005">
+The process of unscrambling data that has been encrypted. See also <a href="glossary.htm#999078">encryption</a>.<P>
+</A>
+<A NAME="digital ID"></A><A NAME="999011">
+<B>digital ID.</B>&nbsp;
+</A><A NAME="999017">
+See <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="digital signature"></A><A NAME="1013995">
+<B>digital signature.</B>&nbsp;
+</A><A NAME="1013996">
+A code created from both the data to be signed and the private key of the signer. This code is unique for each new piece of data. Even a single comma added to a message changes the digital signature for that message. Successful validation of your digital signature by appropriate software not only provides evidence that you approved the transaction or message, but also provides evidence that the data has not changed since you digitally signed it. A digital signature has nothing to do with a handwritten signature, although it can sometimes be used for similar legal purposes. See also <a href="glossary.htm#999248">nonrepudiation</a>, <a href="glossary.htm#999618">tamper detection</a>.<P>
+</A>
+<A NAME="distinguished name (DN)"></A><A NAME="1022191">
+<B>distinguished name (DN).</B>&nbsp;
+</A><A NAME="1022194">
+A specially formatted name that uniquely identifies the subject of a certificate.<P>
+</A>
+<A NAME="dual key pairs"></A><A NAME="1020489">
+<B>dual key pairs.</B>&nbsp;
+</A><A NAME="1020619">
+Two public-private key pairs--four keys altogether--corresponding to two separate certificates. The private key of one pair is used for signing operations, and the public and private keys of the other pair are used for encryption and decryption operations. Each pair corresponds to a separate <a href="glossary.htm#1018895">certificate</a>. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="eavesdropping"></A><A NAME="1020620">
+<B>eavesdropping.</B>&nbsp;
+</A><A NAME="1013975">
+Surreptitious interception of information sent over a network by an entity for which the information is not intended.<P>
+</A>
+<A NAME="encryption"></A><A NAME="999078">
+<B>encryption.</B>&nbsp;
+</A><A NAME="1024038">
+The process of scrambling information in a way that disguises its meaning. For example, encrypted connections between computers make it very difficult for third-parties to unscramble, or <I>decrypt,</I> information flowing over the connection. Encrypted information can be decrypted only by someone who possesses the appropriate key. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="encryption certificate"></A><A NAME="1024953">
+<B>encryption certificate.</B>&nbsp;
+</A><A NAME="1024978">
+A certificate whose public key corresponds to a private key used for encryption only. Encryption certificates are not used for signing operations. See also <a href="glossary.htm#1020489">dual key pairs</a>, <a href="glossary.htm#999493">signing certificate</a>.<P>
+</A>
+<A NAME="encryption key"></A><A NAME="1021254">
+<B>encryption key.</B>&nbsp;
+</A><A NAME="1021255">
+A private key used for encryption only. An encryption key and its equivalent public key, plus a <a href="glossary.htm#1021282">signing key</a> and its equivalent public key, constitute a <a href="glossary.htm#1020489">dual key pairs</a>.<P>
+</A>
+<A NAME="fingerprint"></A><A NAME="1020434">
+<B>fingerprint.</B>&nbsp;
+</A><A NAME="1020450">
+See <a href="glossary.htm#1020297">certificate fingerprint</a>.<P>
+</A>
+<A NAME="FIPS PUBS 140-1"></A><A NAME="1025742">
+<B>FIPS PUBS 140-1.</B>&nbsp;
+</A><A NAME="1025743">
+Federal Information Processing Standards Publications (FIPS PUBS) 140-1 is a US government standard for implementations of cryptographic modules--that is, hardware or software that encrypts and decrypts data or performs other cryptographic operations (such as creating or verifying digital signatures). Many products sold to the US government must comply with one or more of the FIPS standards.<P>
+</A>
+<A NAME="key"></A><A NAME="999203">
+<B>key.</B>&nbsp;
+</A><A NAME="999212">
+A large number used by a <a href="glossary.htm#1019976">cryptographic algorithm</a> to encrypt or decrypt data. A person's public key, for example, allows other people to encrypt messages to that person. The encrypted messages must be decrypted with the corresponding private key. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="Lightweight Directory Access Protocol (LDAP)"></A><A NAME="1022286">
+<B>Lightweight Directory Access Protocol (LDAP).</B>&nbsp;
+</A><A NAME="1022287">
+A protocol for accessing directory services across multiple platforms. LDAP is a simplified version of Directory Access Protocol (DAP), used to access X.500 directories. <P>
+</A>
+<A NAME="master key"></A><A NAME="1032598">
+<B>master key.</B>&nbsp;
+</A><A NAME="1032639">
+A symmetric key used by Personal Security Manager to encrypt information on behalf of other applications. For example, Netscape 6 uses Personal Security Manager and your master key to encrypt email passwords, web site passwords, and other stored sensitive information. See also <a href="glossary.htm#999604">symmetric encryption</a>.<P>
+</A>
+<A NAME="misrepresentation"></A><A NAME="1014057">
+<B>misrepresentation.</B>&nbsp;
+</A><A NAME="1014058">
+Presentation of an entity as a person or organization that it is not. For example, a web site might pretend to be a furniture store when it is really just a site that takes credit card payments but never sends any goods. See also <a href="glossary.htm#1014366">spoofing</a>.<P>
+</A>
+<A NAME="Netscape Certificate Management System"></A><A NAME="1018306">
+<B>Netscape Certificate Management System.</B>&nbsp;
+</A><A NAME="1018308">
+A highly configurable set of software components and tools for creating, deploying, and managing certificates. You enroll with the system to obtain certificates of all kinds; the system maintains information about the certificates it issues.<P>
+</A>
+<A NAME="nonrepudiation"></A><A NAME="999248">
+<B>nonrepudiation.</B>&nbsp;
+</A><A NAME="999254">
+The inability, of the sender of a message, to deny having sent the message. A regular hand-written signature provides one form of nonrepudiation. A <a href="glossary.htm#1013995">digital signature</a> provides another.<P>
+</A>
+<A NAME="object signing"></A><A NAME="1014095">
+<B>object signing.</B>&nbsp;
+</A><A NAME="1014096">
+A technology that allows software developers to sign Java code, JavaScript scripts, or any kind of file, and that allows users to identify the signers and control access by signed code to local system resources.<P>
+</A>
+<A NAME="object-signing certificate"></A><A NAME="1014097">
+<B>object-signing certificate.</B>&nbsp;
+</A><A NAME="1014098">
+A certificate whose corresponding private key is used to sign objects such as code files. See also <a href="glossary.htm#1014095">object signing</a>.<P>
+</A>
+<A NAME="Online Certificate Status Protocol (OCSP)"></A><A NAME="1029304">
+<B>Online Certificate Status Protocol (OCSP).</B>&nbsp;
+</A><A NAME="1029312">
+A set of rules that Personal Security Manager follows to perform an online check of an email certificate's validity each time the certificate is used. This process involves checking the certificate against a list of valid certificates maintained at a specified web site. Your computer must be online for OCSP to work.<P>
+</A>
+<A NAME="password-based authentication"></A><A NAME="1014123">
+<B>password-based authentication.</B>&nbsp;
+</A><A NAME="1014124">
+Confident identification by means of a name and password. See also <a href="glossary.htm#998782">authentication</a>.<P>
+</A>
+<A NAME="Personal Security Password"></A><A NAME="1032744">
+<B>Personal Security Password.</B>&nbsp;
+</A><A NAME="1032748">
+A password used by Personal Security Manager to protect the master key and/or private keys stored on a <a href="glossary.htm#1028962">security device</a>. Personal Security Manager needs to access your private keys, for example, when you sign email messages or use one of your own certificates to identify yourself to a web site. It needs to access your master key when it encrypts or decrypts information on behalf of another application&#151;for example, when Netscape 6 needs to store or access your email password. You can set or change your personal security password from the Certificates tab in Personal Security Manager. Each security device requires a separate Personal Security Password. See also <a href="glossary.htm#1015387">private key</a>, <a href="glossary.htm#1032598">master key</a>.<P>
+</A>
+<A NAME="PKCS #11"></A><A NAME="1025194">
+<B>PKCS #11.</B>&nbsp;
+</A><A NAME="1025195">
+The public-key cryptography standard that governs security devices such as smart cards. See also <a href="glossary.htm#1028962">security device</a>, <a href="glossary.htm#1027625">smart card</a>.<P>
+</A>
+<A NAME="PKCS #11 module"></A><A NAME="1025197">
+<B>PKCS #11 module.</B>&nbsp;
+</A><A NAME="1025271">
+A program on your computer that manages cryptographic services such as encryption and decryption using the PKCS #11 standard. PKCS #11 modules (also called <I>cryptographic modules</I>, <I>cryptographic service providers,</I> or <I>security modules</I>) can be thought of as drivers for cryptographic devices that can be implemented in either hardware or software. A PKCS #11 module always controls one or more slots<B>,</B> which may be implemented as physical hardware slots in some form of physical reader (for example, for smart cards) or as conceptual slots in software. Each slot for a PKCS #11 module can in turn contain a <a href="glossary.htm#1028962">security device</a> (also called <I>token</I>)<B>,</B> which is the hardware or software device that actually provides cryptographic services and optionally stores certificates and keys. Personal Security Manager provides a built-in PKCS #11 module. You may install additional modules on your computer to control smart card readers or other hardware devices.<P>
+</A>
+<A NAME="portable security password"></A><A NAME="1024655">
+<B>portable security password.</B>&nbsp;
+</A><A NAME="1024670">
+A password that protects a certificate that you are backing up or have previously backed up. Personal Security Manager asks you to set this password when you back up a certificate, and requests it when you attempt to restore a certificate that has previously been backed up. <P>
+</A>
+<A NAME="private key"></A><A NAME="1015387">
+<B>private key.</B>&nbsp;
+</A><A NAME="1015391">
+One of a pair of keys used in public-key cryptography. The private key is kept secret and is used to decrypt data that has been encrypted with the corresponding public key.<P>
+</A>
+<A NAME="PSM Private Keys security device"></A><A NAME="1032045">
+<B>PSM Private Keys security device.</B>&nbsp;
+</A><A NAME="1032110">
+The default <a href="glossary.htm#1028962">security device</a> used by Personal Security Manager to store private keys associated with your certificates. In addition to private keys, the PSM Private Keys security device stores the master key used by Netscape 6 to encrypt email passwords, web site passwords, and other sensitive information. See also <a href="glossary.htm#1015387">private key</a>, <a href="glossary.htm#1032598">master key</a>.<P>
+</A>
+<A NAME="public key"></A><A NAME="1019172">
+<B>public key.</B>&nbsp;
+</A><A NAME="1019173">
+One of a pair of keys used in public-key cryptography. The public key is distributed freely and published as part of a <a href="glossary.htm#1018895">certificate</a>. It is typically used to encrypt data sent to the public key's owner, who then decrypts the data with the corresponding private key.<P>
+</A>
+<A NAME="public-key cryptography"></A><A NAME="1019178">
+<B>public-key cryptography.</B>&nbsp;
+</A><A NAME="1023765">
+A set of well-established techniques and standards that allow an entity (such as a person, an organization, or hardware such as a router) to verify its identity electronically or to sign and encrypt electronic data. Two keys are involved: a <a href="glossary.htm#1019172">public key</a> and a <a href="glossary.htm#1015387">private key</a>. The public key is published as part of a <a href="glossary.htm#1018895">certificate</a>, which associates that key with a particular identity. The corresponding private key is kept secret. Data encrypted with the public key can be decrypted only with the private key. <P>
+</A>
+<A NAME="public-key infrastructure (PKI)"></A><A NAME="999412">
+<B>public-key infrastructure (PKI).</B>&nbsp;
+</A><A NAME="1014263">
+The standards and services that facilitate the use of public-key cryptography and certificates in a networked environment.<P>
+</A>
+<A NAME="root CA"></A><A NAME="1015631">
+<B>root CA.</B>&nbsp;
+</A><A NAME="1015635">
+The <a href="glossary.htm#1020903">certificate authority (CA)</a> with a self-signed certificate at the top of a <a href="glossary.htm#1018500">certificate chain</a>. See also <a href="glossary.htm#999541">subordinate CA</a>.<P>
+</A>
+<A NAME="Secure Sockets Layer (SSL)"></A><A NAME="999463">
+<B>Secure Sockets Layer (SSL).</B>&nbsp;
+</A><A NAME="999472">
+A protocol that allows mutual authentication between a <a href="glossary.htm#1029510">client</a> and a <a href="glossary.htm#1029749">server</a> for the purpose of establishing an authenticated and encrypted connection. SSL runs above TCP/IP and below HTTP, LDAP, IMAP, NNTP, and other high-level network protocols. The new Internet Engineering Task Force (IETF) standard called Transport Layer Security (TLS) is based on SSL. See also <a href="glossary.htm#998782">authentication</a>, <a href="glossary.htm#999078">encryption</a>.<P>
+</A>
+<A NAME="security certificate"></A><A NAME="1028900">
+<B>security certificate.</B>&nbsp;
+</A><A NAME="1028904">
+See <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="security device"></A><A NAME="1028962">
+<B>security device.</B>&nbsp;
+</A><A NAME="1028963">
+A hardware or software device that provides cryptographic services such as encryption and decryption and can store certificates and keys. A smart card is one example of a hardware security device. Personal Security Manager contains its own internal security device, called the <a href="glossary.htm#1032045">PSM Private Keys security device</a>, that is implemented in software. Each security device is protected by its own <a href="glossary.htm#1032744">Personal Security Password</a>.<P>
+</A>
+<A NAME="security module"></A><A NAME="1029083">
+<B>security module.</B>&nbsp;
+</A><A NAME="1029097">
+See <a href="glossary.htm#1025197">PKCS #11 module</a>.<P>
+</A>
+<A NAME="security token"></A><A NAME="1028905">
+<B>security token.</B>&nbsp;
+</A><A NAME="1028909">
+See <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="server"></A><A NAME="1029749">
+<B>server.</B>&nbsp;
+</A><A NAME="1029869">
+Software (such as software that serves up web pages) that receives requests from and sends information to a <a href="glossary.htm#1029510">client</a>, which is usually running on a different computer. A computer on which server software runs is also described as a server.<P>
+</A>
+<A NAME="server authentication"></A><A NAME="1031070">
+<B>server authentication.</B>&nbsp;
+</A><A NAME="1031080">
+The process of identifying a <a href="glossary.htm#1029749">server</a> to a <a href="glossary.htm#1029510">client</a> by using a <a href="glossary.htm#1029874">server SSL certificate</a>. See also <a href="glossary.htm#1021054">client authentication</a>, <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>.<P>
+</A>
+<A NAME="server SSL certificate"></A><A NAME="1029874">
+<B>server SSL certificate.</B>&nbsp;
+</A><A NAME="999500">
+A certificate that a <a href="glossary.htm#1029749">server</a> presents to a <a href="glossary.htm#1029510">client</a> to authenticate the server's identity using the <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a> protocol.<P>
+</A>
+<A NAME="signing certificate"></A><A NAME="999493">
+<B>signing certificate.</B>&nbsp;
+</A><A NAME="999507">
+A certificate whose corresponding <a href="glossary.htm#1015387">private key</a> is used to sign transmitted data, so that the receiver can verify the identity of the sender. Certificate authorities (CAs) often issue a signing certificate that will be used to sign email messages at the same time as an <a href="glossary.htm#1024953">encryption certificate</a> that will be used to encrypt email messages. See also <a href="glossary.htm#1020489">dual key pairs</a>, <a href="glossary.htm#1013995">digital signature</a>.<P>
+</A>
+<A NAME="signing key"></A><A NAME="1021282">
+<B>signing key.</B>&nbsp;
+</A><A NAME="1021283">
+A private key used for signing only. A signing key and its equivalent public key, together with an <a href="glossary.htm#1021254">encryption key</a> and its equivalent public key, constitute <a href="glossary.htm#1020489">dual key pairs</a>.<P>
+</A>
+<A NAME="slot"></A><A NAME="1025218">
+<B>slot.</B>&nbsp;
+</A><A NAME="1025222">
+A piece of hardware, or its equivalent in software, that is controlled by a <a href="glossary.htm#1025197">PKCS #11 module</a> and designed to contain a <a href="glossary.htm#1028962">security device</a>. <P>
+</A>
+<A NAME="smart card"></A><A NAME="1027625">
+<B>smart card.</B>&nbsp;
+</A><A NAME="1027626">
+A small device, typically about the size of a credit card, that contains a microprocessor and is capable of storing cryptographic information (such as keys and certificates) and performing cryptographic operations. Smart cards use the <a href="glossary.htm#1025194">PKCS #11</a> standard. A smart card is one kind of <a href="glossary.htm#1028962">security device</a>. <P>
+</A>
+<A NAME="spoofing"></A><A NAME="1014366">
+<B>spoofing.</B>&nbsp;
+</A><A NAME="1014367">
+Pretending to be someone else. For example, a person can pretend to have the email address <FONT FACE="courier, courier new, monospace">jdoe@mozilla.com</FONT>, or a computer can identify itself as a site called <FONT FACE="courier, courier new, monospace">www.mozilla.com</FONT> when it is not. Spoofing is one form of <a href="glossary.htm#1014057">misrepresentation</a>.<P>
+</A>
+<A NAME="SSL"></A><A NAME="999533">
+<B>SSL.</B>&nbsp;
+</A><A NAME="999539">
+See <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>. <P>
+</A>
+<A NAME="subject"></A><A NAME="1013880">
+<B>subject.</B>&nbsp;
+</A><A NAME="1013881">
+The entity (such as a person, organization, or router) identified by a <a href="glossary.htm#1018895">certificate</a>. In particular, the subject field of a certificate contains the certified entity's <a href="glossary.htm#1021328">subject name</a> and other characteristics.<P>
+</A>
+<A NAME="subject name"></A><A NAME="1021328">
+<B>subject name.</B>&nbsp;
+</A><A NAME="1021338">
+A <a href="glossary.htm#1022191">distinguished name (DN)</a> that uniquely describes the <a href="glossary.htm#1013880">subject</a> of a <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="subordinate CA"></A><A NAME="999541">
+<B>subordinate CA.</B>&nbsp;
+</A><A NAME="999591">
+A <a href="glossary.htm#1020903">certificate authority (CA)</a> whose certificate is signed by another subordinate CA or by the root CA. See also <a href="glossary.htm#1018500">certificate chain</a>, <a href="glossary.htm#1015631">root CA</a>.<P>
+</A>
+<A NAME="symmetric encryption"></A><A NAME="999604">
+<B>symmetric encryption.</B>&nbsp;
+</A><A NAME="999625">
+An encryption method that uses a single cryptographic key to both encrypt and decrypt a given message.<P>
+</A>
+<A NAME="tamper detection"></A><A NAME="999618">
+<B>tamper detection.</B>&nbsp;
+</A><A NAME="999631">
+A mechanism ensuring that data received in electronic form has not been tampered with; that is, that the data received corresponds entirely with the original version of the same data.<P>
+</A>
+<A NAME="TLS"></A><A NAME="1027427">
+<B>TLS.</B>&nbsp;
+</A><A NAME="1027428">
+See <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>.<P>
+</A>
+<A NAME="token"></A><A NAME="1024528">
+<B>token.</B>&nbsp;
+</A><A NAME="1024586">
+See <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="trust"></A><A NAME="1019748">
+<B>trust.</B>&nbsp;
+</A><A NAME="1020186">
+Confident reliance on a person or other entity. In the context of <a href="glossary.htm#999412">public-key infrastructure (PKI)</a>, trust usually refers to the relationship between the user of a certificate and the <a href="glossary.htm#1020903">certificate authority (CA)</a> that issued the certificate. If you use Personal Security Manager to specify that you trust a CA, Personal Security Manager trusts valid certificates issued by that CA unless you specify otherwise in the settings for individual certificates. You use the Authorities panel of the Certificates tab in Personal Security Manager to specify the kinds of certificates you trust or don't trust different CAs to issue. <P>
+</A>
+<A NAME="1028719">
+<B></B><a href="glossary.htm#1028962"></a><P>
+</A>
+</dl>
+
+
+<BR>
+
+&copy; Copyright 2000 Netscape Communications Corporation
+</FONT> </CENTER>
+
+<BR>
+
+</BODY>
+
+</HTML>

mozilla/security/psm/doc/license.txt

@@ -0,0 +1,343 @@
+
+NETSCAPE CLIENT PRODUCTS LICENSE AGREEMENT
+Redistribution Or Rental Not Permitted
+
+These terms apply to Personal Security Manager.
+
+BY CLICKING THE ACCEPTANCE BUTTON OR INSTALLING OR
+USING PERSONAL SECURITY MANAGER SOFTWARE (THE "PRODUCT"), 
+THE INDIVIDUAL OR ENTITY LICENSING THE PRODUCT
+("LICENSEE") IS CONSENTING TO BE BOUND BY AND IS
+BECOMING A PARTY TO THIS AGREEMENT.  IF LICENSEE DOES
+NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, THE
+BUTTON INDICATING NON-ACCEPTANCE MUST BE
+SELECTED, AND LICENSEE MUST NOT INSTALL OR USE
+THE SOFTWARE.
+
+1. LICENSE AGREEMENT.  As used in this Agreement, for
+residents of Europe, the Middle East or Africa,
+"Netscape" shall mean Netscape Communications Ireland
+Limited; for residents of Japan, "Netscape" shall
+mean Netscape Communications (Japan), Ltd.; for
+residents of all other countries, "Netscape" shall
+mean Netscape Communications Corporation.  In this
+Agreement "Licensor" shall mean Netscape except under
+the following circumstances: (i) if Licensee acquired
+the Product as a bundled component of a third party
+product or service, then such third party shall be
+Licensor; and (ii) if any third party software is
+included as part of the default installation and no
+license is presented for acceptance the first time
+that third party software is invoked, then the use of
+that third party software shall be governed by this
+Agreement, but the term "Licensor," with respect to
+such third party software, shall mean the
+manufacturer of that software and not Netscape.  With
+the exception of the situation described in (ii)
+above, the use of any included third party software
+product shall be governed by the third party's
+license agreement and not by this Agreement, whether
+that license agreement is presented for acceptance
+the first time that the third party software is
+invoked, is included in a file in electronic form, or
+is included in the package in printed form.  If more
+than one license agreement was provided for the
+Product, and the terms vary, the order of precedence
+of those license agreements is as follows: a signed
+agreement, a license agreement available for review
+on the Netscape website, a printed or electronic
+agreement that states clearly that it supersedes
+other agreements, a printed agreement provided with
+the Product, an electronic agreement provided with
+the Product.
+
+2. LICENSE GRANT.  Licensor grants Licensee a
+non-exclusive and non-transferable license to
+reproduce and use for personal or internal business
+purposes the executable code version of the Product,
+provided any copy must contain all of the original
+proprietary notices.  This license does not entitle
+Licensee to receive from Netscape hard-copy
+documentation, technical support, telephone
+assistance, or enhancements or updates to the
+Product.  Licensee may not customize the Product
+unless Licensee has also licensed the Netscape
+Client Customization Kit ("CCK"), and then only to
+the extent permitted in the license agreement for CCK,
+as applicable.  Licensee may not redistribute the
+Product unless Licensee has separately entered into a
+distribution agreement with Netscape such as the
+Unlimited Distribution Program Agreement.
+
+3. RESTRICTIONS.  Except as otherwise expressly
+permitted in this Agreement, or in another Netscape
+agreement to which Licensee is a party such as the
+CCK license agreement or a distribution agreement,
+Licensee may not: (i) modify or create any derivative
+works of the Product or documentation, including translation
+or localization; (ii) decompile, disassemble, reverse engineer,
+or otherwise attempt to derive the source code for the
+Product (except to the extent applicable laws
+specifically prohibit such restriction or as provided by the
+Netscape Public License or Mozilla Public License
+for portions of the product governed by those licenses);
+(iii) redistribute, encumber, sell, rent, lease,
+sublicense, or otherwise transfer rights to the
+Product; (iv) remove or alter any trademark, logo,
+copyright or other proprietary notices, legends,
+symbols or labels in the Product; or (v) publish any
+results of benchmark tests run on the Product to a
+third party without Netscape's prior written
+consent.
+
+4. FEES.  There is no license fee for the Product.
+If Licensee wishes to receive the Product on media,
+there may be a small charge for the media and for
+shipping and handling.  Licensee is responsible for
+any and all taxes.
+
+5. TERMINATION.  Without prejudice to any other
+rights, Licensor may terminate this Agreement if
+Licensee breaches any of its terms and conditions.
+Upon termination, Licensee shall destroy all copies
+of the Product.
+
+6. PROPRIETARY RIGHTS.  Title, ownership rights, and
+intellectual property rights in the Product shall
+remain in Netscape and/or its suppliers.  Licensee
+acknowledges such ownership and intellectual property
+rights and will not take any action to jeopardize,
+limit or interfere in any manner with Netscape's or
+its suppliers' ownership of or rights with respect to
+the Product.  The Product is protected by copyright
+and other intellectual property laws and by
+international treaties.  Title and related rights in
+the content accessed through the Product is the
+property of the applicable content owner and is
+protected by applicable law.  The license granted
+under this Agreement gives Licensee no rights to such
+content.
+
+7. USE AND AVAILABILITY OF OPEN SOURCE
+CODE. Portions of Personal Security Manager were created using source
+code governed by the Netscape Public License (NPL) and
+the Mozilla Public License (MPL).  The source code for
+the portions of Personal Security Manager governed by the NPL and MPL
+is available from http://www.mozilla.org under those licenses.
+
+8. DISCLAIMER OF WARRANTY.  THE PRODUCT IS PROVIDED
+FREE OF CHARGE, AND, THEREFORE, ON AN "AS IS" BASIS,
+WITHOUT WARRANTY OF ANY KIND, INCLUDING WITHOUT
+LIMITATION THE WARRANTIES THAT IT IS FREE OF DEFECTS,
+MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+NON-INFRINGING.  THE ENTIRE RISK AS TO THE QUALITY
+AND PERFORMANCE OF THE PRODUCT IS BORNE BY LICENSEE.
+SHOULD THE PRODUCT PROVE DEFECTIVE IN ANY RESPECT,
+LICENSEE AND NOT LICENSOR OR ITS SUPPLIERS OR
+RESELLERS OR ANY CONTRIBUTORS TO THE SOURCE CODE
+OF THE PORTIONS OF PERSONAL SECURITY MANAGER AVAILABLE FROM
+HTTP://WWW.MOZILLA.ORG ASSUMES THE ENTIRE COST
+OF ANY SERVICE AND REPAIR.  IN ADDITION, THE SECURITY
+MECHANISMS IMPLEMENTED BY THE PRODUCT HAVE
+INHERENT LIMITATIONS, AND LICENSEE MUST DETERMINE
+THAT THE PRODUCT SUFFICIENTLY MEETS ITS REQUIREMENTS.
+THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
+PART OF THIS AGREEMENT.  NO USE OF THE PRODUCT IS
+AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+9. LIMITATION OF LIABILITY.  TO THE MAXIMUM EXTENT
+PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL
+LICENSOR OR ITS SUPPLIERS OR RESELLERS OR ANY
+CONTRIBUTORS TO THE SOURCE CODE OF THE PORTIONS OF 
+PERSONAL SECURITY MANAGER AVAILABLE FROM
+HTTP://WWW.MOZILLA.ORG BE LIABLE FOR
+ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+DAMAGES ARISING OUT OF THE USE OF OR INABILITY TO USE
+THE PRODUCT, INCLUDING, WITHOUT LIMITATION, DAMAGES
+FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE
+OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+DAMAGES OR LOSSES, EVEN IF ADVISED OF THE POSSIBILITY
+THEREOF, AND REGARDLESS OF THE LEGAL OR EQUITABLE
+THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE
+CLAIM IS BASED.  IN ANY CASE, LICENSOR'S ENTIRE
+LIABILITY UNDER ANY PROVISION OF THIS AGREEMENT SHALL
+NOT EXCEED IN THE AGGREGATE THE SUM OF THE FEES
+LICENSEE PAID FOR THIS LICENSE (IF ANY) AND FEES FOR
+SUPPORT OF THE PRODUCT RECEIVED BY NETSCAPE UNDER A
+SEPARATE SUPPORT AGREEMENT (IF ANY), WITH THE
+EXCEPTION OF DEATH OR PERSONAL INJURY CAUSED BY THE
+NEGLIGENCE OF LICENSOR TO THE EXTENT APPLICABLE LAW
+PROHIBITS THE LIMITATION OF DAMAGES IN SUCH CASES.
+SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+THIS EXCLUSION AND LIMITATION MAY NOT BE APPLICABLE.
+NETSCAPE IS NOT RESPONSIBLE FOR ANY LIABILITY ARISING
+OUT OF CONTENT PROVIDED BY LICENSEE OR A THIRD PARTY
+THAT IS ACCESSED THROUGH THE PRODUCT AND/OR ANY
+MATERIAL LINKED THROUGH SUCH CONTENT.
+
+10. ENCRYPTION.  If Licensee wishes to use the
+cryptographic features of the Product, then Licensee
+may need to obtain and install a signed digital
+certificate from a certificate authority or a
+certificate server.  Licensee may be charged
+additional fees for certification services.  Licensee
+is responsible for maintaining the security of the
+environment in which the Product is used and the
+integrity of the private key file used with the
+Product.  In addition, the use of digital
+certificates is subject to the terms specified by the
+certificate provider, and there are inherent
+limitations in the capabilities of digital
+certificates.  If Licensee is sending or receiving
+digital certificates, Licensee is responsible for
+familiarizing itself with and evaluating such terms
+and limitations.  If the Product is a version with
+FORTEZZA, Licensee will need to obtain PC Card
+Readers and FORTEZZA Crypto Cards from another vendor
+to enable the FORTEZZA features.
+
+11. EXPORT CONTROL.  Licensee agrees to comply with
+all export laws and restrictions and regulations of
+the United States or foreign agencies or authorities,
+and not to export or re-export the Product or any
+direct product thereof in violation of any such
+restrictions, laws or regulations, or without all
+necessary approvals.  As applicable, each party shall
+obtain and bear all expenses relating to any
+necessary licenses and/or exemptions with respect to
+its own export of the Product from the U.S.  Neither
+the Product nor the underlying information or
+technology may be downloaded or otherwise exported or
+re-exported (i) into Cuba, Iran, Iraq, Libya, North
+Korea, Sudan, Syria or any other country subject to
+U.S. trade sanctions covering the Product, to
+individuals or entities controlled by such countries,
+or to nationals or residents of such countries other
+than nationals who are lawfully admitted permanent
+residents of countries not subject to such sanctions;
+or (ii) to anyone on the U.S. Treasury Department's
+list of Specially Designated Nationals and Blocked
+Persons or the U.S. Commerce Department's Table of
+Denial Orders.  By downloading or using the Product,
+Licensee agrees to the foregoing and represents and
+warrants that it complies with these conditions.
+
+12. HIGH RISK ACTIVITIES.  The Product is not
+fault-tolerant and is not designed, manufactured or
+intended for use or resale as on-line control
+equipment in hazardous environments requiring
+fail-safe performance, such as in the operation of
+nuclear facilities, aircraft navigation or
+communication systems, air traffic control, direct
+life support machines, or weapons systems, in which
+the failure of the Product could lead directly to
+death, personal injury, or severe physical or
+environmental damage ("High Risk Activities").
+Accordingly, Licensor and its suppliers specifically
+disclaim any express or implied warranty of fitness
+for High Risk Activities.  Licensee agrees that
+Licensor and its suppliers will not be liable for any
+claims or damages arising from the use of the Product
+in such applications.
+
+13. U.S. GOVERNMENT END USERS.  The Product is a
+"commercial item," as that term is defined in 48
+C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+computer software" and "commercial computer software
+documentation," as such terms are used in 48 C.F.R.
+12.212 (Sept.  1995).  Consistent with 48 C.F.R.
+12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+(June 1995), all U.S. Government End Users acquire
+the Product with only those rights set forth herein.
+
+13. MISCELLANEOUS.  (a) This Agreement constitutes
+the entire agreement between the parties concerning
+the subject matter hereof.  (b) This Agreement may be
+amended only by a writing signed by both parties.
+(c) Except to the extent applicable law, if any,
+provides otherwise, this Agreement shall be governed
+by the laws of the State of California, U.S.A.,
+excluding its conflict of law provisions.  (d) Unless
+otherwise agreed in writing, all disputes relating to
+this Agreement (excepting any dispute relating to
+intellectual property rights) shall be subject to
+final and binding arbitration in Santa Clara County,
+California, under the auspices of JAMS/EndDispute,
+with the losing party paying all costs of
+arbitration.  (e) This Agreement shall not be
+governed by the United Nations Convention on
+Contracts for the International Sale of Goods.  (f)
+If any provision in this Agreement should be held
+illegal or unenforceable by a court having
+jurisdiction, such provision shall be modified to the
+extent necessary to render it enforceable without
+losing its intent, or severed from this Agreement if
+no such modification is possible, and other
+provisions of this Agreement shall remain in full
+force and effect.  (g) The controlling language of
+this Agreement is English.  If Licensee has received
+a translation into another language, it has been
+provided for Licensee's convenience only.  (h) A
+waiver by either party of any term or condition of
+this Agreement or any breach thereof, in any one
+instance, shall not waive such term or condition or
+any subsequent breach thereof.  (i) The provisions of
+this Agreement which require or contemplate
+performance after the expiration or termination of
+this Agreement shall be enforceable notwithstanding
+said expiration or termination.  (j) Licensee may not
+assign or otherwise transfer by operation of law or
+otherwise this Agreement or any rights or obligations
+herein except in the case of a merger or the sale of
+all or substantially all of Licensee's assets to
+another entity.  (k) This Agreement shall be binding
+upon and shall inure to the benefit of the parties,
+their successors and permitted assigns.  (l) Neither
+party shall be in default or be liable for any delay,
+failure in performance (excepting the obligation to
+pay) or interruption of service resulting directly or
+indirectly from any cause beyond its reasonable
+control.  (m) The relationship between Licensor and
+Licensee is that of independent contractors and
+neither Licensee nor its agents shall have any
+authority to bind Licensor in any way.  (n) If any
+dispute arises under this Agreement, the prevailing
+party shall be reimbursed by the other party for any
+and all legal fees and costs associated therewith.
+(o) If any Netscape professional services are being
+provided, then such professional services are
+provided pursuant to the terms of a separate
+Professional Services Agreement between Netscape and
+Licensee.  The parties acknowledge that such services
+are acquired independently of the Product licensed
+hereunder, and that provision of such services is not
+essential to the functionality of such Product.  (p)
+The headings to the sections of this Agreement are
+used for convenience only and shall have no
+substantive meaning.  (q) Licensor may use Licensee's
+name in any customer reference list or in any press
+release issued by Licensor regarding the licensing of
+the Product and/or provide Licensee's name and the
+names of the Product licensed by Licensee to third
+parties.
+
+14. LICENSEE OUTSIDE THE U.S.  If Licensee is located
+outside the U.S., then the provisions of this Section
+shall apply.  (i) Les parties aux presentes
+confirment leur volonte que cette convention de meme
+que tous les documents y compris tout avis qui s'y
+rattache, soient rediges en langue anglaise.
+(translation: "The parties confirm that this
+Agreement and all related documentation is and will
+be in the English language.")  (ii) Licensee is
+responsible for complying with any local laws in its
+jurisdiction which might impact its right to import,
+export or use the Product, and Licensee represents
+that it has complied with any regulations or
+registration procedures required by applicable law to
+make this license enforceable.
+
+
+Netscape Client Software EULA           Rev. [022500]
+

mozilla/security/psm/doc/psmtest.html

@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<head>
+  <title>Personal Security Manager Detection Page</title>
+  <script language=javascript>
+
+    function init_title()
+    {
+      with(window.frames.the_frame) {
+        document.write('<BODY><H1>Personal Security Manager Detection Page</H1><P><P>');
+        if (typeof(crypto.version) == "undefined") {
+          document.write('<FONT color="#ff0000">Personal Security Manager not loaded</FONT>');
+        } else {
+          document.write('<FONT color="#007700">Personal Security Manager&nbsp;Running&nbsp;(version ', crypto.version); 
+          document.write(')</FONT>'); 
+        }
+        document.write('</BODY>');
+        document.close();
+      }
+    }
+  
+
+
+</script>
+</head>
+
+<frameset rows="*,1" border=0 onload="init_title()">
+  <frame src="about:blank" name="the_frame">
+  <frame src="about:blank">
+</frameset>

mozilla/security/psm/doc/release_notes.html

@@ -0,0 +1,297 @@
+<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   
+  <meta name="GENERATOR" content="Mozilla/4.75 [en] (WinNT; U) [Netscape]">
+   
+  <meta name="Author" content="Sean Cotter">
+  <title>Personal Security Manager Release Notes</title>
+</head>
+<body>
+<center>
+<h1><img src="bannerrn.gif" height="32" width="468" align="Center"></h1>
+</center>
+<center>
+<h2>Netscape Personal Security Manager</h2>
+</center>
+<center>
+<h2>Release 1.4</h2>
+</center>
+<center>
+<h2>12/18/2000</h2>
+</center>
+<center>
+<hr width="100%"></center>
+These release notes contain the most recent information about this release
+of Netscape Personal Security Manager. Please read these notes before using
+the software.
+<p>These notes include information for IS professionals who are thoroughly
+familiar with security and public-key infrastructure (PKI) issues.</p>
+<p>Use of this product is subject to the terms detailed in the license agreement
+at <a href="http://docs.iplanet.com/docs/manuals/psm/14/license.txt.">http://docs.iplanet.com/docs/manuals/psm/14/license.txt.</a></p>
+<p></p>
+<hr width="100%">
+<h2>Contents</h2>
+<a href="#Documentation">Documentation</a><br>
+<a href="#Changes Since PSM 1.3">Changes Since Personal Security Manager 1.3</a>
+<br>
+<a href="#Software/Hardware Requirements">Software/Hardware Requirements</a>
+<br>
+<a href="#unpacking">Installing Personal Security Manager</a><br>
+<a href="#Using the Test Bed">Using Personal Security Manager</a><br>
+<a href="#Known Bugs/Issues for 14 Release">Known Bugs/Issues for Personal
+Security Manager 1.4</a><br>
+<a href="#Feedback">Feedback</a>
+<p></p>
+<hr width="100%">
+<h2><a name="Documentation"></a>Documentation</h2>
+The following documentation is available with Personal Security Manager:
+<ul>
+  <li><a href="contents.htm">Personal Security Manager Help</a> -- This online
+help system can also be accessed by clicking the Help button in any personal
+Security Manager window.</li>
+  <li><a href="cmcjavascriptapi.html">JavaScript API for Client Certificate
+Management</a> -- This reference describes a new Javascript API for performing
+user certificate management operations with Personal Security Manager, including
+one-click issuance, forced certificate backup by end users, and automatic
+archival of encryption private keys.</li>
+</ul>
+For the latest release notes, deployment guide, and other information,see
+<a href="http://docs.iPlanet.com/docs/manuals/psm.html">http://docs.iPlanet.com/docs/manuals/psm.html</a><a href="http://developer.iPlanet.com/docs/manuals/psm.html">
+.</a>
+<p></p>
+<hr width="100%">
+<h2><a name="Changes Since PSM 1.3"></a>Changes Since Personal Security Manager
+1.3</h2>
+The <a href="http://www.ietf.org/rfc/rfc2246.txt">Transport Layer Security
+(TLS)</a> protocol is turned on by default in Personal Security Manager1.4.
+To turn TLS off, open Personal Security Manager, click the Advanced tab, click
+Options in the left frame, then deselect the checkbox labeled "Enable TLS."
+<p>TLS is an IETF standard based on the Secure Sockets Layer (SSL) protocol.
+It can be thought of as SSL version 3.1. Some servers that do not implement
+SSL correctly cannot negotiate the SSL handshake with client software (such
+as Personal Security Manager) that supports TLS. To allow Personal Security
+Manager to use SSL with such TLS-intolerant servers, you must disable TLS
+as described above.</p>
+<p>Most other changes since Personal Security Manager 1.3 involve minor bug
+fixes and optimizations.</p>
+<p>This version of Netscape Personal Security Manager ships with Netscape
+6 and also works with Mozilla and Communicator 4.7x. </p>
+<p></p>
+<hr width="100%">
+<h4><a name="Software/Hardware Requirements"></a><font size="+2">Software/Hardware
+Requirements</font></h4>
+<b>Operating systems supported:</b> Windows NT, Windows 95, Windows 98, Windows
+2000; Solaris 2.6, 2.7, 2.8; and Red Hat Linux 6.1.
+<p></p>
+<hr width="100%">
+<h2><a name="unpacking"></a>Installing Personal Security Manager</h2>
+Netscape Personal Security Manager 1.4 is installed with Netscape 6 and recent versions
+of Mozilla. 
+
+<p>When you install Netscape 6 on Windows, Personal Security Manager is installed
+in the directory <tt>C:\Program Files\Common Files\Netscape Shared\Security\</tt>.
+
+<p>When you install Netscape 6 on Unix, Personal Security Manager is installed
+in a directory called <tt>psm</tt> in the same directory where the <tt>netscape</tt>
+executable resides.<br>
+
+<p>The sections that follow describe how to install the Personal Security Manager 
+files for use with Communicator 4.7x.</p>
+<h3>Installing on Windows 95/98/2000/NT for Use With Communicator 4.7x</h3>
+
+To install Netscape Personal Security Manager on Windows 95/98/2000/NT for use with
+Communicator 4.7 or later, save the file in a convenient location with the
+specified filename, then drag the file's icon into a Navigator window (that
+is, a browser window displayed by Communicator). Dropping the file's icon
+over the browser window initiates SmartUpdate, which automatically installs
+Personal Security Manager. Afterinstallation is complete, exit Communicator
+and relaunch it. If your copy of Communicator is installed in the default
+location, SmartUpdate installs the Personal Security Manager files in the
+directory<tt>C:\Program Files\CommonFiles\Netscape Shared\Security\</tt>
+and adds the file <tt>cmnav.dll</tt>in the directory <tt>C:\Program Files\Netscape\Communicator\Program</tt>.<br>
+<h3>Installing on Unix for Use With Communicator 4.7x</h3>
+
+To install Personal Security Manager for use with Communicator 4.7 or later on Unix, you
+must be logged in as the same Unix user you will be logged in as when you
+run Communicator. For the Unix installation to succeed, you must have write
+privileges for both the directory where the Netscape executable resides and
+the directory where the installation script creates the directory containing
+the Personal Security Manager files. To install Personal Security Manager for
+use with Communicator 4.7x, download the tar file for the version of the product
+that you want to install and follow these steps:<br>
+<ol>
+  <li>Exit Communicator, if it is running.</li>
+  <li>Decompress the downloaded file to some convenient location.</li>
+  <li>Run the psm-install program.</li>
+</ol>
+The psm-install program allows you to specify the directory in which Personal
+Security Manager will be installed. In this release, you must install Personal
+Security Manager locally. To do so, you can either install it in the default
+location (<tt>/opt/netscape/security</tt>) or in some other local location. However,
+if you install Personal Security Manager anywhere other than the default
+location, Communicator must also be installed locally. To run Personal Security
+Manager on Unix, you must be logged in as the same Unix user you were logged
+in as when you installed it.<br>
+<h3>Disabling Personal Security Manager</h3>
+To <b>disable</b> Personal Security Manager temporarily, exit the browser,
+then:
+<ul>
+  <li>on Unix, remove the directory<tt>psm</tt> from the directory where
+the<tt>netscape</tt>executable resides.</li>
+  <li>on Windows, rename the directory <tt>C:\Program Files\Common Files\Netscape
+Shared\Security</tt> to something else.</li>
+</ul>
+<hr width="100%">
+<h2><a name="Using the Test Bed"></a>Using Personal Security Manager</h2>
+The sections that follow describe how to test some of the features of Personal
+Security Manager that are available with this release:
+<ul>
+  <li><a href="#Start Up Personal Security Manager with">Start Up Personal
+SecurityManager with Netscape 6</a></li>
+  <li><a href="#Use SSL with Server Authentication">Test Basic SSL</a></li>
+  <li><a href="#Get a Certificate">Get an SSL Client Certificate</a></li>
+  <li><a href="#View Your Personal Certificate">View Your Certificate</a></li>
+  <li><a href="#Using Your Personal Certificate for Client">Test Client Authentication</a></li>
+  <li><a href="#Validate Certificates Using OSCP">Validate Certificates Using
+OCSP</a></li>
+</ul>
+The sections that follow briefly describe how to test some of the features
+listed above.
+<p>For information on the JavaScript API supported by Personal SecurityManager,
+see <a href="cmcjavascriptapi.html">JavaScript API for ClientCertificate
+Management</a> and the Personal Security Manager DeploymentGuide. For the
+latest versions of these documents, see <a href="http://docs.iPlanet.com/docs/manuals/psm.html">
+http://docs.iPlanet.com/docs/manuals/psm.html</a>.</p>
+<h3><a name="Start Up Personal Security Manager with"></a>Use Personal Security
+Manager with Netscape 6</h3>
+Personal Security Manager starts automatically the first time Netscape 6
+needs to perform some action involving security, such as handling anSSL session.
+<p>Follow these steps to view your security settings and confirm that&nbsp;
+Personal Security Manager is running:</p>
+<ol>
+  <li>Launch Netscape 6.</li>
+  <li>Choose Security &amp; Privacy from the Tasks menu, then choose Security
+Manager to view your Personal Security Manager settings.</li>
+  <li>Close the Personal Security Manager window.</li>
+  <li>Go to the page <a href="psmtest.html">psmtest.html</a> (in the same
+directoryas these release notes), then choose Page Source from the View menu
+tosee the JavaScript code that a web programmer can use to detect Personal
+Security Manager and its version number.</li>
+</ol>
+Note that the version number has two parts. The first is the version ofthe
+PSM client library, and the second is the version of the PSM serverlibrary.
+<br>
+&nbsp;
+<h3><a name="Use SSL with Server Authentication"></a>Test Basic SSL</h3>
+Go to any online store, banking service, brokerage account, or other website
+that supports SSL. Verify that the lock in the lower-left corner ofthe browser
+window is closed when you reach the pages for which SSL shouldbe enabled,
+for example a page where you are asked to give your creditcard number.
+<h3><a name="Get a Certificate"></a>Get an SSL Client Certificate</h3>
+Go to any public or private CA and apply for an SSL client certificate.
+<p>To test one-click certificate issuance, dual key-pair certificates,and
+other Personal Security Manager features, system administrators shoulddownload,
+install, and configure Netscape Certificate Management System.For complete
+CMS documentation and other information, see <a href="http://docs.iPlanet.com/docs/manuals/cms.html">
+http://docs.iPlanet.com/docs/manuals/cms.html</a>.To download the latest
+version of CMS, see <a href="http://www.iplanet.com/downloads/download/">
+http://www.iplanet.com/downloads/download/</a>.</p>
+<h3><a name="View Your Personal Certificate"></a>View Your Certificate</h3>
+After you have obtained a certificate, follow these steps to view it:
+<ol>
+  <li>Click the Security icon in the Navigator toolbar.</li>
+  <li>Click the Certificates tab.</li>
+  <li>Click to select your certificate.</li>
+  <li>Click View.</li>
+</ol>
+You should see information about your new certificate.
+<h3><a name="Using Your Personal Certificate for Client"></a><font size="+1">
+TestClient Authentication</font></h3>
+Personal Security Manager allows the SSL server and client to negotiatewhich
+certificate to use, and in most cases they can agree on a singlecorrect certificate
+for the client to present. When this happens, the usercan access an SSL site
+that requires client authentication with zero additionalclicks.
+<p>To test client authentication with Netscape Enterprise Server, systemadministrators
+should follow these steps:</p>
+<ul>
+  <li>Install an Enterprise Server and configure it for client authentication
+as described in <a href="http://docs.iplanet.com/docs/manuals/cms/41/dep_gide/entsrv.htm">
+AppendixD, Using SSL with Enterprise Server 3.x</a>, of <i>Netscape Certificate
+Management System Installation and Deployment Guide</i>.</li>
+  <li>Test the Enterprise Server installation as described at the end of
+AppendixD using Personal Security Manager.</li>
+</ul>
+<h3><a name="Validate Certificates Using OSCP"></a>Validate Certificates
+UsingOSCP</h3>
+Personal Security Manager supports the use of the On-Line Certificate Status
+Protocol (OSCP) to check the validity of certificates in real time. Information
+about this protocol and how configure Personal Security Manager 1.3 andNetscape
+Certificate Management System 4.2 to support it is available from<a href="http://docs.iPlanet.com/docs/manuals/psm/12/psmdply.htm">
+http://docs.iPlanet.com/docs/manuals/psm/12/psmdply.htm</a>
+<p>It's important to note that Personal Security Manager will accept signatures
+from responders only under the following conditions:</p>
+<ul>
+  <li>The response was signed by a delegated responder--that is, the responder's
+certificate was signed by the same CA as the certificate&nbsp; you're trying
+to verify and has the <tt>extendedKeyUsage</tt> bit set indicating thatthe
+certificate is an OCSP response signer. The certificate should be thesame
+as a CA certificate with the addition of the <tt>extendedKeyUsage</tt>bit.</li>
+  <li>The user has designated a default responder in the OCSP Settings dialog
+box (available from the Advanced tab under Options).</li>
+</ul>
+Common problems include the following:
+<ul>
+  <li>Time drift between the client and server machine. Personal Security
+Managerexpects the time of the response to be within the past 24 hours. If
+thereis a difference in the clocks between the machine used to sign the response,
+so the response looks to Personal Security Manager like it was signed inthe
+future, Personal Security Manager interprets this as an error. Runntp on
+both machines to fix this problem.</li>
+  <li>The response doesn't include the certificates required to complete
+thechain needed to verify the signer's certificate. The client frequently
+doesn't have all the certificates in the database that are needed to verify
+the signer's certificate, in which case Personal Security Manager can'tverify
+the signer's certificate and OCSP fails. Make sure the entire chainis included
+with every response. This is the safest way to avoid this problem.</li>
+  <li>If you are using ValiCert, misconfiguration may cause the Validation
+Authoritynot to send the certificate chain (including the CA root certificate
+andthe OCSP responder's certificate) correctly.</li>
+</ul>
+<hr width="100%">
+<h2><a name="Known Bugs/Issues for 14 Release"></a>Known Bugs/Issues for
+Personal Security Manager 1.4</h2>
+<ul>
+  <li>To run Personal Security Manager on Unix with Netscape 6 or Communicator,
+you must be logged in as thesame Unix user you were logged in as when the
+browser was installed.</li>
+  <li>FORTEZZA is not guaranteed to work with this release. [# 94220]</li>
+  <li>In some unusual circumstances you may encounter problems such as valid
+certificates not being verified or the browser freezing up. If you encounter
+a problem that doesn't appear to have a logical explanation, try the following
+as a last resort:</li>
+  <ol>
+    <li>Exit the browser, then relaunch it. If necessary, use Control-Alt-Delete
+on Windows 95/98/2000/NT to bring up the Task Manager and click End Process
+for both <tt>psm.exe</tt> and <tt>netscp6.exe</tt>.</li>
+    <li><b>Warning:</b> <b>Before taking this step, back up your own certificates
+stored internally by Personal Security Manager.</b> If exiting and relaunching
+the browser doesn't take care of the problem, in some rare cases it maywork
+to exit the browser, then delete or rename your <tt>cert7.db</tt> and<tt>
+key3.db</tt>files (located in your user profile directory on Windows 95/98/2000/NT,
+or in the directory in which the Netscape or Mozilla executable resideson
+Unix) and relaunch the browser. You should also look for all otherfiles in
+the same directory that begin with <tt>cert</tt> or<tt>key</tt>and end in
+      <tt>.db</tt> and delete those files as well before relaunchingthe browser.</li>
+  </ol>
+</ul>
+<hr width="100%">
+<h2><a name="Feedback"></a>Feedback</h2>
+To send feedback to the Personal Security Manager development team, send email
+to <a href="mailto:psmfeedback@netscape.com">psmfeedback@netscape.com</a>. 
+Feedback back sent to this address will be read by the team, but you will
+not receive a personal response.
+</body>
+</html>

mozilla/security/psm/lib/Makefile

@@ -0,0 +1,74 @@
+#! gmake
+#
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+

mozilla/security/psm/lib/Makefile.in

@@ -1,22 +1,22 @@
 #
-# The contents of this file are subject to the Mozilla Public
+# 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/MPL/
-# 
+# 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 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
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
-# 
-# Contributor(s):
+#
+# Contributor(s): 
 #
 
 DEPTH		= ../../..
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= ppm png gif jpeg
+DIRS		= protocol client nlslayer
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/security/psm/lib/client/MANIFEST

@@ -0,0 +1,3 @@
+cmtclist.h
+cmtcmn.h
+cmtjs.h

mozilla/security/psm/lib/client/Makefile

@@ -0,0 +1,74 @@
+#! gmake
+#
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+include config.mk
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+

mozilla/security/psm/lib/client/Makefile.in

@@ -0,0 +1,74 @@
+#! gmake
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= cmt
+
+EXPORTS = \
+	cmtcmn.h \
+	cmtjs.h  \
+	cmtclist.h \
+	$(NULL)
+
+MODULE = security
+
+CSRCS = cmtinit.c  \
+	cmtssl.c   \
+	cmtutils.c \
+	cmtcert.c  \
+	cmthash.c  \
+	cmtpkcs7.c \
+	cmtres.c   \
+	cmtjs.c    \
+	cmtevent.c \
+        cmtpasswd.c \
+	cmtadvisor.c \
+	cmtrng.c \
+	cmtsdr.c \
+	$(NULL)
+
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+EXTRA_DSO_LDOPTS	+= $(DIST)/lib/protocol.$(LIB_SUFFIX)
+else
+EXTRA_DSO_LDOPTS	+= -L$(DIST)/lib -lprotocol
+endif
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/security/psm/lib/client/cmtadvisor.c

@@ -0,0 +1,99 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#ifdef XP_MAC
+#include "cmtmac.h"
+#endif
+
+CMTStatus CMT_SecurityAdvisor(PCMT_CONTROL control, CMTSecurityAdvisorData* data, CMUint32 *resID)
+{
+    CMTItem message = {0, NULL, 0};
+    SecurityAdvisorRequest request;
+    SingleNumMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    if (!data) {
+        return CMTFailure;
+    }
+
+    request.infoContext = data->infoContext;
+    request.resID = data->resID;
+    request.hostname = data->hostname;
+	request.senderAddr = data->senderAddr;
+	request.encryptedP7CInfo = data->encryptedP7CInfo;
+	request.signedP7CInfo = data->signedP7CInfo;
+	request.decodeError = data->decodeError;
+	request.verifyError = data->verifyError;
+	request.encryptthis = data->encryptthis;
+	request.signthis = data->signthis;
+	request.numRecipients = data->numRecipients;
+	request.recipients = data->recipients;
+    message.type = SSM_REQUEST_MESSAGE | SSM_SECURITY_ADVISOR;
+
+    if (CMT_EncodeMessage(SecurityAdvisorRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Send the message and get the response */
+	if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+	}
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_SECURITY_ADVISOR)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *resID = reply.value;
+
+    return CMTSuccess;
+loser:
+
+    if (message.data) {
+        free(message.data);
+    }
+    return CMTFailure;
+}
+
+
+
+

mozilla/security/psm/lib/client/cmtclist.h

@@ -0,0 +1,111 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#ifndef cmtclist_h___
+#define cmtclist_h___
+
+typedef struct CMTCListStr CMTCList;
+/*
+** Circular linked list
+*/
+struct CMTCListStr {
+    CMTCList	*next;
+    CMTCList	*prev;
+};
+
+/*
+** Insert element "_e" into the list, before "_l".
+*/
+#define CMT_INSERT_BEFORE(_e,_l)	 \
+	(_e)->next = (_l);	 \
+	(_e)->prev = (_l)->prev; \
+	(_l)->prev->next = (_e); \
+	(_l)->prev = (_e);	 \
+
+/*
+** Insert element "_e" into the list, after "_l".
+*/
+#define CMT_INSERT_AFTER(_e,_l)	 \
+	(_e)->next = (_l)->next; \
+	(_e)->prev = (_l);	 \
+	(_l)->next->prev = (_e); \
+	(_l)->next = (_e);	 \
+
+/*
+** Append an element "_e" to the end of the list "_l"
+*/
+#define CMT_APPEND_LINK(_e,_l) CMT_INSERT_BEFORE(_e,_l)
+
+/*
+** Insert an element "_e" at the head of the list "_l"
+*/
+#define CMT_INSERT_LINK(_e,_l) CMT_INSERT_AFTER(_e,_l)
+
+/* Return the head/tail of the list */
+#define CMT_LIST_HEAD(_l) (_l)->next
+#define CMT_LIST_TAIL(_l) (_l)->prev
+
+/*
+** Remove the element "_e" from it's circular list.
+*/
+#define CMT_REMOVE_LINK(_e)	       \
+	(_e)->prev->next = (_e)->next; \
+	(_e)->next->prev = (_e)->prev; \
+
+/*
+** Remove the element "_e" from it's circular list. Also initializes the
+** linkage.
+*/
+#define CMT_REMOVE_AND_INIT_LINK(_e)    \
+	(_e)->prev->next = (_e)->next; \
+	(_e)->next->prev = (_e)->prev; \
+	(_e)->next = (_e);	       \
+	(_e)->prev = (_e);	       \
+
+/*
+** Return non-zero if the given circular list "_l" is empty, zero if the
+** circular list is not empty
+*/
+#define CMT_CLIST_IS_EMPTY(_l) \
+    ((_l)->next == (_l))
+
+/*
+** Initialize a circular list
+*/
+#define CMT_INIT_CLIST(_l)  \
+	(_l)->next = (_l); \
+	(_l)->prev = (_l); \
+
+#define CMT_INIT_STATIC_CLIST(_l) \
+    {(_l), (_l)}
+
+#endif /* cmtclist_h___ */

mozilla/security/psm/lib/client/cmtevent.c

@@ -0,0 +1,480 @@
+/* -*- Mode: C; tab-width: 4; 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include <string.h>
+#ifdef XP_UNIX
+#include <sys/time.h>
+#endif
+
+/* Typedefs */
+typedef void (*taskcompleted_handler_fn)(CMUint32 resourceID, CMUint32 numReqProcessed, CMUint32 resultCode, void* data);
+
+CMTStatus CMT_SetUIHandlerCallback(PCMT_CONTROL control, 
+                                   uiHandlerCallback_fn f, void *data)
+{
+    return CMT_RegisterEventHandler(control, SSM_UI_EVENT, 0,
+                                    (void_fun)f, data);
+}
+
+void CMT_SetFilePathPromptCallback(PCMT_CONTROL control,
+                                   filePathPromptCallback_fn f, void* arg)
+{
+    control->userFuncs.promptFilePath = f;
+    control->userFuncs.filePromptArg  = arg;
+}
+
+void CMT_SetPromptCallback(PCMT_CONTROL control, 
+                           promptCallback_fn f, void *arg)
+{
+    control->userFuncs.promptCallback = f;
+    control->userFuncs.promptArg      = arg;
+}
+
+void CMT_SetSavePrefsCallback(PCMT_CONTROL control, savePrefsCallback_fn f)
+{
+    control->userFuncs.savePrefs = f;
+}
+
+CMTStatus CMT_RegisterEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                   CMUint32 resourceID, void_fun handler, 
+                                   void* data)
+{
+    PCMT_EVENT ptr;
+
+    /* This is the first connection */
+    if (control->cmtEventHandlers == NULL) {
+        control->cmtEventHandlers = ptr = 
+            (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+        if (!ptr) {
+            goto loser;
+        }
+    } else {
+        /* Look for another event handler of the same type.  Make sure the
+           event handler with a rsrcid of 0 is farther down the list so
+	   that it doesn't get chosen when there's an event handler for
+	   a specific rsrcid.
+	 */
+	for (ptr=control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+            if (ptr->type == type && resourceID != 0) {
+                /* So we've got an event handler that wants to over-ride
+                   an existing event handler.  We'll put it before the one
+                   that's already here.
+                 */
+                if (ptr->previous == NULL) {
+                    /* We're going to insert at the front of the list*/
+                    control->cmtEventHandlers = ptr->previous = 
+                        (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+                    if (ptr->previous == NULL) {
+                        goto loser;
+		    }
+		    ptr->previous->next = ptr;
+		    ptr = control->cmtEventHandlers;
+		} else {
+		    /* We want to insert in the middle of the list */
+		    PCMT_EVENT tmpEvent;
+		    
+		    tmpEvent = (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+		    if (tmpEvent == NULL) {
+		        goto loser;
+		    }
+		    tmpEvent->previous  = ptr->previous;
+		    ptr->previous->next = tmpEvent;
+		    tmpEvent->next      = ptr;
+		    ptr->previous       = tmpEvent;
+		    ptr = tmpEvent;
+		}
+		break;
+	    }
+	    if (ptr->next == NULL) break;
+	}
+	if (ptr == NULL) {
+	    goto loser;	
+	}
+	if (ptr->next == NULL) {
+	    /* We're adding the event handler at the end of the list. */
+	    ptr->next = (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+	    if (!ptr->next) {
+	        goto loser;
+	    } 
+	    /* Fix up the pointers */
+	    ptr->next->previous = ptr;
+	    ptr = ptr->next;
+	}
+    }
+
+    /* Fill in the data */
+    ptr->type = type;
+    ptr->resourceID = resourceID;
+    ptr->handler = handler;
+    ptr->data = data;
+    
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_UnregisterEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                     CMUint32 resourceID) 
+{
+    PCMT_EVENT ptr, pptr = NULL;
+    
+    for (ptr = control->cmtEventHandlers; ptr != NULL;
+	 pptr = ptr, ptr = ptr->next) {
+        if ((ptr->type == type) && (ptr->resourceID == resourceID)) {
+	    if (pptr == NULL) {
+	        /* node is at head */
+	        control->cmtEventHandlers = ptr->next;
+            if (control->cmtEventHandlers != NULL) {
+                control->cmtEventHandlers->previous = NULL;
+            }
+            free(ptr);
+            return CMTSuccess;
+	    }
+	    /* node is elsewhere */
+	    pptr->next = ptr->next;
+        if (ptr->next != NULL) {
+            ptr->next->previous = pptr;
+        }
+	    free(ptr);
+	    return CMTSuccess;
+        }
+    }
+    return CMTFailure;
+}
+
+PCMT_EVENT CMT_GetEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                               CMUint32 resourceID)
+{
+    PCMT_EVENT ptr;
+    
+    for (ptr = control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == type) && ((ptr->resourceID == resourceID) || 
+                                    !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+PCMT_EVENT CMT_GetFirstEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                    CMUint32 resourceID)
+{
+    PCMT_EVENT ptr;
+
+    for (ptr = control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == type) && ((ptr->resourceID == resourceID) || 
+                                    !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+PCMT_EVENT CMT_GetNextEventHandler(PCMT_CONTROL control, PCMT_EVENT e)
+{
+    PCMT_EVENT ptr;
+
+    for (ptr = control->cmtEventHandlers; ptr != NULL || ptr == e; 
+         ptr = ptr->next) {
+    }
+
+    for (; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == e->type) && ((ptr->resourceID == e->resourceID) || 
+                                       !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+void CMT_ProcessEvent(PCMT_CONTROL cm_control)
+{
+    CMTSocket sock; 
+    CMTItem eventData={ 0, NULL, 0 };
+
+    /* Get the control socket */
+    sock = cm_control->sock;
+
+    /* Acquire a lock on the control connection */
+    CMT_LOCK(cm_control->mutex);
+    /* Do another select here to be sure 
+       that the socket is readable */
+    if (cm_control->sockFuncs.select(&sock, 1, 1) != sock) {
+        /* There's no event. */
+        goto done;
+    }
+
+    /* Read the event */
+    if (CMT_ReceiveMessage(cm_control, &eventData) == CMTFailure) {
+        goto done;
+    }
+    CMT_UNLOCK(cm_control->mutex);
+    /* Dispatch the event */
+    CMT_DispatchEvent(cm_control, &eventData);
+    return;
+done:
+    /* Release the lock on the control connection */
+    CMT_UNLOCK(cm_control->mutex);
+}
+
+void CMT_EventLoop(PCMT_CONTROL cm_control)
+{
+    CMTSocket sock;
+
+    /* Get the control socket */
+    sock = cm_control->sock;
+    CMT_ReferenceControlConnection(cm_control);
+    /* Select on the control socket to see if it's readable */
+    while(cm_control->sockFuncs.select(&sock, 1, 0)) {
+      CMT_ProcessEvent(cm_control);
+    }
+    CMT_CloseControlConnection(cm_control);
+    return;
+}
+
+void
+CMT_PromptUser(PCMT_CONTROL cm_control, CMTItem *eventData)
+{
+    char *promptReply  = NULL;
+    CMTItem   response={ 0, NULL, 0 };
+    PromptRequest request;
+    PromptReply reply;
+    void * clientContext;
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(PromptRequestTemplate, &request, eventData) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Copy the client context to a pointer */
+    clientContext = CMT_CopyItemToPtr(request.clientContext);
+
+    if (cm_control->userFuncs.promptCallback == NULL) {
+        goto loser;
+    }
+    promptReply = 
+        cm_control->userFuncs.promptCallback(cm_control->userFuncs.promptArg, 
+                                             request.prompt, clientContext, 1);
+
+    response.type = SSM_EVENT_MESSAGE | SSM_PROMPT_EVENT;
+    if (!promptReply) {
+        /* the user canceled the prompt or other errors occurred */
+        reply.cancel = CM_TRUE;
+    }
+    else {
+        /* note that this includes an empty string (zero length) password */
+        reply.cancel = CM_FALSE;
+    }
+    reply.resID = request.resID;
+    reply.promptReply = promptReply;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(PromptReplyTemplate, &response, &reply) != CMTSuccess) {
+        goto loser;
+    }
+
+    CMT_TransmitMessage(cm_control, &response);
+ loser:
+    if (promptReply != NULL) {
+      cm_control->userFuncs.userFree(promptReply);
+    }
+    return;
+}
+
+void CMT_GetFilePath(PCMT_CONTROL cm_control, CMTItem * eventData)
+{
+    char *fileName=NULL;
+    CMTItem response = { 0, NULL, 0 };
+    FilePathRequest request;
+    FilePathReply reply;
+
+    /* Decode the request */
+    if (CMT_DecodeMessage(FilePathRequestTemplate, &request, eventData) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (cm_control->userFuncs.promptFilePath == NULL) {
+        goto loser;
+    }
+    fileName = 
+     cm_control->userFuncs.promptFilePath(cm_control->userFuncs.filePromptArg,
+                                          request.prompt, request.fileRegEx, 
+                                          request.getExistingFile);
+
+    response.type = SSM_EVENT_MESSAGE | SSM_FILE_PATH_EVENT;
+    reply.resID = request.resID;
+    reply.filePath = fileName;
+
+    /* Encode the reply */
+    if (CMT_EncodeMessage(FilePathReplyTemplate, &response, &reply) != CMTSuccess) {
+        goto loser;
+    }
+
+    CMT_TransmitMessage(cm_control, &response);
+    cm_control->userFuncs.userFree(fileName); 
+loser:
+   return;
+}
+
+void CMT_SavePrefs(PCMT_CONTROL cm_control, CMTItem* eventData)
+{
+    SetPrefListMessage request;
+    int i;
+
+    /* decode the request */
+    if (CMT_DecodeMessage(SetPrefListMessageTemplate, &request, eventData) !=
+        CMTSuccess) {
+        return;
+    }
+
+    if (cm_control->userFuncs.savePrefs == NULL) {
+        /* callback was not registered: bail */
+        return;
+    }
+    cm_control->userFuncs.savePrefs(request.length, 
+                                    (CMTSetPrefElement*)request.list);
+
+    for (i = 0; i < request.length; i++) {
+        if (request.list[i].key != NULL) {
+            free(request.list[i].key);
+        }
+        if (request.list[i].value != NULL) {
+            free(request.list[i].value);
+        }
+    }
+    return;
+}
+
+void CMT_DispatchEvent(PCMT_CONTROL cm_control, CMTItem * eventData)
+{
+    CMUint32 eventType;
+    CMTItem msgCopy;
+
+    /* Init the msgCopy */
+    msgCopy.data = 0;    
+
+    /* Get the event type */
+    if ((eventData->type & SSM_CATEGORY_MASK) != SSM_EVENT_MESSAGE) {
+        /* Somehow there was a message on the socket that was not 
+         * an event message.  Dropping it on the floor.
+         */
+        goto loser;
+    }
+    eventType = (eventData->type & SSM_TYPE_MASK);
+
+    /* We must now dispatch the event based on it's type */
+    switch (eventType) {
+        case SSM_UI_EVENT:
+        {
+            PCMT_EVENT p;
+            UIEvent event;
+            void * clientContext = NULL;
+
+	    /* Copy the message to allow a second try with the old format */
+	    msgCopy.len = eventData->len;
+	    msgCopy.data = calloc(msgCopy.len, 1);
+	    if (msgCopy.data) {
+              memcpy(msgCopy.data, eventData->data, eventData->len);
+	    }
+
+            /* Get the event data first */
+            if (CMT_DecodeMessage(UIEventTemplate, &event, eventData) != CMTSuccess) {
+		/* Attempt to decode using the old format.  Modal is True */
+		if (!msgCopy.data || 
+		    CMT_DecodeMessage(OldUIEventTemplate, &event, &msgCopy) != CMTSuccess) {
+                  goto loser;
+                }
+
+                /* Set default modal value */
+                event.isModal = CM_TRUE;
+            }
+
+            /* Convert the client context to a pointer */
+            clientContext = CMT_CopyItemToPtr(event.clientContext);
+
+            /* Call any handlers for this event */
+            p = CMT_GetEventHandler(cm_control, eventType, event.resourceID);
+            if (!p) {
+                goto loser;
+            }
+            (*(uiHandlerCallback_fn)(p->handler))(event.resourceID, 
+                                                  clientContext, event.width,
+                                                  event.height, event.isModal, event.url, 
+                                                  p->data);
+            break;
+        }
+
+        case SSM_TASK_COMPLETED_EVENT:
+        {
+           PCMT_EVENT p;
+           TaskCompletedEvent event;
+
+            /* Get the event data */
+            if (CMT_DecodeMessage(TaskCompletedEventTemplate, &event, eventData) != CMTSuccess) {
+                goto loser;
+            }
+
+            /* Call handler for this event */
+            p = CMT_GetEventHandler(cm_control, eventType, event.resourceID);
+            if (!p) {
+                goto loser;
+            }
+            (*(taskcompleted_handler_fn)(p->handler))(event.resourceID, 
+                                                      event.numTasks, 
+                                                      event.result, p->data);
+            break;
+        }
+        case SSM_AUTH_EVENT: 
+             CMT_ServicePasswordRequest(cm_control, eventData);
+             break;
+        case SSM_FILE_PATH_EVENT:
+    	     CMT_GetFilePath(cm_control, eventData);
+             break;
+        case SSM_PROMPT_EVENT:
+	         CMT_PromptUser(cm_control, eventData);
+	         break;
+        case SSM_SAVE_PREF_EVENT:
+            CMT_SavePrefs(cm_control, eventData);
+            break;
+        default:
+            break;
+    }
+loser:
+    free(eventData->data);
+    free(msgCopy.data);
+    return;
+}
+

mozilla/security/psm/lib/client/cmthash.c

@@ -0,0 +1,216 @@
+/* -*- Mode: C; tab-width: 4; 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
+#ifdef XP_MAC
+#include "macsocket.h"
+#include "string.h"
+#else
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include <errno.h>
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "rsrcids.h"
+
+CMTStatus CMT_HashCreate(PCMT_CONTROL control, CMUint32 algID, 
+                         CMUint32 * connID)
+{
+    CMTItem message;
+    SingleNumMessage request;
+    DataConnectionReply reply;
+
+    /* Check passed in parameters */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.value = algID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | SSM_HASH_STREAM;
+
+    /* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the response */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | SSM_HASH_STREAM)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        CMTSocket sock;
+
+        sock = control->sockFuncs.socket(0);
+        if(sock == NULL) {
+            goto loser;
+        }
+        
+        if (control->sockFuncs.connect(sock, reply.port, NULL) != CMTSuccess) {
+            goto loser;
+        }
+        /* Send the hello message */
+		control->sockFuncs.send(sock, control->nonce.data, control->nonce.len);
+
+        /* Save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID)
+		    != CMTSuccess) {
+            goto loser;
+        }
+
+        /* Set the connection ID */
+        *connID = reply.connID;
+        return CMTSuccess;
+	} 
+loser:
+    *connID = 0;
+	return CMTFailure;
+}
+
+CMTStatus CMT_HASH_Destroy(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    if (!control) {
+        goto loser;
+    }
+
+    /* Get the cotext implementation data */
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+
+    return CMTFailure;
+}
+
+CMTStatus CMT_HASH_Begin(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    return CMTSuccess;
+}
+
+CMTStatus CMT_HASH_Update(PCMT_CONTROL control, CMUint32 connectionID, const unsigned char * buf, CMUint32 len)
+{
+    CMTSocket sock;
+    CMUint32 sent;
+
+    /* Do some parameter checking */
+    if (!control || !buf) {
+        goto loser;
+    }
+
+    /* Get the data socket */
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Write the data to the socket */
+    sent = CMT_WriteThisMany(control, sock, (void*)buf, len);
+    if (sent != len) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+
+    return CMTFailure;
+}
+
+CMTStatus CMT_HASH_End(PCMT_CONTROL control, CMUint32 connectionID, 
+                       unsigned char * result, CMUint32 * resultlen, 
+                       CMUint32 maxLen)
+{
+    CMTItem hash = { 0, NULL, 0 };
+
+    /* Do some parameter checking */
+    if (!control || !result || !resultlen) {
+        goto loser;
+    }
+
+    /* Close the connection */
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Get the context info */
+    if (CMT_GetStringAttribute(control, connectionID, SSM_FID_HASHCONN_RESULT,
+                               &hash) == CMTFailure) {
+        goto loser;
+    }
+    if (!hash.data) {
+        goto loser;
+    }
+
+    *resultlen = hash.len;
+    if (hash.len > maxLen) {
+        memcpy(result, hash.data, maxLen);
+    } else {
+        memcpy(result, hash.data, hash.len);
+    }   
+
+    if (hash.data) {
+        free(hash.data);
+    }
+
+    return CMTSuccess;
+
+loser:
+    if (hash.data) {
+        free(hash.data);
+    }
+
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtimpl.h

@@ -0,0 +1,56 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#ifndef __CMTIMPL_H_
+#define __CMTIMPL_H_
+
+typedef unsigned long CMT_HANDLE;
+
+struct _CMTControl {
+  CMT_HANDLE channelID;
+  int socketID;
+  CMTStatus (* cmtEventCallback)(struct _CMTControl * control, 
+				 CMTItem * event,  void * arg);
+  void * cmtEventCallbackArg;
+  struct _CMTData * cmtDataConnection;
+} _CMTControl;
+
+
+
+struct _CMTData {
+  CMT_HANDLE channelID;
+  int socketID;
+  struct _CMTData * next;
+  struct _CMTData * previous;
+};
+
+#endif /*__CMTIMPL_H_*/

mozilla/security/psm/lib/client/cmtinit.c

@@ -0,0 +1,490 @@
+/* -*- Mode: C; tab-width: 4; 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/stat.h>
+#ifndef XP_BEOS
+#include <netinet/tcp.h>
+#endif
+#else
+#ifdef XP_MAC
+#include <Events.h> // for WaitNextEvent
+#else /* Windows */
+#include <windows.h>
+#include <winsock.h>
+#include <direct.h>
+#include <sys/stat.h>
+#endif
+#endif
+
+#include "messages.h"
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include <string.h>
+
+#if defined(XP_UNIX) || defined(XP_BEOS)
+#define DIRECTORY_SEPARATOR '/'
+#elif defined(WIN32) || defined(XP_OS2)
+#define DIRECTORY_SEPARATOR '\\'
+#elif defined XP_MAC
+#define DIRECTORY_SEPARATOR ':'
+#endif
+
+/* Local defines */
+#define CARTMAN_PORT	11111
+#define MAX_PATH_LEN    256
+
+/* write to the cmnav.log */
+#if 0
+#define LOG(x); do { FILE *f; f=fopen("cmnav.log","a+"); if (f) { \
+   fprintf(f, x); fclose(f); } } while(0);
+#define LOG_S(x); do { FILE *f; f=fopen("cmnav.log","a+"); if (f) { \
+   fprintf(f, "%s", x); fclose(f); } } while(0);
+#define ASSERT(x); if (!(x)) { LOG("ASSERT:"); LOG(#x); LOG("\n"); exit(-1); }
+#else
+#define LOG(x); ;
+#define LOG_S(x); ;
+#define ASSERT(x); ;
+#endif
+
+static char*
+getCurrWorkDir(char *buf, int maxLen)
+{
+#if defined WIN32
+    return _getcwd(buf, maxLen);
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    return getcwd(buf, maxLen);
+#else
+    return NULL;
+#endif
+}
+
+static void
+setWorkingDir(char *path)
+{
+#if defined WIN32
+    _chdir(path);
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    chdir(path);
+#else
+    return;
+#endif
+}
+
+static CMTStatus
+launch_psm(char *executable)
+{
+#ifndef XP_MAC
+    char command[MAX_PATH_LEN];
+#endif
+#ifdef WIN32
+    STARTUPINFO sui;
+    PROCESS_INFORMATION pi;
+    UNALIGNED long *posfhnd;
+    int i;
+    char *posfile;
+
+    sprintf(command,"%s > psmlog", executable);
+    ZeroMemory( &sui, sizeof(sui) );
+    sui.cb = sizeof(sui);
+    sui.cbReserved2 = (WORD)(sizeof( int ) + (3 * (sizeof( char ) + 
+                                                   sizeof( long ))));
+    sui.lpReserved2 = calloc( sui.cbReserved2, 1 );
+    *((UNALIGNED int *)(sui.lpReserved2)) = 3;
+    posfile = (char *)(sui.lpReserved2 + sizeof( int ));
+    posfhnd = (UNALIGNED long *)(sui.lpReserved2 + sizeof( int ) + 
+                                 (3 * sizeof( char )));
+    
+    for ( i = 0, posfile = (char *)(sui.lpReserved2 + sizeof( int )),
+              posfhnd = (UNALIGNED long *)(sui.lpReserved2 + sizeof( int ) + (3 * sizeof( char ))) ;
+          i < 3 ; i++, posfile++, posfhnd++ ) {
+        
+        *posfile = 0;
+        *posfhnd = (long)INVALID_HANDLE_VALUE;
+    }
+    /* Now, fire up PSM */
+    if (!CreateProcess(NULL, command, NULL, NULL, TRUE, DETACHED_PROCESS, 
+                       NULL, NULL, &sui, &pi)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    sprintf(command,"./%s &", executable);
+    if (system(command) == -1) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+#else
+    return CMTFailure;
+#endif
+}
+
+PCMT_CONTROL CMT_EstablishControlConnection(char            *inPath, 
+                                            CMT_SocketFuncs *sockFuncs,
+                                            CMT_MUTEX       *mutex)
+{
+    PCMT_CONTROL control;
+#ifndef XP_MAC
+    char *executable;
+    char *newWorkingDir;
+    char oldWorkingDir[MAX_PATH_LEN];
+    size_t stringLen;
+#endif    
+    int i;
+    char *path = NULL;
+
+    /*	On the Mac, we do special magic in the Seamonkey PSM component, so
+    	if PSM isn't launched by the time we reach this point, we're not doing well. */
+#ifndef XP_MAC
+
+    struct stat stbuf;
+    
+    /*
+     * Create our own copy of path.
+     * I'd like to do a straight strdup here, but that caused problems
+     * for https.
+     */
+    stringLen = strlen(inPath);
+
+    path = (char*) malloc(stringLen+1);
+    memcpy(path, inPath, stringLen);
+    path[stringLen] = '\0';
+
+    control = CMT_ControlConnect(mutex, sockFuncs);
+    if (control != NULL) {
+        return control;
+    }
+    /*
+     * We have to try to launch it now, so it better be a valid 
+     * path.
+     */
+    if (stat(path, &stbuf) == -1) {
+        goto loser;
+    }
+    /*
+     * Now we have to parse the path and launch the psm server.
+     */
+    executable = strrchr(path, DIRECTORY_SEPARATOR);
+    if (executable != NULL) {
+        *executable = '\0';
+        executable ++;
+        newWorkingDir = path;
+    } else {
+        executable = path;
+        newWorkingDir = NULL;
+    }
+    if (getCurrWorkDir(oldWorkingDir, MAX_PATH_LEN) == NULL) {
+        goto loser;
+    }
+    setWorkingDir(newWorkingDir);
+    if (launch_psm(executable) != CMTSuccess) {
+        goto loser;
+    }
+    setWorkingDir(oldWorkingDir);
+#endif
+
+    /*
+     * Now try to connect to the psm server.  We will try to connect
+     * a maximum of 30 times and then give up.
+     */
+#ifdef WIN32
+    for (i=0; i<30; i++) {
+        Sleep(1000);
+        control = CMT_ControlConnect(mutex, sockFuncs);
+        if (control != NULL) {
+            break;
+        }
+    }
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    i = 0;
+    while (i<1000) {
+        i += sleep(10);
+	control = CMT_ControlConnect(mutex, sockFuncs);
+	if (control != NULL) {
+	  break;
+	}
+    }
+#elif defined(XP_MAC)
+	for (i=0; i<30; i++) 
+	{
+		EventRecord theEvent;
+		WaitNextEvent(0, &theEvent, 30, NULL);
+		control = CMT_ControlConnect(mutex, sockFuncs);
+		if (control != NULL) 
+			break;
+	}
+
+#else
+    /*
+     * Figure out how to sleep for a while first
+     */
+    for (i=0; i<30; i++) {
+      control = CMT_ControlConnect(mutex, sockFuncs);
+      if (control!= NULL) {
+	break;
+      }
+    }
+#endif
+    if (control == NULL) {
+        goto loser;
+    }
+    if (path) {
+        free (path);
+    }
+    return control;
+ loser:
+    if (control != NULL) {
+        CMT_CloseControlConnection(control);
+    }
+    if (path) {
+        free(path);
+    }
+    return NULL;
+}
+
+
+PCMT_CONTROL CMT_ControlConnect(CMT_MUTEX *mutex, CMT_SocketFuncs *sockFuncs)
+{
+    PCMT_CONTROL control = NULL; 
+    CMTSocket sock=NULL;
+#ifdef XP_UNIX
+    int unixSock = 1;
+    char path[20];
+#else
+    int unixSock = 0;
+    char *path=NULL;
+#endif
+
+    if (sockFuncs == NULL) {
+        return NULL;
+    }
+#ifdef XP_UNIX
+    sprintf(path, "/tmp/.nsmc-%d", (int)geteuid());
+#endif    
+
+    sock = sockFuncs->socket(unixSock);
+    if (sock == NULL) {
+        LOG("Could not create a socket to connect to Control Connection.\n");
+        goto loser;
+    }
+    /* Connect to the psm process */
+    if (sockFuncs->connect(sock, CARTMAN_PORT, path)) {
+	  LOG("Could not connect to Cartman\n");
+	  goto loser;
+    }
+
+#ifdef XP_UNIX
+    if (sockFuncs->verify(sock) != CMTSuccess) {
+        goto loser;
+    }
+#endif
+
+	LOG("Connected to Cartman\n");
+	
+	/* fill in the CMTControl struct */
+	control = (PCMT_CONTROL)calloc(sizeof(CMT_CONTROL), 1);
+	if (control == NULL ) {
+		goto loser;
+	}
+	control->sock = sock;
+    if (mutex != NULL) {
+        control->mutex = (CMT_MUTEX*)calloc(sizeof(CMT_MUTEX),1);
+        if (control->mutex == NULL) {
+            goto loser;
+        }
+        *control->mutex = *mutex;
+    }
+    memcpy(&control->sockFuncs, sockFuncs, sizeof(CMT_SocketFuncs));
+    control->refCount = 1;
+	goto done;
+    
+ loser:
+	if (control != NULL) {
+		free(control);
+    }
+    if (sock != NULL) {
+        sockFuncs->close(sock);
+    }
+	control = NULL;
+    
+ done:
+	return control;
+}
+
+CMTStatus CMT_CloseControlConnection(PCMT_CONTROL control)
+{
+	/* XXX Don't know what to do here yet */
+    if (control != NULL) {
+        CMInt32 refCount;
+        CMT_LOCK(control->mutex);
+        control->refCount--;
+        refCount = control->refCount;
+        CMT_UNLOCK(control->mutex);
+        if (refCount <= 0) {
+            if (control->mutex != NULL) {
+                free (control->mutex);
+            }
+            control->sockFuncs.close(control->sock);
+            free(control);
+        }
+    }
+    
+	return CMTSuccess;
+}
+
+CMTStatus CMT_Hello(PCMT_CONTROL control, CMUint32 version, char* profile, 
+                    char* profileDir)
+{
+	CMTItem message;
+    PCMT_EVENT eventHandler;
+    CMBool doesUI;
+    HelloRequest request;
+    HelloReply reply;
+
+	/* Check the passed parameters */
+	if (!control) {
+		return CMTFailure;
+	}
+	if (!profile) {
+		return CMTFailure;
+	}
+    if (!profileDir) {
+        return CMTFailure;
+    }
+    
+	/* Create the hello message */
+    eventHandler = CMT_GetEventHandler(control, SSM_UI_EVENT, 0);
+    doesUI = (eventHandler == NULL) ? CM_FALSE : CM_TRUE;
+
+    /* Setup the request struct */
+    request.version = version;
+    request.policy = 0; /* no more policy */
+    request.doesUI = doesUI;
+    request.profile = profile;
+    request.profileDir = profileDir;
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_HELLO_MESSAGE;
+
+    if (CMT_EncodeMessage(HelloRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+	/* Send the message and get the response */
+	if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+	}
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_HELLO_MESSAGE)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(HelloReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+	/* Successful response */
+	if (reply.result == 0) {
+            /* Save the nonce value */
+            control->sessionID = reply.sessionID;
+            control->protocolVersion = reply.version;
+            control->port = reply.httpPort;
+            control->nonce = reply.nonce;
+            control->policy = reply.policy;
+            control->serverStringVersion = reply.stringVersion;
+
+            /* XXX Free the messages */
+            return CMTSuccess;
+	}
+loser:
+	/* XXX Free the messages */
+	return CMTFailure;
+}
+
+CMTStatus CMT_PassAllPrefs(PCMT_CONTROL control, int num,
+                           CMTSetPrefElement* list)
+{
+    SetPrefListMessage request;
+    SingleNumMessage reply;
+    CMTItem message;
+
+    if ((control == NULL) || (list == NULL)) {
+        return CMTFailure;
+    }
+
+    /* pack the request */
+    request.length = num;
+    request.list = (SetPrefElement*)list;
+
+    if (CMT_EncodeMessage(SetPrefListMessageTemplate, &message, &request) !=
+        CMTSuccess) {
+        goto loser;
+    }
+    message.type = SSM_REQUEST_MESSAGE | SSM_PREF_ACTION;
+
+    /* send the message */
+    if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PREF_ACTION)) {
+        goto loser;
+    }
+
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    /* don't really need to check the return value */
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+char* CMT_GetServerStringVersion(PCMT_CONTROL control)
+{
+    if (control == NULL) {
+        return NULL;
+    }
+    return control->serverStringVersion;
+}

mozilla/security/psm/lib/client/cmtjs.c

@@ -0,0 +1,556 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmtutils.h"
+#include "cmtjs.h"
+#include "messages.h"
+
+CMTStatus
+CMT_GenerateKeyPair(PCMT_CONTROL control, CMUint32 keyGenContext, 
+		    CMUint32 mechType, CMTItem *param, CMUint32 keySize, 
+		    CMUint32 *keyPairId)
+{
+    CMTItem message;
+    CMTStatus rv;
+    KeyPairGenRequest request = {0, 0, 0, {0, NULL, 0}};
+    SingleNumMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.keyGenCtxtID = keyGenContext;
+    request.genMechanism = mechType;
+    if (param) {
+        request.params = *param;
+    }
+    request.keySize = keySize;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(KeyPairGenRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_CREATE_KEY_PAIR;
+
+    /* Send the message and get the response */
+    rv = CMT_SendMessage(control, &message); 
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_CREATE_KEY_PAIR)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+    *keyPairId = reply.value;
+    return CMTSuccess;
+    
+loser:
+    *keyPairId = 0;
+    return CMTFailure;
+}
+
+
+CMTStatus
+CMT_CreateNewCRMFRequest(PCMT_CONTROL control, CMUint32 keyPairID, 
+			 SSMKeyGenType keyGenType, CMUint32 *reqID)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+    SingleNumMessage reply;
+    
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.value = keyPairID;
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | 
+                    SSM_CREATE_CRMF_REQ;
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+  
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_CREATE_CRMF_REQ)) {
+        goto loser;
+    }
+
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *reqID = reply.value;
+
+    rv = CMT_SetNumericAttribute(control, *reqID, SSM_FID_CRMFREQ_KEY_TYPE,
+				 keyGenType);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_EncodeCRMFRequest(PCMT_CONTROL control, CMUint32 *crmfReqID, 
+		      CMUint32 numRequests, char ** der)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    EncodeCRMFReqRequest request;
+    SingleItemMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.numRequests = numRequests;
+    request.reqIDs = (long *) crmfReqID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(EncodeCRMFReqRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_DER_ENCODE_REQ;
+
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_DER_ENCODE_REQ)) {
+        goto loser;
+    }
+
+    /* XXX Should this be a string? Decode the message */
+    if (CMT_DecodeMessage(SingleItemMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *der = (char *) reply.item.data;
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_ProcessCMMFResponse(PCMT_CONTROL control, char *nickname,
+			char *certRepString, CMBool doBackup,
+			void *clientContext)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    CMMFCertResponseRequest request;
+
+    if(!control) {
+        return CMTFailure;
+    }
+
+    request.nickname = nickname;
+    request.base64Der = certRepString;
+    request.doBackup = doBackup;
+    request.clientContext = CMT_CopyPtrToItem(clientContext);
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CMMFCertResponseRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type =  SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_PROCESS_CMMF_RESP;
+
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_PROCESS_CMMF_RESP)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_CreateResource(PCMT_CONTROL control, SSMResourceType resType,
+		   CMTItem *params, CMUint32 *rsrcId, CMUint32 *errorCode)
+{
+    CMTItem message;
+    CMTStatus rv;
+    CreateResourceRequest request = {0, {0, NULL, 0}};
+    CreateResourceReply reply;
+
+    request.type = resType;
+    if (params) {
+        request.params = *params;
+    } 
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CreateResourceRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_CREATE_RESOURCE;
+    
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_CREATE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(CreateResourceReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *rsrcId = reply.resID;
+    *errorCode = reply.result;
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_SignText(PCMT_CONTROL control, CMUint32 resID, char* stringToSign, char* hostName, char* caOption, CMInt32 numCAs, char** caNames)
+{
+    CMTItem message;
+    SignTextRequest request;
+
+    
+    /* So some basic parameter checking */
+    if (!control || !stringToSign) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resID;
+    request.stringToSign = stringToSign;
+    request.hostName = hostName;
+    request.caOption = caOption;
+    request.numCAs = numCAs;
+    request.caNames = caNames;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(SignTextRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_FORMSIGN_ACTION | SSM_SIGN_TEXT;
+
+    /* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_FORMSIGN_ACTION | SSM_SIGN_TEXT)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_ProcessChallengeResponse(PCMT_CONTROL control, char *challengeString,
+			     char **responseString)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    SingleStringMessage request;
+    SingleStringMessage reply;
+
+    /* Set the request */
+    request.string = challengeString;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleStringMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_CHALLENGE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+    
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_CHALLENGE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleStringMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *responseString = reply.string;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_FinishGeneratingKeys(PCMT_CONTROL control, CMUint32 keyGenContext)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+
+    /* Set up the request */
+    request.value = keyGenContext;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_FINISH_KEY_GEN;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the reply */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_FINISH_KEY_GEN)) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_GetLocalizedString(PCMT_CONTROL        control,
+                       SSMLocalizedString  whichString,
+                       char              **localizedString)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+    GetLocalizedTextReply reply;
+
+    /* Set up the request */
+    request.value = whichString;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_LOCALIZED_TEXT;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_LOCALIZED_TEXT)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(GetLocalizedTextReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (reply.whichString != whichString) {
+        goto loser;
+    }
+    *localizedString = reply.localizedString;
+    return CMTSuccess;
+ loser:
+    *localizedString = NULL;
+    return rv; 
+}
+
+CMTStatus
+CMT_AddNewModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 char         *libraryPath,
+                 unsigned long pubMechFlags,
+                 unsigned long pubCipherFlags)
+{
+    CMTItem message;
+    CMTStatus rv;
+    AddNewSecurityModuleRequest request;
+    SingleNumMessage reply;
+
+    /* Set up the request */
+    request.moduleName = moduleName;
+    request.libraryPath = libraryPath;
+    request.pubMechFlags = pubMechFlags;
+    request.pubCipherFlags = pubCipherFlags;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(AddNewSecurityModuleRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_ADD_NEW_MODULE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_ADD_NEW_MODULE)) {
+        goto loser;
+    }
+
+    /* Decode the response */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    return (CMTStatus) reply.value;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_DeleteModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 int          *moduleType)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleStringMessage request;
+    SingleNumMessage reply;
+
+    /* Set up the request */
+    request.string = moduleName;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleStringMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_DEL_MODULE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_DEL_MODULE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *moduleType = reply.value;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_LogoutAllTokens(PCMT_CONTROL control)
+{
+  CMTItem message;
+  CMTStatus rv;
+
+  message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_LOGOUT_ALL;
+  message.data = NULL;
+  message.len  = 0;
+
+  rv = CMT_SendMessage(control, &message);
+  if (rv != CMTSuccess) {
+    return rv;
+  }
+  if (message.type !=  (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | 
+			SSM_LOGOUT_ALL)) {
+    return CMTFailure;
+  }
+  return CMTSuccess;
+}
+
+CMTStatus CMT_GetSSLCapabilities(PCMT_CONTROL control, CMInt32 *capabilites)
+{
+    SingleNumMessage reply;
+    CMTItem message;
+    CMTStatus rv;
+
+    message.type = (SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | 
+                    SSM_ENABLED_CIPHERS);
+    message.data = NULL;
+    message.len  = 0;
+
+    rv = CMT_SendMessage(control, &message);
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION |
+			 SSM_ENABLED_CIPHERS)) {
+        goto loser;
+    }
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, 
+                          &message) != CMTSuccess) {
+        goto loser;
+    }
+    *capabilites = reply.value;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtjs.h

@@ -0,0 +1,555 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#ifndef _CMTJS_H_
+#define _CMTJS_H_
+#include "cmtcmn.h"
+#include "ssmdefs.h"
+#include "rsrcids.h"
+/*
+ * Define some constants.
+ */
+
+/*
+ * These defines are used in conjuction with the function
+ * CMT_AddNewModule.
+ */
+#define PUBLIC_MECH_RSA_FLAG         0x00000001ul
+#define PUBLIC_MECH_DSA_FLAG         0x00000002ul
+#define PUBLIC_MECH_RC2_FLAG         0x00000004ul
+#define PUBLIC_MECH_RC4_FLAG         0x00000008ul
+#define PUBLIC_MECH_DES_FLAG         0x00000010ul
+#define PUBLIC_MECH_DH_FLAG          0x00000020ul
+#define PUBLIC_MECH_FORTEZZA_FLAG    0x00000040ul
+#define PUBLIC_MECH_RC5_FLAG         0x00000080ul
+#define PUBLIC_MECH_SHA1_FLAG        0x00000100ul
+#define PUBLIC_MECH_MD5_FLAG         0x00000200ul
+#define PUBLIC_MECH_MD2_FLAG         0x00000400ul
+ 
+#define PUBLIC_MECH_RANDOM_FLAG      0x08000000ul
+#define PUBLIC_MECH_FRIENDLY_FLAG    0x10000000ul
+#define PUBLIC_OWN_PW_DEFAULTS       0X20000000ul
+#define PUBLIC_DISABLE_FLAG          0x40000000ul
+
+
+/*
+ * This is the lone supported constant for the Cipher flag
+ * for CMT_AddNewModule
+ */
+#define PUBLIC_CIPHER_FORTEZZA_FLAG  0x00000001ul
+
+CMT_BEGIN_EXTERN_C
+
+/*
+ * FUNCTION: CMT_GenerateKeyPair
+ * -----------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyGenContext
+ *        The Resource ID of a key gen context to use for creating the
+ *        key pair.
+ *    mechType
+ *        A PKCS11 mechanism used to generate the key pair. Valid values are:
+ *          CKM_RSA_PKCS_KEY_PAIR_GEN    0x00000000
+ *          CKM_DSA_KEY_PAIR_GEN         0x00000010
+ *        The definition of these values can be found at 
+ *        http://www.rsa.com/rsalabs/pubs/pkcs11.html
+ *        The psm module currently supports v2.01 of PKCS11
+ *    params
+ *        This parameter will be used to pass parameters to the Key Pair
+ *        generation process.  Currently this feature is not supported, so 
+ *        pass in NULL for this parameter.
+ *    keySize
+ *        The size (in bits) of the key to generate.
+ *    keyPairId
+ *        A pointer to pre-allocated memory where the function can place
+ *        the value of the resource ID of the key pair that gets created.
+ *
+ * NOTES:
+ * This function will send a message to the psm server requesting that 
+ * a public/private key pair be generated. The key gen context will queue
+ * the request. You can send as many key gen requests as you want with a
+ * given key gen context. After sending all the key gen requests, the user
+ * must call CMT_FinishGeneratingKeys so that the key gen context actually
+ * generates the keys.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the request for key generation
+ * was queued successfully and the corresponding resource ID can be found
+ * at *keyPairId.  Any other return value indicates an error and the value
+ * at *keyPairId should be ignored.
+ */
+CMTStatus
+CMT_GenerateKeyPair(PCMT_CONTROL control, CMUint32 keyGenContext, 
+		    CMUint32 mechType, CMTItem *params, CMUint32 keySize, 
+		    CMUint32 *keyPairId);
+
+/*
+ * FUNCTION: CMT_FinishGeneratingKeys
+ * ----------------------------------
+ * INPUTS
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyGenContext
+ *        The resource ID of the key gen context which should finish 
+ *        generating its key pairs.
+ * NOTES
+ * This function will send a message to the psm server notifying the key 
+ * gen context with the resource ID of keyGenContext to finish generating
+ * all of the key gen requests it has queued up. After each key gen has 
+ * finished, the psm server will send a SSM_TASK_COMPLETED_EVENT. So in order
+ * to detect when all of the key gens are done, the user should register 
+ * an event handler.  See comments for CMT_RegisterEventHandler for information
+ * on how to successfully register event handler callbacks. You must register
+ * the event handler with keyGenContext as the target resource ID for this
+ * to work correctly.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the key gen context has started to
+ * generate the key pairs in its queue. Any other return value indicates an
+ * error and the key pairs will not be generated.
+ */
+CMTStatus
+CMT_FinishGeneratingKeys(PCMT_CONTROL control, CMUint32 keyGenContext);
+
+/*
+ * FUNCTION: CMT_CreateNewCRMFRequest
+ * ----------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyPairID
+ *        The resource ID of the key pair that should be associated with
+ *        the CRMF request created. At the time this function is called,
+ *        key pair should have already been created. 
+ *    keyGenType
+ *        An enumeration that explains how the key pair will be used.
+ *        Look at the definition of SSMKeyGenType in ssmdefs.h for valid
+ *        values and their affects on the request.
+ *    reqID
+ *        A pointer to a pre-allocatd chunk of memory where the library 
+ *        can place the resource ID of the new CRMF request.
+ * NOTES:
+ * This function sends a message to the psm server requesting that a new 
+ * CRMF resource object be created. Each CRMF request must be associated with 
+ * a public/private key pair, that is why the keyPairID parameter exists.
+ * The keyGenType parameter is used to initialize the request, eg set the
+ * correct keyUsage extension.
+ * 
+ * Before encoding a CRMF request, the user will want to set the appropriate
+ * attributes to build up the request. The supported attributes are:
+ *
+ * Attribute Enumeration          Attribute Type       What value means
+ * ---------------------          --------------       ----------------
+ * SSM_FID_CRMFREQ_REGTOKEN       String               The value to encode as 
+ *                                                     the registration token
+ *                                                     value for the request.
+ *
+ * SSM_FID_CRMFREQ_AUTHENTICATOR String                The value to encode as
+ *                                                     authenticator control
+ *                                                     in the request.
+ * 
+ * SSM_FID_DN                    String                The RFC1485 formatted
+ *                                                     DN to include in the
+ *                                                     CRMF request.
+ *
+ * For information on how to properly set the attribute of a resource, refer
+ * to the comments for the functions CMT_SetNumericAttribute and 
+ * CMT_SetStringAttribute.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates a new CRMF resource was created by
+ * the psm server and has the resource ID placed at *reqID. Any other return
+ * value indicates an error and the value at *reqID should be ignored.
+ */
+CMTStatus
+CMT_CreateNewCRMFRequest(PCMT_CONTROL control, CMUint32 keyPairID, 
+			 SSMKeyGenType keyGenType, CMUint32 *reqID);
+
+/*
+ * FUNCTION: CMT_EncodeCRMFRequest
+ * ------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    crmfReqID
+ *        An array of resource ID's for CRMF objects to be encoded.
+ *    numRequests
+ *        The length of the array crmfReqID that is passed in.
+ *    der
+ *        A pointer to a pre-allocated pointer for a char* where the library
+ *        can place the final DER-encoding of the requests.
+ * NOTES
+ * This function will send a message to the psm server requesting that 
+ * a number of CRMF requests be encoded into their appropriate DER 
+ * representation. The DER that is sent back will be of the type 
+ * CertReqMessages as define in the internet draft for CRMF. To look at the
+ * draft, visit the following URL: 
+ * http://search.ietf.org/internet-drafts/internet-draft-ietf-pkix-crmf-01.txt
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates psm successfully encoded the requests
+ * and placed the base64 DER encoded request at *der. Any other return value
+ * indicates an error and the value at *der should be ignored.
+ */
+CMTStatus
+CMT_EncodeCRMFRequest(PCMT_CONTROL control, CMUint32 *crmfReqID, 
+		      CMUint32 numRequests, char ** der);
+
+/*
+ * FUNCTION: CMT_ProcessCMMFResponse
+ * ---------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    nickname
+ *        The nickname that should be associated with the certificate 
+ *        contained in the CMMF Response.
+ *    certRepString
+ *        This is the base 64 encoded CertRepContent that issues a certificate.
+ *        The psm server will decode the base 64 data and then parse the
+ *        CertRepContent.
+ *    doBackup
+ *        A boolean value indicating whether or not psm should initiate the
+ *        process of backing up the newly issued certificate into a PKCS-12
+ *        file.
+ *    clientContext
+ *         Client supplied data pointer that is returned to the client during
+ *         a UI event.
+ * NOTES:
+ * This function takes a CertRepContent as defined in the CMMF internet draft
+ * (http://search.ietf.org/internet-drafts/draft-ietf-pkix-cmmf-02.txt) and
+ * imports the certificate into the user's database. The certificate will have
+ * the string value of nickanme as it's nickname when added to the database
+ * unless another certificate with that same Distinguished Name (DN) already
+ * exists in the database, in which case the nickname of the certificate that
+ * already exists will be used. If the value passed in for doBackup is 
+ * non-zero, then the psm server will initiate the process of backing up the
+ * certificate(s) that were just imported.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the certificate(s) were successfully
+ * added to the database. Any other return value means the certificate(s) could
+ * not be successfully added to the database.
+ */
+CMTStatus
+CMT_ProcessCMMFResponse(PCMT_CONTROL control, char *nickname, 
+			char *certRepString, CMBool doBackup,
+			void *clientContext);
+
+/*
+ * FUNCTION: CMT_CreateResource
+ * ----------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    resType
+ *        The enumeration representing the resource type to create.
+ *    params
+ *        A resource dependent binary string that will be sent to the psm 
+ *        server. Each resource will expect a binary string it defines.
+ *    rsrcId
+ *        A pointer to a pre-allocated chunk of memory where the library
+ *        can place the resource ID of the newly created resource.
+ *    errorCode
+ *        A pointer to a pre-allocated chunk of memory where the library
+ *        can place the errorCode returned by the psm server after creating
+ *        the resource.
+ * NOTES:
+ * This function sends a message to the psm server requesting that a new 
+ * resource be created.  The params parameter depends on the type of resource
+ * being created.  Below is a table detailing the format of the params for 
+ * a given resource type. Only the resource types listed below can be created
+ * by calling this function.
+ *
+ * Resource Type constant                  Value for params
+ * ------------------------------          ----------------
+ * SSM_RESTYPE_KEYGEN_CONTEXT              NULL
+ * SSM_RESTYPE_SECADVISOR_CONTEXT          NULL
+ * SSM_RESTYPE_SIGNTEXT                    NULL
+ *
+ * RETURN
+ * A return value of CMTSuccess means the psm server received the request and
+ * processed the create resource create. If the value at *errorCode is zero,
+ * then the value at *rsrcId is the resource ID of the newly created resource.
+ * Otherwise, creating the new resource failed and *errorCode contains the
+ * error code returned by the psm server. ???What are the return values and
+ * what do they mean. Any other return value indicates there was an error 
+ * in the communication with the psm server and the values at *rsrcId and 
+ * *errorCode should be ignored.
+ */
+CMTStatus
+CMT_CreateResource(PCMT_CONTROL control, SSMResourceType resType,
+		   CMTItem *params, CMUint32 *rsrcId, CMUint32 *errorCode);
+
+/*
+ * FUNCTION: CMT_SignText
+ * ----------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    resID
+ *        The resource ID of an SSMSignTextResource.
+ *    stringToSign
+ *        The string that the psm server should sign.
+ *    hostName
+ *        The host name of the site that is requesting a string to be
+ *        signed.  This is used for displaying the UI that tells the user
+ *        a web site has requested the use sign some text.
+ *    caOption
+ *        If the value is "auto" then psm will select the certificate
+ *        to use for signing automatically.
+ *        If the value is "ask" then psm will display a list of 
+ *        certificates for signing.
+ *    numCAs
+ *        The number of CA names included in the array caNames passed in as
+ *        the last parameter to this function.
+ *    caNames
+ *        An array of CA Names to use for filtering the user certs to use
+ *        for signing the text.
+ * NOTES
+ * This function will sign the text passed via the parameter stringToSign.
+ * The function will also cause the psm server to send some UI notifying the
+ * user that a site has requested the user sign some text.  The hostName 
+ * parameter is used in the UI to inform the user which site is requesting
+ * the signed text.  The caOption is used to determine if the psm server 
+ * should automatically select which personal cert to use in signing the
+ * text.  The caNames array is ussed to narrow down the field of personal
+ * certs to use when signing the text. In other words, only personal certs 
+ * trusted by the CA's passed in will be used.
+ *
+ * RETURN
+ * If the function returns CMTSuccess, that indicates the psm server 
+ * successfully signed the text.  The signed text can be retrieved by 
+ * calling CMT_GetStringResource and passing in SSM_FID_SIGNTEXT_RESULT
+ * as the field ID. Any other return value indicates an error meaning the
+ * string was not signed successfully.
+ */
+CMTStatus
+CMT_SignText(PCMT_CONTROL control, CMUint32 resID, char* stringToSign,
+             char* hostName, char *caOption, CMInt32 numCAs, char** caNames);
+
+/*
+ * FUNCTION: CMT_ProcessChallengeResponse
+ * --------------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    challengeString
+ *        The base64 encoded Challenge string received as the 
+ *        Proof-Of-Possession Challenge in response to CRMF request that
+ *        specified Challenge-Reponse as the method for Proof-Of-Possession.
+ *    responseString
+ *        A pointer to pre-allocated char* where the library can place a
+ *        copy of the bas64 encoded response to the challenge presented.
+ * NOTES
+ * This function takes the a challenge--that is encrypted with the public key
+ * of a certificate we created--and decrypts it with the private key we 
+ * generated.  The format of the challenge is as follows:
+ *
+ * Challenge ::= SEQUENCE { 
+ *      owf                 AlgorithmIdentifier  OPTIONAL, 
+ *      -- MUST be present in the first Challenge; MAY be omitted in any 
+ *      -- subsequent Challenge in POPODecKeyChallContent (if omitted, 
+ *      -- then the owf used in the immediately preceding Challenge is 
+ *      -- to be used). 
+ *      witness             OCTET STRING, 
+ *      -- the result of applying the one-way function (owf) to a 
+ *      -- randomly-generated INTEGER, A.  [Note that a different 
+ *      -- INTEGER MUST be used for each Challenge.] 
+ *      sender              GeneralName, 
+ *      -- the name of the sender. 
+ *      key                 OCTET STRING, 
+ *      -- the public key used to encrypt the challenge.  This will allow 
+ *      -- the client to find the appropriate key to do the decryption. 
+ *      challenge           OCTET STRING 
+ *      -- the encryption (under the public key for which the cert. 
+ *      -- request is being made) of Rand, where Rand is specified as 
+ *      --   Rand ::= SEQUENCE { 
+ *      --      int      INTEGER, 
+ *      --       - the randomly-generated INTEGER A (above) 
+ *      --      senderHash  OCTET STRING 
+ *      --       - the result of applying the one-way function (owf) to 
+ *      --       - the sender's general name 
+ *      --   } 
+ *      -- the size of "int" must be small enough such that "Rand" can be 
+ *      -- contained within a single PKCS #1 encryption block. 
+ *  } 
+ * This challenge is based on the Challenge initially defined in the CMMF
+ * internet draft, but differs in that this structure includes the sender
+ * as part of the challenge along with the public key and includes a has
+ * of the sender in the encrypted Rand structure.  The reason for including
+ * the key is to facilitate looking up the key that should be used to 
+ * decipher the challenge.  Including the hash of the sender in the encrypted
+ * Rand structure makes the challenge smaller and allows it to fit in 
+ * one RSA block. 
+ *
+ * The response is of the type POPODecKeyRespContent as defined in the CMMF
+ * internet draft.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates psm successfully parsed and processed
+ * the challenge and created a response.  The base64 encoded response to the
+ * challenge is placed at *responseString.  Any other return value indicates
+ * an error and the value at *responseString should be ignored.
+ */
+CMTStatus
+CMT_ProcessChallengeResponse(PCMT_CONTROL control, char *challengeString,
+			     char **responseString);
+
+/*
+ * FUNCTION: CMT_GetLocalizedString
+ * --------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    whichString
+ *        The enumerated value corresponding to the localized string to 
+ *        retrieve from the psm server
+ *    localizedString
+ *        A pointer to a pre-allocated char* where the library can place 
+ *        copy of the localized string retrieved from the psm server.
+ * NOTES
+ * This function retrieves a localized string from the psm server.  These 
+ * strings are useful for strings that aren't localized in the client 
+ * making use of the psm server, but need to be displayed by the user. Look
+ * in protocol.h for the enumerations of the localized strings that can 
+ * be fetched from psm via this method.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates the localized string was retrieved
+ * successfully and the localized value is located at *localizedString.  Any
+ * other return value indicates an error and the value at *localizedString
+ * should be ignored.
+ */
+CMTStatus 
+CMT_GetLocalizedString(PCMT_CONTROL        control, 
+                       SSMLocalizedString  whichString,
+                       char              **localizedString); 
+
+/*
+ * FUNCTION: CMT_DeleteModule
+ * --------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    moduleName
+ *        The name of the PKCS11 module to delete.
+ *    moduleType
+ *        A pointer to a pre-allocated integer where the library can place
+ *        a value that tells what the type of module was deleted.
+ * NOTES
+ * This function will send a message to the psm server requesting the server 
+ * delete a PKCS-11 module stored in psm's security module database. moduleName
+ * is the value passed in as moduleName when the module was added to the 
+ * security module database of psm.
+ * The values that may be returned by psm for moduleType are:
+ *
+ *    0      The module was an external module developped by a third party
+ *           that was added to the psm security module.
+ *
+ *    1      The module deleted was the internal PKCS-11 module that comes
+ *           built in with the psm server.
+ *
+ *    2      The module that was deleted was the FIPS  internal module.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates the security module was successfully
+ * delete from the psm security module database and the value at *moduleType
+ * will tell what type of module was deleted.
+ * Any other return value indicates an error and the value at *moduleType 
+ * should be ignored.
+ */
+CMTStatus
+CMT_DeleteModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 int          *moduleType);
+
+
+/*
+ * FUNCTION: CMT_AddNewModule
+ * --------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    moduleName
+ *        The name to be associated with the module once it is added to 
+ *        the psm security module database.
+ *    libraryPath
+ *        The path to the library to be  loaded.  The library should be 
+ *        loadable at run-time.
+ *    pubMechFlags
+ *        A bit vector indicating all cryptographic mechanisms that should
+ *        be turned on by default.  This module will become the default 
+ *        handler for the mechanisms that are set by this bit vector.
+ *    pubCipherFlags
+ *        A bit vector indicating all SSL or S/MIME cipher functions
+ *        supported by the module. Most modules will pas in 0x0 for this
+ *        parameter.
+ * NOTES:
+ * This function sends a message to the psm server and requests the .so
+ * file on UNIX or .dll file on Windows be loaded as a PKCS11 module and 
+ * be stored in the psm security module database.  The module will be stored
+ * with the name moduleName that is passed in and will always expect the 
+ * library to live at the path passed in via the parameter libraryPath.
+ * The pubMechFlags tell the psm server how this module should be used.
+ * Valid values are the #define constants defined at the beginning of
+ * this file.
+ * 
+ * RETURN
+ * A return value of CMTSuccess indicates the module was successfully loaded
+ * and placed in the security module database of psm.  Any other return value
+ * indicates an error and means the module was not loaded successfully and
+ * not stored in the psm server's security module database.
+ */
+CMTStatus
+CMT_AddNewModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 char         *libraryPath,
+                 unsigned long pubMechFlags,
+                 unsigned long pubCipherFlags);
+
+CMT_END_EXTERN_C
+
+#endif /*_CMTJS_H_*/

mozilla/security/psm/lib/client/cmtmac.c

@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 4; 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#include "cmtmac.h"
+#include "macsocket.h"
+#include "stdlib.h"
+
+#ifndef XP_MAC
+#error Link with the builtin strdup() on your platform.
+#endif
+
+
+static void 
+my_strcpy(char *dest, const char *source)
+{
+	char *i = dest;
+	const char *j = source;
+	while(*j)
+		*i++ = *j++;
+	*i = '\0';
+}
+
+static int
+my_strlen(const char *str)
+{
+	const char *c = str;
+	int i = 0;
+	
+	while(*c++ != '\0')
+		i++;
+	return i;
+}
+
+char * strdup(const char *oldstr)
+{
+	/* used to keep the mac client library from referring to strdup elsewhere */
+	char *newstr;
+	
+	newstr = (char *) malloc(my_strlen(oldstr)+1);
+	if (newstr)
+		my_strcpy(newstr, oldstr);
+	return newstr;
+}
+

mozilla/security/psm/lib/client/cmtmac.h

@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 4; 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#ifndef __CMTMAC_H__
+#define __CMTMAC_H__
+
+char * strdup(const char *str);
+
+#endif