update to use ns_quicksort so that this branch builds

git-svn-id: svn://10.0.0.236/branches/FAST-GTK-GFX@31772 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/gfx/src/gtk/Makefile.in

@@ -15,20 +15,39 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=../..
+DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
 include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = gfxgtk
+
+MODULE=raptor 
+
+REQUIRES=util img xpcom raptor netlib ps
+
+DEFINES += -D_IMPL_NS_GFXONXP 
+CXXFLAGS += $(TK_CFLAGS)
+INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
+
+CPPSRCS = \
+	nsDrawingSurfaceGTK.cpp \
+	nsDeviceContextGTK.cpp \
+	nsDeviceContextSpecFactoryG.cpp \
+	nsDeviceContextSpecG.cpp \
+	nsFontMetricsGTK.cpp \
+	nsGfxFactoryGTK.cpp \
+	nsRenderingContextGTK.cpp \
+	nsImageGTK.cpp \
+	nsRegionGTK.cpp 
+
+CSRCS = \
+	nsPrintdGTK.c
+
 include $(topsrcdir)/config/rules.mk
 
-EXPORT_RESOURCE_XPINSTALL = \
-	$(srcdir)/progress.xul \
-	$(srcdir)/progress.html \
-	$(srcdir)/progress.css \
-	$(NULL)
 
-install:: 
-	$(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/res/xpinstall

mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp

@@ -0,0 +1,375 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <math.h>
+
+#include "nspr.h"
+#include "il_util.h"
+
+#include "nsDeviceContextGTK.h"
+#include "nsGfxCIID.h"
+
+#include "../ps/nsDeviceContextPS.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define NS_TO_GDK_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
+
+#define GDK_COLOR_TO_NS_RGB(c) \
+  ((nscolor) NS_RGB(c.red, c.green, c.blue))
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID);
+
+nsDeviceContextGTK::nsDeviceContextGTK()
+{
+  NS_INIT_REFCNT();
+  mTwipsToPixels = 1.0;
+  mPixelsToTwips = 1.0;
+  mDepth = 0 ;
+  mPaletteInfo.isPaletteDevice = PR_FALSE;
+  mPaletteInfo.sizePalette = 0;
+  mPaletteInfo.numReserved = 0;
+  mPaletteInfo.palette = NULL;
+  mNumCells = 0;
+}
+
+nsDeviceContextGTK::~nsDeviceContextGTK()
+{
+}
+
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextGTK, kDeviceContextIID)
+NS_IMPL_ADDREF(nsDeviceContextGTK)
+NS_IMPL_RELEASE(nsDeviceContextGTK)
+
+NS_IMETHODIMP nsDeviceContextGTK::Init(nsNativeWidget aNativeWidget)
+{
+  GdkVisual *vis;
+  GtkRequisition req;
+  GtkWidget *sb;
+
+  mWidget = aNativeWidget;
+
+  // Compute dpi of display
+  float screenWidth = float(::gdk_screen_width());
+  float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f;
+  nscoord dpi = nscoord(screenWidth / screenWidthIn);
+
+  // Now for some wacky heuristics. 
+  if (dpi < 84) dpi = 72;
+  else if (dpi < 108) dpi = 96;
+  else if (dpi < 132) dpi = 120;
+
+  mTwipsToPixels = float(dpi) / float(NSIntPointsToTwips(72));
+  mPixelsToTwips = 1.0f / mTwipsToPixels;
+
+#if 0
+  mTwipsToPixels = ( ((float)::gdk_screen_width()) /
+                     ((float)::gdk_screen_width_mm()) * 25.4) /
+		     (float)NSIntPointsToTwips(72);
+
+  mPixelsToTwips = 1.0f / mTwipsToPixels;
+#endif
+
+  vis = gdk_rgb_get_visual();
+  mDepth = vis->depth;
+
+  sb = gtk_vscrollbar_new(NULL);
+  gtk_widget_ref(sb);
+  gtk_object_sink(GTK_OBJECT(sb));
+  gtk_widget_size_request(sb,&req);
+  mScrollbarWidth = req.width;
+  gtk_widget_destroy(sb);
+  gtk_widget_unref(sb);
+  
+  sb = gtk_hscrollbar_new(NULL);
+  gtk_widget_ref(sb);
+  gtk_object_sink(GTK_OBJECT(sb));
+  gtk_widget_size_request(sb,&req);
+  mScrollbarHeight = req.height;
+  gtk_widget_destroy(sb);
+  gtk_widget_unref(sb);
+
+#ifdef DEBUG
+  static PRBool once = PR_TRUE;
+  if (once) {
+    printf("GFX: dpi=%d t2p=%g p2t=%g depth=%d\n", dpi, mTwipsToPixels, mPixelsToTwips,mDepth);
+    once = PR_FALSE;
+  }
+#endif
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::CreateRenderingContext(nsIRenderingContext *&aContext)
+{
+  nsIRenderingContext *pContext;
+  nsresult             rv;
+  nsDrawingSurfaceGTK  *surf;
+
+  // to call init for this, we need to have a valid nsDrawingSurfaceGTK created
+  pContext = new nsRenderingContextGTK();
+
+  if (nsnull != pContext)
+  {
+    NS_ADDREF(pContext);
+
+    // create the nsDrawingSurfaceGTK
+    surf = new nsDrawingSurfaceGTK();
+
+    if (nsnull != surf)
+      {
+        GdkDrawable *win = nsnull;
+        // FIXME
+        if (GTK_IS_LAYOUT((GtkWidget*)mWidget))
+          win = (GdkDrawable*)gdk_window_ref(GTK_LAYOUT((GtkWidget*)mWidget)->bin_window);
+        else
+          win = (GdkDrawable*)gdk_window_ref(((GtkWidget*)mWidget)->window);
+
+        GdkGC *gc = gdk_gc_new(win);
+
+        // init the nsDrawingSurfaceGTK
+        rv = surf->Init(win,gc);
+
+        if (NS_OK == rv)
+          // Init the nsRenderingContextGTK
+          rv = pContext->Init(this, surf);
+      }
+    else
+      rv = NS_ERROR_OUT_OF_MEMORY;
+  }
+  else
+    rv = NS_ERROR_OUT_OF_MEMORY;
+
+  if (NS_OK != rv)
+  {
+    NS_IF_RELEASE(pContext);
+  }
+
+  aContext = pContext;
+
+  return rv;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::SupportsNativeWidgets(PRBool &aSupportsWidgets)
+{
+  //XXX it is very critical that this not lie!! MMP
+  // read the comments in the mac code for this
+  aSupportsWidgets = PR_TRUE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetScrollBarDimensions(float &aWidth, float &aHeight) const
+{
+  aWidth = mScrollbarWidth * mPixelsToTwips;
+  aHeight = mScrollbarHeight * mPixelsToTwips;
+ 
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const
+{
+  nsresult status = NS_OK;
+  GtkStyle *style = gtk_style_new();  // get the default styles
+
+  switch (anID) {
+    //---------
+    // Colors
+    //---------
+    case eSystemAttr_Color_WindowBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WindowForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetSelectBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_WidgetSelectForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_Widget3DHighlight:
+        *aInfo->mColor = NS_RGB(0xa0,0xa0,0xa0);
+        break;
+    case eSystemAttr_Color_Widget3DShadow:
+        *aInfo->mColor = NS_RGB(0x40,0x40,0x40);
+        break;
+    case eSystemAttr_Color_TextBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_TextForeground: 
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_TextSelectBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_TextSelectForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->text[GTK_STATE_SELECTED]);
+        break;
+    //---------
+    // Size
+    //---------
+    case eSystemAttr_Size_ScrollbarHeight:
+        aInfo->mSize = mScrollbarHeight;
+        break;
+    case eSystemAttr_Size_ScrollbarWidth: 
+        aInfo->mSize = mScrollbarWidth;
+        break;
+    case eSystemAttr_Size_WindowTitleHeight:
+        aInfo->mSize = 0;
+        break;
+    case eSystemAttr_Size_WindowBorderWidth:
+        aInfo->mSize = style->klass->xthickness;
+        break;
+    case eSystemAttr_Size_WindowBorderHeight:
+        aInfo->mSize = style->klass->ythickness;
+        break;
+    case eSystemAttr_Size_Widget3DBorder:
+        aInfo->mSize = 4;
+        break;
+    //---------
+    // Fonts
+    //---------
+    case eSystemAttr_Font_Caption:
+    case eSystemAttr_Font_Icon:
+    case eSystemAttr_Font_Menu:
+    case eSystemAttr_Font_MessageBox:
+    case eSystemAttr_Font_SmallCaption:
+    case eSystemAttr_Font_StatusBar:
+    case eSystemAttr_Font_Tooltips:
+    case eSystemAttr_Font_Widget:
+      status = NS_ERROR_FAILURE;
+      break;
+  } // switch
+
+  gtk_style_unref(style);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDrawingSurface(nsIRenderingContext &aContext, 
+                                                    nsDrawingSurface &aSurface)
+{
+  aContext.CreateDrawingSurface(nsnull, 0, aSurface);
+  return nsnull == aSurface ? NS_ERROR_OUT_OF_MEMORY : NS_OK;  
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::ConvertPixel(nscolor aColor, 
+                                               PRUint32 & aPixel)
+{
+  aPixel = ::gdk_rgb_xpixel_from_rgb (NS_TO_GDK_RGB(aColor));
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsDeviceContextGTK::CheckFontExistence(const nsString& aFontName)
+{
+  char        **fnames = nsnull;
+  PRInt32     namelen = aFontName.Length() + 1;
+  char        *wildstring = (char *)PR_Malloc(namelen + 200);
+  float       t2d;
+  GetTwipsToDevUnits(t2d);
+  PRInt32     dpi = NSToIntRound(t2d * 1440);
+  int         numnames = 0;
+  XFontStruct *fonts;
+  nsresult    rv = NS_ERROR_FAILURE;
+  
+  if (nsnull == wildstring)
+    return NS_ERROR_UNEXPECTED;
+  
+  if (abs(dpi - 75) < abs(dpi - 100))
+    dpi = 75;
+  else
+    dpi = 100;
+  
+  char* fontName = aFontName.ToNewCString();
+  PR_snprintf(wildstring, namelen + 200,
+             "*-%s-*-*-normal--*-*-%d-%d-*-*-*",
+             fontName, dpi, dpi);
+  delete [] fontName;
+  
+  fnames = ::XListFontsWithInfo(GDK_DISPLAY(), wildstring, 1, &numnames, &fonts);
+  
+  if (numnames > 0)
+  {
+    ::XFreeFontInfo(fnames, fonts, numnames);
+    rv = NS_OK;
+  }
+  
+  PR_Free(wildstring);
+  
+  return rv;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight)
+{
+  aWidth = 1;
+  aHeight = 1;
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
+                                                      nsIDeviceContext *&aContext)
+{
+  // Create a Postscript device context 
+  aContext = new nsDeviceContextPS();
+  ((nsDeviceContextPS *)aContext)->SetSpec(aDevice);
+  NS_ADDREF(aDevice);
+  return((nsDeviceContextPS *) aContext)->Init((nsIDeviceContext*)aContext, (nsIDeviceContext*)this);
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::BeginDocument(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::EndDocument(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::BeginPage(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::EndPage(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDepth(PRUint32& aDepth)
+{
+  GdkVisual * rgb_visual = gdk_rgb_get_visual();
+
+  gint rgb_depth = rgb_visual->depth;
+
+  aDepth = (PRUint32) rgb_depth;
+
+  return NS_OK;
+}

mozilla/gfx/src/gtk/nsDeviceContextGTK.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextGTK_h___
+#define nsDeviceContextGTK_h___
+
+#include "nsDeviceContext.h"
+#include "nsUnitConversion.h"
+#include "nsIWidget.h"
+#include "nsIView.h"
+#include "nsIRenderingContext.h"
+
+#include "nsRenderingContextGTK.h"
+
+class nsDeviceContextGTK : public DeviceContextImpl
+{
+public:
+  nsDeviceContextGTK();
+  virtual ~nsDeviceContextGTK();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(nsNativeWidget aNativeWidget);
+
+  NS_IMETHOD  CreateRenderingContext(nsIRenderingContext *&aContext);
+  NS_IMETHOD  SupportsNativeWidgets(PRBool &aSupportsWidgets);
+
+  NS_IMETHOD  GetScrollBarDimensions(float &aWidth, float &aHeight) const;
+  NS_IMETHOD  GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const;
+
+  //get a low level drawing surface for rendering. the rendering context
+  //that is passed in is used to create the drawing surface if there isn't
+  //already one in the device context. the drawing surface is then cached
+  //in the device context for re-use.
+
+  NS_IMETHOD GetDrawingSurface(nsIRenderingContext &aContext, nsDrawingSurface &aSurface);
+
+  NS_IMETHOD ConvertPixel(nscolor aColor, PRUint32 & aPixel);
+  NS_IMETHOD CheckFontExistence(const nsString& aFontName);
+
+  NS_IMETHOD GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight);
+
+  NS_IMETHOD GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
+                                 nsIDeviceContext *&aContext);
+
+  NS_IMETHOD BeginDocument(void);
+  NS_IMETHOD EndDocument(void);
+
+  NS_IMETHOD BeginPage(void);
+  NS_IMETHOD EndPage(void);
+
+  NS_IMETHOD GetDepth(PRUint32& aDepth);
+
+private:
+  PRUint32      mDepth;
+  PRBool        mWriteable;
+  nsPaletteInfo mPaletteInfo;
+  PRUint32 mNumCells;
+  PRInt16 mScrollbarHeight;
+  PRInt16 mScrollbarWidth;
+};
+
+#endif /* nsDeviceContextGTK_h___ */
+

mozilla/gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDeviceContextSpecFactoryG.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsGfxCIID.h"
+#include "plstr.h"
+
+/** -------------------------------------------------------
+ *  Constructor
+ *  @update   dc 2/16/98
+ */
+nsDeviceContextSpecFactoryGTK :: nsDeviceContextSpecFactoryGTK()
+{
+}
+
+/** -------------------------------------------------------
+ *  Destructor
+ *  @update   dc 2/16/98
+ */
+nsDeviceContextSpecFactoryGTK :: ~nsDeviceContextSpecFactoryGTK()
+{
+}
+
+static NS_DEFINE_IID(kDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID);
+static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
+static NS_DEFINE_IID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID);
+
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecFactoryGTK, kDeviceContextSpecFactoryIID)
+NS_IMPL_ADDREF(nsDeviceContextSpecFactoryGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecFactoryGTK)
+
+/** -------------------------------------------------------
+ *  Initialize the device context spec factory
+ *  @update   dc 2/16/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecFactoryGTK :: Init(void)
+{
+  return NS_OK;
+}
+
+/** -------------------------------------------------------
+ *  Get a device context specification
+ *  @update   dc 2/16/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecFactoryGTK :: CreateDeviceContextSpec(nsIDeviceContextSpec *aOldSpec,
+                                                                       nsIDeviceContextSpec *&aNewSpec,
+                                                                       PRBool aQuiet)
+{
+nsresult  						rv = NS_ERROR_FAILURE;
+nsIDeviceContextSpec  *devSpec = nsnull;
+
+	nsComponentManager::CreateInstance(kDeviceContextSpecCID, nsnull, kIDeviceContextSpecIID, (void **)&devSpec);
+
+	if (nsnull != devSpec){
+	  if (NS_OK == ((nsDeviceContextSpecGTK *)devSpec)->Init(aQuiet)){
+	    aNewSpec = devSpec;
+	    rv = NS_OK;
+	  }
+	}
+	return rv;
+}

mozilla/gfx/src/gtk/nsDeviceContextSpecFactoryG.h

@@ -12,14 +12,30 @@
  *
  * The Initial Developer of this code under the NPL is Netscape
  * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
 
-#ifndef __NS_JSWINREG_H__
-#define __NS_JSWINREG_H__
+#ifndef nsDeviceContextSpecFactoryG_h___
+#define nsDeviceContextSpecFactoryG_h___
 
-PRInt32
-InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
+#include "nsIDeviceContextSpecFactory.h"
+#include "nsIDeviceContextSpec.h"
+
+class nsDeviceContextSpecFactoryGTK : public nsIDeviceContextSpecFactory
+{
+public:
+  nsDeviceContextSpecFactoryGTK();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(void);
+  NS_IMETHOD CreateDeviceContextSpec(nsIDeviceContextSpec *aOldSpec,
+                                     nsIDeviceContextSpec *&aNewSpec,
+                                     PRBool aQuiet);
+
+protected:
+  virtual ~nsDeviceContextSpecFactoryGTK();
+};
 
 #endif

mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp

@@ -0,0 +1,197 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDeviceContextSpecG.h"
+#include "prenv.h" /* for PR_GetEnv */
+
+//#include "prmem.h"
+//#include "plstr.h"
+
+/** -------------------------------------------------------
+ *  Construct the nsDeviceContextSpecGTK
+ *  @update   dc 12/02/98
+ */
+nsDeviceContextSpecGTK :: nsDeviceContextSpecGTK()
+{
+  NS_INIT_REFCNT();
+	
+}
+
+/** -------------------------------------------------------
+ *  Destroy the nsDeviceContextSpecGTK
+ *  @update   dc 2/15/98
+ */
+nsDeviceContextSpecGTK :: ~nsDeviceContextSpecGTK()
+{
+}
+
+static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
+static NS_DEFINE_IID(kIDeviceContextSpecPSIID, NS_IDEVICE_CONTEXT_SPEC_PS_IID);
+
+#if 0
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecGTK, kDeviceContextSpecIID)
+NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
+#endif
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (nsnull == aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  if (aIID.Equals(kIDeviceContextSpecIID))
+  {
+    nsIDeviceContextSpec* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(kIDeviceContextSpecPSIID))
+  {
+    nsIDeviceContextSpecPS* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+  if (aIID.Equals(kISupportsIID))
+  {
+    nsIDeviceContextSpec* tmp = this;
+    nsISupports* tmp2 = tmp;
+    *aInstancePtr = (void*) tmp2;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
+
+/** -------------------------------------------------------
+ *  Initialize the nsDeviceContextSpecGTK
+ *  @update   dc 2/15/98
+ *  @update   syd 3/2/99
+ */
+NS_IMETHODIMP nsDeviceContextSpecGTK :: Init(PRBool	aQuiet)
+{
+  char *path;
+
+  // XXX these settings should eventually come out of preferences 
+
+  mPrData.toPrinter = PR_TRUE;
+  mPrData.fpf = PR_TRUE;
+  mPrData.grayscale = PR_FALSE;
+  mPrData.size = NS_LETTER_SIZE;
+  sprintf( mPrData.command, "lpr" );
+
+  // PWD, HOME, or fail 
+
+  if ( ( path = PR_GetEnv( "PWD" ) ) == (char *) NULL ) 
+	if ( ( path = PR_GetEnv( "HOME" ) ) == (char *) NULL )
+  		strcpy( mPrData.path, "netscape.ps" );
+  if ( path != (char *) NULL )
+	sprintf( mPrData.path, "%s/netscape.ps", path );
+  else
+	return NS_ERROR_FAILURE;
+
+  ::UnixPrDialog( &mPrData );
+  if ( mPrData.cancel == PR_TRUE ) 
+	return NS_ERROR_FAILURE;
+  else
+        return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetToPrinter( PRBool &aToPrinter )     
+{
+  aToPrinter = mPrData.toPrinter;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetFirstPageFirst ( PRBool &aFpf )      
+{
+  aFpf = mPrData.fpf;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetGrayscale ( PRBool &aGrayscale )      
+{
+  aGrayscale = mPrData.grayscale;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetSize ( int &aSize )      
+{
+  aSize = mPrData.size;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetTopMargin ( float &value )      
+{
+  value = mPrData.top;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetBottomMargin ( float &value )      
+{
+  value = mPrData.bottom;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetRightMargin ( float &value )      
+{
+  value = mPrData.right;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetLeftMargin ( float &value )      
+{
+  value = mPrData.left;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetCommand ( char **aCommand )      
+{
+  *aCommand = &mPrData.command[0];
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetPath ( char **aPath )      
+{
+  *aPath = &mPrData.path[0];
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetUserCancelled( PRBool &aCancel )     
+{
+  aCancel = mPrData.cancel;
+  return NS_OK;
+}
+
+/** -------------------------------------------------------
+ * Closes the printmanager if it is open.
+ *  @update   dc 2/15/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecGTK :: ClosePrintManager()
+{
+	return NS_OK;
+}  

mozilla/gfx/src/gtk/nsDeviceContextSpecG.h

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextSpecG_h___
+#define nsDeviceContextSpecG_h___
+
+#include "nsIDeviceContextSpec.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsIDeviceContextSpecPS.h"
+
+#include "nsPrintdGTK.h"
+
+class nsDeviceContextSpecGTK : public nsIDeviceContextSpec ,
+                                      public nsIDeviceContextSpecPS
+{
+public:
+/**
+ * Construct a nsDeviceContextSpecMac, which is an object which contains and manages a mac printrecord
+ * @update  dc 12/02/98
+ */
+  nsDeviceContextSpecGTK();
+
+  NS_DECL_ISUPPORTS
+
+/**
+ * Initialize the nsDeviceContextSpecMac for use.  This will allocate a printrecord for use
+ * @update   dc 2/16/98
+ * @param aQuiet if PR_TRUE, prevent the need for user intervention
+ *        in obtaining device context spec. if nsnull is passed in for
+ *        the aOldSpec, this will typically result in getting a device
+ *        context spec for the default output device (i.e. default
+ *        printer).
+ * @return error status
+ */
+  NS_IMETHOD Init(PRBool	aQuiet);
+  
+  
+/**
+ * Closes the printmanager if it is open.
+ * @update   dc 2/13/98
+ * @update   syd 3/20/99
+ * @return error status
+ */
+
+  NS_IMETHOD ClosePrintManager();
+
+  NS_IMETHOD GetToPrinter( PRBool &aToPrinter ); 
+
+  NS_IMETHOD GetFirstPageFirst ( PRBool &aFpf );     
+
+  NS_IMETHOD GetGrayscale( PRBool &aGrayscale );   
+
+  NS_IMETHOD GetSize ( int &aSize ); 
+
+  NS_IMETHOD GetTopMargin ( float &value ); 
+
+  NS_IMETHOD GetBottomMargin ( float &value ); 
+
+  NS_IMETHOD GetLeftMargin ( float &value ); 
+
+  NS_IMETHOD GetRightMargin ( float &value ); 
+
+  NS_IMETHOD GetCommand ( char **aCommand );   
+
+  NS_IMETHOD GetPath ( char **aPath );    
+
+  NS_IMETHOD GetUserCancelled( PRBool &aCancel );      
+
+protected:
+/**
+ * Destuct a nsDeviceContextSpecMac, this will release the printrecord
+ * @update  dc 2/16/98
+ */
+  virtual ~nsDeviceContextSpecGTK();
+
+protected:
+
+  UnixPrData mPrData;
+	
+};
+
+#endif

mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.cpp

@@ -0,0 +1,367 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
+#define USE_SHM
+#endif
+
+//#define USE_SHM
+
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
+#ifdef USE_SHM
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+#endif /* USE_SHM */
+#include "nsDrawingSurfaceGTK.h"
+
+static NS_DEFINE_IID(kIDrawingSurfaceIID, NS_IDRAWING_SURFACE_IID);
+static NS_DEFINE_IID(kIDrawingSurfaceGTKIID, NS_IDRAWING_SURFACE_GTK_IID);
+
+nsDrawingSurfaceGTK :: nsDrawingSurfaceGTK()
+{
+  NS_INIT_REFCNT();
+  GdkVisual *v;
+
+  mPixmap = nsnull;
+  mGC = nsnull;
+  mDepth = 0;
+  mWidth = mHeight = 0;
+  mFlags = 0;
+
+  mImage = nsnull;
+  mLockWidth = mLockHeight = 0;
+  mLockFlags = 0;
+  mLocked = PR_FALSE;
+
+  v = ::gdk_rgb_get_visual();
+
+  mPixFormat.mRedMask = v->red_mask;
+  mPixFormat.mGreenMask = v->green_mask;
+  mPixFormat.mBlueMask = v->blue_mask;
+  // FIXME
+  mPixFormat.mAlphaMask = 0;
+
+  mPixFormat.mRedShift = v->red_shift;
+  mPixFormat.mGreenShift = v->green_shift;
+  mPixFormat.mBlueShift = v->blue_shift;
+  // FIXME
+  mPixFormat.mAlphaShift = 0;
+
+  mDepth = v->depth;
+}
+
+nsDrawingSurfaceGTK :: ~nsDrawingSurfaceGTK()
+{
+  if (mPixmap)
+    ::gdk_pixmap_unref(mPixmap);
+
+  if (mImage)
+    ::gdk_image_destroy(mImage);
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (nsnull == aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  if (aIID.Equals(kIDrawingSurfaceIID))
+  {
+    nsIDrawingSurface* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(kIDrawingSurfaceGTKIID))
+  {
+    nsDrawingSurfaceGTK* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+  if (aIID.Equals(kISupportsIID))
+  {
+    nsIDrawingSurface* tmp = this;
+    nsISupports* tmp2 = tmp;
+    *aInstancePtr = (void*) tmp2;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsDrawingSurfaceGTK);
+NS_IMPL_RELEASE(nsDrawingSurfaceGTK);
+
+
+  /**
+   * Lock a rect of a drawing surface and return a
+   * pointer to the upper left hand corner of the
+   * bitmap.
+   * @param  aX x position of subrect of bitmap
+   * @param  aY y position of subrect of bitmap
+   * @param  aWidth width of subrect of bitmap
+   * @param  aHeight height of subrect of bitmap
+   * @param  aBits out parameter for upper left hand
+   *         corner of bitmap
+   * @param  aStride out parameter for number of bytes
+   *         to add to aBits to go from scanline to scanline
+   * @param  aWidthBytes out parameter for number of
+   *         bytes per line in aBits to process aWidth pixels
+   * @return error status
+   *
+   **/
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Lock(PRInt32 aX, PRInt32 aY,
+                                          PRUint32 aWidth, PRUint32 aHeight,
+                                          void **aBits, PRInt32 *aStride,
+                                          PRInt32 *aWidthBytes, PRUint32 aFlags)
+{
+#if 0
+  g_print("nsDrawingSurfaceGTK::Lock() called\n" \
+          "  aX = %i, aY = %i,\n" \
+	  "  aWidth = %i, aHeight = %i,\n" \
+	  "  aBits, aStride, aWidthBytes,\n" \
+	  "  aFlags = %i\n", aX, aY, aWidth, aHeight, aFlags);
+#endif
+
+  if (mLocked)
+  {
+    NS_ASSERTION(0, "nested lock attempt");
+    return NS_ERROR_FAILURE;
+  }
+  mLocked = PR_TRUE;
+
+  mLockX = aX;
+  mLockY = aY;
+  mLockWidth = aWidth;
+  mLockHeight = aHeight;
+  mLockFlags = aFlags;
+
+  // Obtain an ximage from the pixmap.
+#ifdef USE_SHM
+  if (gdk_get_use_xshm())
+  {
+    mImage = gdk_image_new(GDK_IMAGE_FASTEST,
+                           gdk_rgb_get_visual(),
+                           mLockWidth,
+                           mLockHeight);
+    
+    XShmGetImage(GDK_DISPLAY(),
+                 GDK_WINDOW_XWINDOW(mPixmap),
+                 GDK_IMAGE_XIMAGE(mImage),
+                 mLockX, mLockY,
+                 0xFFFFFFFF);
+
+    gdk_flush();
+  }
+  else
+  {
+#endif /* USE_SHM */
+    mImage = ::gdk_image_get(mPixmap, mLockX, mLockY, mLockWidth, mLockHeight);
+#ifdef USE_SHM
+  }
+#endif /* USE_SHM */
+
+  *aBits = GDK_IMAGE_XIMAGE(mImage)->data;
+
+  *aWidthBytes = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+  *aStride = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+
+
+#if 0
+  int bytes_per_line = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+
+  //
+  // All this code is a an attempt to set the stride width properly.
+  // Needs to be cleaned up alot.  For now, it will only work in the
+  // case where aWidthBytes and aStride are the same.  One is assigned to 
+  // the other.
+  // 
+
+  *aWidthBytes = mImage->bpl;
+  *aStride = mImage->bpl;
+
+  int width_in_pixels = *aWidthBytes << 8;
+
+
+  int bitmap_pad = GDK_IMAGE_XIMAGE(mImage)->bitmap_pad;
+  int depth = GDK_IMAGE_XIMAGE(mImage)->depth;
+
+#define RASWIDTH8(width, bpp) (width)
+#define RASWIDTH16(width, bpp) ((((width) * (bpp) + 15) >> 4) << 1)
+#define RASWIDTH32(width, bpp) ((((width) * (bpp) + 31) >> 5) << 2)
+
+  switch(bitmap_pad)
+    {
+    case 8:
+      *aStride = RASWIDTH8(aWidth,bitmap_pad);
+      break;
+
+    case 16:
+      *aStride = bytes_per_line;
+      *aStride = RASWIDTH16(aWidth,bitmap_pad);
+      break;
+
+    case 32:
+      *aStride = bytes_per_line;
+      *aStride = RASWIDTH32(aWidth,bitmap_pad);
+      break;
+
+    default:
+
+      NS_ASSERTION(nsnull,"something got screwed");
+
+    }
+
+  *aStride = (*aWidthBytes) + ((bitmap_pad >> 3) - 1);
+
+  GDK_IMAGE_XIMAGE(mImage)->bitmap_pad;
+
+  *aWidthBytes = mImage->bpl;
+#endif
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Unlock(void)
+{
+  //  g_print("nsDrawingSurfaceGTK::UnLock() called\n");
+  if (!mLocked)
+  {
+    NS_ASSERTION(0, "attempting to unlock an DS that isn't locked");
+    return NS_ERROR_FAILURE;
+  }
+
+  // If the lock was not read only, put the bits back on the pixmap
+  if (!(mLockFlags & NS_LOCK_SURFACE_READ_ONLY))
+  {
+#if 0
+    g_print("gdk_draw_image(pixmap=%p,lockx=%d,locky=%d,lockw=%d,lockh=%d)\n",
+            mPixmap,
+            mLockX, mLockY,
+            mLockWidth, mLockHeight);
+#endif
+
+    gdk_draw_image(mPixmap,
+                   mGC,
+                   mImage,
+                   0, 0,
+                   mLockX, mLockY,
+                   mLockWidth, mLockHeight);
+
+  }
+
+  // FIXME if we are using shared mem, we shouldn't destroy the image...
+  if (mImage)
+    ::gdk_image_destroy(mImage);
+  mImage = nsnull;
+
+  mLocked = PR_FALSE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetDimensions(PRUint32 *aWidth, PRUint32 *aHeight)
+{
+  *aWidth = mWidth;
+  *aHeight = mHeight;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: IsOffscreen(PRBool *aOffScreen)
+{
+  *aOffScreen = mIsOffscreen;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: IsPixelAddressable(PRBool *aAddressable)
+{
+// FIXME
+  *aAddressable = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetPixelFormat(nsPixelFormat *aFormat)
+{
+  *aFormat = mPixFormat;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkDrawable *aDrawable, GdkGC *aGC)
+{
+  mGC = aGC;
+  mPixmap = aDrawable;
+// this is definatly going to be on the screen, as it will be the window of a
+// widget or something.
+  mIsOffscreen = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkGC *aGC, PRUint32 aWidth,
+                                          PRUint32 aHeight, PRUint32 aFlags)
+{
+//  ::g_return_val_if_fail (aGC != nsnull, NS_ERROR_FAILURE);
+//  ::g_return_val_if_fail ((aWidth > 0) && (aHeight > 0), NS_ERROR_FAILURE);
+
+  mGC = aGC;
+  mWidth = aWidth;
+  mHeight = aHeight;
+  mFlags = aFlags;
+
+// we can draw on this offscreen because it has no parent
+  mIsOffscreen = PR_TRUE;
+
+  mPixmap = ::gdk_pixmap_new(nsnull, mWidth, mHeight, mDepth);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetGC(GdkGC *aGC)
+{
+  aGC = ::gdk_gc_ref(mGC);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: ReleaseGC(void)
+{
+  ::gdk_gc_unref(mGC);
+  return NS_OK;
+}
+
+/* below are utility functions used mostly for nsRenderingContext and nsImage
+ * to plug into gdk_* functions for drawing.  You should not set a pointer
+ * that might hang around with the return from these.  instead use the ones
+ * above.  pav
+ */
+GdkGC *nsDrawingSurfaceGTK::GetGC(void)
+{
+  return mGC;
+}
+
+GdkDrawable *nsDrawingSurfaceGTK::GetDrawable(void)
+{
+  return mPixmap;
+}
+

mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.h

@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDrawingSurfaceGTK_h___
+#define nsDrawingSurfaceGTK_h___
+
+#include "nsIDrawingSurface.h"
+#include "nsIDrawingSurfaceGTK.h"
+
+#include <gtk/gtk.h>
+
+class nsDrawingSurfaceGTK : public nsIDrawingSurface,
+                            public nsIDrawingSurfaceGTK
+{
+public:
+  nsDrawingSurfaceGTK();
+  virtual ~nsDrawingSurfaceGTK();
+
+  NS_DECL_ISUPPORTS
+
+  //nsIDrawingSurface interface
+
+  NS_IMETHOD Lock(PRInt32 aX, PRInt32 aY, PRUint32 aWidth, PRUint32 aHeight,
+                  void **aBits, PRInt32 *aStride, PRInt32 *aWidthBytes,
+                  PRUint32 aFlags);
+  NS_IMETHOD Unlock(void);
+  NS_IMETHOD GetDimensions(PRUint32 *aWidth, PRUint32 *aHeight);
+  NS_IMETHOD IsOffscreen(PRBool *aOffScreen);
+  NS_IMETHOD IsPixelAddressable(PRBool *aAddressable);
+  NS_IMETHOD GetPixelFormat(nsPixelFormat *aFormat);
+
+  //nsIDrawingSurfaceGTK interface
+
+  NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC);
+  NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight, PRUint32 aFlags);
+
+/* get the GC and manage the GdkGC's refcount */
+  NS_IMETHOD GetGC(GdkGC *aGC);
+  NS_IMETHOD ReleaseGC(void);
+
+/* below are utility functions used mostly for nsRenderingContext and nsImage
+ * to plug into gdk_* functions for drawing.  You should not set a pointer
+ * that might hang around with the return from these.  instead use the ones
+ * above.  pav
+ */
+  GdkGC *GetGC(void);
+  GdkDrawable *GetDrawable(void);
+
+private:
+  /* general */
+  GdkPixmap	*mPixmap;
+  GdkGC		*mGC;
+  gint		mDepth;
+  nsPixelFormat	mPixFormat;
+  PRUint32      mWidth;
+  PRUint32      mHeight;
+  PRUint32	mFlags;
+  PRBool	mIsOffscreen;
+
+  /* for locks */
+  GdkImage	*mImage;
+  PRInt32	mLockX;
+  PRInt32	mLockY;
+  PRUint32	mLockWidth;
+  PRUint32	mLockHeight;
+  PRUint32	mLockFlags;
+  PRBool	mLocked;
+};
+
+#endif

mozilla/gfx/src/gtk/nsFontMetricsGTK.h

@@ -0,0 +1,162 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFontMetricsGTK_h__
+#define nsFontMetricsGTK_h__
+
+#include "nsIFontMetrics.h"
+#include "nsFont.h"
+#include "nsString.h"
+#include "nsUnitConversion.h"
+#include "nsIDeviceContext.h"
+#include "nsCRT.h"
+#include "nsDeviceContextGTK.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define FONT_SWITCHING
+#ifdef FONT_SWITCHING
+
+#ifdef ADD_GLYPH
+#undef ADD_GLYPH
+#endif
+#define ADD_GLYPH(map, g) (map)[(g) >> 3] |= (1 << ((g) & 7))
+
+#ifdef FONT_HAS_GLYPH
+#undef FONT_HAS_GLYPH
+#endif
+#define FONT_HAS_GLYPH(map, g) (((map)[(g) >> 3] >> ((g) & 7)) & 1)
+
+typedef struct nsFontCharSetInfo nsFontCharSetInfo;
+
+typedef gint (*nsFontCharSetConverter)(nsFontCharSetInfo* aSelf,
+  const PRUnichar* aSrcBuf, PRUint32 aSrcLen, PRUint8* aDestBuf,
+  PRUint32 aDestLen);
+
+struct nsFontCharSet;
+class nsFontMetricsGTK;
+
+struct nsFontGTK
+{
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  void LoadFont(nsFontCharSet* aCharSet, nsFontMetricsGTK* aMetrics);
+
+  GdkFont*               mFont;
+  PRUint8*               mMap;
+  nsFontCharSetInfo*     mCharSetInfo;
+  char*                  mName;
+  PRUint16               mSize;
+  PRUint16               mActualSize;
+  PRInt16                mBaselineAdjust;
+};
+
+struct nsFontStretch;
+struct nsFontFamily;
+typedef struct nsFontSearch nsFontSearch;
+
+#endif /* FONT_SWITCHING */
+
+class nsFontMetricsGTK : public nsIFontMetrics
+{
+public:
+  nsFontMetricsGTK();
+  virtual ~nsFontMetricsGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(const nsFont& aFont, nsIDeviceContext* aContext);
+  NS_IMETHOD  Destroy();
+
+  NS_IMETHOD  GetXHeight(nscoord& aResult);
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize);
+  NS_IMETHOD  GetUnderline(nscoord& aOffset, nscoord& aSize);
+
+  NS_IMETHOD  GetHeight(nscoord &aHeight);
+  NS_IMETHOD  GetLeading(nscoord &aLeading);
+  NS_IMETHOD  GetMaxAscent(nscoord &aAscent);
+  NS_IMETHOD  GetMaxDescent(nscoord &aDescent);
+  NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance);
+  NS_IMETHOD  GetFont(const nsFont *&aFont);
+  NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle);
+
+#ifdef FONT_SWITCHING
+
+  nsFontGTK*  FindFont(PRUnichar aChar);
+  static gint GetWidth(nsFontGTK* aFont, const PRUnichar* aString,
+                       PRUint32 aLength);
+  static void DrawString(nsDrawingSurfaceGTK* aSurface, nsFontGTK* aFont,
+                         nscoord aX, nscoord aY, const PRUnichar* aString,
+			 PRUint32 aLength);
+  static void InitFonts(void);
+
+  friend void PickASizeAndLoad(nsFontSearch* aSearch, nsFontStretch* aStretch,
+                               nsFontCharSet* aCharSet);
+  friend void TryCharSet(nsFontSearch* aSearch, nsFontCharSet* aCharSet);
+  friend void TryFamily(nsFontSearch* aSearch, nsFontFamily* aFamily);
+  friend struct nsFontGTK;
+
+  nsFontGTK   **mLoadedFonts;
+  PRUint16    mLoadedFontsAlloc;
+  PRUint16    mLoadedFontsCount;
+
+  nsString    *mFonts;
+  PRUint16    mFontsAlloc;
+  PRUint16    mFontsCount;
+  PRUint16    mFontsIndex;
+
+#endif /* FONT_SWITCHING */
+
+protected:
+  char *PickAppropriateSize(char **names, XFontStruct *fonts, int cnt, nscoord desired);
+  void RealizeFont();
+
+  nsIDeviceContext    *mDeviceContext;
+  nsFont              *mFont;
+  GdkFont             *mFontHandle;
+
+  nscoord             mHeight;
+  nscoord             mAscent;
+  nscoord             mDescent;
+  nscoord             mLeading;
+  nscoord             mMaxAscent;
+  nscoord             mMaxDescent;
+  nscoord             mMaxAdvance;
+  nscoord             mXHeight;
+  nscoord             mSuperscriptOffset;
+  nscoord             mSubscriptOffset;
+  nscoord             mStrikeoutSize;
+  nscoord             mStrikeoutOffset;
+  nscoord             mUnderlineSize;
+  nscoord             mUnderlineOffset;
+
+#ifdef FONT_SWITCHING
+
+  PRUint16            mPixelSize;
+  PRUint8             mStretchIndex;
+  PRUint8             mStyleIndex;
+
+#endif /* FONT_SWITCHING */
+};
+
+#endif

mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp

@@ -0,0 +1,205 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+
+#include "nscore.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsGfxCIID.h"
+#include "nsFontMetricsGTK.h"
+#include "nsRenderingContextGTK.h"
+#include "nsImageGTK.h"
+#include "nsDeviceContextGTK.h"
+#include "nsRegionGTK.h"
+#include "nsBlender.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsDeviceContextSpecFactoryG.h" 
+#include "nsIDeviceContextSpecPS.h"
+
+static NS_DEFINE_IID(kCFontMetrics, NS_FONT_METRICS_CID);
+static NS_DEFINE_IID(kCRenderingContext, NS_RENDERING_CONTEXT_CID);
+static NS_DEFINE_IID(kCImage, NS_IMAGE_CID);
+static NS_DEFINE_IID(kCDeviceContext, NS_DEVICE_CONTEXT_CID);
+static NS_DEFINE_IID(kCRegion, NS_REGION_CID);
+
+static NS_DEFINE_IID(kCBlender, NS_BLENDER_CID);
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
+
+static NS_DEFINE_IID(kCDeviceContextSpec, NS_DEVICE_CONTEXT_SPEC_CID);
+static NS_DEFINE_IID(kCDeviceContextSpecFactory, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); 
+
+
+class nsGfxFactoryGTK : public nsIFactory
+{   
+  public:   
+    // nsISupports methods   
+    NS_IMETHOD QueryInterface(const nsIID &aIID,    
+                                       void **aResult);   
+    NS_IMETHOD_(nsrefcnt) AddRef(void);   
+    NS_IMETHOD_(nsrefcnt) Release(void);   
+
+    // nsIFactory methods   
+    NS_IMETHOD CreateInstance(nsISupports *aOuter,   
+                                       const nsIID &aIID,   
+                                       void **aResult);   
+
+    NS_IMETHOD LockFactory(PRBool aLock);   
+
+    nsGfxFactoryGTK(const nsCID &aClass);   
+    virtual ~nsGfxFactoryGTK();   
+
+  private:   
+    nsrefcnt  mRefCnt;   
+    nsCID     mClassID;
+};   
+
+nsGfxFactoryGTK::nsGfxFactoryGTK(const nsCID &aClass)   
+{   
+  mRefCnt = 0;
+  mClassID = aClass;
+}   
+
+nsGfxFactoryGTK::~nsGfxFactoryGTK()   
+{   
+  NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");   
+}   
+
+nsresult nsGfxFactoryGTK::QueryInterface(const nsIID &aIID,   
+                                         void **aResult)   
+{   
+  if (aResult == NULL) {   
+    return NS_ERROR_NULL_POINTER;   
+  }   
+
+  // Always NULL result, in case of failure   
+  *aResult = NULL;   
+
+  if (aIID.Equals(kISupportsIID)) {   
+    *aResult = (void *)(nsISupports*)this;   
+  } else if (aIID.Equals(kIFactoryIID)) {   
+    *aResult = (void *)(nsIFactory*)this;   
+  }   
+
+  if (*aResult == NULL) {   
+    return NS_NOINTERFACE;   
+  }   
+
+  AddRef(); // Increase reference count for caller   
+  return NS_OK;   
+}   
+
+nsrefcnt nsGfxFactoryGTK::AddRef()   
+{   
+  return ++mRefCnt;   
+}   
+
+nsrefcnt nsGfxFactoryGTK::Release()   
+{   
+  if (--mRefCnt == 0) {   
+    delete this;   
+    return 0; // Don't access mRefCnt after deleting!   
+  }   
+  return mRefCnt;   
+}  
+
+nsresult nsGfxFactoryGTK::CreateInstance(nsISupports *aOuter,  
+                                          const nsIID &aIID,  
+                                          void **aResult)  
+{  
+  if (aResult == NULL) {  
+    return NS_ERROR_NULL_POINTER;  
+  }  
+
+  *aResult = NULL;  
+  
+  nsISupports *inst = nsnull;
+
+  if (mClassID.Equals(kCFontMetrics)) {
+    inst = (nsISupports *)new nsFontMetricsGTK();
+  }
+  else if (mClassID.Equals(kCDeviceContext)) {
+    inst = (nsISupports *)new nsDeviceContextGTK();
+  }
+  else if (mClassID.Equals(kCRenderingContext)) {
+    inst = (nsISupports *)new nsRenderingContextGTK();
+  }
+  else if (mClassID.Equals(kCImage)) {
+    inst = (nsISupports *)new nsImageGTK();
+  }
+  else if (mClassID.Equals(kCRegion)) {
+    inst = (nsISupports *)new nsRegionGTK();
+  }
+  else if (mClassID.Equals(kCBlender)) {
+    inst = (nsISupports *)new nsBlender;
+  }
+  else if (mClassID.Equals(kCDeviceContextSpec)) {
+    nsDeviceContextSpecGTK* dcs;
+    NS_NEWXPCOM(dcs, nsDeviceContextSpecGTK);
+    inst = (nsISupports *)((nsIDeviceContextSpecPS *)dcs);
+  }
+  else if (mClassID.Equals(kCDeviceContextSpecFactory)) {
+    nsDeviceContextSpecFactoryGTK* dcs;
+    NS_NEWXPCOM(dcs, nsDeviceContextSpecFactoryGTK);
+    inst = (nsISupports *)dcs;
+  }          
+	
+  if (inst == NULL) {  
+    return NS_ERROR_OUT_OF_MEMORY;  
+  }  
+
+  nsresult res = inst->QueryInterface(aIID, aResult);
+
+  if (res != NS_OK) {  
+    // We didn't get the right interface, so clean up  
+    delete inst;  
+  }  
+//  else {
+//    inst->Release();
+//  }
+
+  return res;  
+}  
+
+nsresult nsGfxFactoryGTK::LockFactory(PRBool aLock)  
+{  
+  // Not implemented in simplest case.  
+  return NS_OK;
+}  
+
+// return the proper factory to the caller
+extern "C" NS_GFXNONXP nsresult NSGetFactory(nsISupports* servMgr,
+                                             const nsCID &aClass,
+                                             const char *aClassName,
+                                             const char *aProgID,
+                                             nsIFactory **aFactory)
+{
+  if (nsnull == aFactory) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  *aFactory = new nsGfxFactoryGTK(aClass);
+
+  if (nsnull == aFactory) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
+}

mozilla/gfx/src/gtk/nsIDrawingSurfaceGTK.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIDrawingSurfaceGTK_h___
+#define nsIDrawingSurfaceGTK_h___
+
+#include "nsIDrawingSurface.h"
+#include <gtk/gtk.h>
+
+// windows specific drawing surface method set
+
+#define NS_IDRAWING_SURFACE_GTK_IID   \
+{ 0x1ed958b0, 0xcab6, 0x11d2, \
+{ 0xa8, 0x49, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
+
+class nsIDrawingSurfaceGTK : public nsISupports
+{
+public:
+  /**
+   * Initialize a drawing surface using a windows DC.
+   * aDC is "owned" by the drawing surface until the drawing
+   * surface is destroyed.
+   * @param  aDC HDC to initialize drawing surface with
+   * @return error status
+   **/
+  NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC) = 0;
+
+  /**
+   * Initialize an offscreen drawing surface using a
+   * windows DC. aDC is not "owned" by this drawing surface, instead
+   * it is used to create a drawing surface compatible
+   * with aDC. if width or height are less than zero, aDC will
+   * be created with no offscreen bitmap installed.
+   * @param  aDC HDC to initialize drawing surface with
+   * @param  aWidth width of drawing surface
+   * @param  aHeight height of drawing surface
+   * @param  aFlags flags used to control type of drawing
+   *         surface created
+   * @return error status
+   **/
+  NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight,
+                  PRUint32 aFlags) = 0;
+
+  /**
+   * Get a windows DC that represents the drawing surface.
+   * GetDC() must be paired with ReleaseDC(). Getting a DC
+   * and Lock()ing are mutually exclusive operations.
+   * @param  aDC out parameter for HDC
+   * @return error status
+   **/
+  NS_IMETHOD GetGC(GdkGC *aGC) = 0;
+
+  /**
+   * Release a windows DC obtained by GetDC().
+   * ReleaseDC() must be preceded by a call to ReleaseDC().
+   * @return error status
+   **/
+  NS_IMETHOD ReleaseGC(void) = 0;
+
+};
+
+#endif  // nsIDrawingSurfaceGTK_h___ 

mozilla/gfx/src/gtk/nsImageGTK.cpp

@@ -0,0 +1,515 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#include "nsImageGTK.h"
+#include "nsRenderingContextGTK.h"
+
+#include "nspr.h"
+
+#define IsFlagSet(a,b) (a & b)
+
+#undef CHEAP_PERFORMANCE_MEASURMENT
+
+
+// Defining this will trace the allocation of images.  This includes
+// ctor, dtor and update.
+#undef TRACE_IMAGE_ALLOCATION
+
+static NS_DEFINE_IID(kIImageIID, NS_IIMAGE_IID);
+
+//------------------------------------------------------------
+
+nsImageGTK::nsImageGTK()
+{
+  NS_INIT_REFCNT();
+  mImageBits = nsnull;
+  mWidth = 0;
+  mHeight = 0;
+  mDepth = 0;
+  mAlphaBits = nsnull;
+  mAlphaPixmap = nsnull;
+  mImagePixmap = nsnull;
+  mGC = nsnull;
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::nsImageGTK(this=%p)\n",
+         this);
+#endif
+}
+
+//------------------------------------------------------------
+
+nsImageGTK::~nsImageGTK()
+{
+  if(nsnull != mImageBits) {
+    delete[] (PRUint8*)mImageBits;
+    mImageBits = nsnull;
+  }
+
+  if (nsnull != mAlphaBits) {
+    delete[] (PRUint8*)mAlphaBits;
+    mAlphaBits = nsnull;
+  }
+
+  if (nsnull != mAlphaPixmap) {
+    gdk_pixmap_unref(mAlphaPixmap);
+    mAlphaPixmap = nsnull;
+  }
+
+  if (nsnull != mImagePixmap) {
+    gdk_pixmap_unref(mImagePixmap);
+    mImagePixmap = nsnull;
+  }
+
+  if (nsnull != mGC) {
+    gdk_gc_unref(mGC);
+    mGC = nsnull;
+  }
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::~nsImageGTK(this=%p)\n",
+         this);
+#endif
+}
+
+NS_IMPL_ISUPPORTS(nsImageGTK, kIImageIID);
+
+//------------------------------------------------------------
+
+nsresult nsImageGTK::Init(PRInt32 aWidth, PRInt32 aHeight,
+                          PRInt32 aDepth, nsMaskRequirements aMaskRequirements)
+{
+  g_return_val_if_fail ((aWidth != 0) || (aHeight != 0), NS_ERROR_FAILURE);
+
+  if (nsnull != mImageBits) {
+   delete[] (PRUint8*)mImageBits;
+   mImageBits = nsnull;
+  }
+
+  if (nsnull != mAlphaBits) {
+    delete[] (PRUint8*)mAlphaBits;
+    mAlphaBits = nsnull;
+  }
+
+  if (nsnull != mAlphaPixmap) {
+    gdk_pixmap_unref(mAlphaPixmap);
+    mAlphaPixmap = nsnull;
+  }
+
+  if (nsnull != mImagePixmap) {
+    gdk_pixmap_unref(mImagePixmap);
+    mImagePixmap = nsnull;
+  }
+
+  if (24 == aDepth) {
+    mNumBytesPixel = 3;
+  } else {
+    NS_ASSERTION(PR_FALSE, "unexpected image depth");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  mImageUpdated = PR_TRUE;
+  mWidth = aWidth;
+  mHeight = aHeight;
+  mDepth = aDepth;
+  mIsTopToBottom = PR_TRUE;
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::Init(this=%p,%d,%d,%d,%d)\n",
+         this,
+         aWidth,
+         aHeight,
+         aDepth,
+         aMaskRequirements);
+#endif
+
+  // create the memory for the image
+  ComputMetrics();
+
+  mImageBits = (PRUint8*) new PRUint8[mSizeImage];
+
+  switch(aMaskRequirements)
+  {
+    case nsMaskRequirements_kNoMask:
+      mAlphaBits = nsnull;
+      mAlphaWidth = 0;
+      mAlphaHeight = 0;
+      break;
+
+    case nsMaskRequirements_kNeeds1Bit:
+      mAlphaRowBytes = (aWidth + 7) / 8;
+      mAlphaDepth = 1;
+
+      // 32-bit align each row
+      mAlphaRowBytes = (mAlphaRowBytes + 3) & ~0x3;
+
+      mAlphaBits = new PRUint8[mAlphaRowBytes * aHeight];
+      mAlphaWidth = aWidth;
+      mAlphaHeight = aHeight;
+
+      mAlphaPixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                    mAlphaDepth);
+      break;
+
+    case nsMaskRequirements_kNeeds8Bit:
+      mAlphaBits = nsnull;
+      mAlphaWidth = 0;
+      mAlphaHeight = 0;
+      mAlphaDepth = 8;
+      g_print("TODO: want an 8bit mask for an image..\n");
+
+      mAlphaPixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                    mAlphaDepth);
+      break;
+  }
+
+
+  mImagePixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                gdk_rgb_get_visual()->depth);
+  mGC = gdk_gc_new(mImagePixmap);
+
+  return NS_OK;
+}
+
+//------------------------------------------------------------
+
+PRInt32 nsImageGTK::CalcBytesSpan(PRUint32  aWidth)
+{
+  PRInt32 spanbytes;
+
+  spanbytes = (aWidth * mDepth) >> 5;
+
+  if (((PRUint32)aWidth * mDepth) & 0x1F)
+    spanbytes++;
+  spanbytes <<= 2;
+  return(spanbytes);
+}
+
+void nsImageGTK::ComputMetrics()
+{
+  mRowBytes = CalcBytesSpan(mWidth);
+  mSizeImage = mRowBytes * mHeight;
+}
+
+PRInt32 nsImageGTK::GetHeight()
+{
+  return mHeight;
+}
+
+PRInt32 nsImageGTK::GetWidth()
+{
+  return mWidth;
+}
+
+PRUint8 *nsImageGTK::GetBits()
+{
+  return mImageBits;
+}
+
+void *nsImageGTK::GetBitInfo()
+{
+  return nsnull;
+}
+
+PRInt32 nsImageGTK::GetLineStride()
+{
+  return mRowBytes;
+}
+
+nsColorMap *nsImageGTK::GetColorMap()
+{
+  return nsnull;
+}
+
+PRBool nsImageGTK::IsOptimized()
+{
+  return PR_TRUE;
+}
+
+PRUint8 *nsImageGTK::GetAlphaBits()
+{
+  return mAlphaBits;
+}
+
+PRInt32 nsImageGTK::GetAlphaWidth()
+{
+  return mAlphaWidth;
+}
+
+PRInt32 nsImageGTK::GetAlphaHeight()
+{
+  return mAlphaHeight;
+}
+
+PRInt32 nsImageGTK::GetAlphaLineStride()
+{
+  return mAlphaRowBytes;
+}
+
+nsIImage *nsImageGTK::DuplicateImage()
+{
+  return nsnull;
+}
+
+void nsImageGTK::SetAlphaLevel(PRInt32 aAlphaLevel)
+{
+}
+
+PRInt32 nsImageGTK::GetAlphaLevel()
+{
+  return 0;
+}
+
+void nsImageGTK::MoveAlphaMask(PRInt32 aX, PRInt32 aY)
+{
+}
+
+//------------------------------------------------------------
+
+// set up the palette to the passed in color array, RGB only in this array
+void nsImageGTK::ImageUpdated(nsIDeviceContext *aContext,
+                              PRUint8 aFlags,
+                              nsRect *aUpdateRect)
+{
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::ImageUpdated(this=%p,%d)\n",
+         this,
+         aFlags);
+#endif
+
+  if (IsFlagSet(nsImageUpdateFlags_kBitsChanged, aFlags)) {
+    mImageUpdated = PR_TRUE;
+    // FIXME do something with aUpdateRect
+  }
+}
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+static PRTime gConvertTime, gStartTime, gPixmapTime, gEndTime;
+#endif
+
+// Draw the bitmap, this method has a source and destination coordinates
+NS_IMETHODIMP
+nsImageGTK::Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
+                 PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
+                 PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight)
+{
+  g_return_val_if_fail ((aSurface != nsnull), NS_ERROR_FAILURE);
+
+  nsDrawingSurfaceGTK *drawing = (nsDrawingSurfaceGTK*)aSurface;
+
+  if (mAlphaBits)
+    g_print("calling nsImageGTK::Draw() with alpha bits\n");
+
+  gdk_draw_rgb_image (drawing->GetDrawable(),
+                      mGC,
+                      aDX, aDY, aDWidth, aDHeight,
+                      GDK_RGB_DITHER_MAX,
+                      mImageBits + mRowBytes * aSY + 3 * aDX,
+                      mRowBytes);
+
+  return NS_OK;
+}
+
+//------------------------------------------------------------
+
+// Draw the bitmap, this draw just has destination coordinates
+NS_IMETHODIMP
+nsImageGTK::Draw(nsIRenderingContext &aContext,
+                 nsDrawingSurface aSurface,
+                 PRInt32 aX, PRInt32 aY,
+                 PRInt32 aWidth, PRInt32 aHeight)
+{
+  g_return_val_if_fail ((aSurface != nsnull), NS_ERROR_FAILURE);
+
+
+  // XXX kipp: this is temporary code until we eliminate the
+  // width/height arguments from the draw method.
+  if ((aWidth != mWidth) || (aHeight != mHeight)) {
+    aWidth = mWidth;
+    aHeight = mHeight;
+  }
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::Draw(this=%p,x=%d,y=%d,width=%d,height=%d)\n",
+         this,
+         aX,
+         aY,
+         aWidth,
+         aHeight);
+#endif
+
+  nsDrawingSurfaceGTK* drawing = (nsDrawingSurfaceGTK*) aSurface;
+
+  XImage *x_image = nsnull;
+  Pixmap pixmap = 0;
+  Display *dpy = nsnull;
+  Visual *visual = nsnull;
+  GC      gc;
+  XGCValues gcv;
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+  gStartTime = gPixmapTime = PR_Now();
+#endif
+
+  // Create gc clip-mask on demand
+  if ((mAlphaBits) && (mImageUpdated == PR_TRUE))
+  {
+    /* get the X primitives */
+    dpy = GDK_WINDOW_XDISPLAY(mAlphaPixmap);
+
+    
+    /* this is the depth of the pixmap that we are going to draw to.
+       It's always a bitmap.  We're doing alpha here folks. */
+    visual = GDK_VISUAL_XVISUAL(gdk_rgb_get_visual());
+
+    // Make an image out of the alpha-bits created by the image library
+    x_image = XCreateImage(dpy, visual,
+                           1, /* visual depth...1 for bitmaps */
+                           XYPixmap,
+                           0, /* x offset, XXX fix this */
+                           (char *)mAlphaBits,  /* cast away our sign. */
+                           aWidth,
+                           aHeight,
+                           32,/* bitmap pad */
+                           mAlphaRowBytes); /* bytes per line */
+
+    x_image->bits_per_pixel=1;
+
+    /* Image library always places pixels left-to-right MSB to LSB */
+    x_image->bitmap_bit_order = MSBFirst;
+
+    /* This definition doesn't depend on client byte ordering
+       because the image library ensures that the bytes in
+       bitmask data are arranged left to right on the screen,
+       low to high address in memory. */
+    x_image->byte_order = MSBFirst;
+#if defined(IS_LITTLE_ENDIAN)
+    // no, it's still MSB XXX check on this!!
+    //      x_image->byte_order = LSBFirst;
+#elif defined (IS_BIG_ENDIAN)
+    x_image->byte_order = MSBFirst;
+#else
+#error ERROR! Endianness is unknown;
+#endif
+
+    // Write into the pixemap that is underneath gdk's mAlphaPixmap
+    // the image we just created.
+
+    pixmap = GDK_WINDOW_XWINDOW(mAlphaPixmap);
+    memset(&gcv, 0, sizeof(XGCValues));
+    gcv.function = GXcopy;
+    gc = XCreateGC(dpy, pixmap, GCFunction, &gcv);
+    XPutImage(dpy, pixmap, gc, x_image, 0, 0, 0, 0,
+              aWidth, aHeight);
+    XFreeGC(dpy, gc);
+
+    // Now we are done with the temporary image
+    x_image->data = 0;          /* Don't free the IL_Pixmap's bits. */
+    XDestroyImage(x_image);
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+    gPixmapTime = PR_Now();
+#endif
+  }
+
+  // Render unique image bits onto an off screen pixmap only once
+  // The image bits can change as a result of ImageUpdated() - for
+  // example: animated GIFs.
+  if (mImageUpdated == PR_TRUE)
+  {
+#ifdef TRACE_IMAGE_ALLOCATION
+    printf("nsImageGTK::Draw(this=%p) gdk_pixmap_new(nsnull,width=%d,height=%d,depth=%d)\n",
+           this,
+           aWidth,
+           aHeight,
+           mDepth);
+#endif
+
+    gdk_gc_set_clip_origin(mGC, 0, 0);
+    gdk_gc_set_clip_mask(mGC, nsnull);
+
+    // Render the image bits into an off screen pixmap
+    gdk_draw_rgb_image (mImagePixmap,
+                        mGC,
+                        0, 0, aWidth, aHeight,
+                        GDK_RGB_DITHER_MAX,
+                        mImageBits, mRowBytes);
+
+    if (mAlphaPixmap)
+    {
+      // Setup gc to use the given alpha-pixmap for clipping
+      gdk_gc_set_clip_mask(mGC, mAlphaPixmap);
+      gdk_gc_set_clip_origin(mGC, aX, aY);
+    }
+    
+#ifdef TRACE_IMAGE_ALLOCATION
+    printf("nsImageGTK::Draw(this=%p) gdk_draw_pixmap(x=%d,y=%d,width=%d,height=%d)\n",
+           this,
+           aX,
+           aY,
+           aWidth,
+           aHeight);
+#endif
+
+    mImageUpdated = PR_FALSE;
+  }
+
+
+  // copy our offscreen pixmap onto the window.
+  gdk_window_copy_area(drawing->GetDrawable(),      // dest window
+                       mGC,                         // gc
+                       aX,                          // xsrc
+                       aY,                          // ysrc
+                       mImagePixmap,                // source window
+                       0,                           // xdest
+                       0,                           // ydest
+                       aWidth,                      // width
+                       aHeight);                    // height
+
+  if (mAlphaBits)
+  {
+    // Revert gc to its old clip-mask and origin
+    gdk_gc_set_clip_origin(mGC, 0, 0);
+    gdk_gc_set_clip_mask(mGC, nsnull);
+  }
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+  gEndTime = PR_Now();
+  printf("nsImageGTK::Draw(this=%p,w=%d,h=%d) total=%lld pixmap=%lld, cvt=%lld\n",
+         this,
+         aWidth, aHeight,
+         gEndTime - gStartTime,
+         gPixmapTime - gStartTime,
+         gConvertTime - gPixmapTime);
+#endif
+
+  mImageUpdated = PR_FALSE;
+
+  return NS_OK;
+}
+
+
+//------------------------------------------------------------
+
+nsresult nsImageGTK::Optimize(nsIDeviceContext* aContext)
+{
+  return NS_OK;
+}

mozilla/gfx/src/gtk/nsImageGTK.h

@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsImageGTK_h___
+#define nsImageGTK_h___
+
+#include "nsIImage.h"
+
+#include "X11/Xlib.h"
+#include "X11/Xutil.h"
+#include <gdk/gdk.h>
+
+#undef Bool
+
+class nsImageGTK : public nsIImage
+{
+public:
+  nsImageGTK();
+  virtual ~nsImageGTK();
+
+  NS_DECL_ISUPPORTS
+
+  /**
+  @see nsIImage.h
+  */
+  virtual PRInt32     GetBytesPix()       { return mNumBytesPixel; }
+  virtual PRInt32     GetHeight();
+  virtual PRInt32     GetWidth();
+  virtual PRUint8*    GetBits();
+  virtual void*       GetBitInfo();
+  virtual PRBool      GetIsRowOrderTopToBottom() { return mIsTopToBottom; }
+  virtual PRInt32     GetLineStride();
+  virtual nsColorMap* GetColorMap();
+  NS_IMETHOD Draw(nsIRenderingContext &aContext,
+                  nsDrawingSurface aSurface,
+                  PRInt32 aX, PRInt32 aY,
+                  PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD Draw(nsIRenderingContext &aContext,
+                  nsDrawingSurface aSurface,
+                  PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
+                  PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight);
+  virtual void ImageUpdated(nsIDeviceContext *aContext,
+                            PRUint8 aFlags, nsRect *aUpdateRect);
+  virtual nsresult    Init(PRInt32 aWidth, PRInt32 aHeight,
+                           PRInt32 aDepth,
+                           nsMaskRequirements aMaskRequirements);
+  virtual PRBool      IsOptimized();
+
+  virtual nsresult    Optimize(nsIDeviceContext* aContext);
+  virtual PRUint8*    GetAlphaBits();
+  virtual PRInt32     GetAlphaWidth();
+  virtual PRInt32     GetAlphaHeight();
+  virtual PRInt32     GetAlphaLineStride();
+  virtual nsIImage*   DuplicateImage();
+
+  /**
+   * Calculate the number of bytes spaned for this image for a given width
+   * @param aWidth is the width to calculate the number of bytes for
+   * @return the number of bytes in this span
+   */
+  PRInt32  CalcBytesSpan(PRUint32  aWidth);
+  virtual void  SetAlphaLevel(PRInt32 aAlphaLevel);
+  virtual PRInt32 GetAlphaLevel();
+  virtual void  MoveAlphaMask(PRInt32 aX, PRInt32 aY);
+
+private:
+  /**
+   * Calculate the amount of memory needed for the initialization of the image
+   */
+  void ComputMetrics();
+  void ComputePaletteSize(PRIntn nBitCount);
+
+private:
+  PRInt32    mWidth;
+  PRInt32    mHeight;
+  PRInt32    mDepth;       // bits per pixel
+  PRInt32    mRowBytes;
+  PRUint8    *mImageBits;
+  PRUint8    *mConvertedBits;
+  PRInt32    mSizeImage;
+  PRBool     mIsTopToBottom;
+  PRBool     mImageUpdated;
+
+  PRInt8     mNumBytesPixel;
+
+  // alpha layer members
+  PRUint8    *mAlphaBits;
+  GdkPixmap  *mAlphaPixmap;
+  PRInt8     mAlphaDepth;        // alpha layer depth
+  PRInt16    mAlphaRowBytes;     // alpha bytes per row
+  PRInt16    mAlphaWidth;        // alpha layer width
+  PRInt16    mAlphaHeight;       // alpha layer height
+  nsPoint    mLocation;          // alpha mask location
+
+  GdkPixmap  *mImagePixmap;
+
+  GdkGC      *mGC;
+};
+
+#endif

mozilla/gfx/src/gtk/nsPrintdGTK.c

@@ -0,0 +1,452 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Original Code: Syd Logan (syd@netscape.com) 3/12/99 */
+
+#include <gtk/gtk.h>
+
+#include "nspr.h"
+
+#include "nsPrintdGTK.h"
+
+/* A structure to hold widgets that need to be referenced in callbacks. We
+   declare this statically in the caller entry point (as a field of 
+   UnixPrOps, below), and pass a pointer to the structure to Gtk+ for each 
+   signal handler registered. This avoids use of globals. */
+
+typedef struct prwidgets {
+	GtkWidget *toplevel;		/* should be set to toplevel window */
+	GtkWidget *prDialog;		
+	GtkWidget *cmdEntry;
+	GtkWidget *pathEntry;
+	GtkWidget *browseButton;
+	GtkWidget *fpfToggle;
+	GtkWidget *greyToggle;
+	GtkWidget *letterToggle;
+	GtkWidget *legalToggle;
+	GtkWidget *execToggle;
+	GtkWidget *topSpinner;
+	GtkWidget *bottomSpinner;
+	GtkWidget *leftSpinner;
+	GtkWidget *rightSpinner;
+	GtkFileSelection *fsWidget;
+} PrWidgets;
+
+typedef struct unixprops {
+	UnixPrData *prData;	/* pointer to caller struct */
+	PrWidgets widgets;	 
+} UnixPrOps;
+
+/* user clicked cancel. tear things down, and set cancel field in 
+   caller data to PR_TRUE so printing will not happen */
+
+static void
+CancelPrint (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_main_quit();
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.prDialog) );
+	prOps->prData->cancel = PR_TRUE;
+}
+
+/* user selected the Print button. Collect any remaining data from the
+   widgets, and set cancel field in caller data to PR_FALSE so printing
+   will be performed. Also, tear down dialog and exit inner main loop */
+ 
+static void
+DoPrint (GtkWidget *widget, UnixPrOps *prOps)
+{
+	strcpy( prOps->prData->command, 
+		gtk_entry_get_text( GTK_ENTRY( prOps->widgets.cmdEntry ) ) );
+	strcpy( prOps->prData->path, 
+		gtk_entry_get_text( GTK_ENTRY( prOps->widgets.pathEntry ) ) );
+
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.fpfToggle )->active == PR_TRUE )
+		prOps->prData->fpf = PR_TRUE;
+	else
+		prOps->prData->fpf = PR_FALSE;
+
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.greyToggle )->active == PR_TRUE )
+		prOps->prData->grayscale = PR_TRUE;
+	else
+		prOps->prData->grayscale = PR_FALSE;
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.letterToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_LETTER_SIZE;
+	else if ( GTK_TOGGLE_BUTTON( prOps->widgets.legalToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_LEGAL_SIZE;
+	else if ( GTK_TOGGLE_BUTTON( prOps->widgets.execToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_EXECUTIVE_SIZE;
+	else
+		prOps->prData->size = NS_A4_SIZE;
+
+	/* margins */
+
+	prOps->prData->top = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.topSpinner) );
+	prOps->prData->bottom = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.bottomSpinner) );
+	prOps->prData->left = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.leftSpinner) );
+	prOps->prData->right = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.rightSpinner) );
+
+	/* we got everything... bring down the dialog and tell caller
+	   it's o.k. to print */
+
+	gtk_main_quit();
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.prDialog) );
+	prOps->prData->cancel = PR_FALSE;
+}
+
+/* User hit ok in file selection widget brought up by the browse button.
+   snarf the selected file, stuff it in caller data */
+
+static void
+ModifyPrPath (GtkWidget *widget, UnixPrOps *prOps)
+{
+	strcpy( prOps->prData->path, 
+		gtk_file_selection_get_filename(prOps->widgets.fsWidget) );
+      	gtk_entry_set_text (GTK_ENTRY (prOps->widgets.pathEntry), 
+		prOps->prData->path);
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.fsWidget) );
+}
+
+/* user selected print to printer. de-sensitize print to file fields */
+
+static void
+SwitchToPrinter (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_widget_set_sensitive( prOps->widgets.cmdEntry, PR_TRUE );
+	gtk_widget_set_sensitive( prOps->widgets.pathEntry, PR_FALSE );
+	gtk_widget_set_sensitive( prOps->widgets.browseButton, PR_FALSE );
+	prOps->prData->toPrinter = PR_TRUE;
+}
+
+/* user selected print to file. de-sensitize print to printer fields */
+
+static void
+SwitchToFile (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_widget_set_sensitive( prOps->widgets.cmdEntry, PR_FALSE );
+	gtk_widget_set_sensitive( prOps->widgets.pathEntry, PR_TRUE );
+	gtk_widget_set_sensitive( prOps->widgets.browseButton, PR_TRUE );
+	prOps->prData->toPrinter = PR_FALSE;
+}
+
+/* user hit the browse button. Pop up a file selection widget and grab
+   result */
+
+static void
+GetPrPath (GtkWidget *widget, UnixPrOps *prOps)
+{
+    GtkWidget *fs;
+
+    fs = gtk_file_selection_new("Netscape: File Browser");
+
+    gtk_file_selection_set_filename( GTK_FILE_SELECTION(fs), 
+	prOps->prData->path );
+
+    gtk_window_set_modal (GTK_WINDOW(fs),PR_TRUE);
+
+#if 0
+    /* XXX not sure what the toplevel window should be. */
+
+    gtk_window_set_transient_for (GTK_WINDOW (fs), 
+	GTK_WINDOW (prOps->widgets.toplevel));
+#endif
+
+    prOps->widgets.fsWidget = GTK_FILE_SELECTION(fs);
+
+    gtk_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button), 
+	"clicked", GTK_SIGNAL_FUNC(ModifyPrPath), prOps);
+
+    gtk_signal_connect_object (GTK_OBJECT(
+	GTK_FILE_SELECTION(fs)->cancel_button), "clicked",
+	GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT (fs));
+
+    gtk_widget_show(fs);
+}
+
+/* create file data dialog. XXX widget should be NULL */
+
+static void
+DoPrintGTK (GtkWidget *widget, UnixPrOps *prOps)
+{
+	GtkWidget *separator, *dialog, *label, *vbox, *entry, *hbox, 
+		*button, *fileButton, *prButton, *table, *spinner1;
+        GtkAdjustment *adj;
+
+	prOps->widgets.prDialog = dialog = 
+		gtk_window_new( GTK_WINDOW_TOPLEVEL );
+	gtk_window_set_modal( GTK_WINDOW(dialog), PR_TRUE );
+#if 0
+	/* not yet sure what the toplevel window should be */
+
+        gtk_window_set_transient_for (GTK_WINDOW (dialog), 
+		GTK_WINDOW (prOps->widgets.toplevel));
+#endif
+      	gtk_window_set_title( GTK_WINDOW(dialog), "Netscape: Print" );
+
+	vbox = gtk_vbox_new (PR_FALSE, 0);
+        gtk_container_add (GTK_CONTAINER (dialog), vbox);
+
+	table = gtk_table_new (3, 3, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+        gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_TRUE, 5);
+	label = gtk_label_new( "Print To:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = prButton = gtk_radio_button_new_with_label (NULL, "Printer");
+        if ( prOps->prData->toPrinter == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	button = fileButton = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), "File");
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+        if ( prOps->prData->toPrinter == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+
+	label = gtk_label_new( "Print Command:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	entry = gtk_entry_new ();
+      	gtk_entry_set_text (GTK_ENTRY (entry), prOps->prData->command);
+	gtk_table_attach (GTK_TABLE (table), entry, 1, 3, 1, 2,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	if ( prOps->prData->toPrinter == PR_FALSE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.cmdEntry = entry;
+
+	label = gtk_label_new( "File Name:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	entry = gtk_entry_new ();
+	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+      	gtk_entry_set_text (GTK_ENTRY (entry), prOps->prData->path);
+	if ( prOps->prData->toPrinter == PR_TRUE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.pathEntry = entry;
+
+	button = gtk_button_new_with_label ("Browse...");
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC (GetPrPath), prOps);
+	if ( prOps->prData->toPrinter == PR_TRUE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.browseButton = button;
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+	table = gtk_table_new (2, 4, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+      	gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_FALSE, 0);
+
+	label = gtk_label_new( "Print: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, "First Page First");
+        if ( prOps->prData->fpf == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	prOps->widgets.fpfToggle = button;
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Last Page First");
+        if ( prOps->prData->fpf == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Print: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, "Greyscale");
+	prOps->widgets.greyToggle = button;
+        if ( prOps->prData->grayscale == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Color");
+        if ( prOps->prData->grayscale == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Paper Size: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, 
+		"Letter (8 1/2 x 11 in.)");
+	prOps->widgets.letterToggle = button;
+        if ( prOps->prData->size == NS_LETTER_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Legal (8 1/2 x 14 in.)");
+	prOps->widgets.legalToggle = button;
+        if ( prOps->prData->size == NS_LEGAL_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Executive (7 1/2 x 10 in.)");
+	prOps->widgets.execToggle = button;
+        if ( prOps->prData->size == NS_EXECUTIVE_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 4, 5,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"A4 (210 x 297 mm)");
+        if ( prOps->prData->size == NS_A4_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 4, 5,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	/* margins */
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+      	gtk_box_pack_start (GTK_BOX (vbox), hbox, PR_FALSE, PR_FALSE, 5);
+	label = gtk_label_new( "Margins (inches):" );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_FALSE, PR_FALSE, 10);
+
+	table = gtk_table_new (1, 2, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+      	gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_FALSE, 0);
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+	gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	label = gtk_label_new( "Top: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.topSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	label = gtk_label_new( "Bottom: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.bottomSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+	
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+	gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Left: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (0.75, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.leftSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	label = gtk_label_new( "Right: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (0.75, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.rightSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+        hbox = gtk_hbox_new (PR_FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), hbox, PR_TRUE, PR_FALSE, 5);
+	button = gtk_button_new_with_label ("Print");
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC (DoPrint), prOps );
+        gtk_box_pack_start (GTK_BOX (hbox), button, PR_TRUE, PR_FALSE, 0);
+
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+	gtk_widget_grab_default (button);
+
+	button = gtk_button_new_with_label ("Cancel");
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC ( CancelPrint ), prOps);
+        gtk_box_pack_start (GTK_BOX (hbox), button, PR_TRUE, PR_FALSE, 0);
+
+	/* Do this here, otherwise, upon creation the callbacks will be
+           triggered and the widgets these callbacks set sensitivity on
+	   do not exist yet */
+
+      	gtk_signal_connect (GTK_OBJECT (prButton), "clicked",
+        	GTK_SIGNAL_FUNC (SwitchToPrinter), prOps);
+      	gtk_signal_connect (GTK_OBJECT (fileButton), "clicked",
+        	GTK_SIGNAL_FUNC (SwitchToFile), prOps);
+
+	gtk_widget_show_all( dialog );
+	gtk_main ();
+}
+
+/* public interface to print dialog. Caller passes in preferences using
+   argument, we return any changes and indication of whether to print
+   or cancel. */
+
+void
+UnixPrDialog( UnixPrData *prData )
+{
+	static UnixPrOps prOps;
+
+	prOps.prData = prData;
+	DoPrintGTK( (GtkWidget *) NULL, &prOps );
+}
+

mozilla/gfx/src/gtk/nsPrintdGTK.h

@@ -0,0 +1,60 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Original Code: Syd Logan (syd@netscape.com) 3/12/99 */
+
+#ifndef nsPrintdGTK_h___
+#define nsPrintdGTK_h___
+
+#include <limits.h>
+
+PR_BEGIN_EXTERN_C
+
+/* stolen from nsPostScriptObj.h. needs to be put somewhere else that
+   both ps and gtk can see easily */
+
+#ifndef NS_LEGAL_SIZE
+#define NS_LETTER_SIZE    0
+#define NS_LEGAL_SIZE     1
+#define NS_EXECUTIVE_SIZE 2
+#define NS_A4_SIZE        3
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX	_POSIX_PATH_MAX
+#endif
+
+typedef struct unixprdata {
+        PRBool toPrinter;          /* If PR_TRUE, print to printer */
+        PRBool fpf;                /* If PR_TRUE, first page first */
+        PRBool grayscale;          /* If PR_TRUE, print grayscale */
+        int size;                   /* Paper size e.g., SizeLetter */
+        char command[ PATH_MAX ];   /* Print command e.g., lpr */
+        char path[ PATH_MAX ];      /* If toPrinter = PR_FALSE, dest file */
+	PRBool cancel;		    /* If PR_TRUE, user cancelled */
+	float left;		    /* left margin */
+	float right;		    /* right margin */
+	float top;		    /* top margin */
+	float bottom;		    /* bottom margin */
+} UnixPrData;
+
+void UnixPrDialog(UnixPrData *prData);
+
+PR_END_EXTERN_C
+
+#endif /* nsPrintdGTK_h___ */

mozilla/gfx/src/gtk/nsRegionGTK.cpp

@@ -0,0 +1,302 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
+#include "nsRegionGTK.h"
+#include "xregion.h"
+#include "prmem.h"
+
+static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID);
+
+nsRegionGTK::nsRegionGTK()
+{
+  NS_INIT_REFCNT();
+  
+  mRegion = nsnull;
+  mRegionType = eRegionComplexity_empty;
+}
+
+nsRegionGTK::~nsRegionGTK()
+{
+   if (mRegion)
+     ::gdk_region_destroy(mRegion);
+  mRegion = nsnull;
+}
+
+NS_IMPL_QUERY_INTERFACE(nsRegionGTK, kRegionIID)
+NS_IMPL_ADDREF(nsRegionGTK)
+NS_IMPL_RELEASE(nsRegionGTK)
+
+nsresult nsRegionGTK::Init(void)
+{
+  NS_ADDREF_THIS();
+  mRegion = ::gdk_region_new();
+  mRegionType = eRegionComplexity_empty;
+  return NS_OK;
+}
+
+void nsRegionGTK::SetTo(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+  SetRegionEmpty();
+  
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, pRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::SetTo(const nsRegionGTK *aRegion)
+{
+  SetRegionEmpty();
+  
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, aRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  SetRegionEmpty();
+
+  GdkRectangle grect;
+
+  grect.x = aX;
+  grect.y = aY;
+  grect.width = aWidth;
+  grect.height = aHeight;
+  
+  GdkRegion *nRegion = ::gdk_region_union_with_rect(mRegion, &grect);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Intersect(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+  GdkRegion *nRegion = ::gdk_regions_intersect(mRegion, pRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+
+  GdkRegion *nRegion = ::gdk_regions_intersect(mRegion, tRegion);
+  ::gdk_region_destroy(tRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Union(const nsIRegion &aRegion)
+{
+   nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+   
+   GdkRegion *nRegion = ::gdk_regions_union(mRegion, pRegion->mRegion);
+   ::gdk_region_destroy(mRegion);
+   mRegion = nRegion;
+}
+
+void nsRegionGTK::Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, tRegion);
+  ::gdk_region_destroy(mRegion);
+  ::gdk_region_destroy(tRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Subtract(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+   GdkRegion *nRegion = ::gdk_regions_subtract(mRegion, pRegion->mRegion);
+   ::gdk_region_destroy(mRegion);
+   mRegion = nRegion;
+}
+
+void nsRegionGTK::Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+  
+  GdkRegion *nRegion = ::gdk_regions_subtract(mRegion, tRegion);
+  ::gdk_region_destroy(mRegion);
+  ::gdk_region_destroy(tRegion);
+  mRegion = nRegion;
+}
+
+PRBool nsRegionGTK::IsEmpty(void)
+{
+  return (::gdk_region_empty(mRegion));
+}
+
+PRBool nsRegionGTK::IsEqual(const nsIRegion &aRegion)
+{
+  nsRegionGTK *pRegion = (nsRegionGTK *)&aRegion;
+
+  return(::gdk_region_equal(mRegion, pRegion->mRegion));
+
+}
+
+void nsRegionGTK::GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight)
+{
+  GdkRectangle rect;
+
+  ::gdk_region_get_clipbox(mRegion, &rect);
+
+  *aX = rect.x;
+  *aY = rect.y;
+  *aWidth = rect.width;
+  *aHeight = rect.height;
+}
+
+void nsRegionGTK::Offset(PRInt32 aXOffset, PRInt32 aYOffset)
+{
+   ::gdk_region_offset(mRegion, aXOffset, aYOffset);
+}
+
+PRBool nsRegionGTK::ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkOverlapType containment;
+  GdkRectangle rect;
+   
+  rect.x = aX;
+  rect.y = aY;
+  rect.width = aWidth;
+  rect.height = aHeight;
+   
+  containment = ::gdk_region_rect_in(mRegion, &rect);
+
+  if (containment != GDK_OVERLAP_RECTANGLE_OUT)
+    return PR_TRUE;
+  else
+    return PR_FALSE;
+
+}
+
+NS_IMETHODIMP nsRegionGTK::GetRects(nsRegionRectSet **aRects)
+{
+  nsRegionRectSet   *rects;
+  GdkRegionPrivate  *priv = (GdkRegionPrivate *)mRegion;
+  Region            pRegion = priv->xregion;
+  int               nbox;
+  BOX               *pbox;
+  nsRegionRect      *rect;
+
+  NS_ASSERTION(!(nsnull == aRects), "bad ptr");
+
+  //code lifted from old xfe. MMP
+
+  pbox = pRegion->rects;
+  nbox = pRegion->numRects;
+
+  rects = *aRects;
+
+  if ((nsnull == rects) || (rects->mRectsLen < (PRUint32)nbox))
+  {
+    void *buf = PR_Realloc(rects, sizeof(nsRegionRectSet) + (sizeof(nsRegionRect) * (nbox - 1)));
+
+    if (nsnull == buf)
+    {
+      if (nsnull != rects)
+        rects->mNumRects = 0;
+
+      return NS_OK;
+    }
+
+    rects = (nsRegionRectSet *)buf;
+    rects->mRectsLen = nbox;
+  }
+
+  rects->mNumRects = nbox;
+  rects->mArea = 0;
+  rect = &rects->mRects[0];
+
+  while (nbox--)
+  {
+    rect->x = pbox->x1;
+    rect->width = (pbox->x2 - pbox->x1);
+    rect->y = pbox->y1;
+    rect->height = (pbox->y2 - pbox->y1);
+
+    rects->mArea += rect->width * rect->height;
+
+    pbox++;
+    rect++;
+  }
+
+  *aRects = rects;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::FreeRects(nsRegionRectSet *aRects)
+{
+  if (nsnull != aRects)
+    PR_Free((void *)aRects);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::GetNativeRegion(void *&aRegion) const
+{
+  aRegion = (void *)mRegion;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::GetRegionComplexity(nsRegionComplexity &aComplexity) const
+{
+  // cast to avoid const-ness problems on some compilers
+  if (((nsRegionGTK*)this)->IsEmpty())
+    aComplexity = eRegionComplexity_empty;
+  else
+    aComplexity = eRegionComplexity_complex;
+
+  return NS_OK;
+}
+
+void nsRegionGTK::SetRegionEmpty()
+{
+  if (!IsEmpty()) {
+    ::gdk_region_destroy(mRegion);
+    mRegion = ::gdk_region_new();
+  }
+}
+
+GdkRegion *nsRegionGTK::CreateRectRegion(PRInt32 aX,
+					 PRInt32 aY,
+					 PRInt32 aWidth,
+					 PRInt32 aHeight)
+{
+  GdkRegion *tRegion = ::gdk_region_new();
+  GdkRectangle rect;
+
+  rect.x = aX;
+  rect.y = aY;
+  rect.width = aWidth;
+  rect.height = aHeight;
+
+  GdkRegion *rRegion = ::gdk_region_union_with_rect(tRegion, &rect);
+  ::gdk_region_destroy(tRegion);
+  
+  return (rRegion);
+}

mozilla/gfx/src/gtk/nsRegionGTK.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsRegionGTK_h___
+#define nsRegionGTK_h___
+
+#include "nsIRegion.h"
+
+class nsRegionGTK : public nsIRegion
+{
+public:
+  nsRegionGTK();
+  virtual ~nsRegionGTK();
+
+  NS_DECL_ISUPPORTS
+
+  virtual nsresult Init();
+
+  virtual void SetTo(const nsIRegion &aRegion);
+  virtual void SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  void SetTo(const nsRegionGTK *aRegion);
+  virtual void Intersect(const nsIRegion &aRegion);
+  virtual void Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual void Union(const nsIRegion &aRegion);
+  virtual void Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual void Subtract(const nsIRegion &aRegion);
+  virtual void Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual PRBool IsEmpty(void);
+  virtual PRBool IsEqual(const nsIRegion &aRegion);
+  virtual void GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight);
+  virtual void Offset(PRInt32 aXOffset, PRInt32 aYOffset);
+  virtual PRBool ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD GetRects(nsRegionRectSet **aRects);
+  NS_IMETHOD FreeRects(nsRegionRectSet *aRects);
+  NS_IMETHOD GetNativeRegion(void *&aRegion) const;
+  NS_IMETHOD GetRegionComplexity(nsRegionComplexity &aComplexity) const;
+
+  GdkRegion *CreateRectRegion(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+
+private:
+  GdkRegion           *mRegion;
+  nsRegionComplexity  mRegionType;
+
+  virtual void SetRegionEmpty();
+
+};
+
+#endif  // nsRegionGTK_h___ 

mozilla/gfx/src/gtk/nsRenderingContextGTK.h

@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsRenderingContextGTK_h___
+#define nsRenderingContextGTK_h___
+
+#include "nsIRenderingContext.h"
+#include "nsUnitConversion.h"
+#include "nsFont.h"
+#include "nsIFontMetrics.h"
+#include "nsPoint.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "nsTransform2D.h"
+#include "nsIViewManager.h"
+#include "nsIWidget.h"
+#include "nsRect.h"
+#include "nsImageGTK.h"
+#include "nsIDeviceContext.h"
+#include "nsVoidArray.h"
+
+#include "nsDrawingSurfaceGTK.h"
+#include "nsRegionGTK.h"
+
+#include <gtk/gtk.h>
+
+class nsRenderingContextGTK : public nsIRenderingContext
+{
+public:
+  nsRenderingContextGTK();
+  virtual ~nsRenderingContextGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(nsIDeviceContext* aContext, nsIWidget *aWindow);
+  NS_IMETHOD Init(nsIDeviceContext* aContext, nsDrawingSurface aSurface);
+
+  NS_IMETHOD Reset(void);
+
+  NS_IMETHOD GetDeviceContext(nsIDeviceContext *&aContext);
+
+  NS_IMETHOD LockDrawingSurface(PRInt32 aX, PRInt32 aY, PRUint32 aWidth, PRUint32 aHeight,
+                                void **aBits, PRInt32 *aStride, PRInt32 *aWidthBytes,
+                                PRUint32 aFlags);
+  NS_IMETHOD UnlockDrawingSurface(void);
+
+  NS_IMETHOD SelectOffScreenDrawingSurface(nsDrawingSurface aSurface);
+  NS_IMETHOD GetDrawingSurface(nsDrawingSurface *aSurface);
+  NS_IMETHOD GetHints(PRUint32& aResult);
+
+  NS_IMETHOD PushState(void);
+  NS_IMETHOD PopState(PRBool &aClipEmpty);
+
+  NS_IMETHOD IsVisibleRect(const nsRect& aRect, PRBool &aVisible);
+
+  NS_IMETHOD SetClipRect(const nsRect& aRect, nsClipCombine aCombine, PRBool &aClipEmpty);
+  NS_IMETHOD GetClipRect(nsRect &aRect, PRBool &aClipValid);
+  NS_IMETHOD SetClipRegion(const nsIRegion& aRegion, nsClipCombine aCombine, PRBool &aClipEmpty);
+  NS_IMETHOD GetClipRegion(nsIRegion **aRegion);
+
+  NS_IMETHOD SetLineStyle(nsLineStyle aLineStyle);
+  NS_IMETHOD GetLineStyle(nsLineStyle &aLineStyle);
+
+  NS_IMETHOD SetColor(nscolor aColor);
+  NS_IMETHOD GetColor(nscolor &aColor) const;
+
+  NS_IMETHOD SetFont(const nsFont& aFont);
+  NS_IMETHOD SetFont(nsIFontMetrics *aFontMetrics);
+
+  NS_IMETHOD GetFontMetrics(nsIFontMetrics *&aFontMetrics);
+
+  NS_IMETHOD Translate(nscoord aX, nscoord aY);
+  NS_IMETHOD Scale(float aSx, float aSy);
+  NS_IMETHOD GetCurrentTransform(nsTransform2D *&aTransform);
+
+  NS_IMETHOD CreateDrawingSurface(nsRect *aBounds, PRUint32 aSurfFlags, nsDrawingSurface &aSurface);
+  NS_IMETHOD DestroyDrawingSurface(nsDrawingSurface aDS);
+
+  NS_IMETHOD DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
+  NS_IMETHOD DrawPolyline(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+  NS_IMETHOD DrawRect(const nsRect& aRect);
+  NS_IMETHOD DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+  NS_IMETHOD FillRect(const nsRect& aRect);
+  NS_IMETHOD FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+
+  NS_IMETHOD DrawPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+  NS_IMETHOD FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+  NS_IMETHOD DrawEllipse(const nsRect& aRect);
+  NS_IMETHOD DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+  NS_IMETHOD FillEllipse(const nsRect& aRect);
+  NS_IMETHOD FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+
+  NS_IMETHOD DrawArc(const nsRect& aRect,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD DrawArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD FillArc(const nsRect& aRect,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD FillArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
+                     float aStartAngle, float aEndAngle);
+
+  NS_IMETHOD GetWidth(char aC, nscoord &aWidth);
+  NS_IMETHOD GetWidth(PRUnichar aC, nscoord &aWidth,
+                      PRInt32 *aFontID);
+  NS_IMETHOD GetWidth(const nsString& aString, nscoord &aWidth,
+                      PRInt32 *aFontID);
+  NS_IMETHOD GetWidth(const char *aString, nscoord &aWidth);
+  NS_IMETHOD GetWidth(const char *aString, PRUint32 aLength, nscoord &aWidth);
+  NS_IMETHOD GetWidth(const PRUnichar *aString, PRUint32 aLength, nscoord &aWidth,
+                      PRInt32 *aFontID);
+
+  NS_IMETHOD DrawString(const char *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        const nscoord* aSpacing);
+  NS_IMETHOD DrawString(const PRUnichar *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing);
+  NS_IMETHOD DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing);
+
+  NS_IMETHOD DrawImage(nsIImage *aImage, nscoord aX, nscoord aY);
+  NS_IMETHOD DrawImage(nsIImage *aImage, nscoord aX, nscoord aY,
+                       nscoord aWidth, nscoord aHeight); 
+  NS_IMETHOD DrawImage(nsIImage *aImage, const nsRect& aRect);
+  NS_IMETHOD DrawImage(nsIImage *aImage, const nsRect& aSRect, const nsRect& aDRect);
+
+  NS_IMETHOD CopyOffScreenBits(nsDrawingSurface aSrcSurf, PRInt32 aSrcX, PRInt32 aSrcY,
+                               const nsRect &aDestBounds, PRUint32 aCopyFlags);
+
+  //locals
+  NS_IMETHOD CommonInit();
+
+protected:
+  nsDrawingSurfaceGTK   *mOffscreenSurface;  
+  nsDrawingSurfaceGTK   *mSurface;
+  nsIDeviceContext      *mContext;
+  nsIFontMetrics        *mFontMetrics;
+  nsRegionGTK           *mClipRegion;
+  nsTransform2D         *mTMatrix;
+  float                  mP2T;
+  GdkWChar*              mDrawStringBuf;
+  PRUint32               mDrawStringSize;
+
+ // graphic state stack (GraphicsState)
+  nsVoidArray           *mStateCache;
+
+  nscolor                mCurrentColor;
+  GdkFont               *mCurrentFont;
+  nsLineStyle            mCurrentLineStyle;
+};
+
+#endif /* nsRenderingContextGTK_h___ */

mozilla/gfx/src/gtk/xregion.h

@@ -0,0 +1,177 @@
+/* $XConsortium: region.h,v 11.13 91/09/10 08:21:49 rws Exp $ */
+/************************************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+************************************************************************/
+
+#ifndef _XREGION_H
+#define _XREGION_H
+
+typedef struct {
+    short x1, x2, y1, y2;
+} Box, BOX, BoxRec, *BoxPtr;
+
+typedef struct {
+    short x, y, width, height;
+}RECTANGLE, RectangleRec, *RectanglePtr;
+
+#ifdef TRUE
+#undef TRUE
+#endif
+
+#define TRUE 1
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef MAXSHORT
+#define MAXSHORT 32767
+#endif
+#ifndef MINSHORT
+#define MINSHORT -MAXSHORT
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+
+/* 
+ *   clip region
+ */
+
+typedef struct _XRegion {
+    long size;
+    long numRects;
+    BOX *rects;
+    BOX extents;
+} REGION;
+
+/* Xutil.h contains the declaration: 
+ * typedef struct _XRegion *Region; 
+ */   
+
+/*  1 if two BOXs overlap.
+ *  0 if two BOXs do not overlap.
+ *  Remember, x2 and y2 are not in the region 
+ */
+#define EXTENTCHECK(r1, r2) \
+	((r1)->x2 > (r2)->x1 && \
+	 (r1)->x1 < (r2)->x2 && \
+	 (r1)->y2 > (r2)->y1 && \
+	 (r1)->y1 < (r2)->y2)
+
+/*
+ *  update region extents
+ */
+#define EXTENTS(r,idRect){\
+            if((r)->x1 < (idRect)->extents.x1)\
+              (idRect)->extents.x1 = (r)->x1;\
+            if((r)->y1 < (idRect)->extents.y1)\
+              (idRect)->extents.y1 = (r)->y1;\
+            if((r)->x2 > (idRect)->extents.x2)\
+              (idRect)->extents.x2 = (r)->x2;\
+            if((r)->y2 > (idRect)->extents.y2)\
+              (idRect)->extents.y2 = (r)->y2;\
+        }
+
+/*
+ *   Check to see if there is enough memory in the present region.
+ */
+#define MEMCHECK(reg, rect, firstrect){\
+        if ((reg)->numRects >= ((reg)->size - 1)){\
+          (firstrect) = (BOX *) Xrealloc \
+          ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\
+          if ((firstrect) == 0)\
+            return(0);\
+          (reg)->size *= 2;\
+          (rect) = &(firstrect)[(reg)->numRects];\
+         }\
+       }
+
+/*  this routine checks to see if the previous rectangle is the same
+ *  or subsumes the new rectangle to add.
+ */
+
+#define CHECK_PREVIOUS(Reg, R, Rx1, Ry1, Rx2, Ry2)\
+               (!(((Reg)->numRects > 0)&&\
+                  ((R-1)->y1 == (Ry1)) &&\
+                  ((R-1)->y2 == (Ry2)) &&\
+                  ((R-1)->x1 <= (Rx1)) &&\
+                  ((R-1)->x2 >= (Rx2))))
+
+/*  add a rectangle to the given Region */
+#define ADDRECT(reg, r, rx1, ry1, rx2, ry2){\
+    if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&\
+        CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              EXTENTS((r), (reg));\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+
+
+/*  add a rectangle to the given Region */
+#define ADDRECTNOX(reg, r, rx1, ry1, rx2, ry2){\
+            if ((rx1 < rx2) && (ry1 < ry2) &&\
+                CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+#define EMPTY_REGION(pReg) pReg->numRects = 0
+
+#define REGION_NOT_EMPTY(pReg) pReg->numRects
+
+#define INBOX(r, x, y) \
+      ( ( ((r).x2 >  x)) && \
+        ( ((r).x1 <= x)) && \
+        ( ((r).y2 >  y)) && \
+        ( ((r).y1 <= y)) )
+
+/*
+ * number of points to buffer before sending them off
+ * to scanlines() :  Must be an even number
+ */
+#define NUMPTSTOBUFFER 200
+
+/*
+ * used to allocate buffers for points and link
+ * the buffers together
+ */
+typedef struct _POINTBLOCK {
+    XPoint pts[NUMPTSTOBUFFER];
+    struct _POINTBLOCK *next;
+} POINTBLOCK;
+
+#endif

mozilla/xpinstall/Makefile.in

@@ -1,39 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License.  You may obtain a copy of the License at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-
-DEPTH = ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = public
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
-

mozilla/xpinstall/makefile.win

@@ -1,30 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License.  You may obtain a copy of the License at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-
-DEPTH=..
-
-DIRS= public res src 
-
-include <$(DEPTH)\config\rules.mak>

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

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

mozilla/xpinstall/notifier/SoftwareUpdate.css

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

mozilla/xpinstall/notifier/SoftwareUpdate.js

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

mozilla/xpinstall/notifier/SoftwareUpdate.xul

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

mozilla/xpinstall/notifier/SoftwareUpdates.rdf

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

mozilla/xpinstall/public/MANIFEST

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

mozilla/xpinstall/public/Makefile.in

@@ -1,47 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License.  You may obtain a copy of the License at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-DEPTH = ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = xpinstall
-
-XPIDLSRCS = nsIXPInstallProgress.idl
-
-EXPORTS =		             \
-        nsIDOMInstallTriggerGlobal.h \
-        nsIDOMInstallVersion.h       \
-        nsSoftwareUpdateIIDs.h       \
-        nsISoftwareUpdate.h          \
-        $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk

mozilla/xpinstall/public/idl/Install.idl

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

mozilla/xpinstall/public/idl/InstallTrigger.idl

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

mozilla/xpinstall/public/idl/InstallVersion.idl

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

mozilla/xpinstall/public/makefile.win

@@ -1,36 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License.  You may obtain a copy of the License at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-MODULE=xpinstall 
-DEPTH=..\..
-
-EXPORTS=    nsIDOMInstallTriggerGlobal.h \
-			nsIDOMInstallVersion.h       \
-            nsSoftwareUpdateIIDs.h       \
-			nsISoftwareUpdate.h
-
-XPIDLSRCS = .\nsIXPInstallProgress.idl        
-
-include <$(DEPTH)\config\config.mak>
-include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/public/nsIDOMInstall.h

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

mozilla/xpinstall/public/nsIDOMInstallTriggerGlobal.h

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

mozilla/xpinstall/public/nsIDOMInstallVersion.h

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

mozilla/xpinstall/public/nsISoftwareUpdate.h

@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#ifndef nsISoftwareUpdate_h__
-#define nsISoftwareUpdate_h__
-
-#include "nsISupports.h"
-#include "nsIFactory.h"
-#include "nsString.h"
-
-#include "nsIXPInstallProgress.h"
-
-#define NS_IXPINSTALLCOMPONENT_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/xpinstall"
-#define NS_IXPINSTALLCOMPONENT_CLASSNAME "Mozilla XPInstall Component"
-
-
-#define NS_ISOFTWAREUPDATE_IID                   \
-{ 0x18c2f992, 									 \
-  0xb09f, 										 \
-  0x11d2,						                 \
- {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}\
-} 
-
-
-class nsISoftwareUpdate : public nsISupports  
-{
-    public:
-        	NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISOFTWAREUPDATE_IID)
-            
-            NS_IMETHOD InstallJar(const nsString& fromURL,
-                                  const nsString& localFile,
-                                  long  flags) = 0; 
-            
-            NS_IMETHOD RegisterNotifier(nsIXPInstallProgress *notifier) = 0;
-            
-            NS_IMETHOD InstallPending(void) = 0;
-
-            /* FIX: these should be in a private interface */
-            NS_IMETHOD InstallJarCallBack()                   = 0; 
-            NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier) = 0;
-};
-
-
-class nsSoftwareUpdateFactory : public nsIFactory 
-{
-    public:
-        
-        nsSoftwareUpdateFactory();
-        virtual ~nsSoftwareUpdateFactory();
-        
-        NS_DECL_ISUPPORTS
-
-              NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                        REFNSIID aIID,
-                                        void **aResult);
-
-              NS_IMETHOD LockFactory(PRBool aLock);
-
-};
-
-
-#endif // nsISoftwareUpdate_h__
-

mozilla/xpinstall/public/nsIXPInstallProgress.idl

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

mozilla/xpinstall/public/nsIXPInstallProgressNotifier.h

@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsIXPInstallProgressNotifier_h__
-#define nsIXPInstallProgressNotifier_h__
-
-
-class nsIXPInstallProgressNotifier
-{
-     public:
-        
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: BeforeJavascriptEvaluation
-        // Description	    : This will be called when prior to the install script being evaluate
-        // Return type		: void 
-        // Argument         : void
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void BeforeJavascriptEvaluation(void) = 0;
-        
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: AfterJavascriptEvaluation
-        // Description	    : This will be called after the install script has being evaluated
-        // Return type		: void 
-        // Argument         : void
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-         
-        virtual void AfterJavascriptEvaluation(void) = 0;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: InstallStarted
-        // Description	    : This will be called when StartInstall has been called
-        // Return type		: void
-        // Argument         : char* UIPackageName - User Package Name
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void InstallStarted(const char* UIPackageName) = 0;
-        
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: ItemScheduled
-        // Description	    : This will be called when items are being scheduled 
-        // Return type		: Any value returned other than zero, will be treated as an error and the script will be aborted
-        // Argument         : The message that should be displayed to the user
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual long ItemScheduled( const char* message ) = 0;
-        
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: InstallFinalization
-        // Description	    : This will be called when the installation is in its Finalize stage 
-        // Return type		: void 
-        // Argument         : char* message - The message that should be displayed to the user
-        // Argument         : long itemNum  - This is the current item number
-        // Argument         : long totNum   - This is the total number of items
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void InstallFinalization( const char* message, long itemNum, long totNum ) = 0;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Function name	: InstallAborted
-        // Description	    : This will be called when the install is aborted 
-        // Return type		: void
-        // Argument         : void
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void InstallAborted(void) = 0;
-
-};
-
-
-#endif

mozilla/xpinstall/public/nsSoftwareUpdateIIDs.h

@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#ifndef nsSoftwareUpdateIIDs_h___
-#define nsSoftwareUpdateIIDs_h___
-
-#define NS_SoftwareUpdate_CID                        \
-{ /* 18c2f989-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f989,                                      \
-    0xb09f,                                          \
-    0x11d2,                                          \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
-}
-
-#define NS_SoftwareUpdateInstall_CID                 \
-{ /* 18c2f98b-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f98b,                                      \
-    0xb09f,                                          \
-    0x11d2,                                          \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
-}
-
-#define NS_SoftwareUpdateInstallTrigger_CID          \
-{ /* 18c2f98d-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f98d,                                      \
-    0xb09f,                                          \
-    0x11d2,                                          \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
-}
-
-#define NS_SoftwareUpdateInstallVersion_CID          \
-{ /* 18c2f98f-b09f-11d2-bcde-00805f0e1353 */         \
-    0x18c2f98f,                                      \
-    0xb09f,                                          \
-    0x11d2,                                          \
-    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
-}
-
-
-
-#endif /* nsSoftwareUpdateIIDs_h___ */
-

mozilla/xpinstall/res/MANIFEST

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

mozilla/xpinstall/res/makefile.win

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

mozilla/xpinstall/res/progress.css

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

mozilla/xpinstall/res/progress.html

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

mozilla/xpinstall/res/progress.xul

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

mozilla/xpinstall/src/Makefile.in

@@ -1,61 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License.  You may obtain a copy of the License at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-DEPTH           = ../..
-topsrcdir       = @top_srcdir@
-VPATH           = @srcdir@
-srcdir          = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= xpinstall
-LIBRARY_NAME	= xpinstall
-IS_COMPONENT	= 1
-REQUIRES        = dom js netlib raptor xpcom
-
-CPPSRCS = \
-    nsSoftwareUpdate.cpp        \
-    nsInstall.cpp               \
-    nsInstallDelete.cpp         \
-    nsInstallExecute.cpp        \
-    nsInstallFile.cpp           \
-    nsInstallFolder.cpp         \
-    nsInstallPatch.cpp          \
-    nsInstallUninstall.cpp      \
-    nsInstallTrigger.cpp        \
-    nsInstallResources.cpp      \
-    nsJSInstall.cpp             \
-    nsJSInstallTriggerGlobal.cpp\
-    nsSoftwareUpdateRun.cpp     \
-    nsSoftwareUpdateStream.cpp  \
-    nsTopProgressNotifier.cpp   \
-    nsLoggingProgressNotifier   \
-    ScheduledTasks.cpp          \
-    nsInstallFileOpItem.cpp     \
-    $(NULL)
-
-INCLUDES += -I$(srcdir)/../public
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/xpinstall/src/PatchableAppleSingle.h

@@ -1,233 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/*
-
- * The contents of this file are subject to the Netscape Public License
-
- * Version 1.0 (the "License"); you may not use this file except in
-
- * compliance with the License.  You may obtain a copy of the License at
-
- * http://www.mozilla.org/NPL/
-
- *
-
- * Software distributed under the License is distributed on an "AS IS" basis,
-
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-
- * for the specific language governing rights and limitations under the
-
- * License.
-
- *
-
- * The Original Code is Mozilla Communicator client code, 
-
- * released March 31, 1998. 
-
- *
-
- * The Initial Developer of the Original Code is Netscape Communications 
-
- * Corporation.  Portions created by Netscape are 
-
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-
- * Reserved.
-
- *
-
- * Contributors:
-
- *     Douglas Turner <dougt@netscape.com>
-
- */
-
- 
-
-#ifndef SU_PAS_H
-
-#define SU_PAS_H
-
-
-
-
-
-#include <Errors.h>
-
-#include <Types.h>
-
-#include <Files.h>
-
-#include <Script.h>
-
-#include <Resources.h>
-
-
-
-typedef struct PASHeader /* header portion of Patchable AppleSingle */
-
-{
-
-       UInt32 magicNum; 	/* internal file type tag = 0x00244200*/
-
-       UInt32 versionNum; 	/* format version: 1 = 0x00010000 */
-
-       UInt8 filler[16]; 	/* filler */
-
-       UInt16 numEntries; 	/* number of entries which follow */
-
-} PASHeader ; 
-
-
-
-
-
-typedef struct PASEntry 	/* one Patchable AppleSingle entry descriptor */
-
-{
-
-        UInt32 entryID; 	/* entry type: see list, 0 invalid 		*/
-
-        UInt32 entryOffset; /* offset, in bytes, from beginning 	*/
-
-                            /* of file to this entry's data 		*/
-
-        UInt32 entryLength; /* length of data in octets 			*/
-
-        
-
-} PASEntry; 
-
-
-
-
-
-typedef struct PASMiscInfo
-
-{
-
-	short	fileHasResFork;
-
-	short	fileResAttrs;
-
-	OSType 	fileType;
-
-	OSType	fileCreator;
-
-	UInt32	fileFlags;
-
-
-
-} PASMiscInfo; 
-
-
-
-
-
-typedef struct PASResFork
-
-{
-
-	short	NumberOfTypes;
-
-	
-
-} PASResFork; 
-
-
-
-
-
-typedef struct PASResource
-
-{
-
-	short			attr;
-
-	short			attrID;
-
-	OSType			attrType;
-
-	Str255			attrName;
-
-	unsigned long	length;
-
-		
-
-} PASResource; 
-
-
-
-
-
-
-
-#if PRAGMA_ALIGN_SUPPORTED
-
-#pragma options align=reset
-
-#endif
-
-
-
-
-
-#define kCreator	'MOSS'
-
-#define kType		'PASf'
-
-#define PAS_BUFFER_SIZE (1024*512)
-
-
-
-#define PAS_MAGIC_NUM	(0x00244200)
-
-#define PAS_VERSION		(0x00010000)
-
-
-
-enum
-
-{
-
-	ePas_Data	=	1,
-
-	ePas_Misc,
-
-	ePas_Resource
-
-};
-
-
-
-#ifdef __cplusplus
-
-extern "C" {
-
-#endif
-
-
-
-/* Prototypes */
-
-OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec);
-
-OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec);
-
-
-
-
-
-
-
-#ifdef __cplusplus
-
-}
-
-#endif
-
-
-
-#endif /* SU_PAS_H */

mozilla/xpinstall/src/ScheduledTasks.cpp

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

mozilla/xpinstall/src/ScheduledTasks.h

@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef __SCHEDULEDTASKS_H__
-#define __SCHEDULEDTASKS_H__
-
-
-#include "NSReg.h"
-#include "nsFileSpec.h"
-
-
-REGERR DeleteFileNowOrSchedule(nsFileSpec& filename);
-REGERR ReplaceFileNowOrSchedule(nsFileSpec& tmpfile, nsFileSpec& target );
-
-
-extern "C" void PerformScheduledTasks(void *data);
-
-
-#endif

mozilla/xpinstall/src/gdiff.h

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

mozilla/xpinstall/src/makefile.win

@@ -1,111 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License.  You may obtain a copy of the License at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# Contributors:
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-
-DEPTH=..\..
-IGNORE_MANIFEST=1
-
-MAKE_OBJ_TYPE = DLL
-MODULE=xpinstall
-
-DLL=.\$(OBJDIR)\$(MODULE).dll
-
-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
-
-LCFLAGS =          \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-LINCS=                          \
-        -I$(PUBLIC)\xpinstall   \
-        -I$(PUBLIC)\jar         \
-        -I$(PUBLIC)\libreg      \
-        -I$(PUBLIC)\netlib      \
-        -I$(PUBLIC)\xpcom       \
-        -I$(PUBLIC)\pref        \
-        -I$(PUBLIC)\rdf         \
-        -I$(PUBLIC)\js          \
-        -I$(PUBLIC)\dom         \
-        -I$(PUBLIC)\raptor      \
-        -I$(PUBLIC)\nspr2       \
-		-I$(PUBLIC)\zlib        \
-        -I$(PUBLIC)\xpfe\components \
-        $(NULL)
-
-LLIBS =                                \
-        $(DIST)\lib\jar50.lib          \
-        $(DIST)\lib\libreg32.lib       \
-        $(DIST)\lib\netlib.lib         \
-        $(DIST)\lib\xpcom.lib        \
-        $(DIST)\lib\js3250.lib         \
-        $(DIST)\lib\jsdombase_s.lib    \
-        $(DIST)\lib\jsdomevents_s.lib  \
-		$(DIST)\lib\zlib.lib           \
-		$(DIST)\lib\plc3.lib           \
-        $(LIBNSPR)                     \
-        $(NULL)
-
-
-OBJS =                                          \
-       .\$(OBJDIR)\nsInstall.obj                \
-       .\$(OBJDIR)\nsInstallTrigger.obj         \
-       .\$(OBJDIR)\nsInstallVersion.obj         \
-       .\$(OBJDIR)\nsInstallFolder.obj          \
-       .\$(OBJDIR)\nsJSInstall.obj              \
-       .\$(OBJDIR)\nsJSInstallTriggerGlobal.obj \
-       .\$(OBJDIR)\nsJSInstallVersion.obj       \
-       .\$(OBJDIR)\nsSoftwareUpdate.obj         \
-       .\$(OBJDIR)\nsSoftwareUpdateRun.obj      \
-       .\$(OBJDIR)\nsSoftwareUpdateStream.obj   \
-       .\$(OBJDIR)\nsInstallFile.obj            \
-       .\$(OBJDIR)\nsInstallDelete.obj          \
-       .\$(OBJDIR)\nsInstallExecute.obj         \
-       .\$(OBJDIR)\nsInstallPatch.obj           \
-       .\$(OBJDIR)\nsInstallUninstall.obj       \
-       .\$(OBJDIR)\nsInstallResources.obj       \
-       .\$(OBJDIR)\nsTopProgressNotifier.obj    \
-       .\$(OBJDIR)\nsLoggingProgressNotifier.obj\
-       .\$(OBJDIR)\ScheduledTasks.obj           \
-       .\$(OBJDIR)\nsWinReg.obj                 \
-       .\$(OBJDIR)\nsJSWinReg.obj               \
-       .\$(OBJDIR)\nsWinRegItem.obj             \
-       .\$(OBJDIR)\nsWinRegValue.obj            \
-       .\$(OBJDIR)\nsWinProfile.obj             \
-       .\$(OBJDIR)\nsJSWinProfile.obj           \
-       .\$(OBJDIR)\nsWinProfileItem.obj         \
-       .\$(OBJDIR)\nsInstallProgressDialog.obj  \
-       .\$(OBJDIR)\nsInstallFileOpItem.obj      \
-       $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
-    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin\components
-
-clobber::
-        rm -f $(DIST)\lib\$(MODULE).lib
-        rm -f $(DIST)\bin\components\$(MODULE).dll
-

mozilla/xpinstall/src/nsInstall.h

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

mozilla/xpinstall/src/nsInstallDelete.cpp

@@ -1,235 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#include "prmem.h"
-
-#include "nsFileSpec.h"
-
-#include "VerReg.h"
-#include "ScheduledTasks.h"
-#include "nsInstallDelete.h"
-#include "nsInstallResources.h"
-
-#include "nsInstall.h"
-#include "nsIDOMInstallVersion.h"
-
-nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
-                                  const nsString& folderSpec,
-                                  const nsString& inPartialPath,
-                                  PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    if ((folderSpec == "null") || (inInstall == NULL)) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mDeleteStatus = DELETE_FILE;
-    mFinalFile      = nsnull;
-    mRegistryName   = "";
-    
-
-    mFinalFile = new nsFileSpec(folderSpec);
-    *mFinalFile += inPartialPath;
-
-    *error = ProcessInstallDelete();
-}
-
-nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
-                                  const nsString& inComponentName,
-                                  PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    if (inInstall == NULL) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mDeleteStatus = DELETE_COMPONENT;
-    mFinalFile    = nsnull;
-    mRegistryName = inComponentName;
-
-    *error = ProcessInstallDelete();
-}
-
-
-nsInstallDelete::~nsInstallDelete()
-{
-    if (mFinalFile == nsnull)
-        delete mFinalFile;
-}
-
-
-PRInt32 nsInstallDelete::Prepare()
-{
-    // no set-up necessary
-    return nsInstall::SUCCESS;
-}
-
-PRInt32 nsInstallDelete::Complete()
-{
-    PRInt32 err = nsInstall::SUCCESS;
-
-    if (mInstall == NULL) 
-       return nsInstall::INVALID_ARGUMENTS;
-
-    if (mDeleteStatus == DELETE_COMPONENT) 
-    {
-        char* temp = mRegistryName.ToNewCString();
-        err = VR_Remove(temp);
-        delete [] temp;
-    }
-
-    if ((mDeleteStatus == DELETE_FILE) || (err == REGERR_OK)) 
-    {
-        err = NativeComplete();
-    }	
-    else 
-    {
-        err = nsInstall::UNEXPECTED_ERROR;
-    }
-
-    
-    return err;
-}
-
-void nsInstallDelete::Abort()
-{
-}
-
-char* nsInstallDelete::toString()
-{
-    char* buffer = new char[1024];
-    
-    if (mDeleteStatus == DELETE_COMPONENT)
-    {
-        sprintf( buffer, nsInstallResources::GetDeleteComponentString(), nsAutoCString(mRegistryName));
-    }
-    else
-    {
-        if (mFinalFile)
-            sprintf( buffer, nsInstallResources::GetDeleteFileString(), mFinalFile->GetCString());
-    }
-
-    return buffer;
-}
-
-
-PRBool
-nsInstallDelete::CanUninstall()
-{
-    return PR_FALSE;
-}
-
-PRBool
-nsInstallDelete::RegisterPackageNode()
-{
-    return PR_FALSE;
-}
-
-
-PRInt32 nsInstallDelete::ProcessInstallDelete()
-{
-    PRInt32 err;
-    
-    char* tempCString = nsnull;
-
-    if (mDeleteStatus == DELETE_COMPONENT) 
-    {
-        /* Check if the component is in the registry */
-        tempCString = mRegistryName.ToNewCString();
-
-        err = VR_InRegistry( tempCString );
-                
-        if (err != REGERR_OK) 
-        {
-            return err;
-        } 
-        else 
-        {
-            char* tempRegistryString;
-
-            tempRegistryString = (char*)PR_Calloc(MAXREGPATHLEN, sizeof(char));
-            
-            err = VR_GetPath( tempCString , MAXREGPATHLEN, tempRegistryString);
-            
-            if (err == REGERR_OK)
-            {
-                if (mFinalFile)
-                    delete mFinalFile;
-
-                mFinalFile = new nsFileSpec(tempRegistryString);
-            }
-
-            PR_FREEIF(tempRegistryString);
-        }
-    }
-    
-    if(tempCString)
-        delete [] tempCString;
-
-    if (mFinalFile->Exists())
-    {
-        if (mFinalFile->IsFile())
-        {
-            err = nsInstall::SUCCESS;
-        }
-        else
-        {
-            err = nsInstall::FILE_IS_DIRECTORY;
-        }
-    }
-    else
-    {
-        err = nsInstall::FILE_DOES_NOT_EXIST;
-    }
-
-    return err;
-}
-
-
-
-PRInt32 nsInstallDelete::NativeComplete()
-{
-    if (mFinalFile->Exists())
-    {
-        if (mFinalFile->IsFile())
-        {
-           return DeleteFileNowOrSchedule(*mFinalFile);
-        }
-        else
-        {
-            return nsInstall::FILE_IS_DIRECTORY;
-        }
-    }
-    
-    return nsInstall::FILE_DOES_NOT_EXIST;
-}
-

mozilla/xpinstall/src/nsInstallDelete.h

@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsInstallDelete_h__
-#define nsInstallDelete_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-#include "nsInstallObject.h"
-
-#include "nsInstall.h"
-
-#define DELETE_COMPONENT 1
-#define DELETE_FILE      2
-
-class nsInstallDelete : public nsInstallObject 
-{
-    public:
-
-        nsInstallDelete(  nsInstall* inInstall,
-                          const nsString& folderSpec,
-                          const nsString& inPartialPath,
-                          PRInt32 *error);
-
-        nsInstallDelete(  nsInstall* inInstall,
-                          const nsString& ,
-                          PRInt32 *error);
-
-        virtual ~nsInstallDelete();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void    Abort();
-        char*   toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	    
-  
-    private:
-
-        /* Private Fields */
-
-        nsFileSpec* mFinalFile;
-        
-        nsString    mRegistryName;
-        PRInt32     mDeleteStatus;
-
-        PRInt32 ProcessInstallDelete();
-        PRInt32 NativeComplete();
-        
-};
-
-#endif /* nsInstallDelete_h__ */

mozilla/xpinstall/src/nsInstallExecute.cpp

@@ -1,136 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-
-#include "prmem.h"
-
-#include "nsFileSpec.h"
-
-#include "VerReg.h"
-#include "nsInstallExecute.h"
-#include "nsInstallResources.h"
-#include "ScheduledTasks.h"
-
-#include "nsInstall.h"
-#include "nsIDOMInstallVersion.h"
-
-nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
-                                      const nsString& inJarLocation,
-                                      const nsString& inArgs,
-                                      PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    if ((inInstall == nsnull) || (inJarLocation == "null"))
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    mJarLocation        = inJarLocation;
-    mArgs               = inArgs;
-    mExecutableFile     = nsnull;
-
-}
-
-
-nsInstallExecute::~nsInstallExecute()
-{
-    if (mExecutableFile)
-        delete mExecutableFile;
-}
-
-
-
-PRInt32 nsInstallExecute::Prepare()
-{
-    if (mInstall == NULL || mJarLocation == "null") 
-        return nsInstall::INVALID_ARGUMENTS;
-
-    return mInstall->ExtractFileFromJar(mJarLocation, nsnull, &mExecutableFile);
-}
-
-PRInt32 nsInstallExecute::Complete()
-{
-    if (mExecutableFile == nsnull)
-        return nsInstall::INVALID_ARGUMENTS;
-
-    nsFileSpec app( *mExecutableFile);
-    
-    if (!app.Exists())
-	{
-		return nsInstall::INVALID_ARGUMENTS;
-	}
-
-    PRInt32 result = app.Execute( mArgs );
-    
-    DeleteFileNowOrSchedule( app );
-    
-    return result;
-}
-
-void nsInstallExecute::Abort()
-{
-    /* Get the names */
-    if (mExecutableFile == nsnull) 
-        return;
-
-    DeleteFileNowOrSchedule(*mExecutableFile);
-}
-
-char* nsInstallExecute::toString()
-{
-    char* buffer = new char[1024];
-    
-    // if the FileSpec is NULL, just us the in jar file name.
-
-    if (mExecutableFile == nsnull)
-    {
-        char *tempString = mJarLocation.ToNewCString();
-        sprintf( buffer, nsInstallResources::GetExecuteString(), tempString);
-        delete [] tempString;
-    }
-    else
-    {
-        sprintf( buffer, nsInstallResources::GetExecuteString(), mExecutableFile->GetCString());
-    }
-    return buffer;
-
-}
-
-
-PRBool
-nsInstallExecute::CanUninstall()
-{
-    return PR_FALSE;
-}
-
-PRBool
-nsInstallExecute::RegisterPackageNode()
-{
-    return PR_FALSE;
-}
-

mozilla/xpinstall/src/nsInstallExecute.h

@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsInstallExecute_h__
-#define nsInstallExecute_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-#include "nsInstallObject.h"
-
-#include "nsInstall.h"
-#include "nsIDOMInstallVersion.h"
-
-
-class nsInstallExecute : public nsInstallObject 
-{
-    public:
-          
-        nsInstallExecute( nsInstall* inInstall,
-                          const nsString& inJarLocation,
-                          const nsString& inArgs,
-                          PRInt32 *error);
-
-
-        virtual ~nsInstallExecute();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void  Abort();
-        char* toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	  
-  
-    private:
-          
-        nsString mJarLocation; // Location in the JAR
-        nsString mArgs;        // command line arguments
-        
-        nsFileSpec *mExecutableFile;    // temporary file location
-        
-
-        PRInt32 NativeComplete(void);
-        void NativeAbort(void);
-
-};
-
-#endif /* nsInstallExecute_h__ */

mozilla/xpinstall/src/nsInstallFile.cpp

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

mozilla/xpinstall/src/nsInstallFile.h

@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsInstallFile_h__
-#define nsInstallFile_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-#include "nsInstallObject.h"
-
-#include "nsInstall.h"
-#include "nsInstallVersion.h"
-
-class nsInstallFile : public nsInstallObject 
-{
-    public:
-
-      /*************************************************************
-       * Public Methods 
-       *
-       *	Constructor
-       *    inSoftUpdate    - softUpdate object we belong to
-       *    inComponentName	- full path of the registry component
-       *    inVInfo	        - full version info
-       *    inJarLocation   - location inside the JAR file
-       *    inFinalFileSpec	- final	location on	disk
-       *************************************************************/
-        nsInstallFile(  nsInstall* inInstall,
-                        const nsString& inVRName,
-                        const nsString& inVInfo,
-                        const nsString& inJarLocation,
-                        const nsString& folderSpec,
-                        const nsString& inPartialPath,
-                        PRBool forceInstall,
-                        PRInt32 *error);
-
-        virtual ~nsInstallFile();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void  Abort();
-        char* toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	  
-  
-    private:
-
-        /* Private Fields */
-        nsString*     mVersionInfo;	  /* Version info for this file*/
-        
-        nsString*     mJarLocation;	      /* Location in the JAR */
-        nsFileSpec*   mExtracedFile;	  /* temporary file location */
-        nsFileSpec*   mFinalFile;	      /* final file destination */
-
-        nsString*   mVersionRegistryName; /* full version path */
-        
-        PRBool      mForceInstall;   /* whether install is forced */
-        PRBool      mReplaceFile;    /* whether file exists */
-        PRBool      mChildFile;      /* whether file is a child */
-        PRBool      mUpgradeFile;    /* whether file is an upgrade */
-
-
-        PRInt32     CompleteFileMove();
-        PRInt32     RegisterInVersionRegistry();
-};
-
-#endif /* nsInstallFile_h__ */

mozilla/xpinstall/src/nsInstallFileOpEnums.h

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

mozilla/xpinstall/src/nsInstallFileOpItem.cpp

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

mozilla/xpinstall/src/nsInstallFileOpItem.h

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

mozilla/xpinstall/src/nsInstallFolder.cpp

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

mozilla/xpinstall/src/nsInstallFolder.h

@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef __NS_INSTALLFOLDER_H__
-#define __NS_INSTALLFOLDER_H__
-
-#include "nscore.h"
-#include "prtypes.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsSpecialSystemDirectory.h"
-
-class nsInstallFolder
-{
-    public:
-        
-       nsInstallFolder(const nsString& aFolderID);
-       nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath);
-       virtual ~nsInstallFolder();
-
-       void GetDirectoryPath(nsString& aDirectoryPath);
-       
-    private:
-        
-        nsFileSpec*  mFileSpec;
-
-		void         SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath);
-        void         PickDefaultDirectory();
-        PRInt32      MapNameToEnum(const nsString&  name);
-        void         SetAppShellDirectory(PRUint32 value);
-};
-
-
-#endif

mozilla/xpinstall/src/nsInstallObject.h

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

mozilla/xpinstall/src/nsInstallPatch.cpp

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

mozilla/xpinstall/src/nsInstallPatch.h

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

mozilla/xpinstall/src/nsInstallProgressDialog.cpp

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

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-#ifndef __nsInstallProgressDialog_h__
-#define __nsInstallProgressDialog_h__
-
-#include "nsIXPInstallProgress.h"
-#include "nsISupports.h"
-#include "nsISupportsUtils.h"
-
-#include "nsCOMPtr.h"
-
-#include "nsIWebShell.h"
-#include "nsIWebShellWindow.h"
-#include "nsIXULWindowCallbacks.h"    
-
-#include "nsIDocument.h"
-#include "nsIDOMXULDocument.h"
-
-
-class nsInstallProgressDialog : public nsIXPInstallProgress, public nsIXULWindowCallbacks
-{
-    public: 
-
-        nsInstallProgressDialog();
-        virtual ~nsInstallProgressDialog();
-        
-        NS_DECL_ISUPPORTS
-
-        
-        NS_IMETHOD BeforeJavascriptEvaluation();
-        NS_IMETHOD AfterJavascriptEvaluation();
-        NS_IMETHOD InstallStarted(const char *UIPackageName);
-        NS_IMETHOD ItemScheduled(const char *message);
-        NS_IMETHOD InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum);
-        NS_IMETHOD InstallAborted();
-
-        // Declare implementations of nsIXULWindowCallbacks interface functions.
-        NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);
-        NS_IMETHOD ConstructAfterJavaScript(nsIWebShell *aWebShell) { return NS_OK; }
-
-    private:
-
-        nsCOMPtr<nsIDOMXULDocument>  mDocument;
-        nsCOMPtr<nsIWebShellWindow>  mWindow;
-};
-#endif

mozilla/xpinstall/src/nsInstallResources.cpp

@@ -1,67 +0,0 @@
- /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsInstallResources.h"
-
-char* nsInstallResources::GetInstallFileString(void)
-{ 
-    return "Installing: %s"; 
-}
-
-char* nsInstallResources::GetReplaceFileString(void)
-{ 
-    return "Replacing %s"; 
-}     
-
-char* nsInstallResources::GetDeleteFileString(void)
-{ 
-    return "Deleting file: %s"; 
-} 
-
-char* nsInstallResources::GetDeleteComponentString(void) 
-{ 
-    return "Deleting component: %s"; 
-}
-
-char* nsInstallResources::GetExecuteString(void)         
-{ 
-    return "Executing: %s"; 
-}
-
-char* nsInstallResources::GetExecuteWithArgsString(void) 
-{ 
-    return "Executing: %s with argument: %s"; 
-}
-
-char* nsInstallResources::GetPatchFileString(void)       
-{ 
-    return "Patching: %s"; 
-}
-
-char* nsInstallResources::GetUninstallString(void)       
-{ 
-    return "Uninstalling: %s"; 
-}
-

mozilla/xpinstall/src/nsInstallResources.h

@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef __NS_INSTALLRESOURCES_H__
-#define __NS_INSTALLRESOURCES_H__
-
-class nsInstallResources
-{
-    public:
-       
-       static char* GetInstallFileString(void);
-       static char* GetReplaceFileString(void);     
-       static char* GetDeleteFileString(void);      
-       static char* GetDeleteComponentString(void); 
-       static char* GetExecuteString(void);         
-       static char* GetExecuteWithArgsString(void); 
-       static char* GetPatchFileString(void);       
-       static char* GetUninstallString(void);       
-};
-
-
-#endif

mozilla/xpinstall/src/nsInstallTrigger.cpp

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

mozilla/xpinstall/src/nsInstallTrigger.h

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

mozilla/xpinstall/src/nsInstallUninstall.cpp

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

mozilla/xpinstall/src/nsInstallUninstall.h

@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsInstallUninstall_h__
-#define nsInstallUninstall_h__
-
-#include "prtypes.h"
-#include "nsString.h"
-#include "nsInstallObject.h"
-#include "nsInstall.h"
-
-class nsInstallUninstall : public nsInstallObject 
-{
-    public:
-          
-        nsInstallUninstall( nsInstall* inInstall,
-                            const nsString& regName,
-                            PRInt32 *error);
-
-
-        virtual ~nsInstallUninstall();
-
-        PRInt32 Prepare();
-        PRInt32 Complete();
-        void  Abort();
-        char* toString();
-
-        PRBool CanUninstall();
-        PRBool RegisterPackageNode();
-	  
-  
-    private:
-          
-        nsString mRegName;        // Registry name of package
-        nsString mUIName;         // User name of package
-
-        
-};
-
-#endif /* nsInstallUninstall_h__ */

mozilla/xpinstall/src/nsInstallVersion.cpp

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

mozilla/xpinstall/src/nsInstallVersion.h

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

mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp

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

mozilla/xpinstall/src/nsJSInstallVersion.cpp

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

mozilla/xpinstall/src/nsJSWinProfile.cpp

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

mozilla/xpinstall/src/nsJSWinProfile.h

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

mozilla/xpinstall/src/nsJSWinReg.cpp

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

mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp

@@ -1,134 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsIXPInstallProgress.h"
-#include "nsLoggingProgressNotifier.h"
-
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsSpecialSystemDirectory.h"
-
-#include "nspr.h"
-
-
-
-nsLoggingProgressNotifier::nsLoggingProgressNotifier()
-{
-    NS_INIT_REFCNT();
-}
-
-nsLoggingProgressNotifier::~nsLoggingProgressNotifier()
-{
-}
-
-NS_IMPL_ISUPPORTS(nsLoggingProgressNotifier, nsIXPInstallProgress::GetIID());
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::BeforeJavascriptEvaluation()
-{
-    nsSpecialSystemDirectory logFile(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-    logFile += "Install.log";
-
-    mLogStream = new nsOutputFileStream(logFile, PR_WRONLY | PR_CREATE_FILE | PR_APPEND, 0744 );
-    mLogStream->seek(logFile.GetFileSize());
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::AfterJavascriptEvaluation()
-{
-    char* time;
-    GetTime(&time);
-
-    *mLogStream << nsEndl;
-    *mLogStream << "     Finished Installation  " << time << nsEndl << nsEndl;
-
-    PL_strfree(time);
-
-    mLogStream->close();
-    delete mLogStream;
-    mLogStream = nsnull;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::InstallStarted(const char* UIPackageName)
-{
-    if (mLogStream == nsnull) return -1;
-
-    char* time;
-    GetTime(&time);
-    
-    *mLogStream << "---------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << UIPackageName << nsEndl;    
-    *mLogStream << "---------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << nsEndl;
-    *mLogStream << "     Starting Installation at " << nsAutoCString(time) << nsEndl;   
-    *mLogStream << nsEndl;
-
-
-    PL_strfree(time);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::ItemScheduled(const char* message )
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum )
-{
-    if (mLogStream == nsnull) return -1;
-
-    *mLogStream << "     Item [" << (itemNum+1) << "/" << totNum << "]\t" << message << nsEndl;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::InstallAborted()
-{
-    if (mLogStream == nsnull) return -1;
-
-    char* time;
-    GetTime(&time);
-    
-    *mLogStream << "     Aborted Installation at " << time << nsEndl << nsEndl;
-
-    PL_strfree(time);
-    return NS_OK;
-}
-
-void 
-nsLoggingProgressNotifier::GetTime(char** aString)
-{
-    PRExplodedTime et;
-    char line[256];
-    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &et);
-    PR_FormatTimeUSEnglish(line, sizeof(line), "%m/%d/%Y %H:%M:%S", &et);
-    *aString = PL_strdup(line);
-}
-    

mozilla/xpinstall/src/nsLoggingProgressNotifier.h

@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsLoggingProgressNotifier_H__
-#define nsLoggingProgressNotifier_H__
-
-#include "nsIXPInstallProgress.h"
-#include "nsFileStream.h"
-
-
-class nsLoggingProgressNotifier : public nsIXPInstallProgress
-{
-    public:
-        
-        nsLoggingProgressNotifier();
-        virtual ~nsLoggingProgressNotifier();
-        
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD BeforeJavascriptEvaluation();
-        NS_IMETHOD AfterJavascriptEvaluation();
-        NS_IMETHOD InstallStarted(const char* UIPackageName);
-        NS_IMETHOD ItemScheduled(const char* message );
-        NS_IMETHOD InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum );
-        NS_IMETHOD InstallAborted();
-   
-     private:
-        void GetTime(char** aString);
-        nsOutputFileStream  *mLogStream;
-};
-
-#endif

mozilla/xpinstall/src/nsSoftwareUpdate.cpp

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

mozilla/xpinstall/src/nsSoftwareUpdate.h

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

mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp

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

mozilla/xpinstall/src/nsSoftwareUpdateRun.h

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

mozilla/xpinstall/src/nsSoftwareUpdateStream.cpp

@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are Copyright (C) 1998
- * Netscape Communications Corporation.  All Rights Reserved.
- */
-
-#include "nsSoftwareUpdateStream.h"
-#include "nscore.h"
-#include "nsFileSpec.h"
-#include "nsVector.h"
-
-#include "nsISupports.h"
-#include "nsIServiceManager.h"
-
-#include "nsIURL.h"
-#include "nsINetlibURL.h"
-#include "nsINetService.h"
-#include "nsIInputStream.h"
-#include "nsIStreamListener.h"
-
-#include "nsISoftwareUpdate.h"
-#include "nsSoftwareUpdateIIDs.h"
-
-
-static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID);
-static NS_DEFINE_IID(kSoftwareUpdateCID,  NS_SoftwareUpdate_CID);
-
-
-nsSoftwareUpdateListener::nsSoftwareUpdateListener(const nsString& fromURL, const nsString& localFile, long flags)
-{
-    NS_INIT_REFCNT();
-    
-    mFromURL    = fromURL;
-    mLocalFile  = localFile;
-    mFlags      = flags;
-
-    mOutFileDesc = PR_Open(nsAutoCString(localFile),  PR_CREATE_FILE | PR_RDWR, 0744);
-    
-    if(mOutFileDesc == NULL)
-    {
-        mResult = -1;
-    };
-
-    mResult = nsServiceManager::GetService(  kSoftwareUpdateCID, 
-                                             kISoftwareUpdateIID,
-                                             (nsISupports**)&mSoftwareUpdate);
-    
-    if (NS_FAILED(mResult))
-        return;
-
-    nsIURL  *pURL  = nsnull;
-    mResult = NS_NewURL(&pURL, fromURL);
-
-    if (NS_FAILED(mResult)) 
-        return;
- 
-    mResult = NS_OpenURL(pURL, this);
-}
-
-nsSoftwareUpdateListener::~nsSoftwareUpdateListener()
-{    
-    mSoftwareUpdate->Release();
-}
-
-
-NS_IMPL_ISUPPORTS( nsSoftwareUpdateListener, kIStreamListenerIID )
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::GetBindInfo(nsIURL* aURL, nsStreamBindingInfo* info)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnProgress( nsIURL* aURL,
-                          PRUint32 Progress,
-                          PRUint32 ProgressMax)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnStatus(nsIURL* aURL, 
-                       const PRUnichar* aMsg)
-{ 
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnStartBinding(nsIURL* aURL, 
-                             const char *aContentType)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnStopBinding(nsIURL* aURL,
-                                        nsresult status,
-                                        const PRUnichar* aMsg)
-{
-    switch( status ) 
-    {
-
-        case NS_BINDING_SUCCEEDED:
-                PR_Close(mOutFileDesc);
-                mSoftwareUpdate->InstallJar(mFromURL,
-                                            mLocalFile,
-                                            mFlags );
-            break;
-
-        case NS_BINDING_FAILED:
-        case NS_BINDING_ABORTED:
-            mResult = status;
-            PR_Close(mOutFileDesc);
-            break;
-
-        default:
-            mResult = NS_ERROR_ILLEGAL_VALUE;
-    }
-
-    return mResult;
-}
-
-#define BUF_SIZE 1024
-
-NS_IMETHODIMP
-nsSoftwareUpdateListener::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRUint32 length)
-{
-    PRUint32 len;
-    nsresult err;
-    char buffer[BUF_SIZE];
-    
-    do 
-    {
-        err = pIStream->Read(buffer, BUF_SIZE, &len);
-        
-        if (mResult == 0 && err == 0)
-        {
-            if ( PR_Write(mOutFileDesc, buffer, len) == -1 )
-            {
-                /* Error */ 
-                return -1;
-            }
-        }
-
-    } while (len > 0 && err == NS_OK);
-
-    return 0;
-}

mozilla/xpinstall/src/nsSoftwareUpdateStream.h

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

mozilla/xpinstall/src/nsTopProgressNotifier.cpp

@@ -1,169 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsIXPInstallProgress.h"
-#include "nsTopProgressNotifier.h"
-
-nsTopProgressNotifier::nsTopProgressNotifier()
-{
-    mNotifiers = new nsVector();
-}
-
-nsTopProgressNotifier::~nsTopProgressNotifier()
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            delete element;
-        }
-
-        mNotifiers->RemoveAll();
-        delete (mNotifiers);
-    }
-}
-
-
-NS_IMPL_ISUPPORTS(nsTopProgressNotifier, nsIXPInstallProgress::GetIID());
-
-
-long
-nsTopProgressNotifier::RegisterNotifier(nsIXPInstallProgress * newNotifier)
-{
-     return mNotifiers->Add( newNotifier );
-}
-
-
-void
-nsTopProgressNotifier::UnregisterNotifier(long id)
-{
-     mNotifiers->Set(id, NULL);
-}
-
-
-
-NS_IMETHODIMP
-nsTopProgressNotifier::BeforeJavascriptEvaluation()
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->BeforeJavascriptEvaluation();
-        }
-    }
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::AfterJavascriptEvaluation(void)
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->AfterJavascriptEvaluation();
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::InstallStarted(const char* UIPackageName)
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->InstallStarted(UIPackageName);
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::ItemScheduled( const char* message )
-{
-    long rv = 0;
-
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                if (element->ItemScheduled( message ) != 0)
-                    rv = -1;
-        }
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::InstallFinalization( const char* message, PRInt32 itemNum, PRInt32 totNum )
-{
-    if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->InstallFinalization( message, itemNum, totNum );
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::InstallAborted(void)
-{
-   if (mNotifiers)
-    {
-        PRUint32 i=0;
-        for (; i < mNotifiers->GetSize(); i++) 
-        {
-            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
-            if (element != NULL)
-                element->InstallAborted();
-        }
-    }
-   return NS_OK;
-}
-
-

mozilla/xpinstall/src/nsTopProgressNotifier.h

@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#ifndef nsTopProgressNotifier_h__
-#define nsTopProgressNotifier_h__
-
-#include "nsIXPInstallProgress.h"
-#include "nsVector.h"
-
-
-class nsTopProgressNotifier : public nsIXPInstallProgress
-{
-    public:
-
-        nsTopProgressNotifier();
-        virtual ~nsTopProgressNotifier();
-
-        long RegisterNotifier(nsIXPInstallProgress * newNotifier);
-        void UnregisterNotifier(long id);
-
-        NS_DECL_ISUPPORTS
-
-
-        NS_IMETHOD BeforeJavascriptEvaluation();
-        NS_IMETHOD AfterJavascriptEvaluation();
-        NS_IMETHOD InstallStarted(const char* UIPackageName);
-        NS_IMETHOD ItemScheduled(const  char* message );
-        NS_IMETHOD InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum );
-        NS_IMETHOD InstallAborted();
-   
-   private:
-        nsVector *mNotifiers;
-
-};
-
-#endif