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

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

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_JSFILEOBJ_H__
-#define __NS_JSFILEOBJ_H__
+#ifndef nsDeviceContextSpecFactoryG_h___
+#define nsDeviceContextSpecFactoryG_h___
 
-PRInt32 
-InitFileSpecObjectPrototype(JSContext *jscontext, JSObject *global, JSObject **fileSpecObjectPrototype);
+#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/packager/windows/browser.jst

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

mozilla/xpinstall/packager/windows/config.it

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

mozilla/xpinstall/packager/windows/core.jst

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

mozilla/xpinstall/packager/windows/editor.jst

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

mozilla/xpinstall/packager/windows/mail.jst

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

mozilla/xpinstall/packager/windows/makeall.pl

@@ -1,134 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#  
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#  
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script builds the xpi, config.ini, and js files.
-#
-
-# Make sure there are at least four arguments
-if($#ARGV < 2)
-{
-  die "usage: $0 <default version> <staging path> <dist install path>
-
-       default version   : y2k compliant based date version.
-                           ie: 5.0.0.2000040413
-
-       staging path      : full path to where the components are staged at
-
-       dist install path : full path to where the dist install dir is at.
-                           ie: d:\\builds\\mozilla\\dist\\win32_o.obj\\install
-       \n";
-}
-
-$inDefaultVersion     = $ARGV[0];
-$inStagePath          = $ARGV[1];
-$inDistPath           = $ARGV[2];
-
-$inRedirIniUrl        = "ftp://not.needed.com/because/the/xpi/files/will/be/located/in/the/same/dir/as/the/installer";
-$inXpiUrl             = "ftp://not.needed.com/because/the/xpi/files/will/be/located/in/the/same/dir/as/the/installer";
-
-$seiFileNameGeneric   = "nsinstall.exe";
-$seiFileNameSpecific  = "mozilla-win32-installer.exe";
-$userAgent            = "5.0b2 (en)";
-
-# Check for existance of staging path
-if(!(-e "$inStagePath"))
-{
-  die "invalid path: $inStagePath\n";
-}
-
-# Make sure inDestPath exists
-if(!(-e "$inDistPath"))
-{
-  mkdir ("$inDestPath",0775);
-}
-
-# Make .js files
-MakeJsFile("core");
-MakeJsFile("browser");
-MakeJsFile("mail");
-
-# Make .xpi files
-MakeXpiFile("core");
-MakeXpiFile("browser");
-MakeXpiFile("mail");
-
-MakeConfigFile();
-
-if(-e "$inDistPath\\setup")
-{
-  unlink <$inDistPath\\setup\\*>;
-}
-else
-{
-  mkdir ("$inDistPath\\setup",0775);
-}
-
-# Copy the setup files to the dist setup directory.
-system("xcopy /f config.ini                 $inDistPath\\");
-system("xcopy /f config.ini                 $inDistPath\\setup\\");
-system("xcopy /f $inDistPath\\setup.exe     $inDistPath\\setup\\");
-system("xcopy /f $inDistPath\\setuprsc.dll  $inDistPath\\setup\\");
-
-# build the self-extracting .exe file.
-print "\nbuilding self-extracting installer ($seiFileNameSpecific)...\n";
-system("copy $inDistPath\\$seiFileNameGeneric $inDistPath\\$seiFileNameSpecific");
-system("$inDistPath\\nszip.exe $inDistPath\\$seiFileNameSpecific $inDistPath\\setup\\*.* $inDistPath\\xpi\\*.*");
-
-print " done!\n";
-
-# end of script
-exit(0);
-
-sub MakeConfigFile
-{
-  # Make config.ini file
-  if(system("perl makecfgini.pl config.it $inDefaultVersion \"$userAgent\" $inStagePath $inDistPath\\xpi $inRedirIniUrl $inXpiUrl") != 0)
-  {
-    exit(1);
-  }
-}
-
-sub MakeJsFile
-{
-  my($componentName) = @_;
-
-  # Make .js file
-  if(system("perl makejs.pl $componentName.jst $inDefaultVersion \"$userAgent\" $inStagePath\\$componentName") != 0)
-  {
-    exit(1);
-  }
-}
-
-sub MakeXpiFile
-{
-  my($componentName) = @_;
-
-  # Make .xpi file
-  if(system("perl makexpi.pl $componentName $inStagePath $inDistPath\\xpi") != 0)
-  {
-    exit(1);
-  }
-}
-

mozilla/xpinstall/packager/windows/makecfgini.pl

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

mozilla/xpinstall/packager/windows/makejs.pl

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

mozilla/xpinstall/packager/windows/makexpi.pl

@@ -1,114 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#  
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#  
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script creates .xpi files given component input name
-#
-# Input: component name
-#             - name of the component directory located in the staging path
-#        staging path
-#             - path to where the built files are staged at
-#        dest path
-#             - path to where the .xpi files are are to be created at.
-#               ** MUST BE AN ABSOLUTE PATH, NOT A RELATIVE PATH **
-#
-#   ie: perl makexpi.pl core z:\exposed\windows\32bit\en\5.0 d:\build\mozilla\dist\win32_o.obj\install\working
-#
-
-use File::Copy;
-use Cwd;
-
-# Make sure there are at least three arguments
-if($#ARGV < 2)
-{
-  die "usage: $0 <component name> <staging path> <dest path>
-
-       component name : name of component directory within staging path
-       staging path   : path to where the components are staged at
-       dest path      : path to where the .xpi files are to be created at
-       \n";
-}
-
-$inComponentName  = $ARGV[0];
-$inStagePath      = $ARGV[1];
-$inDestPath       = $ARGV[2];
-
-# check for existance of staging component path
-if(!(-e "$inStagePath\\$inComponentName"))
-{
-  die "invalid path: $inStagePath\\$inComponentName\n";
-}
-
-# check for existance of .js script
-if(!(-e "$inComponentName.js"))
-{
-  die "missing .js script: $inComponentName.js\n";
-}
-
-# delete component .xpi file
-if(-e "$inDestPath\\$inComponentName.xpi")
-{
-  unlink("$inDestPath\\$inComponentName.xpi");
-}
-if(-e "$inStagePath\\$incomponentName\\$inComponentName.xpi")
-{
-  unlink("$inDestPath\\$inComponentName.xpi");
-}
-
-# delete install.js
-if(-e "install.js")
-{
-  unlink("install.js");
-}
-
-# make sure inDestPath exists
-if(!(-e "$inDestPath"))
-{
-  system("mkdir $inDestPath");
-}
-
-print "\n Making $inComponentName.xpi...\n";
-
-$saveCwdir = cwd();
-
-# change directory to where the files are, else zip will store
-# unwanted path information.
-chdir("$inStagePath\\$inComponentName");
-system("zip -r $inDestPath\\$inComponentName.xpi *");
-chdir("$saveCwdir");
-
-copy("$inComponentName.js", "install.js");
-system("zip -g $inDestPath\\$inComponentName.xpi install.js");
-
-# delete install.js
-if(-e "install.js")
-{
-  unlink("install.js");
-}
-
-print " done!\n";
-
-# end of script
-exit(0);
-

mozilla/xpinstall/packager/windows/rdir.pl

@@ -1,111 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#  
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#  
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-use Cwd;
-
-if($#ARGV < 0)
-{
-    print_usage();
-    exit(1);
-}
-
-print "removing directory:\n";
-for($i = 0; $i <= $#ARGV; $i++)
-{
-    print "  $ARGV[$i]";
-    remove_dir_structure($ARGV[$i]);
-    print "\n";
-}
-
-exit(0);
-# end
-
-sub remove_dir_structure
-{
-    my($curr_dir) = @_;
-    $save_cwd     = cwd();
-    $save_cwd     =~ s/\//\\/g;
-    if((-e "$curr_dir") && (-d "$curr_dir"))
-    {
-        remove_all_dir($curr_dir);
-        chdir($save_cwd);
-        remove_directory($curr_dir);
-        print " done!";
-    }
-    else
-    {
-        if(!(-e "$curr_dir"))
-        {
-            print "\n";
-            print "$curr_dir does not exist!";
-        }
-        elsif(!(-d "$curr_dir"))
-        {
-            print "\n";
-            print "$curr_dir is not a valid directory!";
-        }
-    }
-}
-
-sub remove_all_dir
-{
-    my($curr_dir) = @_;
-    my(@dirlist);
-    my($dir);
-
-    chdir("$curr_dir");
-    @dirlist = <*>;
-    foreach $dir (@dirlist)
-    {
-        if(-d "$dir")
-        {
-            print ".";
-            remove_all_dir($dir);
-        }
-    }
-    chdir("..");
-    remove_directory($curr_dir);
-}
-
-sub remove_directory
-{
-    my($directory) = @_;
-    my($save_cwd);
-
-    $save_cwd = cwd();
-    $save_cwd =~ s/\//\\/g;
-
-    if(-e "$directory")
-    {
-        chdir($directory);
-        unlink <*>; # remove files
-        chdir($save_cwd);
-        rmdir $directory;         # remove directory
-    }
-}
-
-sub print_usage
-{
-    print "usage: $0 <dir1> [dir2 dir3...]\n";
-}

mozilla/xpinstall/src/Makefile.in

@@ -1,83 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is Mozilla Communicator client code, 
-# released March 31, 1998. 
-#
-# The Initial Developer of the Original Code is Netscape Communications 
-# Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= xpinstall
-LIBRARY_NAME	= xpinstall
-SHORT_LIBNAME	= xpinstal
-IS_COMPONENT	= 1
-
-EXTRA_DSO_LIBS	= jsdom
-
-REQUIRES	= dom js netlib raptor xpcom
-
-# XXX shouldn't need to export this
-EXPORTS		= nsXPITriggerInfo.h
-
-CPPSRCS		= \
-		nsInstall.cpp \
-		nsInstallTrigger.cpp \
-		nsInstallVersion.cpp \
-		nsInstallFolder.cpp \
-		nsJSInstall.cpp \
-		nsJSFile.cpp \
-		nsJSInstallTriggerGlobal.cpp \
-		nsJSInstallVersion.cpp \
-		nsSoftwareUpdate.cpp \
-		nsSoftwareUpdateRun.cpp \
-		nsInstallFile.cpp \
-		nsInstallDelete.cpp \
-		nsInstallExecute.cpp \
-		nsInstallPatch.cpp \
-		nsInstallUninstall.cpp \
-		nsInstallResources.cpp \
-		nsTopProgressNotifier.cpp \
-		nsLoggingProgressNotifier.cpp \
-		ScheduledTasks.cpp \
-		nsInstallProgressDialog.cpp \
-		nsXPITriggerInfo.cpp \
-		nsXPInstallManager.cpp \
-		nsInstallFileOpItem.cpp \
-		nsJSFileSpecObj.cpp \
-		$(NULL)
-
-LOCAL_INCLUDES	= -I$(srcdir)/../public
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_REGISTRY_LIBS) \
-		-L$(DIST)/bin \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(ZLIB_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/xpinstall/src/PatchableAppleSingle.cpp

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

mozilla/xpinstall/src/PatchableAppleSingle.h

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

mozilla/xpinstall/src/ScheduledTasks.cpp

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

mozilla/xpinstall/src/ScheduledTasks.h

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

mozilla/xpinstall/src/gdiff.h

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

mozilla/xpinstall/src/makefile.win

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

mozilla/xpinstall/src/nsAppleSingleDecoder.cpp

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

mozilla/xpinstall/src/nsAppleSingleDecoder.h

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

mozilla/xpinstall/src/nsInstall.h

@@ -1,323 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef __NS_INSTALL_H__
-#define __NS_INSTALL_H__
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-#include "jsapi.h"
-
-#include "plevent.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsVoidArray.h"
-#include "nsHashtable.h"
-#include "nsCOMPtr.h"
-
-#include "nsSoftwareUpdate.h"
-
-#include "nsInstallObject.h"
-#include "nsInstallVersion.h"
-#include "nsInstallFolder.h"
-
-#include "nsIXPINotifier.h"
-
-#include "nsIStringBundle.h"
-#include "nsILocale.h"
-#include "nsIEventQueueService.h"
-#include "nsIServiceManager.h"
-#include "nsIComponentManager.h"
-#include "nsIPersistentProperties.h"
-#include "nsIEnumerator.h"
-#include "nsIZipReader.h"
-
-class nsInstallInfo
-{
-  public:
-    
-    nsInstallInfo( nsIFileSpec*     aFile, 
-                   const PRUnichar* aURL, 
-                   const PRUnichar* aArgs, 
-                   long             aFlags, 
-                   nsIXPINotifier*  aNotifier);
-
-    virtual ~nsInstallInfo();
-
-    nsresult GetLocalFile(nsFileSpec& aSpec);
-
-    void GetURL(nsString& aURL) { aURL = mURL; }
-
-    void GetArguments(nsString& aArgs) { aArgs = mArgs; }
-    
-    long GetFlags() { return mFlags; }
-
-    nsIXPINotifier* GetNotifier() { return mNotifier; };
-    
-  private:
-    
-    nsresult  mError;
-
-    long       mFlags;
-    nsString   mURL;
-    nsString   mArgs;
-
-    nsCOMPtr<nsIFileSpec>       mFile;
-    nsCOMPtr<nsIXPINotifier>    mNotifier;
-};
-
-#ifdef XP_PC
-#define FILESEP '\\'
-#elif defined XP_MAC
-#define FILESEP ':'
-#elif defined XP_BEOS
-#define FILESEP '/'
-#else
-#define FILESEP '/'
-#endif
-
-class nsInstall
-{
-    friend class nsWinReg;
-    friend class nsWinProfile;
-
-    public:
-       
-        enum 
-        {
-            BAD_PACKAGE_NAME            = -200,
-            UNEXPECTED_ERROR            = -201,
-            ACCESS_DENIED               = -202,
-            TOO_MANY_CERTIFICATES       = -203,
-            NO_INSTALL_SCRIPT           = -204,
-            NO_CERTIFICATE              = -205,
-            NO_MATCHING_CERTIFICATE     = -206,
-            CANT_READ_ARCHIVE           = -207,
-            INVALID_ARGUMENTS           = -208,
-            ILLEGAL_RELATIVE_PATH       = -209,
-            USER_CANCELLED              = -210,
-            INSTALL_NOT_STARTED         = -211,
-            SILENT_MODE_DENIED          = -212,
-            NO_SUCH_COMPONENT           = -213,
-            DOES_NOT_EXIST              = -214,
-            READ_ONLY                   = -215,
-            IS_DIRECTORY                = -216,
-            NETWORK_FILE_IS_IN_USE      = -217,
-            APPLE_SINGLE_ERR            = -218,
-            INVALID_PATH_ERR            = -219,
-            PATCH_BAD_DIFF              = -220,
-            PATCH_BAD_CHECKSUM_TARGET   = -221,
-            PATCH_BAD_CHECKSUM_RESULT   = -222,
-            UNINSTALL_FAILED            = -223,
-            PACKAGE_FOLDER_NOT_SET      = -224,
-            EXTRACTION_FAILED           = -225,
-            FILENAME_ALREADY_USED       = -226,
-            ABORT_INSTALL               = -227,
-            DOWNLOAD_ERROR              = -228,
-            SCRIPT_ERROR                = -229,
-
-            ALREADY_EXISTS              = -230,
-            IS_FILE                     = -231,
-            SOURCE_DOES_NOT_EXIST       = -232,
-            SOURCE_IS_DIRECTORY         = -233,
-            SOURCE_IS_FILE              = -234,
-            INSUFFICIENT_DISK_SPACE     = -235,
-            FILENAME_TOO_LONG           = -236,
-            
-            OUT_OF_MEMORY               = -299,
-
-            GESTALT_UNKNOWN_ERR         = -5550,
-            GESTALT_INVALID_ARGUMENT    = -5551,
-            
-            SUCCESS                     = 0,
-            REBOOT_NEEDED               = 999,
-            
-            LIMITED_INSTALL             = 0,
-            FULL_INSTALL                = 1,
-            NO_STATUS_DLG               = 2,
-            NO_FINALIZE_DLG             = 4,
-
-            INSTALL_FILE_UNEXPECTED_MSG_ID = 0,
-            DETAILS_REPLACE_FILE_MSG_ID = 1,
-            DETAILS_INSTALL_FILE_MSG_ID = 2
-        };
-
-
-        nsInstall(nsIZipReader * theJARFile);
-        virtual ~nsInstall();
-        
-        PRInt32    SetScriptObject(void* aScriptObject);
-
-        PRInt32    SaveWinRegPrototype(void* aScriptObject);
-        PRInt32    SaveWinProfilePrototype(void* aScriptObject);
-        
-        JSObject*  RetrieveWinRegPrototype(void);
-        JSObject*  RetrieveWinProfilePrototype(void);
-
-        PRInt32    GetUserPackageName(nsString& aUserPackageName);
-        PRInt32    GetRegPackageName(nsString& aRegPackageName);
-
-        PRInt32    AbortInstall(PRInt32 aErrorNumber);
-        
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32 aMode, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aJarSource, PRInt32* aReturn);
-        
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32 aMode, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aJarSource, PRInt32* aReturn);
-        
-        PRInt32    DeleteComponent(const nsString& aRegistryName, PRInt32* aReturn);
-        PRInt32    DeleteFile(nsInstallFolder* aFolder, const nsString& aRelativeFileName, PRInt32* aReturn);
-        PRInt32    DiskSpaceAvailable(const nsString& aFolder, PRInt64* aReturn);
-        PRInt32    Execute(const nsString& aJarSource, const nsString& aArgs, PRInt32* aReturn);
-        PRInt32    Execute(const nsString& aJarSource, PRInt32* aReturn);
-        PRInt32    FinalizeInstall(PRInt32* aReturn);
-        PRInt32    Gestalt(const nsString& aSelector, PRInt32* aReturn);
-        
-        PRInt32    GetComponentFolder(const nsString& aComponentName, const nsString& aSubdirectory, nsInstallFolder** aFolder);
-        PRInt32    GetComponentFolder(const nsString& aComponentName, nsInstallFolder** aFolder);
-        
-        PRInt32    GetFolder(nsInstallFolder& aTargetFolder, const nsString& aSubdirectory, nsInstallFolder** aFolder);
-        PRInt32    GetFolder(const nsString& aTargetFolder, const nsString& aSubdirectory, nsInstallFolder** aFolder);
-        PRInt32    GetFolder(const nsString& aTargetFolder, nsInstallFolder** aFolder);
-        
-        PRInt32    GetLastError(PRInt32* aReturn);
-        PRInt32    GetWinProfile(const nsString& aFolder, const nsString& aFile, JSContext* jscontext, JSClass* WinProfileClass, jsval* aReturn);
-        PRInt32    GetWinRegistry(JSContext* jscontext, JSClass* WinRegClass, jsval* aReturn);
-        PRInt32	   LoadResources(JSContext* cx, const nsString& aBaseName, jsval* aReturn);
-        PRInt32    Patch(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    Patch(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    ResetError();
-        PRInt32    SetPackageFolder(nsInstallFolder& aFolder);
-        PRInt32    StartInstall(const nsString& aUserPackageName, const nsString& aPackageName, const nsString& aVersion, PRInt32* aReturn);
-        PRInt32    Uninstall(const nsString& aPackageName, PRInt32* aReturn);
-        
-        PRInt32    FileOpDirCreate(nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpDirGetParent(nsInstallFolder& aTarget, nsFileSpec* aReturn);
-        PRInt32    FileOpDirRemove(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpDirRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileCopy(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileDelete(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpFileExists(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileExecute(nsInstallFolder& aTarget, nsString& aParams, PRInt32* aReturn);
-        PRInt32    FileOpFileGetNativeVersion(nsInstallFolder& aTarget, nsString* aReturn);
-        PRInt32    FileOpFileGetDiskSpaceAvailable(nsInstallFolder& aTarget, PRInt64* aReturn);
-        PRInt32    FileOpFileGetModDate(nsInstallFolder& aTarget, nsFileSpec::TimeStamp* aReturn);
-        PRInt32    FileOpFileGetSize(nsInstallFolder& aTarget, PRUint32* aReturn);
-        PRInt32    FileOpFileIsDirectory(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileIsFile(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileModDateChanged(nsInstallFolder& aTarget, nsFileSpec::TimeStamp& aOldStamp, PRBool* aReturn);
-        PRInt32    FileOpFileMove(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileWindowsShortcut(nsFileSpec& aTarget, nsFileSpec& aShortcutPath, nsString& aDescription, nsFileSpec& aWorkingPath, nsString& aParams, nsFileSpec& aIcon, PRInt32 aIconId, PRInt32* aReturn);
-        PRInt32    FileOpFileMacAlias(nsString& aSourcePath, nsString& aAliasPath, PRInt32* aReturn);
-        PRInt32    FileOpFileUnixLink(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-
-        void       LogComment(nsString& aComment);
-
-        PRInt32    ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedName, nsFileSpec** aRealName);
-        char*      GetResourcedString(const nsString& aResName);
-        void       AddPatch(nsHashKey *aKey, nsFileSpec* fileName);
-        void       GetPatch(nsHashKey *aKey, nsFileSpec** fileName);
-        
-        void       GetJarFileLocation(nsString& aFile);
-        void       SetJarFileLocation(const nsFileSpec& aFile);
-
-        void       GetInstallArguments(nsString& args);
-        void       SetInstallArguments(const nsString& args);
-
-        void       GetInstallURL(nsString& url);
-        void       SetInstallURL(const nsString& url);
-
-        PRBool     GetStatusSent() { return mStatusSent; }
-        PRBool     InInstallTransaction(void) { return mInstalledFiles != nsnull; }
-        
-        PRInt32    Alert(nsString& string);
-        PRInt32    Confirm(nsString& string, PRBool* aReturn);
-        void       InternalAbort(PRInt32 errcode);
-
-        PRInt32    SaveError(PRInt32 errcode);
-
-    private:
-        JSObject*           mScriptObject;
-        
-        JSObject*           mWinRegObject;
-        JSObject*           mWinProfileObject;
-
-        
-        nsFileSpec          mJarFileLocation;
-        nsIZipReader*       mJarFileData;
-        
-        nsString            mInstallArguments;
-        nsString            mInstallURL;
-        nsInstallFolder*    mPackageFolder;
-
-        PRBool              mUserCancelled;
-        PRBool              mStatusSent;
-        
-        PRBool              mUninstallPackage;
-        PRBool              mRegisterPackage;
-        PRBool              mStartInstallCompleted;
-
-        nsString            mRegistryPackageName;   /* Name of the package we are installing */
-        nsString            mUIName;                /* User-readable package name */
-        nsInstallVersion*   mVersionInfo;           /* Component version info */
-        
-        nsVoidArray*        mInstalledFiles;        
-        nsHashtable*        mPatchList;
-        
-        nsIXPINotifier      *mNotifier;
-
-        nsCOMPtr<nsIStringBundle>   mStringBundle;
-
-        PRInt32             mLastError;
-        
-        void        ParseFlags(int flags);
-        PRInt32     SanityCheck(void);
-        void        GetTime(nsString &aString);
-
-        
-        PRInt32     GetQualifiedRegName(const nsString& name, nsString& qualifiedRegName );
-        PRInt32     GetQualifiedPackageName( const nsString& name, nsString& qualifiedName );
-        
-        void        CurrentUserNode(nsString& userRegNode);
-        PRBool      BadRegName(const nsString& regName);
-
-        void        CleanUp();
-
-        PRInt32     ExtractDirEntries(const nsString& directory, nsVoidArray *paths);
-
-        PRInt32     ScheduleForInstall(nsInstallObject* ob);
-
-        static void DeleteVector(nsVoidArray* vector);    
-};
-
-#endif

mozilla/xpinstall/src/nsInstallDelete.cpp

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

mozilla/xpinstall/src/nsInstallDelete.h

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

mozilla/xpinstall/src/nsInstallExecute.cpp

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

mozilla/xpinstall/src/nsInstallExecute.h

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

mozilla/xpinstall/src/nsInstallFile.cpp

@@ -1,452 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "prprf.h"
-#include "nsInstallFile.h"
-#include "nsFileSpec.h"
-#include "VerReg.h"
-#include "ScheduledTasks.h"
-#include "nsInstall.h"
-#include "nsIDOMInstallVersion.h"
-#include "nsInstallResources.h"
-
-/* Public Methods */
-
-/*	Constructor
-        inInstall    - softUpdate object we belong to
-        inComponentName	- full path of the registry component
-        inVInfo	        - full version info
-        inJarLocation   - location inside the JAR file
-        inFinalFileSpec	- final	location on disk
-*/
-
-MOZ_DECL_CTOR_COUNTER(nsInstallFile);
-
-nsInstallFile::nsInstallFile(nsInstall* inInstall,
-                             const nsString& inComponentName,
-                             const nsString& inVInfo,
-                             const nsString& inJarLocation,
-                             nsInstallFolder *folderSpec,
-                             const nsString& inPartialPath,
-                             PRInt32 mode,
-                             PRInt32 *error) 
-  : nsInstallObject(inInstall),
-    mVersionInfo(nsnull),
-    mJarLocation(nsnull),
-    mExtractedFile(nsnull),
-    mFinalFile(nsnull),
-    mVersionRegistryName(nsnull),
-    mReplaceFile(PR_FALSE),
-    mChildFile(PR_TRUE),
-    mUpgradeFile(PR_FALSE),
-    mSkipInstall(PR_FALSE),
-    mMode(mode)
-{
-    MOZ_COUNT_CTOR(nsInstallFile);
-
-    if ((folderSpec == nsnull) || (inInstall == NULL))
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    *error = nsInstall::SUCCESS;
-    
-    /* Check for existence of the newer	version	*/
-#if 0 // XXX need to re-implement force mode in the opposite sense
-
-    char* qualifiedRegNameString = inComponentName.ToNewCString();
-
-    // --------------------------------------------------------------------
-    // we always install if forceInstall is true, or the new file's
-    // version is null, or the file doesn't previously exist.
-    //
-    // IFF it's not force, AND the new file has a version, AND it's been
-    // previously installed, THEN we have to do the version comparing foo.
-    // --------------------------------------------------------------------
-    if ( !(mode & INSTALL_NO_COMPARE ) && (inVInfo !=  "") && 
-          ( VR_ValidateComponent( qualifiedRegNameString ) == 0 ) ) 
-    {
-        nsInstallVersion *newVersion = new nsInstallVersion();
-        
-        if (newVersion == nsnull)
-        {
-            Recycle(qualifiedRegNameString);
-            *error = nsInstall::OUT_OF_MEMORY;
-            return;
-        }
-
-        newVersion->Init(inVInfo);
-        
-        VERSION versionStruct;
-        
-        VR_GetVersion( qualifiedRegNameString, &versionStruct );
-        
-        nsInstallVersion* oldVersion = new nsInstallVersion();
-        
-        if (oldVersion == nsnull)
-        {
-            Recycle(qualifiedRegNameString);
-            delete oldVersion;
-            *error = nsInstall::OUT_OF_MEMORY;
-            return;
-        }
-
-        oldVersion->Init(versionStruct.major,
-                         versionStruct.minor,
-                         versionStruct.release,
-                         versionStruct.build);
-
-        PRInt32 areTheyEqual;
-        newVersion->CompareTo(oldVersion, &areTheyEqual);
-        
-        delete oldVersion;
-        delete newVersion;
-
-        if ( areTheyEqual < 0 )
-        {
-            // the file to be installed is OLDER than what is on disk.
-            // Don't install it.
-            mSkipInstall = PR_TRUE;
-        }
-    }
-
-    Recycle(qualifiedRegNameString);
-#endif
-
-    nsFileSpec* tmp = folderSpec->GetFileSpec();
-    if (!tmp)
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    mFinalFile = new nsFileSpec(*tmp);
-    if (mFinalFile == nsnull)
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-
-    if ( mFinalFile->Exists() )
-    {
-        // is there a file with the same name as the proposed folder?
-        if ( mFinalFile->IsFile() ) 
-        {
-            *error = nsInstall::FILENAME_ALREADY_USED;
-            return;
-        }
-        // else this directory already exists, so do nothing
-    }
-    else
-    {
-        /* the nsFileSpecMac.cpp operator += requires "this" (the nsFileSpec)
-         * to be an existing dir
-         */
-        int dirPermissions = 0755; // std default for UNIX, ignored otherwise
-        mFinalFile->CreateDir(dirPermissions);
-    }
-
-    *mFinalFile += inPartialPath;
-    
-    mReplaceFile = mFinalFile->Exists();
-    
-    if (mReplaceFile == PR_FALSE)
-    {
-       /* although it appears that we are creating the dir _again_ it is necessary
-        * when inPartialPath has arbitrary levels of nested dirs before the leaf
-        */
-        nsFileSpec parent;
-        mFinalFile->GetParent(parent);
-        nsFileSpec makeDirs(parent.GetCString(), PR_TRUE);
-    }
-
-    mVersionRegistryName    = new nsString(inComponentName);
-    mJarLocation            = new nsString(inJarLocation);
-    mVersionInfo	        = new nsString(inVInfo);
-     
-    if (mVersionRegistryName == nsnull ||
-        mJarLocation         == nsnull ||
-        mVersionInfo         == nsnull )
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-
-    nsString regPackageName;
-    mInstall->GetRegPackageName(regPackageName);
-    
-    // determine Child status
-    if ( regPackageName.IsEmpty() ) 
-    {
-        // in the "current communicator package" absolute pathnames (start
-        // with slash) indicate shared files -- all others are children
-        mChildFile = ( mVersionRegistryName->CharAt(0) != '/' );
-    } 
-    else 
-    {
-        mChildFile = mVersionRegistryName->Equals( regPackageName,
-                                                   PR_FALSE,
-                                                   regPackageName.Length() );
-    }
-}
-
-
-nsInstallFile::~nsInstallFile()
-{
-    if (mVersionRegistryName)
-        delete mVersionRegistryName;
-  
-    if (mJarLocation)
-        delete mJarLocation;
-  
-    if (mExtractedFile)
-        delete mExtractedFile;
-
-    if (mFinalFile)
-        delete mFinalFile;
-  
-    if (mVersionInfo)
-      delete mVersionInfo;
-
-    MOZ_COUNT_DTOR(nsInstallFile);
-}
-
-/* Prepare
- * Extracts file out of the JAR archive
- */
-PRInt32 nsInstallFile::Prepare()
-{
-    if (mSkipInstall)
-        return nsInstall::SUCCESS;
-
-    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull )
-        return nsInstall::INVALID_ARGUMENTS;
-
-    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtractedFile);
-}
-
-/* Complete
- * Completes the install:
- * - move the downloaded file to the final location
- * - updates the registry
- */
-PRInt32 nsInstallFile::Complete()
-{
-    PRInt32 err;
-
-    if (mInstall == nsnull || mVersionRegistryName == nsnull || mFinalFile == nsnull ) 
-    {
-       return nsInstall::INVALID_ARGUMENTS;
-    }
-   
-    if (mSkipInstall)
-        return nsInstall::SUCCESS;
-
-    err = CompleteFileMove();
-    
-    if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
-    {
-        // XXX Don't register individual files for now -- crucial performance
-        // speed up on the Mac, and we'll switch uninstall schemes after beta
-
-        // RegisterInVersionRegistry();
-    }
-    
-    return err;
-
-}
-
-void nsInstallFile::Abort()
-{
-    if (mExtractedFile != nsnull)
-        mExtractedFile->Delete(PR_FALSE);
-}
-
-#define RESBUFSIZE 1024
-char* nsInstallFile::toString()
-{
-    char* buffer = new char[RESBUFSIZE];
-    char* rsrcVal = nsnull;
-    const char* fname = nsnull;
-
-    if (buffer == nsnull || !mInstall)
-        return nsnull;
-    else
-        buffer[0] = '\0';
-    
-    if (mReplaceFile)
-    {
-        rsrcVal = mInstall->GetResourcedString("ReplaceFile");
-    }
-    else if (mSkipInstall)
-    {
-        rsrcVal = mInstall->GetResourcedString("SkipFile");
-    }
-    else
-    {
-        rsrcVal = mInstall->GetResourcedString("InstallFile");
-    }
-
-    if (rsrcVal)
-    {
-        if (mFinalFile)
-            fname = mFinalFile->GetCString();
-
-        PR_snprintf( buffer, RESBUFSIZE, rsrcVal, fname );
-
-        Recycle(rsrcVal);
-    }
-
-    return buffer;
-}
-
-
-PRInt32 nsInstallFile::CompleteFileMove()
-{
-    int result = 0;
-    
-    if (mExtractedFile == nsnull) 
-    {
-        return nsInstall::UNEXPECTED_ERROR;
-    }
-   	
-    if ( *mExtractedFile == *mFinalFile ) 
-    {
-        /* No need to rename, they are the same */
-        result = nsInstall::SUCCESS;
-    } 
-    else 
-    {
-        result = ReplaceFileNowOrSchedule(*mExtractedFile, *mFinalFile );
-    }
-
-  return result;  
-}
-
-PRInt32
-nsInstallFile::RegisterInVersionRegistry()
-{
-    int refCount;
-    nsString regPackageName;
-    mInstall->GetRegPackageName(regPackageName);
-    
-  
-    // Register file and log for Uninstall
-  
-    if (!mChildFile) 
-    {
-        int found;
-        if (!regPackageName.IsEmpty()) 
-        {
-            found = VR_UninstallFileExistsInList( (char*)(const char*)nsAutoCString(regPackageName) , 
-                                                  (char*)(const char*)nsAutoCString(*mVersionRegistryName));
-        } 
-        else 
-        {
-            found = VR_UninstallFileExistsInList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
-        }
-        
-        if (found != REGERR_OK)
-            mUpgradeFile = PR_FALSE;
-        else
-            mUpgradeFile = PR_TRUE;
-    } 
-    else if (REGERR_OK == VR_InRegistry( (char*)(const char*)nsAutoCString(*mVersionRegistryName))) 
-    {
-        mUpgradeFile = PR_TRUE;
-    } 
-    else 
-    {
-        mUpgradeFile = PR_FALSE;
-    }
-
-    if ( REGERR_OK != VR_GetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), &refCount )) 
-    {
-        refCount = 0;
-    }
-
-    VR_Install( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 
-                (char*)(const char*)mFinalFile->GetNativePathCString(),  // DO NOT CHANGE THIS. 
-                (char*)(const char*)nsAutoCString(*mVersionInfo), 
-                PR_FALSE );
-
-    if (mUpgradeFile) 
-    {
-        if (refCount == 0) 
-            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
-        else 
-            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount );  //FIX?? what should the ref count be/
-    }
-    else
-    {
-        if (refCount != 0) 
-        {
-            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount + 1 );
-        } 
-        else 
-        {
-            if (mReplaceFile)
-                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 2 );
-            else
-                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
-        }
-    }
-    
-    if ( !mChildFile && !mUpgradeFile ) 
-    {
-        if (!regPackageName.IsEmpty()) 
-        { 
-            VR_UninstallAddFileToList( (char*)(const char*)nsAutoCString(regPackageName), 
-                                       (char*)(const char*)nsAutoCString(*mVersionRegistryName));
-        } 
-        else 
-        {
-            VR_UninstallAddFileToList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
-        }
-    }
-
-    return nsInstall::SUCCESS;
-}
-
-/* CanUninstall
-* InstallFile() installs files which can be uninstalled,
-* hence this function returns true. 
-*/
-PRBool
-nsInstallFile::CanUninstall()
-{
-    return PR_TRUE;
-}
-
-/* RegisterPackageNode
-* InstallFile() installs files which need to be registered,
-* hence this function returns true.
-*/
-PRBool
-nsInstallFile::RegisterPackageNode()
-{
-    return PR_TRUE;
-}

mozilla/xpinstall/src/nsInstallFile.h

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

mozilla/xpinstall/src/nsInstallFileOpEnums.h

@@ -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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsInstallFileOpEnums_h__
-#define nsInstallFileOpEnums_h__
-
-typedef enum nsInstallFileOpEnums {
-  NS_FOP_DIR_CREATE         = 0,
-  NS_FOP_DIR_REMOVE         = 1,
-  NS_FOP_DIR_RENAME         = 2,
-  NS_FOP_FILE_COPY          = 3,
-  NS_FOP_FILE_DELETE        = 4,
-  NS_FOP_FILE_EXECUTE       = 5,
-  NS_FOP_FILE_MOVE          = 6,
-  NS_FOP_FILE_RENAME        = 7,
-  NS_FOP_WIN_SHORTCUT       = 8,
-  NS_FOP_MAC_ALIAS          = 9,
-  NS_FOP_UNIX_LINK          = 10,
-  NS_FOP_FILE_SET_STAT      = 11
-
-} nsInstallFileOpEnums;
-
-#endif /* nsInstallFileOpEnums_h__ */

mozilla/xpinstall/src/nsInstallFileOpItem.h

@@ -1,156 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsInstallFileOpItem_h__
-#define nsInstallFileOpItem_h__
-
-#include "prtypes.h"
-
-#include "nsFileSpec.h"
-#include "nsSoftwareUpdate.h"
-#include "nsInstallObject.h"
-#include "nsInstall.h"
-
-class nsInstallFileOpItem : public nsInstallObject
-{
-  public:
-    /* Public Fields */
-    enum 
-    {
-      ACTION_NONE                 = -401,
-      ACTION_SUCCESS              = -402,
-      ACTION_FAILED               = -403
-    };
-
-
-    /* Public Methods */
-    // used by:
-    //   FileOpFileDelete()
-    nsInstallFileOpItem(nsInstall*    installObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   aTarget,
-                        PRInt32       aFlags,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   FileOpDirRemove()
-    //   FileOpFileCopy()
-    //   FileOpFileMove()
-    //   FileMacAlias()
-    nsInstallFileOpItem(nsInstall*    installObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   aSrc,
-                        nsFileSpec&   aTarget,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   FileOpDirCreate()
-    nsInstallFileOpItem(nsInstall*    aInstallObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   aTarget,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   FileOpDirRename()
-    //   FileOpFileExecute()
-    //   FileOpFileRename()
-    nsInstallFileOpItem(nsInstall*    aInstallObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   a1,
-                        nsString&     a2,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   WindowsShortcut()
-    nsInstallFileOpItem(nsInstall*     aInstallObj,
-                        PRInt32        aCommand,
-                        nsFileSpec&    aTarget,
-                        nsFileSpec&    aShortcutPath,
-                        nsString&      aDescription,
-                        nsFileSpec&    aWorkingPath,
-                        nsString&      aParams,
-                        nsFileSpec&    aIcon,
-                        PRInt32        aIconId,
-                        PRInt32*       aReturn);
-
-    virtual ~nsInstallFileOpItem();
-
-    PRInt32       Prepare(void);
-    PRInt32       Complete();
-    char*         toString();
-    void          Abort();
-    
-  /* should these be protected? */
-    PRBool        CanUninstall();
-    PRBool        RegisterPackageNode();
-      
-  private:
-    
-    /* Private Fields */
-    
-    nsInstall*    mIObj;        // initiating Install object
-    nsFileSpec*   mSrc;
-    nsFileSpec*   mTarget;
-    nsFileSpec*   mShortcutPath;
-    nsFileSpec*   mWorkingPath;
-    nsFileSpec*   mIcon;
-    nsString*     mDescription;
-    nsString*     mStrTarget;
-    nsString*     mParams;
-    long          mFStat;
-    PRInt32       mFlags;
-    PRInt32       mIconId;
-    PRInt32       mCommand;
-    PRInt32       mAction;
-    
-    /* Private Methods */
-
-    PRInt32       NativeFileOpDirCreatePrepare();
-    PRInt32       NativeFileOpDirCreateAbort();
-    PRInt32       NativeFileOpDirRemovePrepare();
-    PRInt32       NativeFileOpDirRemoveComplete();
-    PRInt32       NativeFileOpDirRenamePrepare();
-    PRInt32       NativeFileOpDirRenameComplete();
-    PRInt32       NativeFileOpDirRenameAbort();
-    PRInt32       NativeFileOpFileCopyPrepare();
-    PRInt32       NativeFileOpFileCopyComplete();
-    PRInt32       NativeFileOpFileCopyAbort();
-    PRInt32       NativeFileOpFileDeletePrepare();
-    PRInt32       NativeFileOpFileDeleteComplete(nsFileSpec *aTarget);
-    PRInt32       NativeFileOpFileExecutePrepare();
-    PRInt32       NativeFileOpFileExecuteComplete();
-    PRInt32       NativeFileOpFileMovePrepare();
-    PRInt32       NativeFileOpFileMoveComplete();
-    PRInt32       NativeFileOpFileMoveAbort();
-    PRInt32       NativeFileOpFileRenamePrepare();
-    PRInt32       NativeFileOpFileRenameComplete();
-    PRInt32       NativeFileOpFileRenameAbort();
-    PRInt32       NativeFileOpWindowsShortcutComplete();
-    PRInt32       NativeFileOpWindowsShortcutAbort();
-    PRInt32       NativeFileOpMacAliasComplete();
-    PRInt32       NativeFileOpMacAliasAbort();
-    PRInt32       NativeFileOpUnixLink();
-
-};
-
-#endif /* nsInstallFileOpItem_h__ */
-

mozilla/xpinstall/src/nsInstallFolder.cpp

@@ -1,467 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsInstall.h"
-#include "nsInstallFolder.h"
-
-#include "nscore.h"
-#include "prtypes.h"
-#include "nsRepository.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsIFileSpec.h"
-#include "nsSpecialSystemDirectory.h"
-
-#include "nsFileLocations.h"
-#include "nsIFileLocator.h"
-
-struct DirectoryTable
-{
-	char *  directoryName;			/* The formal directory name */
-	PRInt32 folderEnum;		        /* Directory ID */
-};
-
-struct DirectoryTable DirectoryTable[] = 
-{
-    {"Plugins",             100 },
-	{"Program",             101 },
-	{"Communicator",        102 },
-	{"User Pick",           103 },
-	{"Temporary",           104 },
-	{"Installed",           105 },
-	{"Current User",        106 },
-	{"Preferences",         107 },
-	{"OS Drive",            108 },
-	{"file:///",            109 },
-
-    {"Components",          110 },
-    {"Chrome",              111 },
-
-	{"Win System",          200 },
-	{"Windows",             201 },
-
-	{"Mac System",          300 },
-	{"Mac Desktop",         301 },
-	{"Mac Trash",           302 },
-	{"Mac Startup",         303 },
-	{"Mac Shutdown",        304 },
-	{"Mac Apple Menu",      305 },
-	{"Mac Control Panel",   306 },
-	{"Mac Extension",       307 },
-	{"Mac Fonts",           308 },
-	{"Mac Preferences",     309 },
-    {"Mac Documents",       310 },
-
-	{"Unix Local",          400 },
-	{"Unix Lib",            401 },
-
-	{"",                    -1  }
-};
-
-
-MOZ_DECL_CTOR_COUNTER(nsInstallFolder);
-
-nsInstallFolder::nsInstallFolder(const nsString& aFolderID)
-{
-    nsInstallFolder( aFolderID, "" );
-}
-
-nsInstallFolder::nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath)
-{
-    MOZ_COUNT_CTOR(nsInstallFolder);
-
-    mFileSpec = nsnull;
-
-    /*
-        aFolderID can be either a Folder enum in which case we merely pass it
-        to SetDirectoryPath, or it can be a Directory.  If it is the later, it
-        must already exist and of course be a directory not a file.  
-    */
-
-    SetDirectoryPath( aFolderID, aRelativePath );
-
-    // check to see if that worked
-    if ( !mFileSpec )
-    {
-        // it didn't, so aFolderID is not one of the magic strings.
-        // maybe it's already a pathname? If so it had better be a directory
-        // if it already exists...
-        nsFileSpec dirCheck(aFolderID);
-        if ( (dirCheck.Error() == NS_OK) && 
-             ( dirCheck.IsDirectory() || !dirCheck.Exists() ) )
-        {
-            mFileSpec = new nsFileSpec( dirCheck );
-
-            if (mFileSpec && aRelativePath.Length() > 0 )
-            {
-                // we've got a subdirectory to tack on
-                nsString morePath(aRelativePath);
-
-                if ( morePath.Last() != '/' || morePath.Last() != '\\' )
-                    morePath += '/';
-
-                *mFileSpec += morePath;
-            }
-
-            // make sure that the directory is created. 
-            // XXX: **why** are we creating these? they might not be used!
-            nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
-        }
-    }
-}
-
-
-nsInstallFolder::nsInstallFolder(nsInstallFolder& inFolder, const nsString& subString)
-{
-    MOZ_COUNT_CTOR(nsInstallFolder);
-
-    mFileSpec = new nsFileSpec();
-    if (mFileSpec != nsnull)
-    {
-        *mFileSpec = *inFolder.mFileSpec;
-
-        if (!subString.IsEmpty())
-            *mFileSpec += subString;
-    }
-}
-
-
-nsInstallFolder::~nsInstallFolder()
-{
-    if (mFileSpec != nsnull)
-        delete mFileSpec;
-
-    MOZ_COUNT_DTOR(nsInstallFolder);
-}
-
-void 
-nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
-{
-	aDirectoryPath = "";
-    
-    if (mFileSpec != nsnull)
-    {
-        // We want the a NATIVE path.
-       aDirectoryPath.Assign(mFileSpec->GetCString());
-
-       if (mFileSpec->IsDirectory())
-       {
-          if (aDirectoryPath.Last() != FILESEP)
-              aDirectoryPath.Append(FILESEP);
-       }
-    }
-}
-
-void
-nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath)
-{
-    if ( aFolderID.EqualsIgnoreCase("User Pick") )
-    {
-        PickDefaultDirectory();
-        return;
-    }
-    else if ( aFolderID.EqualsIgnoreCase("Installed") )
-    {   
-        // XXX block from users or remove "Installed"
-        // XXX the filespec creation will fail due to unix slashes on Mac
-        mFileSpec = new nsFileSpec(aRelativePath, PR_TRUE);  // creates the directories to the relative path.
-        return;
-    }
-    else
-    {
-        nsresult rv = NS_OK;
-        PRInt32 folderDirSpecID = MapNameToEnum(aFolderID);
-        
-        switch (folderDirSpecID) 
-		{
-            case 100: ///////////////////////////////////////////////////////////  Plugins
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                {
-                    SetAppShellDirectory(nsSpecialFileSpec::App_PluginsDirectory );
-                }
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Plugins";
-#else
-                        *mFileSpec += "plugins";
-#endif
-                    }
-                    else
-                        mFileSpec = nsnull;
-                }
-                break; 
-
-            case 101: ///////////////////////////////////////////////////////////  Program
-            case 102: ///////////////////////////////////////////////////////////  Communicator
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (!NS_SUCCEEDED(rv))
-                        mFileSpec = nsnull;
-                }
-                break;
-            
-            case 103: ///////////////////////////////////////////////////////////  User Pick
-                // we should never be here.
-                mFileSpec = nsnull;
-                break;
-
-            case 104: ///////////////////////////////////////////////////////////  Temporary
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_TemporaryDirectory ));
-                break;
-
-            case 105: ///////////////////////////////////////////////////////////  Installed
-                // we should never be here.
-                mFileSpec = nsnull;
-                break;
-
-            case 106: ///////////////////////////////////////////////////////////  Current User
-                SetAppShellDirectory(nsSpecialFileSpec::App_UserProfileDirectory50 );
-                break;
-
-            case 107: ///////////////////////////////////////////////////////////  Preferences
-                SetAppShellDirectory(nsSpecialFileSpec::App_PrefsDirectory50 );
-                break;
-
-            case 108: ///////////////////////////////////////////////////////////  OS Drive
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_DriveDirectory ));
-                break;
-
-            case 109: ///////////////////////////////////////////////////////////  File URL
-                {
-                    if (aRelativePath.IsEmpty())
-                    {
-                        mFileSpec = nsnull;
-                        return;
-                    }
-
-                    nsString tempFileURLString = aFolderID;
-                    tempFileURLString += aRelativePath;
-                    mFileSpec = new nsFileSpec( nsFileURL(tempFileURLString) );
-
-                    // file:// is a special case where it returns and does not
-                    // go to the standard relative path code below.  This is
-                    // so that nsFile(Spec|Path) will work properly.  (ie. Passing
-                    // just "file://" to the nsFileSpec && nsFileURL is wrong).
-
-                    return;
-
-                }
-                break;
-
-            case 110: ///////////////////////////////////////////////////////////  Components
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    SetAppShellDirectory(nsSpecialFileSpec::App_ComponentsDirectory );
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Components";
-#else
-                        *mFileSpec += "components";
-#endif
-                    }
-                }
-                break;
-            
-            case 111: ///////////////////////////////////////////////////////////  Chrome
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    SetAppShellDirectory(nsSpecialFileSpec::App_ChromeDirectory );
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Chrome";
-#else
-                        *mFileSpec += "chrome";
-#endif
-                    }
-                }
-                break;
-
-            case 200: ///////////////////////////////////////////////////////////  Win System
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_SystemDirectory ));
-                break;
-
-            case 201: ///////////////////////////////////////////////////////////  Windows
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_WindowsDirectory ));
-                break;
-
-            case 300: ///////////////////////////////////////////////////////////  Mac System
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_SystemDirectory ));
-                break;
-
-            case 301: ///////////////////////////////////////////////////////////  Mac Desktop
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DesktopDirectory ));
-                break;
-
-            case 302: ///////////////////////////////////////////////////////////  Mac Trash
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_TrashDirectory ));
-                break;
-
-            case 303: ///////////////////////////////////////////////////////////  Mac Startup
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
-                break;
-
-            case 304: ///////////////////////////////////////////////////////////  Mac Shutdown
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ShutdownDirectory ));
-                break;
-
-            case 305: ///////////////////////////////////////////////////////////  Mac Apple Menu
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_AppleMenuDirectory ));
-                break;
-
-            case 306: ///////////////////////////////////////////////////////////  Mac Control Panel
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ControlPanelDirectory ));
-                break;
-
-            case 307: ///////////////////////////////////////////////////////////  Mac Extension
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ExtensionDirectory ));
-                break;
-
-            case 308: ///////////////////////////////////////////////////////////  Mac Fonts
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_FontsDirectory ));
-                break;
-
-            case 309: ///////////////////////////////////////////////////////////  Mac Preferences
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_PreferencesDirectory ));
-                break;
-                    
-            case 310: ///////////////////////////////////////////////////////////  Mac Documents
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DocumentsDirectory ));
-                break;
-                    
-            case 400: ///////////////////////////////////////////////////////////  Unix Local
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LocalDirectory ));
-                break;
-
-            case 401: ///////////////////////////////////////////////////////////  Unix Lib
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LibDirectory ));
-                break;
-
-
-            case -1:
-		    default:
-                mFileSpec = nsnull;
-			   return;
-		}
-
-        if (aRelativePath.Length() > 0 && mFileSpec)
-        {
-            nsString tempPath(aRelativePath);
-
-            if (aRelativePath.Last() != '/' || aRelativePath.Last() != '\\')
-                tempPath += '/';
-
-            *mFileSpec += tempPath;
-        }
-    }
-}
-
-void nsInstallFolder::PickDefaultDirectory()
-{
-    //FIX:  Need to put up a dialog here and set mFileSpec
-    return;   
-}
-
-/* MapNameToEnum
- * maps name from the directory table to its enum */
-PRInt32 
-nsInstallFolder::MapNameToEnum(const nsString& name)
-{
-	int i = 0;
-
-	if ( name.Equals(""))
-        return -1;
-
-	while ( DirectoryTable[i].directoryName[0] != 0 )
-	{
-		if ( name.EqualsIgnoreCase(DirectoryTable[i].directoryName) )
-			return DirectoryTable[i].folderEnum;
-		i++;
-	}
-	return -1;
-}
-
-void
-nsInstallFolder::SetAppShellDirectory(PRUint32 value)
-{
-    nsIFileSpec* fs = NS_LocateFileOrDirectory(value);
-    if ( fs )
-    {
-        mFileSpec = new nsFileSpec();
-        fs->GetFileSpec(mFileSpec);
-	    NS_RELEASE(fs);
-    }
-}
-
-nsFileSpec*
-nsInstallFolder::GetFileSpec()
-{
-  if (mFileSpec == nsnull)
-    return nsnull;
-  return mFileSpec;
-}
-
-PRInt32
-nsInstallFolder::ToString(nsAutoString* outString)
-{
-  //XXX: May need to fix. Native charset paths will be converted into Unicode when the get to JS
-  //     This will appear to work on Latin-1 charsets but won't work on Mac or other charsets.
-
-  *outString = mFileSpec->GetCString();
-  return NS_OK;
-}

mozilla/xpinstall/src/nsInstallFolder.h

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

mozilla/xpinstall/src/nsInstallObject.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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsInstallObject_h__
-#define nsInstallObject_h__
-
-#include "prtypes.h"
-
-class nsInstall;
-
-class nsInstallObject 
-{
-    public:
-        /* Public Methods */
-        nsInstallObject(nsInstall* inInstall) {mInstall = inInstall; }
-        virtual ~nsInstallObject() {}
-
-        /* 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.h

@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef 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,
-                        nsInstallFolder* 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,364 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- *     Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nsIXPINotifier.h"
-#include "nsInstallProgressDialog.h"
-
-#include "nsIAppShellComponentImpl.h"
-
-
-#include "nsIDOMWindow.h"
-#include "nsIServiceManager.h"
-#include "nsIDocumentViewer.h"
-#include "nsIContent.h"
-#include "nsINameSpaceManager.h"
-#include "nsIContentViewer.h"
-#include "nsIDOMElement.h"
-#include "nsNetUtil.h"
-#include "nsIURL.h"
-#include "nsIWebShell.h"
-#include "nsIWebShellWindow.h"
-#include "nsPIXPIManagerCallbacks.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID( kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
-
-static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
-
-nsInstallProgressDialog::nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager)
-  : mManager(aManager)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-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(NS_GET_IID(nsIXPINotifier))) {
-    *aInstancePtr = (void*) ((nsIXPINotifier*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(NS_GET_IID(nsIXPIProgressDlg))) {
-    *aInstancePtr = (void*) ((nsIXPIProgressDlg*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*) (nsISupports*)((nsIXPINotifier*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  return NS_ERROR_NO_INTERFACE;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::BeforeJavascriptEvaluation(const PRUnichar *URL)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::AfterJavascriptEvaluation(const PRUnichar *URL)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::InstallStarted(const PRUnichar *URL, const PRUnichar *UIPackageName)
-{
-    return SetHeading( UIPackageName );
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::ItemScheduled(const PRUnichar *message)
-{
-    return SetActionText( message );
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::FinalizeProgress(const PRUnichar *message, PRInt32 itemNum, PRInt32 totNum)
-{
-
-    nsresult rv = SetActionText( message );
-
-    if (NS_SUCCEEDED(rv))
-        rv = SetProgress( itemNum, totNum, 'n' );
-    
-    return rv;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::FinalStatus(const PRUnichar *URL, PRInt32 status)
-{
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::LogComment(const PRUnichar* comment)
-{
-    return NS_OK;
-}
-
-
-
-NS_IMETHODIMP
-nsInstallProgressDialog::Open(nsIDialogParamBlock* ioParamBlock)
-{
-    nsresult rv = NS_OK;
-    
-    // Now do the stuff to create a window and pass the JS args to it.
-    NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv );
-    if ( NS_SUCCEEDED( rv ) ) 
-    {
-        nsCOMPtr<nsIDOMWindow> hiddenWindow;
-        JSContext* jsContext;
-        rv = appShell->GetHiddenWindowAndJSContext( getter_AddRefs(hiddenWindow), &jsContext);
-        if (NS_SUCCEEDED(rv))
-        {
-            nsCOMPtr<nsPIXPIManagerCallbacks> mgr = do_QueryInterface(mManager);
-
-            void* stackPtr;
-            jsval *argv = JS_PushArguments( jsContext,
-                                            &stackPtr,
-                                            "sss%ip%ip",
-                                            "chrome://xpinstall/content/xpistatus.xul",
-                                            "_blank",
-                                            "chrome",
-                                            (const nsIID*)&NS_GET_IID(nsIDialogParamBlock),
-                                            (nsISupports*)ioParamBlock,
-                                            (const nsIID*)&NS_GET_IID(nsPIXPIManagerCallbacks),
-                                            (nsISupports*)mgr
-                                            );
-            if (argv)
-            {
-                rv = hiddenWindow->OpenDialog( jsContext,
-                                               argv,
-                                               5,
-                                               getter_AddRefs( mWindow ));
-            }
-
-            JS_PopArguments( jsContext, stackPtr);  
-        }
-        
-    }
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsInstallProgressDialog::Close()
-{
-    mWindow->Close();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::SetTitle(const PRUnichar * aTitle)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::SetHeading(const PRUnichar * aHeading)
-{
-    return setDlgAttribute( "dialog.uiPackageName", "value", nsString(aHeading) );
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::SetActionText(const PRUnichar * aActionText)
-{
-    const PRInt32 maxChars = 50;
-
-    nsString theMessage(aActionText);
-    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);
-    }
-
-    return setDlgAttribute( "dialog.currentAction", "value", theMessage );
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::SetProgress(PRInt32 aValue, PRInt32 aMax, char mode)
-{
-    char buf[16];
-    static char modeFlag = 'n';
-    nsresult rv;
-    static PRInt32 previousMax;
-
-    //First check to see if the max value changed so we don't
-    //have to send a max value across the proxy every time.
-    if ( aMax != previousMax)
-    {
-        previousMax = aMax;
-
-        PR_snprintf( buf, sizeof buf, "%lu", aMax );
-        rv = setDlgAttribute( "dialog.progress", "max", buf );
-    }
-    
-    //I use this modeFlag business so I don't have to send
-    //progressmeter mode information across the proxy every time.
-    if ( mode != modeFlag )
-    {
-        modeFlag = mode;
-        if ( modeFlag == 'n' )
-            rv = setDlgAttribute( "dialog.progress", "mode", "normal");
-        else
-            rv = setDlgAttribute( "dialog.progress", "mode", "undetermined");
-    }
-
-    if ( NS_SUCCEEDED(rv))
-    {
-        if (aMax != 0)
-            PR_snprintf( buf, sizeof buf, "%lu", 100 * aValue/aMax );
-        else
-            PR_snprintf( buf, sizeof buf, "%lu", 0 );
-
-        rv = setDlgAttribute( "dialog.progress", "value", buf );
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::StartInstallPhase()
-{
-    nsresult rv = NS_OK;
-
-    // don't care if this fails
-    setDlgAttribute("dialog.cancel", "disabled", nsString("true"));
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::GetCancelStatus(PRBool *_retval)
-{
-    *_retval = PR_FALSE;
-    return NS_OK;
-}
-
-// Utility to set element attribute.
-nsresult nsInstallProgressDialog::setDlgAttribute( const char *id,
-                                                   const char *name,
-                                                   const nsString &value )
-{
-    nsresult rv = NS_OK;
-
-    if (!mDocument)
-    {
-        nsCOMPtr<nsIDOMDocument> doc;
-        rv = mWindow->GetDocument( getter_AddRefs(doc) );
-        if (NS_SUCCEEDED(rv))
-        {
-            mDocument = do_QueryInterface(doc,&rv);
-        }
-        NS_WARN_IF_FALSE(rv == NS_OK,"couldn't get nsIDOMXULDocument from nsXPIProgressDlg");
-    }
-
-    if ( mDocument ) {
-        // Find specified element.
-        nsCOMPtr<nsIDOMElement> elem;
-        rv = mDocument->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.
-nsresult nsInstallProgressDialog::getDlgAttribute(  const char *id,
-                                                    const char *name,
-                                                    nsString &value ) 
-{
-    nsresult rv = NS_OK;
-
-    if (!mDocument)
-    {
-        nsCOMPtr<nsIDOMDocument> doc;
-        rv = mWindow->GetDocument( getter_AddRefs(doc) );
-        if (NS_SUCCEEDED(rv))
-        {
-            mDocument = do_QueryInterface(doc,&rv);
-        }
-        NS_WARN_IF_FALSE(rv == NS_OK,"couldn't get nsIDOMXULDocument from nsXPIProgressDlg");
-    }
-
-    if ( mDocument ) {
-        // Find specified element.
-        nsCOMPtr<nsIDOMElement> elem;
-        rv = mDocument->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: GetAttribute 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;
-}

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- */
-#ifndef __nsInstallProgressDialog_h__
-#define __nsInstallProgressDialog_h__
-
-#include "nscore.h"
-#include "nsIXPINotifier.h"
-#include "nsIXPIProgressDlg.h"
-#include "nsISupports.h"
-#include "nsISupportsUtils.h"
-
-#include "nsCOMPtr.h"
-
-#include "nsIWebShell.h"
-#include "nsIWebShellWindow.h"
-#include "nsPIXPIManagerCallbacks.h"    
-
-#include "nsIDocument.h"
-#include "nsIDOMWindow.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMXULDocument.h"
-
-
-class nsInstallProgressDialog : public nsIXPINotifier,
-                                public nsIXPIProgressDlg
-{
-    public: 
-
-        nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager);
-        virtual ~nsInstallProgressDialog();
-        
-        NS_DECL_ISUPPORTS
-
-        // implement nsIXPINotifier
-        NS_DECL_NSIXPINOTIFIER
-
-        // implement nsIXPIProgressDlg
-        NS_DECL_NSIXPIPROGRESSDLG
-
-//        void SetWindow(nsISupports* aWindow);
-
-    protected:
-        nsresult setDlgAttribute(const char *id, const char *name, const nsString &value);
-        nsresult getDlgAttribute(const char *id, const char *name, nsString &value);
-
-    private:
-        nsPIXPIManagerCallbacks*       mManager;
-        nsCOMPtr<nsIDOMXULDocument>    mDocument;   // Should this be a weak reference?
-        nsCOMPtr<nsIDOMWindow>         mWindow;     // Should this be a weak reference?
-};
-#endif

mozilla/xpinstall/src/nsInstallResources.cpp

@@ -1,83 +0,0 @@
- /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- *     Samir Gehani <sgehani@netscape.com>
- */
-
-#include <string.h>
-#include "nscore.h"
-#include "nsInstallResources.h"
-
-static nsXPIResourceTableItem XPIResTable[] = 
-{
-    /*---------------------------------------------------------------------*
-     *   Install Actions 
-     *---------------------------------------------------------------------*/
-    { "InstallFile",        "Installing: %s" },
-    { "ReplaceFile",        "Replacing: %s" },
-    { "SkipFile",           "Skipping: %s" },
-    { "DeleteFile",         "Deleting file: %s" },
-    { "DeleteComponent",    "Deleting component: %s" },
-    { "Execute",            "Executing: %s" },
-    { "ExecuteWithArgs",    "Executing: %s with argument: %s" },
-    { "Patch",              "Patching: %s" },
-    { "Uninstall",          "Uninstalling: %s" },
-
-    // XXX FileOp*() action strings
-    // XXX WinReg and WinProfile action strings
-
-    /*---------------------------------------------------------------------*
-     *   Dialog Messages 
-     *---------------------------------------------------------------------*/
-    { "FinishingInstallMsg", "Finishing install... please wait." },
-
-    /*---------------------------------------------------------------------*
-     *    Miscellaneous 
-     *---------------------------------------------------------------------*/
-    { "ERROR", "ERROR" },
-
-    { NS_XPI_EOT, "" }
-};
-
-char* 
-nsInstallResources::GetDefaultVal(const char* aResName)
-{
-    char    *currResName = XPIResTable[0].resName;
-    char    *currResVal = nsnull;
-    PRInt32 idx, len = 0;
-
-    for (idx = 0; 0 != strcmp(currResName, NS_XPI_EOT); idx++)
-    {
-        currResName = XPIResTable[idx].resName;
-        len = strlen(currResName);
-
-        if (0 == strncmp(currResName, aResName, len))
-        {
-            currResVal = XPIResTable[idx].defaultString;
-            break;
-        }
-    }
-
-    return currResVal;
-}
-

mozilla/xpinstall/src/nsInstallResources.h

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

mozilla/xpinstall/src/nsInstallTrigger.cpp

@@ -1,489 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsSoftwareUpdate.h"
-#include "nsXPInstallManager.h"
-#include "nsInstallTrigger.h"
-#include "nsInstallVersion.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"
-
-#include "VerReg.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*) XPINSTALL_ENABLE_PREF, aReturn);
-
-        if (NS_FAILED(rv))
-        {
-            *aReturn = PR_FALSE;
-        }
-
-        NS_RELEASE(prefs);
-    }
-    else
-    {
-        *aReturn = PR_FALSE;  /* no prefs manager.  set to false */
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInstallTrigger::Install(nsXPITriggerInfo* aTrigger, PRBool* aReturn)
-{
-    nsresult rv;
-    *aReturn = PR_FALSE;
-
-    PRBool enabled;
-    UpdateEnabled(&enabled);
-    if (!enabled) 
-    {
-        delete aTrigger;
-        return NS_OK;
-    }
-
-    nsXPInstallManager *mgr = new nsXPInstallManager();
-    if (mgr)
-    {
-        // The Install manager will delete itself when done
-        rv = mgr->InitManager( aTrigger );
-        if (NS_SUCCEEDED(rv))
-            *aReturn = PR_TRUE;
-    }
-    else
-    {
-        delete aTrigger;
-        rv = NS_ERROR_OUT_OF_MEMORY;
-    }
-
-
-    return rv;
-}
-
-
-NS_IMETHODIMP    
-nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRBool* aReturn)
-{
-    PRBool enabled;
-    nsresult rv = NS_ERROR_OUT_OF_MEMORY;
-    *aReturn = PR_FALSE;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    // The Install manager will delete itself when done, once we've called
-    // InitManager. Before then **WE** must delete it
-    nsXPInstallManager *mgr = new nsXPInstallManager();
-    if (mgr)
-    {
-        nsXPITriggerInfo* trigger = new nsXPITriggerInfo();
-        if ( trigger )
-        {
-            nsXPITriggerItem* item = new nsXPITriggerItem(0,aURL.GetUnicode());
-            if (item)
-            {
-                trigger->Add( item );
-                // The Install manager will delete itself when done
-                rv = mgr->InitManager( trigger );
-                *aReturn = PR_TRUE;
-            }
-            else
-            {
-                rv = NS_ERROR_OUT_OF_MEMORY;
-                delete trigger;
-                delete mgr;
-            }
-        }
-        else
-        {
-            rv = NS_ERROR_OUT_OF_MEMORY;
-            delete mgr;
-        }
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-    return ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, &inVersion, aMode, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    PRBool needJar = PR_FALSE;
-
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    if (aURL.IsEmpty() || aVersion == nsnull)
-    {
-        needJar = PR_TRUE;
-    }
-    else
-    {
-        char * regNameCString = aRegName.ToNewCString();
-
-        REGERR status = VR_ValidateComponent( regNameCString );
-        
-        if ( status == REGERR_NOFIND || status == REGERR_NOFILE )
-        {
-            // either component is not in the registry or it's a file
-            // node and the physical file is missing
-            needJar = PR_TRUE;
-        }
-        else
-        {
-            VERSION oldVersion;
-            PRInt32 diffValue;
-
-            status = VR_GetVersion( regNameCString, &oldVersion );
-            nsInstallVersion oldInstallVersion;
-
-            oldInstallVersion.Init(oldVersion.major, 
-                                oldVersion.minor, 
-                                oldVersion.release, 
-                                oldVersion.build);
-
-
-            if ( status != REGERR_OK )
-                needJar = PR_TRUE;
-            else if ( aDiffLevel < 0 )
-            {
-                aVersion->CompareTo(&oldInstallVersion, &diffValue); 
-                needJar = (diffValue <= aDiffLevel);
-            }
-            else
-            {
-                aVersion->CompareTo(&oldInstallVersion, &diffValue);
-                needJar = (diffValue >= aDiffLevel);
-            }
-        }
-    }
-
-    if (needJar)
-        return StartSoftwareUpdate(aURL, aMode, aReturn);
-    else
-        *aReturn = 0;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, aVersion, aMode, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, &inVersion, aMode, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);;
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, &inVersion, 0, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
-{
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, aVersion, 0, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aMajor, aMinor, aRelease, aBuild);
-
-    return CompareVersion(aRegName, &inVersion, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-
-    return CompareVersion(aRegName, &inVersion, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
-{
-    *aReturn = EQUAL;  // assume failure.
-
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    VERSION              cVersion;
-    char*                tempCString;
-    REGERR               status;
-    nsInstallVersion     regNameVersion;
-    
-    tempCString = aRegName.ToNewCString();
-
-    status = VR_GetVersion( tempCString, &cVersion );
-
-    /* if we got the version */
-    if ( status == REGERR_OK ) 
-    {
-        if ( VR_ValidateComponent( tempCString ) == REGERR_NOFILE ) 
-        {
-            regNameVersion.Init(0,0,0,0);
-        }
-        else
-        {
-            regNameVersion.Init(cVersion.major, 
-                                cVersion.minor, 
-                                cVersion.release, 
-                                cVersion.build);
-        }
-    }
-    else
-        regNameVersion.Init(0,0,0,0);
-        
-    regNameVersion.CompareTo( aVersion, aReturn );
-
-    if (tempCString)
-        Recycle(tempCString);
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::GetVersion(const nsString& component, nsString& version)
-{
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    VERSION              cVersion;
-    char*                tempCString;
-    REGERR               status;
-    
-    tempCString = component.ToNewCString();
-
-    status = VR_GetVersion( tempCString, &cVersion );
-
-    version.Truncate();
-
-    /* if we got the version */
-    if ( status == REGERR_OK && VR_ValidateComponent( tempCString ) == REGERR_OK) 
-    {
-        nsInstallVersion regNameVersion;
-        
-        regNameVersion.Init(cVersion.major, 
-                            cVersion.minor, 
-                            cVersion.release, 
-                            cVersion.build);
-
-        regNameVersion.ToString(version);
-    }
-    
-    if (tempCString)
-         Recycle(tempCString);
-
-    return NS_OK;
-}
-
-
-// this will take a nsIURI, 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:/", 6) )
-    {       
-        tempFileString.Assign( nsNSPRPath(nsFileURL(aURL)) );
-    }
-    else
-    {
-        nsSpecialSystemDirectory tempFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-    
-        PRInt32 result = aURL.RFindChar('/');
-        if (result != -1)
-        {    
-            nsString jarName;
-                       
-            aURL.Right(jarName, (aURL.Length() - result) );
-            
-            PRInt32 argOffset = jarName.RFindChar('?');
-
-            if (argOffset != -1)
-            {
-                // we need to remove ? and everything after it
-                jarName.Truncate(argOffset);
-            }
-            
-            
-            tempFile += jarName;
-        }
-        else
-        {   
-            tempFile += "xpinstall.jar";
-        }
-
-        tempFile.MakeUnique();
-
-        tempFileString.Assign( nsNSPRPath( nsFilePath(tempFile) ) );
-    }
-}
-
-

mozilla/xpinstall/src/nsInstallTrigger.h

@@ -1,55 +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 "prtypes.h"
-#include "nsHashtable.h"
-
-#include "nsIDOMInstallTriggerGlobal.h"
-#include "nsSoftwareUpdate.h"
-#include "nsXPITriggerInfo.h"
-
-
-
-
-class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTriggerGlobal
-{
-    public:
-        static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallTrigger_CID; return iid; }
-
-        nsInstallTrigger();
-        virtual ~nsInstallTrigger();
-        
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-        NS_IMETHOD    SetScriptObject(void* aScriptObject);
-
-        NS_IMETHOD    UpdateEnabled(PRBool* aReturn);
-        NS_IMETHOD    Install(nsXPITriggerInfo *aInfo, PRBool* aReturn);
-        NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, 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);
-        NS_IMETHOD    GetVersion(const nsString& component, nsString& version);
-
-        
-    private:
-        void *mScriptObject;
-        void CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString);
-
-};
-
-#define NS_INSTALLTRIGGERCOMPONENT_PROGID NS_IXPINSTALLCOMPONENT_PROGID "/installtrigger"
-#endif

mozilla/xpinstall/src/nsInstallUninstall.cpp

@@ -1,216 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsInstall.h"
-#include "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);
-
-MOZ_DECL_CTOR_COUNTER(nsInstallUninstall);
-
-nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall,
-                                        const nsString& regName,
-                                        PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    MOZ_COUNT_CTOR(nsInstallUninstall);
-
-    if (regName.Equals("")) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mRegName.Assign(regName);
-
-    char* userName = (char*)PR_Malloc(MAXREGPATHLEN);
-    PRInt32 err = VR_GetUninstallUserName( (char*) (const char*) nsAutoCString(regName), 
-                                           userName, 
-                                           MAXREGPATHLEN );
-    
-    mUIName.Assign(userName);
-    
-    if (err != REGERR_OK)
-    {
-        *error = nsInstall::NO_SUCH_COMPONENT;
-    }
-    
-    PR_FREEIF(userName);
-    
-}
-
-nsInstallUninstall::~nsInstallUninstall()
-{
-    MOZ_COUNT_CTOR(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* rsrcVal = nsnull;
-
-    if (buffer == nsnull || !mInstall)
-        return buffer;
-    
-    char* temp = mUIName.ToNewCString();
-    
-    if (temp)
-    {
-        rsrcVal = mInstall->GetResourcedString("Uninstall");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, temp);
-            nsCRT::free(rsrcVal);
-        }
-    }
-
-    if (temp)
-         Recycle(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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef 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,341 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsSoftwareUpdate.h"
-
-#include "nsInstallVersion.h"
-#include "nsIDOMInstallVersion.h"
-
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIScriptGlobalObject.h"
-
-#include "prprf.h"
-#include "prmem.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& aString, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aString);
-
-    return CompareTo(&inVersion, aReturn);
-}
-
-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.Assign(result);
-
-    PR_FREEIF(result);
-
-    return NS_OK;
-}
-
-
-nsresult
-nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajor, PRInt32 *aMinor, PRInt32 *aRelease, PRInt32 *aBuild)    
-{
-    PRInt32 errorCode;
-
-    int dot = version.FindChar('.', PR_FALSE,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.FindChar('.',PR_FALSE,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.FindChar('.',PR_FALSE,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;
-}
-

mozilla/xpinstall/src/nsInstallVersion.h

@@ -1,60 +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;
-};
-
-
-#define NS_INSTALLVERSIONCOMPONENT_PROGID NS_IXPINSTALLCOMPONENT_PROGID "/installversion"
-#endif

mozilla/xpinstall/src/nsJSFile.h

@@ -1,93 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __NS_JSFILE_H__
-#define __NS_JSFILE_H__
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-
-
-JSBool PR_CALLBACK
-InstallFileOpDirCreate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirGetParent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileCopy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileDelete(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileExists(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileExecute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetNativeVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetDiskSpaceAvailable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetModDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetSize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileIsDirectory(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileIsFile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileModDateChanged(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileMove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileWindowsShortcut(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileMacAlias(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileUnixLink(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-PRInt32 InitXPFileOpObjectPrototype(JSContext *jscontext, JSObject *global, JSObject **fileOpObjectPrototype);
-
-#endif

mozilla/xpinstall/src/nsJSFileSpecObj.cpp

@@ -1,150 +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 "nsJSUtils.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-
-#include "nsString.h"
-#include "nsInstall.h"
-#include "nsJSFileSpecObj.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);
-
-
-
-/***********************************************************************************/
-// Native methods for FileSpecObj functions
-
-/*
- * Native method fso_ToString
- */
-PR_STATIC_CALLBACK(JSBool)
-fso_ToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-
-  nsInstallFolder *nativeThis = (nsInstallFolder*)JS_GetPrivate(cx, obj);
-  nsAutoString stringReturned;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-    if(NS_OK != nativeThis->ToString(&stringReturned))
-      return JS_FALSE;
-    nsJSUtils::nsConvertStringToJSVal(stringReturned, cx, rval);
-
-  return JS_TRUE;
-}
-
-
-/*
- * Native method fso_AppendString
- */
-PR_STATIC_CALLBACK(JSBool)
-fso_AppendPath(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_TRUE;
-}
-
-
-/*
- * FileSpecObj destructor
- */
-static void PR_CALLBACK FileSpecObjectCleanup(JSContext *cx, JSObject *obj)
-{
-    nsInstallFolder *nativeThis = (nsInstallFolder*)JS_GetPrivate(cx, obj);
-    if (nativeThis != nsnull)
-       delete nativeThis;
-}
-
-/***********************************************************************/
-//
-// class for FileObj
-//
-JSClass FileSpecObjectClass = {
-  "FileSpecObject",
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  FileSpecObjectCleanup
-};
-
-
-//
-// FileObj class methods
-//
-static JSFunctionSpec fileSpecObjMethods[] = 
-{
-  {"appendPath",       fso_AppendPath,     1},
-  {"toString",         fso_ToString,       0},
-  {0}
-};
-
-
-PRInt32  InitFileSpecObjectPrototype(JSContext *jscontext, 
-                                      JSObject *global, 
-                                      JSObject **fileSpecObjectPrototype)
-{
-  *fileSpecObjectPrototype  = JS_InitClass( jscontext,         // context
-                                            global,            // global object
-                                            nsnull,            // parent proto 
-                                            &FileSpecObjectClass, // JSClass
-                                            nsnull,            // JSNative ctor
-                                            0,                 // ctor args
-                                            nsnull,            // proto props
-                                            fileSpecObjMethods,// proto funcs
-                                            nsnull,            // ctor props (static)
-                                            nsnull);           // ctor funcs (static)
-
-  if (nsnull == *fileSpecObjectPrototype) 
-  {
-      return NS_ERROR_FAILURE;
-  }
-
- 
-  return NS_OK;
-}
-
-

mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp

@@ -1,719 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-#include "nsIJSScriptObject.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsCRT.h"
-#include "nsString.h"
-#include "nsIDOMInstallVersion.h"
-#include "nsIDOMInstallTriggerGlobal.h"
-#include "nsXPITriggerInfo.h"
-
-#include "nsRepository.h"
-
-#include "nsSoftwareUpdateIIDs.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);
-
-//
-// InstallTriggerGlobal finalizer
-//
-PR_STATIC_CALLBACK(void)
-FinalizeInstallTriggerGlobal(JSContext *cx, JSObject *obj)
-{
-  nsJSUtils::nsGenericFinalize(cx, obj);
-}
-
-static NS_DEFINE_IID(kIDOMInstallTriggerIID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-static NS_DEFINE_IID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
-
-static JSBool CreateNativeObject(JSContext *cx, JSObject *obj, nsIDOMInstallTriggerGlobal **aResult)
-{
-    nsresult result;
-    nsIScriptObjectOwner *owner = nsnull;
-    nsIDOMInstallTriggerGlobal *nativeThis;
-
-    result = nsRepository::CreateInstance(kInstallTrigger_CID,
-                                        nsnull,
-                                        kIDOMInstallTriggerIID,
-                                        (void **)&nativeThis);
-
-    if (NS_OK != result) return JS_FALSE;
-    
-    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);
-    
-    *aResult = nativeThis;
-    
-    NS_RELEASE(nativeThis);  // we only want one refcnt. JSUtils cleans us up.
-    return JS_TRUE;
-}
-
-//
-// 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);
-  PRBool nativeRet;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  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 Install
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-
-  *rval = JSVAL_FALSE;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-
-  // make sure XPInstall is enabled, return false if not
-  PRBool enabled = PR_FALSE;
-  nativeThis->UpdateEnabled(&enabled);
-  if (!enabled)
-      return JS_TRUE;
-
-
-  // get window.location to construct relative URLs
-  nsString baseURL;
-  JSObject* global = JS_GetGlobalObject(cx);
-  if (global)
-  {
-    jsval v;
-    if (JS_GetProperty(cx,global,"location",&v))
-    {
-      ConvertJSValToStr( baseURL, cx, v );
-      PRInt32 lastslash = baseURL.RFindChar('/');
-      if (lastslash != kNotFound)
-      {
-        baseURL.Truncate(lastslash+1);
-      }
-    }
-  }
-
-  
-  // parse associative array of installs
-  if ( argc >= 1 && JSVAL_IS_OBJECT(argv[0]) )
-  {
-    nsXPITriggerInfo *trigger = new nsXPITriggerInfo();
-    if (!trigger)
-      return JS_FALSE;
-
-    JSIdArray *ida = JS_Enumerate( cx, JSVAL_TO_OBJECT(argv[0]) );
-    if ( ida ) 
-    {
-      jsval v;
-      PRUnichar *name, *URL;
-
-      for (int i = 0; i < ida->length; i++ )
-      {
-        JS_IdToValue( cx, ida->vector[i], &v );
-        name = JS_GetStringChars( JS_ValueToString( cx, v ) );
-
-        JS_GetUCProperty( cx, JSVAL_TO_OBJECT(argv[0]), name, nsCRT::strlen(name), &v );
-        URL = JS_GetStringChars( JS_ValueToString( cx, v ) );
-
-        if ( name && URL )
-        {
-            nsXPITriggerItem *item = new nsXPITriggerItem( name, URL );
-            if ( item )
-            {
-                if ( item->IsRelativeURL() )
-                {
-                  item->mURL.Insert( baseURL, 0 );
-                }
-                trigger->Add( item );
-            }
-            else
-                ; // XXX signal error somehow
-        }
-        else
-            ; // XXX need to signal error
-      }
-      JS_DestroyIdArray( cx, ida );
-    }
-
-
-    // save callback function if any (ignore bad args for now)
-    if ( argc >= 2 && JS_TypeOfValue(cx,argv[1]) == JSTYPE_FUNCTION )
-    {
-      trigger->SaveCallback( cx, argv[1] );
-    }
-
-
-    // pass on only if good stuff found
-    if (trigger->Size() > 0)
-    {
-        PRBool result;
-        nativeThis->Install(trigger,&result);
-        *rval = BOOLEAN_TO_JSVAL(result);
-        return JS_TRUE;
-    }
-    else
-        delete trigger;
-  }
-
-  JS_ReportError(cx, "Incorrect arguments to InstallTrigger.Install()");
-  return JS_FALSE;
-}
-
-//
-// 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);
-  PRBool       nativeRet;
-  nsAutoString b0;
-  PRInt32      b1 = 0;
-
-  *rval = JSVAL_FALSE;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  if ( argc >= 1 )
-  {
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if (argc >= 2 && !JS_ValueToInt32(cx, argv[1], (int32 *)&b1))
-    {
-        JS_ReportError(cx, "StartSoftwareUpdate() 2nd parameter must be a number");
-        return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->StartSoftwareUpdate(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-    *rval = BOOLEAN_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);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-  nsAutoString b2str;
-  PRInt32      b2int;
-  nsAutoString b3str;
-  PRInt32      b3int;
-  PRInt32      b4;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  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);
-  PRInt32 nativeRet;
-  nsAutoString regname;
-  nsAutoString version;
-  int32        major,minor,release,build;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  if (argc < 2 )
-  {
-    JS_ReportError(cx, "CompareVersion requires at least 2 parameters");
-    return JS_FALSE;
-  }
-  else if ( !JSVAL_IS_STRING(argv[0]) )
-  {
-    JS_ReportError(cx, "Invalid parameter passed to CompareVersion");
-    return JS_FALSE;
-  }
-
-  // get the registry name argument
-  ConvertJSValToStr(regname, cx, argv[0]);
-
-  if (argc == 2 )
-  {
-    //  public int CompareVersion(String registryName, String version)
-    //  --OR-- CompareVersion(String registryNamve, InstallVersion version)
-
-    ConvertJSValToStr(version, cx, argv[1]);
-    if(NS_OK != nativeThis->CompareVersion(regname, version, &nativeRet))
-    {
-          return JS_FALSE;
-    }
-  }
-  else
-  {
-    //  public int CompareVersion(String registryName,
-    //                            int    major,
-    //                            int    minor,
-    //                            int    release,
-    //                            int    build);
-    //
-    //  minor, release, and build values are optional
-
-    major = minor = release = build = 0;
-
-    if(!JS_ValueToInt32(cx, argv[1], &major))
-    {
-      JS_ReportError(cx, "2th parameter must be a number");
-      return JS_FALSE;
-    }
-    if( argc > 2 && !JS_ValueToInt32(cx, argv[2], &minor) )
-    {
-      JS_ReportError(cx, "3th parameter must be a number");
-      return JS_FALSE;
-    }
-    if( argc > 3 && !JS_ValueToInt32(cx, argv[3], &release) )
-    {
-      JS_ReportError(cx, "4th parameter must be a number");
-      return JS_FALSE;
-    }
-    if( argc > 4 && !JS_ValueToInt32(cx, argv[4], &build) )
-    {
-      JS_ReportError(cx, "5th parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->CompareVersion(regname, major, minor, release, build, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-  }
-
-  *rval = INT_TO_JSVAL(nativeRet);
-  return JS_TRUE;
-}
-
-//
-// Native method GetVersion
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalGetVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-  
-  nsAutoString regname;
-  nsAutoString version;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  // get the registry name argument
-  ConvertJSValToStr(regname, cx, argv[0]);
-
-  if(NS_OK != nativeThis->GetVersion(regname, version))
-  {
-        return JS_FALSE;
-  }
-  
-  if(version.Equals(""))
-      *rval = JSVAL_NULL;
-    else
-      ConvertStrToJSVal(version, cx, rval);
-
-  return JS_TRUE;
-}
-
-/***********************************************************************/
-//
-// class for InstallTriggerGlobal
-//
-JSClass InstallTriggerGlobalClass = {
-  "InstallTrigger", 
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  FinalizeInstallTriggerGlobal
-};
-
-//
-// InstallTriggerGlobal class methods
-//
-static JSFunctionSpec InstallTriggerGlobalMethods[] = 
-{
-  {"UpdateEnabled",             InstallTriggerGlobalUpdateEnabled,             0},
-  {"Install",                   InstallTriggerGlobalInstall,                   2},
-  {"StartSoftwareUpdate",       InstallTriggerGlobalStartSoftwareUpdate,       2},
-  {"ConditionalSoftwareUpdate", InstallTriggerGlobalConditionalSoftwareUpdate, 5},
-  {"CompareVersion",            InstallTriggerGlobalCompareVersion,            5},
-  {"GetVersion",                InstallTriggerGlobalGetVersion,                2},
-  // -- new forms to match JS style --
-  {"updateEnabled",             InstallTriggerGlobalUpdateEnabled,             0},
-  {"install",                   InstallTriggerGlobalInstall,                   2},
-  {"startSoftwareUpdate",       InstallTriggerGlobalStartSoftwareUpdate,       2},
-  {"conditionalSoftwareUpdate", InstallTriggerGlobalConditionalSoftwareUpdate, 5},
-  {"compareVersion",            InstallTriggerGlobalCompareVersion,            5},
-  {"getVersion",                InstallTriggerGlobalGetVersion,                2},
-  {0}
-};
-
-
-static JSConstDoubleSpec diff_constants[] = 
-{
-    { nsIDOMInstallTriggerGlobal::MAJOR_DIFF,    "MAJOR_DIFF" },
-    { nsIDOMInstallTriggerGlobal::MINOR_DIFF,    "MINOR_DIFF" },
-    { nsIDOMInstallTriggerGlobal::REL_DIFF,      "REL_DIFF"   },
-    { nsIDOMInstallTriggerGlobal::BLD_DIFF,      "BLD_DIFF"   },
-    { nsIDOMInstallTriggerGlobal::EQUAL,         "EQUAL"      },
-    {0}
-};
-
-
-
-nsresult InitInstallTriggerGlobalClass(JSContext *jscontext, JSObject *global, void** prototype)
-{
-  JSObject *proto = nsnull;
-  
-  if (prototype != nsnull)
-    *prototype = nsnull;
-
-    proto = JS_InitClass(jscontext,                       // context
-                         global,                          // global object
-                         nsnull,                          // parent proto 
-                         &InstallTriggerGlobalClass,      // JSClass
-                         nsnull,                          // JSNative ctor
-                         nsnull,                          // ctor args
-                         nsnull,                          // proto props
-                         nsnull,                          // proto funcs
-                         nsnull,                          // ctor props (static)
-                         InstallTriggerGlobalMethods);    // ctor funcs (static)
-    
-    
-    if (nsnull == proto) return NS_ERROR_FAILURE;
-    
-    if ( PR_FALSE == JS_DefineConstDoubles(jscontext, proto, diff_constants) )
-            return NS_ERROR_FAILURE;
-
-    if (prototype != nsnull)
-      *prototype = proto;
-  
-  return NS_OK;
-}
-
-
-
-//
-// InstallTriggerGlobal class initialization
-//
-nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = 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)) 
-  {
-    nsresult rv = InitInstallTriggerGlobalClass(jscontext, global, (void**)&proto);
-    if (NS_FAILED(rv)) return rv;
-  }
-  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,651 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-/* 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 "nsString.h"
-#include "nsIDOMInstallVersion.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsRepository.h"
-#include "nsDOMCID.h"
-
-#include "nsSoftwareUpdateIIDs.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);
-
-//
-// 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, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, 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, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, 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);
-  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]);
-  }
-  else 
-  {
-      b0 = "0.0.0.0";
-  }
-    
-  if (NS_OK != nativeThis->Init(b0)) 
-        return JS_FALSE;
-  
-  *rval = JSVAL_VOID;
-
-  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);
-  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);
-  PRInt32                 nativeRet;
-  nsString                b0str;
-  PRInt32                 b0int;
-  PRInt32                 b1int;
-  PRInt32                 b2int;
-  PRInt32                 b3int;
-
-  *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]))
-    {
-        nsCOMPtr<nsIDOMInstallVersion> versionObj;
-
-        if(JS_FALSE == ConvertJSValToObj(getter_AddRefs(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}
-};
-
-static JSConstDoubleSpec version_constants[] = 
-{
-    { nsIDOMInstallVersion::EQUAL,                  "EQUAL"              },
-    { nsIDOMInstallVersion::BLD_DIFF,               "BLD_DIFF"           },
-    { nsIDOMInstallVersion::BLD_DIFF_MINUS,         "BLD_DIFF_MINUS"     },
-    { nsIDOMInstallVersion::REL_DIFF,               "REL_DIFF"           },
-    { nsIDOMInstallVersion::REL_DIFF_MINUS,         "REL_DIFF_MINUS"     },
-    { nsIDOMInstallVersion::MINOR_DIFF,             "MINOR_DIFF"         },
-    { nsIDOMInstallVersion::MINOR_DIFF_MINUS,       "MINOR_DIFF_MINUS"   },
-    { nsIDOMInstallVersion::MAJOR_DIFF,             "MAJOR_DIFF"         },
-    { nsIDOMInstallVersion::MAJOR_DIFF_MINUS,       "MAJOR_DIFF_MINUS"   },
-    {0}
-};
-
-
-
-//
-// InstallVersion constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsresult result;
-  
-  nsIDOMInstallVersion *nativeThis;
-  nsIScriptObjectOwner *owner = nsnull;
-
-  static NS_DEFINE_IID(kIDOMInstallVersionIID, NS_IDOMINSTALLVERSION_IID);
-  static NS_DEFINE_IID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID);
-
-  result = nsRepository::CreateInstance(kInstallVersion_CID,
-                                        nsnull,
-                                        kIDOMInstallVersionIID,
-                                        (void **)&nativeThis);
-  if (NS_OK != result) return JS_FALSE;
-
-            
-  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);
-   
-  jsval ignore;
-  InstallVersionInit(cx, obj, argc, argv, &ignore);
-
-  return JS_TRUE;
-}
-
-nsresult InitInstallVersionClass(JSContext *jscontext, JSObject *global, void** prototype)
-{
-  JSObject *proto = nsnull;
-
-  if (prototype != nsnull)
-    *prototype = nsnull;
-
-  proto = JS_InitClass(jscontext,     // context
-                       global,        // global object
-                       nsnull,  // 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_FALSE == JS_DefineConstDoubles(jscontext, proto, version_constants) )
-            return NS_ERROR_FAILURE;
-  
-  if (prototype != nsnull)
-      *prototype = proto;
-  
-  return NS_OK;
-}
-
-//
-// InstallVersion class initialization
-//
-nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = 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)) 
-  {
-    nsresult rv = InitInstallVersionClass(jscontext, global, (void**)&proto);
-    if (NS_FAILED(rv)) return rv;
-  }
-  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,211 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#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,29 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __NS_JSWINPROTOTYPE_H__
-#define __NS_JSWINPROTOTYPE_H__
-
-PRInt32
-InitWinProfilePrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
-
-#endif

mozilla/xpinstall/src/nsJSWinReg.cpp

@@ -1,593 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#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;
-    }
-
-    ConvertStrToJSVal(nativeRet, cx, rval);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.GetValueString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method SetValueNumber
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetValueNumber(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;
-  PRInt32      ib2;
-
-  *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 setValueNumber ( String subKey,
-    //                              String valueName,
-    //                              Number value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(JSVAL_IS_INT(argv[2])) 
-    {
-      ib2 = JSVAL_TO_INT(argv[2]);
-//      ConvertJSValToStr(b2, cx, argv[2]);
-    }
-    else
-    {
-      JS_ReportError(cx, "Parameter 3 must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->SetValueNumber(b0, b1, ib2, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.SetValueNumber() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method GetValueNumber
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegGetValueNumber(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 getValueNumber ( String subKey,
-    //                              Number valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->GetValueNumber(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.GetValueNumber() 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;
-}
-
-
-//
-// 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},
-  {"setValueNumber",            WinRegSetValueNumber,           3},
-  {"getValueNumber",            WinRegGetValueNumber,           2},
-  {"setValue",                  WinRegSetValue,                 3},
-  {"getValue",                  WinRegGetValue,                 2},
-  {0}
-};
-
-PRInt32
-InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype)
-{
-  *winRegPrototype = JS_InitClass( jscontext,         // context
-                                  global,            // global object
-                                  nsnull,            // parent proto 
-                                  &WinRegClass,      // JSClass
-                                  nsnull,            // JSNative ctor
-                                  0,                 // ctor args
-                                  nsnull,            // proto props
-                                  nsnull,            // proto funcs
-                                  nsnull,            // ctor props (static)
-                                  WinRegMethods);    // ctor funcs (static)
-
-  if(nsnull == *winRegPrototype) 
-  {
-    return NS_ERROR_FAILURE;
-  }
-
-  if(PR_FALSE == JS_DefineConstDoubles(jscontext, *winRegPrototype, winreg_constants))
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}

mozilla/xpinstall/src/nsJSWinReg.h

@@ -1,29 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __NS_JSWINREG_H__
-#define __NS_JSWINREG_H__
-
-PRInt32
-InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
-
-#endif

mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp

@@ -1,198 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- *     Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-#include "nsIXPINotifier.h"
-#include "nsLoggingProgressNotifier.h"
-
-#include "nsInstall.h"
-
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsSpecialSystemDirectory.h"
-
-#include "nspr.h"
-
-
-
-nsLoggingProgressNotifier::nsLoggingProgressNotifier()
-    : mLogStream(0)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsLoggingProgressNotifier::~nsLoggingProgressNotifier()
-{
-    if (mLogStream)
-    {
-        NS_WARN_IF_FALSE(PR_FALSE, "We're being destroyed before script finishes!");
-        mLogStream->close();
-        delete mLogStream;
-        mLogStream = 0;
-    }
-}
-
-NS_IMPL_ISUPPORTS(nsLoggingProgressNotifier, NS_GET_IID(nsIXPINotifier));
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::BeforeJavascriptEvaluation(const PRUnichar *URL)
-{
-    nsSpecialSystemDirectory logFile(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-#ifdef XP_MAC
-    logFile += "Install Log";
-#else
-    logFile += "install.log";
-#endif
-
-    mLogStream = new nsOutputFileStream(logFile, PR_WRONLY | PR_CREATE_FILE | PR_APPEND, 0744 );
-    if (!mLogStream) 
-        return NS_ERROR_NULL_POINTER;
-
-    char* time;
-    GetTime(&time);
-
-    mLogStream->seek(logFile.GetFileSize());
-
-    *mLogStream << "-------------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << nsAutoCString(URL) << "  --  " << time << nsEndl;
-    *mLogStream << "-------------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << nsEndl;
-
-    PL_strfree(time);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::AfterJavascriptEvaluation(const PRUnichar *URL)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-    
-    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 PRUnichar *URL, const PRUnichar* UIPackageName)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-//    char* time;
-//    GetTime(&time);
-
-    nsCString name(UIPackageName);
-    nsCString uline;
-    uline.SetCapacity(name.Length());
-    for ( unsigned int i=0; i < name.Length(); ++i)
-        uline.Append('-');
-
-    *mLogStream << "     " << name.GetBuffer() << nsEndl;
-    *mLogStream << "     " << uline.GetBuffer() << nsEndl;
-
-    *mLogStream << nsEndl;
-//    *mLogStream << "     Starting Installation at " << time << nsEndl;   
-//    *mLogStream << nsEndl;
-
-
-//    PL_strfree(time);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::ItemScheduled(const PRUnichar* message )
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::FinalizeProgress(const PRUnichar* message, PRInt32 itemNum, PRInt32 totNum )
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-    *mLogStream << "     [" << (itemNum) << "/" << totNum << "]\t" << nsAutoCString(message) << nsEndl;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::FinalStatus(const PRUnichar *URL, PRInt32 status)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-    *mLogStream << nsEndl;
-
-    switch (status)
-    {
-    case nsInstall::SUCCESS:
-        *mLogStream << "     Install completed successfully" << nsEndl;
-        break;
-
-    case nsInstall::REBOOT_NEEDED:
-        *mLogStream << "     Install completed successfully, restart required" << nsEndl;
-        break;
-
-    case nsInstall::ABORT_INSTALL:
-        *mLogStream << "     Install script aborted" << nsEndl;
-        break;
-
-    case nsInstall::USER_CANCELLED:
-        *mLogStream << "     Install cancelled by user" << nsEndl;
-        break;
-
-    default:
-        *mLogStream << "     Install **FAILED** with error " << status << nsEndl;
-        break;
-    }
-
-    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);
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::LogComment(const PRUnichar* comment)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-    *mLogStream << "     ** " << nsAutoCString(comment) << nsEndl;    
-    return NS_OK;
-}
-

mozilla/xpinstall/src/nsLoggingProgressNotifier.h

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

mozilla/xpinstall/src/nsSoftwareUpdate.cpp

@@ -1,655 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nscore.h"
-#include "nsIGenericFactory.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-#include "nsCRT.h"
-
-#include "nspr.h"
-#include "prlock.h"
-#include "NSReg.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 "nsIAppShellComponent.h"
-#include "nsIRegistry.h"
-#include "nsBuildID.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_CID(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(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-static NS_DEFINE_CID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
-
-static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID);
-static NS_DEFINE_CID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID);
-
-static NS_DEFINE_CID(knsRegistryCID, NS_REGISTRY_CID);
-
-nsSoftwareUpdate* nsSoftwareUpdate::mInstance = nsnull;
-nsIFileSpec*      nsSoftwareUpdate::mProgramDir = nsnull;
-
-#if NOTIFICATION_ENABLE
-#include "nsUpdateNotification.h"
-static NS_DEFINE_CID(kUpdateNotificationCID, NS_XPI_UPDATE_NOTIFIER_CID);
-nsIUpdateNotification*      nsSoftwareUpdate::mUpdateNotifier= nsnull;
-#endif
-
-
-nsSoftwareUpdate *
-nsSoftwareUpdate::GetInstance()
-{
-    if (mInstance == nsnull) 
-        mInstance = new nsSoftwareUpdate();
-
-    NS_IF_ADDREF(mInstance);
-    return mInstance;
-}
-
-
-
-nsSoftwareUpdate::nsSoftwareUpdate()
-: mInstalling(PR_FALSE),
-  mStubLockout(PR_FALSE),
-  mReg(0)
-{
-    NS_INIT_ISUPPORTS();
-
-    mLock = PR_NewLock();
-
-    /***************************************/
-    /* 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() );
-}
-
-
-
-
-
-nsSoftwareUpdate::~nsSoftwareUpdate()
-{
-    PR_Lock(mLock);
-
-    nsInstallInfo* element;
-    for (PRInt32 i=0; i < mJarInstallQueue.Count(); i++)
-    {
-        element = (nsInstallInfo*)mJarInstallQueue.ElementAt(i);
-        //FIX:  need to add to registry....
-        delete element;
-    }
-
-    mJarInstallQueue.Clear();
-
-    PR_Unlock(mLock);
-    PR_DestroyLock(mLock);
-
-    NR_ShutdownRegistry();
-
-    NS_IF_RELEASE( mProgramDir );
-
-    mInstance = nsnull;
-}
-
-
-//------------------------------------------------------------------------
-//  nsISupports implementation
-//------------------------------------------------------------------------
-NS_IMPL_THREADSAFE_ADDREF( nsSoftwareUpdate );
-NS_IMPL_THREADSAFE_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
-    {
-        /* Check for IIDs we support and cast this appropriately. */
-        if ( anIID.Equals( NS_GET_IID(nsISoftwareUpdate) ) ) 
-            *anInstancePtr = (void*) ( (nsISoftwareUpdate*)this );
-        else if ( anIID.Equals( NS_GET_IID(nsIAppShellComponent) ) ) 
-            *anInstancePtr = (void*) ( (nsIAppShellComponent*)this );
-        else if (anIID.Equals( NS_GET_IID(nsPIXPIStubHook) ) )
-            *anInstancePtr = (void*) ( (nsPIXPIStubHook*)this );
-        else if ( anIID.Equals( kISupportsIID ) )
-            *anInstancePtr = (void*) ( (nsISupports*) (nsISoftwareUpdate*) this );
-        else
-        {
-            /* Not an interface we support. */
-            *anInstancePtr = 0;
-            rv = NS_NOINTERFACE;
-        }
-    }
-
-    if (NS_SUCCEEDED(rv))
-        NS_ADDREF_THIS();
-
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::Initialize( nsIAppShellService *anAppShell, nsICmdLineService  *aCmdLineService ) 
-{
-    // Close the registry if open. We left it open through most of startup
-    // so it wouldn't get opened and closed a lot by different services
-    if (mReg) 
-        NR_RegClose(mReg);
-
-    // prevent use of nsPIXPIStubHook by browser
-    mStubLockout = PR_TRUE;
-
-    /***************************************/
-    /* Add us to the Javascript Name Space */
-    /***************************************/
-
-    RegisterNameset();
-
-    /***************************************/
-    /* Register us with NetLib             */
-    /***************************************/
-        // FIX 
-
-
-    /***************************************/
-    /* Create a top level observer         */
-    /***************************************/
-
-    nsLoggingProgressNotifier *logger = new nsLoggingProgressNotifier();
-    RegisterNotifier(logger);
-    
-#if NOTIFICATION_ENABLE
-    /***************************************/
-    /* Create a Update notification object */
-    /***************************************/
-    NS_IF_RELEASE(mUpdateNotifier);
-
-    nsComponentManager::CreateInstance(kUpdateNotificationCID,
-                                       nsnull,
-                                       NS_GET_IID(nsIUpdateNotification),
-                                       (void**)&mUpdateNotifier);
-
-#endif
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::Shutdown()
-{
-#if NOTIFICATION_ENABLED
-    if (mUpdateNotifier)
-    {
-        mUpdateNotifier->DisplayUpdateDialog();
-        NS_RELEASE(mUpdateNotifier);
-    }
-#endif
-
-    // nothing to do here. Should we UnregisterService?
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-nsSoftwareUpdate::RegisterNotifier(nsIXPINotifier *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) mMasterNotifier.RegisterNotifier(notifier);
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::GetMasterNotifier(nsIXPINotifier **notifier)
-{
-    NS_ASSERTION(notifier, "getter has invalid return pointer");
-    if (!notifier)
-        return NS_ERROR_NULL_POINTER;
-
-    *notifier = &mMasterNotifier;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::SetActiveNotifier(nsIXPINotifier *notifier)
-{
-    mMasterNotifier.SetActiveNotifier(notifier);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::InstallJar(  nsIFileSpec* aLocalFile,
-                               const PRUnichar* aURL,
-                               const PRUnichar* aArguments,
-                               long flags,
-                               nsIXPINotifier* aNotifier)
-{
-    if ( !aLocalFile )
-        return NS_ERROR_NULL_POINTER;
-
-    nsInstallInfo *info =
-        new nsInstallInfo( aLocalFile, aURL, aArguments, flags, aNotifier );
-    
-    if (!info)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    PR_Lock(mLock);
-    mJarInstallQueue.AppendElement( info );
-    PR_Unlock(mLock);
-    RunNextInstall();
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::InstallJarCallBack()
-{
-    PR_Lock(mLock);
-
-    nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue.ElementAt(0);
-    if (nextInstall != nsnull)
-        delete nextInstall;
-
-    mJarInstallQueue.RemoveElementAt(0);
-    mInstalling = PR_FALSE;
-
-    PR_Unlock(mLock);
-
-    return RunNextInstall();
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::StartupTasks( PRBool *needAutoreg )
-{
-    PRBool  autoReg = PR_FALSE;
-    RKEY    xpiRoot;
-    REGERR  err;
-
-    *needAutoreg = PR_TRUE;
-
-    // First do any left-over file replacements and deletes
-
-    // NOTE: we leave the registry open until later to prevent
-    // having to load and unload it many times at startup
-
-    if ( REGERR_OK == NR_RegOpen("", &mReg) )
-    {
-        // XXX get a return val and if not all replaced autoreg again later
-        PerformScheduledTasks(mReg);
-
-        // now look for an autoreg flag left behind by XPInstall
-        err = NR_RegGetKey( mReg, ROOTKEY_COMMON, XPI_ROOT_KEY, &xpiRoot);
-        if ( err == REGERR_OK )
-        {
-            char buf[8];
-            err = NR_RegGetEntryString( mReg, xpiRoot, XPI_AUTOREG_VAL,
-                                        buf, sizeof(buf) );
-
-            if ( err == REGERR_OK && !strcmp( buf, "yes" ) )
-                autoReg = PR_TRUE;
-        }
-    }
-
-    // Also check for build number changes
-    nsresult rv;
-    PRInt32 buildID = 0;
-    nsRegistryKey idKey = 0;
-    nsCOMPtr<nsIRegistry> reg = do_GetService(knsRegistryCID,&rv);
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
-        if (NS_SUCCEEDED(rv))
-        {
-            rv = reg->GetSubtree(nsIRegistry::Common,XPCOM_KEY,&idKey);
-            if (NS_SUCCEEDED(rv))
-            {
-                rv = reg->GetInt( idKey, XPI_AUTOREG_VAL, &buildID );
-            }
-        }
-    }
-
-    // Autoregister if we found the XPInstall flag, the stored BuildID
-    // is not the actual BuildID, or if we couldn't get the BuildID
-    if ( autoReg || NS_FAILED(rv) || buildID != NS_BUILD_ID )
-    {
-        rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,0);
-
-        if (NS_SUCCEEDED(rv))
-        {
-            *needAutoreg = PR_FALSE;
-
-            // Now store back into the registries so we don't do this again
-            if ( autoReg )
-                NR_RegSetEntryString( mReg, xpiRoot, XPI_AUTOREG_VAL, "no" );
-
-            if ( buildID != NS_BUILD_ID && idKey != 0 )
-                reg->SetInt( idKey, XPI_AUTOREG_VAL, NS_BUILD_ID );
-        }
-    }
-    else
-    {
-        //We don't need to autoreg, we're up to date
-        *needAutoreg = PR_FALSE;
-#ifdef DEBUG
-        // debug (developer) builds should always autoreg
-        *needAutoreg = PR_TRUE;
-#endif
-    }
-
-    return rv;
-}
-
-
-nsresult
-nsSoftwareUpdate::RunNextInstall()
-{
-    nsresult        rv = NS_OK;
-    nsInstallInfo*  info = nsnull;
-
-    PR_Lock(mLock);
-    if (!mInstalling) 
-    {
-        if ( mJarInstallQueue.Count() > 0 )
-        {
-            info = (nsInstallInfo*)mJarInstallQueue.ElementAt(0);
-
-            if ( info )
-                mInstalling = PR_TRUE;
-            else 
-            {
-                // bogus elements got into the queue
-                NS_ERROR("leaks remaining nsInstallInfos, please file bug!");
-                rv = NS_ERROR_NULL_POINTER;
-                VR_Close();
-            }
-        }
-        else
-        {
-            // nothing more to do
-            VR_Close();
-        }
-    }
-    PR_Unlock(mLock);
-
-    // make sure to RunInstall() outside of locked section due to callbacks
-    if (info)
-        RunInstall( info );
-
-    return rv;
-}
-
-
-nsresult
-nsSoftwareUpdate::RegisterNameset()
-{
-    nsresult rv;
-    nsCOMPtr<nsIScriptNameSetRegistry> namesetService = 
-        do_GetService( kCScriptNameSetRegistryCID, &rv );
-
-    if (NS_SUCCEEDED(rv))
-    {
-        nsSoftwareUpdateNameSet* nameset = new nsSoftwareUpdateNameSet();
-        // the NameSet service will AddRef this one
-        namesetService->AddExternalNameSet( nameset );
-    }
-
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::StubInitialize(nsIFileSpec *aDir)
-{
-    if (mStubLockout)
-        return NS_ERROR_ABORT;
-    else if ( !aDir )
-        return NS_ERROR_NULL_POINTER;
-
-    // only allow once, it could be a mess if we've already started installing
-    mStubLockout = PR_TRUE;
-
-    // fix GetFolder return path
-    mProgramDir = aDir;
-    NS_ADDREF(mProgramDir);
-
-    // make sure registry updates go to the right place
-    nsFileSpec instDir;
-    if (NS_SUCCEEDED( aDir->GetFileSpec( &instDir ) ) )
-        VR_SetRegDirectory( instDir.GetNativePathCString() );
-
-    // Create the logfile observer
-    nsLoggingProgressNotifier *logger = new nsLoggingProgressNotifier();
-    RegisterNotifier(logger);
-
-    // setup version registry path
-    char*    path;
-    nsresult rv = aDir->GetNativePath( &path );
-    if (NS_SUCCEEDED(rv))
-    {
-        VR_SetRegDirectory( path );
-        nsCRT::free( path );
-    }
-
-    return rv;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsSoftwareUpdateNameSet
-////////////////////////////////////////////////////////////////////////////////
-
-nsSoftwareUpdateNameSet::nsSoftwareUpdateNameSet()
-{
-    NS_INIT_ISUPPORTS();
-}
-
-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;
-}
-            
-//----------------------------------------------------------------------
-
-// Functions used to create new instances of a given object by the
-// generic factory.
-
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsSoftwareUpdate,nsSoftwareUpdate::GetInstance);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallTrigger);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallVersion);
-//----------------------------------------------------------------------
-
-
-
-static NS_METHOD 
-RegisterSoftwareUpdate( nsIComponentManager *aCompMgr,
-                        nsIFile *aPath,
-                        const char *registryLocation,
-                        const char *componentType)
-{
-    // get the registry
-    nsIRegistry* registry;
-    nsresult rv = nsServiceManager::GetService(NS_REGISTRY_PROGID,
-                                               NS_GET_IID(nsIRegistry),
-                                               (nsISupports**)&registry);
-    if ( NS_SUCCEEDED( rv ) ) 
-    {
-        registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
-        char buffer[256];
-        char *cid = nsSoftwareUpdate::GetCID().ToString();
-        PR_snprintf( buffer,
-                     sizeof buffer,
-                     "%s/%s",
-                     NS_IAPPSHELLCOMPONENT_KEY,
-                     cid ? cid : "unknown" );
-        nsCRT::free(cid);
-
-        nsRegistryKey key;
-        rv = registry->AddSubtree( nsIRegistry::Common,
-                                   buffer,
-                                   &key );
-        nsServiceManager::ReleaseService(NS_REGISTRY_PROGID, registry);
-    }
-    return rv;
-
-}
-
-
-// The list of components we register
-static nsModuleComponentInfo components[] = 
-{
-    { "SoftwareUpdate Component", 
-       NS_SoftwareUpdate_CID,
-       NS_IXPINSTALLCOMPONENT_PROGID,
-       nsSoftwareUpdateConstructor,
-       RegisterSoftwareUpdate
-    },
-	   
-    { "InstallTrigger Component", 
-       NS_SoftwareUpdateInstallTrigger_CID,
-       NS_INSTALLTRIGGERCOMPONENT_PROGID, 
-       nsInstallTriggerConstructor
-    },
-    
-    { "InstallVersion Component", 
-       NS_SoftwareUpdateInstallVersion_CID,
-       NS_INSTALLVERSIONCOMPONENT_PROGID,
-       nsInstallVersionConstructor 
-    },
-
-#if NOTIFICATION_ENABLED 
-    { "XPInstall Update Notifier", 
-      NS_XPI_UPDATE_NOTIFIER_CID,
-      NS_XPI_UPDATE_NOTIFIER_PROGID, 
-      nsXPINotifierImpl::New
-    },
-#endif
-
-};
-
-
-
-NS_IMPL_NSGETMODULE("nsSoftwareUpdate", components)
-

mozilla/xpinstall/src/nsSoftwareUpdate.h

@@ -1,114 +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 "nsVoidArray.h"
-#include "prlock.h"
-//#include "mozreg.h"
-#include "NSReg.h"
-
-class nsInstallInfo;
-
-#include "nsIScriptExternalNameSet.h"
-#include "nsIAppShellComponent.h"
-#include "nsIXPINotifier.h"
-#include "nsPIXPIStubHook.h"
-#include "nsTopProgressNotifier.h"
-
-#if NOTIFICATION_ENABLE
-#include "nsIUpdateNotification.h"
-#endif
-
-
-#define XPI_ROOT_KEY    "software/mozilla/xpinstall"
-#define XPI_AUTOREG_VAL "Autoreg"
-#define XPCOM_KEY       "software/mozilla/XPCOM"
-
-class nsSoftwareUpdate: public nsIAppShellComponent, 
-                        public nsISoftwareUpdate, 
-                        public nsPIXPIStubHook
-{
-    public:
-        
-        NS_DEFINE_STATIC_CID_ACCESSOR( NS_SoftwareUpdate_CID );
-
-        static nsSoftwareUpdate *GetInstance();
-
-        /** GetProgramDirectory
-         *  information used within the XPI module -- not
-         *  available through any interface
-         */
-        static nsIFileSpec* GetProgramDirectory() { return mProgramDir; }
-
-        NS_DECL_ISUPPORTS
-        NS_DECL_NSIAPPSHELLCOMPONENT
-        
-        NS_IMETHOD InstallJar( nsIFileSpec* localFile,
-                               const PRUnichar* URL,
-                               const PRUnichar* arguments,
-                               long flags = 0,
-                               nsIXPINotifier* notifier = 0);  
-
-        NS_IMETHOD RegisterNotifier(nsIXPINotifier *notifier);
-        
-        NS_IMETHOD InstallJarCallBack();
-        NS_IMETHOD GetMasterNotifier(nsIXPINotifier **notifier);
-        NS_IMETHOD SetActiveNotifier(nsIXPINotifier *notifier);
-        NS_IMETHOD StartupTasks( PRBool* needAutoreg );
-
-        /** StubInitialize() is private for the Install Wizard.
-         *  The mStubLockout property makes sure this is only called
-         *  once, and is also set by the AppShellComponent initialize
-         *  so it can't be called during a normal Mozilla run
-         */
-        NS_IMETHOD StubInitialize(nsIFileSpec *dir);
-
-        nsSoftwareUpdate();
-        virtual ~nsSoftwareUpdate();
-
-
-    private:
-        static   nsSoftwareUpdate* mInstance;
-        static   nsIFileSpec*      mProgramDir;
-
-#if NOTIFICATION_ENABLE
-        static   nsIUpdateNotification *mUpdateNotifier;
-#endif
-        
-        nsresult RunNextInstall();
-        nsresult RegisterNameset();
-        
-        PRLock*           mLock;
-        PRBool            mInstalling;
-        PRBool            mStubLockout;
-        nsVoidArray       mJarInstallQueue;
-        nsTopProgressNotifier   mMasterNotifier;
-
-        HREG              mReg;
-        
-        
-
-};
-
-
-class nsSoftwareUpdateNameSet : public nsIScriptExternalNameSet 
-{
-    public:
-        nsSoftwareUpdateNameSet();
-        virtual ~nsSoftwareUpdateNameSet();
-
-        // nsISupports
-        NS_DECL_ISUPPORTS
-
-        // nsIScriptExternalNameSet
-        NS_IMETHOD InitializeClasses(nsIScriptContext* aScriptContext);
-        NS_IMETHOD AddNameSet(nsIScriptContext* aScriptContext);
-};
-#endif

mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp

@@ -1,448 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsSoftwareUpdate.h"
-#include "nsSoftwareUpdateRun.h"
-#include "nsSoftwareUpdateIIDs.h"
-
-#include "nsInstall.h"
-
-#include "nsRepository.h"
-#include "nsIServiceManager.h"
-
-#include "nsSpecialSystemDirectory.h"
-#include "nsFileStream.h"
-
-#include "nspr.h"
-#include "jsapi.h"
-
-#include "nsIEventQueueService.h"
-#include "nsIEnumerator.h"
-#include "nsIZipReader.h"
-#include "nsIJSRuntimeService.h"
-#include "nsCOMPtr.h"
-
-#include "nsIEventQueueService.h"
-#include "nsILocalFile.h"
-
-static NS_DEFINE_CID(kSoftwareUpdateCID,  NS_SoftwareUpdate_CID);
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-
-extern JSObject *InitXPInstallObjects(JSContext *jscontext, JSObject *global, const nsFileSpec& jarfile, const PRUnichar* url, const PRUnichar* args, nsIZipReader* hZip);
-extern nsresult InitInstallVersionClass(JSContext *jscontext, JSObject *global, void** prototype);
-extern nsresult InitInstallTriggerGlobalClass(JSContext *jscontext, JSObject *global, void** prototype);
-
-// Defined in this file:
-static void     XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report);
-static PRInt32  GetInstallScriptFromJarfile(nsIZipReader* hZip, nsFileSpec& jarFile, char** scriptBuffer, PRUint32 *scriptLength);
-static nsresult SetupInstallContext(nsIZipReader* hZip, const nsFileSpec& jarFile, const PRUnichar* url, const PRUnichar* 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 PRInt32 
-// Argument         : const char* jarFile     - **NSPR** filepath
-// Argument         : char** scriptBuffer     - must be deleted via delete []
-// Argument         : PRUint32 *scriptLength
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-static PRInt32
-GetInstallScriptFromJarfile(nsIZipReader* hZip, nsFileSpec& jarFile, char** scriptBuffer, PRUint32 *scriptLength)
-{
-    PRInt32 result = NS_OK;
-    
-    *scriptBuffer = nsnull;
-    *scriptLength = 0;
-
-    nsCOMPtr<nsILocalFile> jFile;
-    nsresult rv = NS_NewLocalFile(jarFile, getter_AddRefs(jFile));
-    if (NS_SUCCEEDED(rv))
-      rv = hZip->Init(jFile);
-
-    if (NS_FAILED(rv))
-        return nsInstall::CANT_READ_ARCHIVE;
-
-    rv = hZip->Open();
-    if (NS_FAILED(rv))
-        return nsInstall::CANT_READ_ARCHIVE;
-
-    // Extract the install.js file to the temporary directory
-    nsSpecialSystemDirectory installJSFileSpec(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-    installJSFileSpec += "install.js";
-    installJSFileSpec.MakeUnique();
-
-    // Extract the install.js file.
-    nsCOMPtr<nsILocalFile> iFile;
-    rv = NS_NewLocalFile(installJSFileSpec, getter_AddRefs(iFile));
-    if (NS_SUCCEEDED(rv))
-      rv = hZip->Extract("install.js", iFile);
-    if ( NS_SUCCEEDED(rv) )
-    {
-        // Read it into a buffer
-        char* buffer;
-        PRUint32 bufferLength;
-        PRUint32 readLength;
-        result = nsInstall::CANT_READ_ARCHIVE;
-
-        nsInputFileStream fileStream(installJSFileSpec);
-        nsCOMPtr<nsIInputStream> instream = fileStream.GetIStream();
-
-        if ( instream )
-        {
-            instream->Available(&bufferLength);
-            buffer = new char[bufferLength + 1];
-
-            if (buffer != nsnull)
-            {
-                rv = instream->Read(buffer, bufferLength, &readLength);
-
-                if (NS_SUCCEEDED(rv) && readLength > 0)
-                {
-                    *scriptBuffer = buffer;
-                    *scriptLength = readLength;
-                    result = NS_OK;
-                }
-                else
-                {
-                    delete [] buffer;
-                }
-            }
-
-            fileStream.close();
-        }
-
-        installJSFileSpec.Delete(PR_FALSE);
-    }
-    else
-    {
-        result = nsInstall::NO_INSTALL_SCRIPT;
-    }
-
-    return result;   
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name    : SetupInstallContext
-// Description      : Creates a Javascript context and adds our xpinstall objects to it.
-// Return type      : static nsresult
-// Argument         : nsIZipReader hZip - the handle to the open archive file
-// Argument         : const char* jarFile - native filepath to where jar exists on disk 
-// Argument         : const PRUnichar* url  - URL of where this package came from
-// Argument         : const PRUnichar* args    - any arguments passed into the javascript context
-// Argument         : JSRuntime *jsRT    - A valid JS Runtime
-// Argument         : JSContext **jsCX   - Created context, destroy via JS_DestroyContext
-// Argument         : JSObject **jsGlob  - created global object
-///////////////////////////////////////////////////////////////////////////////////////////////
-static nsresult SetupInstallContext(nsIZipReader* hZip,
-                                    const nsFileSpec& jarFile,
-                                    const PRUnichar* url,
-                                    const PRUnichar* args, 
-                                    JSRuntime *rt, 
-                                    JSContext **jsCX, 
-                                    JSObject **jsGlob)
-{
-    JSContext   *cx;
-    JSObject    *glob;
-    
-    *jsCX   = nsnull;
-    *jsGlob = nsnull;
-
-    if (!rt) 
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    cx = JS_NewContext(rt, 8192);
-    if (!cx)
-    {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    JS_SetErrorReporter(cx, XPInstallErrorReporter);
-
-
-    glob = InitXPInstallObjects(cx, nsnull, jarFile, url, args, hZip);
-    // Init standard classes
-    JS_InitStandardClasses(cx, glob);
-
-    // Add our Install class to this context
-    InitInstallVersionClass(cx, glob, nsnull);
-    InitInstallTriggerGlobalClass(cx, glob, nsnull);
-
-    *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() & XPI_NO_NEW_THREAD)
-    {
-        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 = nsnull;
-    PRUint32    scriptLength;
-
-    JSRuntime   *rt;
-    JSContext   *cx;
-    JSObject    *glob;
-
-    nsCOMPtr<nsIZipReader> hZip;
-
-    static NS_DEFINE_IID(kIZipReaderIID, NS_IZIPREADER_IID);
-    static NS_DEFINE_IID(kZipReaderCID,  NS_ZIPREADER_CID);
-    nsresult rv = nsComponentManager::CreateInstance(kZipReaderCID, nsnull, kIZipReaderIID, 
-                                                     getter_AddRefs(hZip));
-
-    if (NS_FAILED(rv))
-        return;
-
-    // we will plan on sending a failure status back from here unless we
-    // find positive acknowledgement that the script sent the status
-    PRInt32     finalStatus;
-    PRBool      sendStatus = PR_TRUE;
-
-    nsIXPINotifier *notifier;
-
-    // lets set up an eventQ so that our xpcom/proxies will not have to:
-    nsCOMPtr<nsIEventQueue> eventQ;
-    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
-    if (NS_SUCCEEDED(rv)) 
-    {   
-        eventQService->CreateThreadEventQueue();
-        eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ));
-    }
-
-    NS_WITH_SERVICE(nsISoftwareUpdate, softwareUpdate, kSoftwareUpdateCID, &rv );
-
-    if (!NS_SUCCEEDED(rv))
-    {
-        NS_WARNING("shouldn't have RunInstall() if we can't get SoftwareUpdate");
-        return;
-    }
-
-    softwareUpdate->SetActiveNotifier( installInfo->GetNotifier() );
-    softwareUpdate->GetMasterNotifier(&notifier);
-    
-    nsString url;
-    installInfo->GetURL(url);
-
-    if(notifier)
-        notifier->BeforeJavascriptEvaluation( url.GetUnicode() );
-    
-    nsString args;
-    installInfo->GetArguments(args);
-
-    nsFileSpec jarpath;
-    rv = installInfo->GetLocalFile(jarpath);
-    if (NS_SUCCEEDED(rv))
-	{
-        finalStatus = GetInstallScriptFromJarfile( hZip,
-                                                   jarpath,
-                                                   &scriptBuffer, 
-                                                   &scriptLength);
-
-        if ( finalStatus == NS_OK && scriptBuffer )
-        {
-            PRBool ownRuntime = PR_FALSE;
-
-            NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "nsJSRuntimeService", &rv);
-            if(NS_FAILED(rv) || NS_FAILED(rtsvc->GetRuntime(&rt)))
-            {
-                // service not available (wizard context?)
-                // create our own runtime
-                ownRuntime = PR_TRUE;
-	            rt = JS_Init(4L * 1024L * 1024L);
-            }
-
-            rv = SetupInstallContext( hZip, jarpath, 
-                                      url.GetUnicode(),
-                                      args.GetUnicode(), 
-                                      rt, &cx, &glob);
-
-            if (NS_SUCCEEDED(rv))
-            {
-                // Go ahead and run!!
-                jsval rval;
-                jsval installedFiles;
-
-                PRBool ok = JS_EvaluateScript(  cx, 
-                                                glob,
-                                                scriptBuffer, 
-                                                scriptLength,
-                                                nsnull,
-                                                0,
-                                                &rval);
-
-
-                if(!ok)
-                {
-                    // problem compiling or running script
-                    if(JS_GetProperty(cx, glob, "_installedFiles", &installedFiles) &&
-                       JSVAL_TO_BOOLEAN(installedFiles))
-                    {
-                        nsInstall *a = (nsInstall*)JS_GetPrivate(cx, glob);
-                        a->InternalAbort(nsInstall::SCRIPT_ERROR);
-                    }
-
-                    finalStatus = nsInstall::SCRIPT_ERROR;
-                }
-                else
-                {
-                    // check to make sure the script sent back a status
-                    jsval sent;
-
-                    if(JS_GetProperty(cx, glob, "_installedFiles", &installedFiles) &&
-                       JSVAL_TO_BOOLEAN(installedFiles))
-                    {
-                      nsInstall *a = (nsInstall*)JS_GetPrivate(cx, glob);
-                      a->InternalAbort(nsInstall::SCRIPT_ERROR);
-                    }
-
-                    if ( JS_GetProperty( cx, glob, "_statusSent", &sent ) &&
-                         JSVAL_TO_BOOLEAN(sent) )
-                        sendStatus = PR_FALSE;
-                    else
-                        finalStatus = nsInstall::SCRIPT_ERROR;
-                }
-
-                JS_DestroyContext(cx);
-            }
-            else
-            {
-                // couldn't initialize install context
-                finalStatus = nsInstall::UNEXPECTED_ERROR;
-            }
-
-            // clean up Runtime if we created it ourselves
-            if ( ownRuntime ) 
-                JS_DestroyRuntime(rt);
-        }
-    }
-    else 
-    {
-        // no path to local jar archive
-        finalStatus = nsInstall::DOWNLOAD_ERROR;
-    }
-
-    if(notifier) 
-    {
-        if ( sendStatus )
-            notifier->FinalStatus( url.GetUnicode(), finalStatus );
-
-        notifier->AfterJavascriptEvaluation( url.GetUnicode() );
-    }
-
-    if (scriptBuffer) delete [] scriptBuffer;
-
-    softwareUpdate->SetActiveNotifier(0);
-    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/nsTopProgressNotifier.cpp

@@ -1,211 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- *     Daniel Veditz <dveditz@netscape.com>
- *     Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-#include "nsIXPINotifier.h"
-#include "nsTopProgressNotifier.h"
-
-nsTopProgressNotifier::nsTopProgressNotifier()
-{
-    NS_INIT_ISUPPORTS();
-    mNotifiers = new nsVoidArray();
-    mActive = 0;
-}
-
-nsTopProgressNotifier::~nsTopProgressNotifier()
-{
-    if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            NS_IF_RELEASE(element);
-        }
-
-        mNotifiers->Clear();
-        delete (mNotifiers);
-    }
-}
-
-
-NS_IMPL_ISUPPORTS(nsTopProgressNotifier, NS_GET_IID(nsIXPINotifier));
-
-
-long
-nsTopProgressNotifier::RegisterNotifier(nsIXPINotifier * newNotifier)
-{
-    NS_IF_ADDREF( newNotifier );
-    return mNotifiers->AppendElement( newNotifier );
-}
-
-
-void
-nsTopProgressNotifier::UnregisterNotifier(long id)
-{
-    nsIXPINotifier *item = (nsIXPINotifier*)mNotifiers->ElementAt(id);
-    NS_IF_RELEASE(item);
-    mNotifiers->ReplaceElementAt(nsnull, id);
-}
-
-
-
-NS_IMETHODIMP
-nsTopProgressNotifier::BeforeJavascriptEvaluation(const PRUnichar *URL)
-{
-    if (mActive)
-        mActive->BeforeJavascriptEvaluation(URL);
-
-    if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            if (element != NULL)
-                element->BeforeJavascriptEvaluation(URL);
-        }
-    }
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::AfterJavascriptEvaluation(const PRUnichar *URL)
-{
-    if (mActive)
-        mActive->AfterJavascriptEvaluation(URL);
-
-    if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            if (element != NULL)
-                element->AfterJavascriptEvaluation(URL);
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::InstallStarted(const PRUnichar *URL, const PRUnichar* UIPackageName)
-{
-    if (mActive)
-        mActive->InstallStarted(URL, UIPackageName);
-
-    if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            if (element != NULL)
-                element->InstallStarted(URL, UIPackageName);
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::ItemScheduled( const PRUnichar* message )
-{
-    long rv = 0;
-
-    if (mActive)
-        mActive->ItemScheduled( message );
-
-    if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            if (element != NULL)
-                element->ItemScheduled( message );
-        }
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::FinalizeProgress( const PRUnichar* message, PRInt32 itemNum, PRInt32 totNum )
-{
-    if (mActive)
-        mActive->FinalizeProgress( message, itemNum, totNum );
-
-    if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            if (element != NULL)
-                element->FinalizeProgress( message, itemNum, totNum );
-        }
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::FinalStatus(const PRUnichar *URL, PRInt32 status)
-{
-    if (mActive)
-        mActive->FinalStatus(URL, status);
-
-    if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            if (element != NULL)
-                element->FinalStatus(URL,status);
-        }
-    }
-   return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::LogComment(const PRUnichar* comment)
-{
-    if (mActive)
-        mActive->LogComment(comment);
-
-   if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            if (element != NULL)
-                element->LogComment(comment);
-        }
-    }
-   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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- *     Daniel Veditz <dveditz@netscape.com>
- */
-
-#ifndef nsTopProgressNotifier_h__
-#define nsTopProgressNotifier_h__
-
-#include "nsCOMPtr.h"
-#include "nsIXPINotifier.h"
-#include "nsVoidArray.h"
-
-
-class nsTopProgressNotifier : public nsIXPINotifier
-{
-    public:
-
-        nsTopProgressNotifier();
-        virtual ~nsTopProgressNotifier();
-
-        long RegisterNotifier(nsIXPINotifier * newNotifier);
-        void UnregisterNotifier(long id);
-        void SetActiveNotifier(nsIXPINotifier *aNotifier) 
-            { mActive = aNotifier; }
-
-        NS_DECL_ISUPPORTS
-
-        // implements nsIXPINotifier
-        NS_DECL_NSIXPINOTIFIER
-   
-   private:
-        nsVoidArray     *mNotifiers;
-        nsCOMPtr<nsIXPINotifier>  mActive;
-
-};
-
-#endif

mozilla/xpinstall/src/nsUpdateNotification.cpp

@@ -1,645 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Doug Turner <dougt@netscape.com>
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nsUpdateNotification.h"
-
-#include "nsISupports.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsIGenericFactory.h"
-#include "nsIRDFContainer.h"
-#include "nsIRDFDataSource.h"
-#include "nsIRDFService.h"
-#include "nsIRDFRemoteDataSource.h"
-#include "nsRDFCID.h"
-#include "nsIRDFXMLSink.h"
-
-#include "nsIPref.h"
-#include "nsISoftwareUpdate.h"
-
-#define NC_RDF_NAME	         	"http://home.netscape.com/NC-rdf#name"
-#define NC_RDF_SOURCE			"http://home.netscape.com/NC-rdf#source"
-#define NC_RDF_URL				"http://home.netscape.com/NC-rdf#url"
-#define NC_RDF_CHILD			"http://home.netscape.com/NC-rdf#child"
-
-#define NC_RDF_NOTIFICATION_ROOT	"http://home.netscape.com/NC-rdf#SoftwareNotificationRoot"
-#define NC_XPI_SOURCES              "http://home.netscape.com/NC-rdf#SoftwareUpdateDataSources"
-#define NC_XPI_PACKAGES             "http://home.netscape.com/NC-rdf#SoftwarePackages"
-
-#define NC_XPI_TITLE        "http://home.netscape.com/NC-rdf#title"
-#define NC_XPI_REGKEY       "http://home.netscape.com/NC-rdf#registryKey"
-#define NC_XPI_VERSION      "http://home.netscape.com/NC-rdf#version"
-#define NC_XPI_DESCRIPTION	"http://home.netscape.com/NC-rdf#description"
-
-static NS_DEFINE_CID(kRDFServiceCID,   NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID);
-static NS_DEFINE_IID(kPrefsIID, NS_IPREF_IID);
-static NS_DEFINE_IID(kPrefsCID,  NS_PREF_CID);
-
-
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierSources = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackages = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackage_Title = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackage_Version = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackage_Description = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackage_RegKey = nsnull;
-
-nsIRDFResource* nsXPINotifierImpl::kNC_NotificationRoot = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kNC_Source = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kNC_Name = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kNC_URL = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kNC_Child = nsnull;
-
-
-nsXPINotifierImpl::nsXPINotifierImpl()
-    : mRDF(nsnull)
-{
-    NS_INIT_REFCNT();
-
-    mPendingRefreshes = 0;
-
-    static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);
-    
-    nsComponentManager::CreateInstance(kRDFInMemoryDataSourceCID,
-                                       nsnull,
-                                       NS_GET_IID(nsISupports),
-                                       getter_AddRefs(mNotifications));
-}
-
-
-nsXPINotifierImpl::~nsXPINotifierImpl()
-{
-    if (mRDF) 
-    {
-        nsServiceManager::ReleaseService(kRDFServiceCID, mRDF);
-        mRDF = nsnull;
-    }
-
-    NS_IF_RELEASE(kXPI_NotifierSources);
-    NS_IF_RELEASE(kXPI_NotifierPackages);
-    NS_IF_RELEASE(kXPI_NotifierPackage_Title);
-    NS_IF_RELEASE(kXPI_NotifierPackage_Version);
-    NS_IF_RELEASE(kXPI_NotifierPackage_Description);
-    NS_IF_RELEASE(kXPI_NotifierPackage_RegKey);
-
-   	NS_IF_RELEASE(kNC_NotificationRoot);
-    NS_IF_RELEASE(kNC_Source);
-	NS_IF_RELEASE(kNC_Name);
-	NS_IF_RELEASE(kNC_URL);
-	NS_IF_RELEASE(kNC_Child);
-}
-
-
-NS_IMPL_ISUPPORTS2(nsXPINotifierImpl, nsIRDFXMLSinkObserver, nsIUpdateNotification);
-
-
-nsresult
-nsXPINotifierImpl::NotificationEnabled(PRBool* aReturn)
-{
-    *aReturn = PR_FALSE;
-
-
-    nsIPref * prefs;
-    nsresult rv = nsServiceManager::GetService(kPrefsCID, 
-                                               kPrefsIID,
-                                               (nsISupports**) &prefs);
-
-    
-    
-    if ( NS_SUCCEEDED(rv) )
-    {
-        PRBool value;
-        // check to see if we are on.
-        rv = prefs->GetBoolPref( (const char*) XPINSTALL_NOTIFICATIONS_ENABLE, &value);
-
-        if (NS_SUCCEEDED(rv) && value)
-        {
-            // check to see the last time we did anything.  Since flash does not have a persistant
-            // way to do poll invervals longer than a session, we will implemented that here by using the
-            // preferences.  
-
-            PRInt32 intervalHours = 0;
-            
-            PRTime now            = 0;
-            PRInt32 nowSec        = 0;
-
-            PRInt32 lastTime      = 0;
-            
-            rv = prefs->GetIntPref(XPINSTALL_NOTIFICATIONS_INTERVAL, &intervalHours);
-
-            if (NS_FAILED(rv))
-            {
-                intervalHours = 7*24;  // default at once a week
-                rv = prefs->SetIntPref(XPINSTALL_NOTIFICATIONS_INTERVAL, intervalHours);
-            }
-
-            rv = prefs->GetIntPref(XPINSTALL_NOTIFICATIONS_LASTDATE, &lastTime);
-    
-            now = PR_Now();
-
-            // nowSec = now / 1000000
-            LL_DIV(nowSec, now, 1000000);
-
-            if (NS_FAILED(rv) || lastTime == 0)
-            {
-                rv = prefs->SetIntPref(XPINSTALL_NOTIFICATIONS_LASTDATE, nowSec);
-                return NS_OK;
-            }
-            
-            if ((lastTime + (intervalHours*60*24)) <= nowSec)
-            {
-                *aReturn = PR_TRUE;
-            }
-
-            NS_RELEASE(prefs);
-        }
-    }
-    
-    return NS_OK;
-}
-
-nsresult
-nsXPINotifierImpl::Init()
-{
-    PRBool enabled;
-
-    NotificationEnabled(&enabled);
-
-    if (!enabled)
-        return NS_ERROR_FAILURE;
-    
-    if (mNotifications == nsnull)
-        return NS_ERROR_FAILURE;
-
-    nsresult rv;
-    nsCOMPtr<nsIRDFDataSource> distributors;
-    nsCOMPtr<nsIRDFContainer> distributorsContainer;
-    nsCOMPtr <nsISimpleEnumerator> distributorEnumerator;
-    PRBool moreElements;
-    
-    // Read the distributor registry
-    rv = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService), (nsISupports**) &mRDF);
-    if (NS_FAILED(rv)) return rv;
-    
-    if (! kXPI_NotifierSources)
-	{
-	   mRDF->GetResource(NC_XPI_SOURCES,       &kXPI_NotifierSources);
-       mRDF->GetResource(NC_XPI_PACKAGES,      &kXPI_NotifierPackages);
-       mRDF->GetResource(NC_XPI_TITLE,         &kXPI_NotifierPackage_Title);
-       mRDF->GetResource(NC_XPI_VERSION,       &kXPI_NotifierPackage_Version);
-       mRDF->GetResource(NC_XPI_DESCRIPTION,   &kXPI_NotifierPackage_Description);
-       mRDF->GetResource(NC_XPI_REGKEY,        &kXPI_NotifierPackage_RegKey);
-
-       mRDF->GetResource(NC_RDF_NOTIFICATION_ROOT,  &kNC_NotificationRoot);
-       
-       mRDF->GetResource(NC_RDF_SOURCE,             &kNC_Source);
-	   mRDF->GetResource(NC_RDF_NAME,               &kNC_Name);
-	   mRDF->GetResource(NC_RDF_URL,                &kNC_URL);
-	   mRDF->GetResource(NC_RDF_CHILD,              &kNC_Child);
-
-	}
-
-    rv = OpenRemoteDataSource(BASE_DATASOURCE_URL, PR_TRUE, getter_AddRefs(distributors));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = nsComponentManager::CreateInstance(kRDFContainerCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIRDFContainer),
-                                            getter_AddRefs(distributorsContainer));
-
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = distributorsContainer->Init(distributors, kXPI_NotifierSources);
-        
-        if (NS_SUCCEEDED(rv))
-        {
-            rv = distributorsContainer->GetElements(getter_AddRefs(distributorEnumerator));
-
-            if (NS_SUCCEEDED(rv))
-            {
-                distributorEnumerator->HasMoreElements(&moreElements);
-                while (moreElements) 
-                {
-                    nsCOMPtr<nsISupports> i;
-                    rv = distributorEnumerator->GetNext(getter_AddRefs(i));
-                    if (NS_FAILED(rv)) break;
-
-                    nsCOMPtr<nsIRDFResource> aDistributor(do_QueryInterface(i, &rv));
-                    if (NS_FAILED(rv)) break;
-
-                    char* uri;
-                    nsCOMPtr<nsIRDFDataSource> remoteDatasource;
-                    aDistributor->GetValue(&uri);
-
-                    rv = OpenRemoteDataSource(uri, PR_FALSE, getter_AddRefs(remoteDatasource));
-					nsAllocator::Free(uri);
-                    if (NS_FAILED(rv)) break;
-                    
-                    distributorEnumerator->HasMoreElements(&moreElements);
-                }
-            }
-        }
-    }
-    return NS_OK;
-}
-
-
-PRBool 
-nsXPINotifierImpl::IsNewerOrUninstalled(const char* regKey, const char* versionString)
-{
-    PRBool needJar = PR_FALSE;
-
-    REGERR status = VR_ValidateComponent( (char*) regKey );
-
-    if ( status == REGERR_NOFIND || status == REGERR_NOFILE )
-    {
-        // either component is not in the registry or it's a file
-        // node and the physical file is missing
-        needJar = PR_TRUE;
-    }
-    else
-    {
-        VERSION oldVersion;
-
-        status = VR_GetVersion( (char*)regKey, &oldVersion );
-        
-        if ( status != REGERR_OK )
-        {
-            needJar = PR_TRUE;
-        }
-        else 
-        {
-            VERSION newVersion;
-
-            StringToVersionNumbers(versionString, &(newVersion).major, &(newVersion).minor, &(newVersion).release, &(newVersion).build);
-            
-            if ( CompareVersions(&oldVersion, &newVersion) < 0 )
-                needJar = PR_TRUE;
-        }
-    }
-    return needJar;
-}
-
-
-PRInt32
-nsXPINotifierImpl::CompareVersions(VERSION *oldversion, VERSION *newVersion)
-{
-    PRInt32 diff;
-    
-    if ( oldversion->major == newVersion->major ) 
-    {
-        if ( oldversion->minor == newVersion->minor ) 
-        {
-            if ( oldversion->release == newVersion->release ) 
-            {
-                if ( oldversion->build == newVersion->build )
-                    diff = 0;
-                else if ( oldversion->build > newVersion->build )
-                    diff = 1;
-                else
-                    diff = -1;
-            }
-            else if ( oldversion->release > newVersion->release )
-                diff = 1;
-            else
-                diff = -1;
-        }
-        else if (  oldversion->minor > newVersion->minor )
-            diff = 1;
-        else
-            diff = -1;
-    }
-    else if ( oldversion->major > newVersion->major )
-        diff = 1;
-    else
-        diff = -1;
-
-    return diff;
-}
-
-
-void
-nsXPINotifierImpl::StringToVersionNumbers(const nsString& version, int32 *aMajor, int32 *aMinor, int32 *aRelease, int32 *aBuild)    
-{
-    PRInt32 errorCode;
-
-    int dot = version.FindChar('.', PR_FALSE,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.FindChar('.',PR_FALSE,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.FindChar('.',PR_FALSE,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);
-               }
-            }
-        }
-    }
-}
-
-nsresult
-nsXPINotifierImpl::OpenRemoteDataSource(const char* aURL, PRBool blocking, nsIRDFDataSource** aResult)
-{
-    static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID);
-    nsresult rv;
-
-    nsCOMPtr<nsIRDFRemoteDataSource> remote;
-    rv = nsComponentManager::CreateInstance(kRDFXMLDataSourceCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIRDFRemoteDataSource),
-                                            getter_AddRefs(remote));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = remote->Init(aURL);
-    if (NS_SUCCEEDED(rv)) 
-    {
-        if (! blocking)
-        {
-            nsCOMPtr<nsIRDFXMLSink> sink = do_QueryInterface(remote, &rv);
-            if (NS_FAILED(rv)) return rv;
-
-            rv = sink->AddXMLSinkObserver(this);
-            if (NS_FAILED(rv)) return rv;
-        }
-
-        rv = remote->Refresh(blocking);
-        if (NS_FAILED(rv)) return rv;
-
-        nsCOMPtr<nsIRDFDataSource> result = do_QueryInterface(remote, &rv);
-        *aResult = result;
-        NS_IF_ADDREF(*aResult);
-        return rv;
-    }
-    else 
-    {
-        // we've already loaded this datasource. use cached copy
-        return mRDF->GetDataSource(aURL, aResult);
-    }
-}
-
-
-NS_IMETHODIMP
-nsXPINotifierImpl::New(nsISupports* aOuter, REFNSIID aIID, void** aResult)
-{
-    NS_PRECONDITION(aOuter == nsnull, "no aggregation");
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsXPINotifierImpl* result = new nsXPINotifierImpl();
-    if (! result)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(result); // stabilize
-
-    nsresult rv;
-    rv = result->Init();
-    if (NS_SUCCEEDED(rv)) {
-        rv = result->QueryInterface(aIID, aResult);
-    }
-
-    NS_RELEASE(result);
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsXPINotifierImpl::OnBeginLoad(nsIRDFXMLSink *aSink)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXPINotifierImpl::OnInterrupt(nsIRDFXMLSink *aSink)
-{
-    return NS_OK;
-}
-NS_IMETHODIMP
-nsXPINotifierImpl::OnResume(nsIRDFXMLSink *aSink)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXPINotifierImpl::OnEndLoad(nsIRDFXMLSink *aSink)
-{
-    nsresult rv;
-
-    (void) aSink->RemoveXMLSinkObserver(this);
-
-    nsCOMPtr<nsIRDFDataSource> distributorDataSource = do_QueryInterface(aSink, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIRDFContainer> distributorContainer;
-    nsCOMPtr <nsISimpleEnumerator> packageEnumerator;
-    PRBool moreElements;
-
-    rv = nsComponentManager::CreateInstance(kRDFContainerCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIRDFContainer),
-                                            getter_AddRefs(distributorContainer));
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = distributorContainer->Init(distributorDataSource, kXPI_NotifierPackages);
-        if (NS_SUCCEEDED(rv))
-        {
-            rv = distributorContainer->GetElements(getter_AddRefs(packageEnumerator));
-            if (NS_SUCCEEDED(rv))
-            {
-                packageEnumerator->HasMoreElements(&moreElements);
-                while (moreElements) 
-                {
-                    nsCOMPtr<nsISupports> i;
-
-                    rv = packageEnumerator->GetNext(getter_AddRefs(i));
-                    if (NS_FAILED(rv)) break;
-
-                    nsCOMPtr<nsIRDFResource> aPackage(do_QueryInterface(i, &rv));
-                    if (NS_FAILED(rv)) break;
-    
-                    
-                    // Get the version information
-                    nsCOMPtr<nsIRDFNode> versionNode;
-                    distributorDataSource->GetTarget(aPackage, 
-                                                     kXPI_NotifierPackage_Version, 
-                                                     PR_TRUE, 
-                                                     getter_AddRefs(versionNode));
-
-                    nsCOMPtr<nsIRDFLiteral> version(do_QueryInterface(versionNode, &rv));
-                    if (NS_FAILED(rv)) break;
-
-                    // Get the regkey information
-                    nsCOMPtr<nsIRDFNode> regkeyNode;
-                    distributorDataSource->GetTarget(aPackage, 
-                                                     kXPI_NotifierPackage_RegKey, 
-                                                     PR_TRUE, 
-                                                     getter_AddRefs(regkeyNode));
-
-                    nsCOMPtr<nsIRDFLiteral> regkey(do_QueryInterface(regkeyNode, &rv));
-                    if (NS_FAILED(rv)) break;
-
-                    // convert them into workable nsAutoStrings
-                    PRUnichar* regkeyCString;
-                    regkey->GetValue(&regkeyCString);
-                    nsString regKeyString(regkeyCString);
-                    
-                    PRUnichar* versionCString;
-                    version->GetValue(&versionCString);
-                    nsString versionString(versionCString);
-					nsAllocator::Free(versionCString);
-					nsAllocator::Free(regkeyCString);
-
-                    // check to see if this software title should be "flashed"
-                    if (IsNewerOrUninstalled(nsAutoCString(regKeyString), nsAutoCString(versionString)))
-                    {
-                        //assert into flash
-                        
-                        nsCOMPtr<nsIRDFNode> urlNode;
-                        distributorDataSource->GetTarget(kXPI_NotifierPackages, 
-                                                         kNC_URL, 
-                                                         PR_TRUE, 
-                                                         getter_AddRefs(urlNode));
-
-                        nsCOMPtr<nsIRDFLiteral> url(do_QueryInterface(urlNode, &rv));
-                        if (NS_FAILED(rv)) break;
-
-
-                        nsCOMPtr<nsIRDFNode> titleNode;
-                        distributorDataSource->GetTarget(kXPI_NotifierPackages, 
-                                                         kXPI_NotifierPackage_Title, 
-                                                         PR_TRUE, 
-                                                         getter_AddRefs(titleNode));
-
-                        nsCOMPtr<nsIRDFLiteral> title(do_QueryInterface(titleNode, &rv));
-                        if (NS_FAILED(rv)) break;
-
-                        nsCOMPtr<nsIRDFDataSource> ds = do_QueryInterface(mNotifications);
-
-                        ds->Assert(aPackage, kNC_Name, title, PR_TRUE);
-                        ds->Assert(aPackage, kNC_URL, url, PR_TRUE);
-
-                        ds->Assert(kNC_NotificationRoot, kNC_Child, aPackage, PR_TRUE);
-                        break;
-
-                    }
-                }
-            }
-        }
-    }
-	VR_Close();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsXPINotifierImpl::OnError(nsIRDFXMLSink *aSink, nsresult aResult, const PRUnichar* aErrorMsg)
-{
-    (void) aSink->RemoveXMLSinkObserver(this);
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsXPINotifierImpl::DisplayUpdateDialog(void)
-{
-    nsresult rv;
-    nsCOMPtr <nsISimpleEnumerator> packages;
-    PRBool moreElements;
-
-    nsCOMPtr<nsIRDFDataSource> ds = do_QueryInterface(mNotifications, &rv);
-
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = ds->GetAllResources(getter_AddRefs(packages));
-        if (NS_SUCCEEDED(rv))
-        {
-            packages->HasMoreElements(&moreElements);
-            while (moreElements) 
-            {
-                nsCOMPtr<nsISupports> i;
-
-                rv = packages->GetNext(getter_AddRefs(i));
-                if (NS_FAILED(rv)) break;
-
-                nsCOMPtr<nsIRDFResource> aPackage(do_QueryInterface(i, &rv));
-                if (NS_FAILED(rv)) break;
-
-                
-                // Get the version information
-                nsCOMPtr<nsIRDFNode> name;
-                ds->GetTarget(aPackage, 
-                              nsXPINotifierImpl::kNC_Name, 
-                              PR_TRUE, 
-                              getter_AddRefs(name));
-
-                nsCOMPtr<nsIRDFLiteral> nameLiteral = do_QueryInterface(name, &rv);
-                if (NS_FAILED(rv)) break;
-            }
-        }
-    }
-    return rv;
-}
-
-
-

mozilla/xpinstall/src/nsUpdateNotification.h

@@ -1,92 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Doug Turner <dougt@netscape.com>
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nsCOMPtr.h"
-
-#include "nsIRDFDataSource.h"
-#include "nsRDFCID.h"
-#include "nsIRDFXMLSink.h"
-#include "nsIRDFResource.h"
-#include "nsIRDFService.h"
-
-#include "VerReg.h"
-
-#include "nsIUpdateNotification.h"
-
-#define NS_XPI_UPDATE_NOTIFIER_DATASOURCE_CID \
-{ 0x69fdc800, 0x4050, 0x11d3, { 0xbe, 0x2f, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } }
-
-#define NS_XPI_UPDATE_NOTIFIER_CID \
-{ 0x68a24e36, 0x042d, 0x11d4, { 0xac, 0x85, 0x0, 0xc0, 0x4f, 0xa0, 0xd2, 0x6b } }
-
-#define NS_XPI_UPDATE_NOTIFIER_PROGID "component://mozilla/xpinstall/notifier"
-
-#define BASE_DATASOURCE_URL "chrome://xpinstall/content/SoftwareUpdates.rdf"
-
-
-
-class nsXPINotifierImpl : public nsIUpdateNotification, public nsIRDFXMLSinkObserver
-{
-
-public:
-    static NS_IMETHODIMP New(nsISupports* aOuter, REFNSIID aIID, void** aResult);
-    
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIRDFXMLSINKOBSERVER
-    NS_DECL_NSIUPDATENOTIFICATION    
-
-protected:
-    
-    nsXPINotifierImpl();
-    virtual ~nsXPINotifierImpl();
-
-    nsresult NotificationEnabled(PRBool* aReturn);
-    nsresult Init();
-    nsresult OpenRemoteDataSource(const char* aURL, PRBool blocking, nsIRDFDataSource** aResult);
-    
-    PRBool IsNewerOrUninstalled(const char* regKey, const char* versionString);
-    PRInt32 CompareVersions(VERSION *oldversion, VERSION *newVersion);
-    void   StringToVersionNumbers(const nsString& version, int32 *aMajor, int32 *aMinor, int32 *aRelease, int32 *aBuild);
-    
-    nsCOMPtr<nsISupports> mNotifications;
-    nsIRDFService* mRDF;
-
-    PRUint32 mPendingRefreshes;
-
-    static nsIRDFResource* kXPI_NotifierSources;
-    static nsIRDFResource* kXPI_NotifierPackages;
-    static nsIRDFResource* kXPI_NotifierPackage_Title;
-    static nsIRDFResource* kXPI_NotifierPackage_Version;
-    static nsIRDFResource* kXPI_NotifierPackage_Description;
-    static nsIRDFResource* kXPI_NotifierPackage_RegKey;
-
-    static nsIRDFResource* kNC_NotificationRoot;
-    static nsIRDFResource* kNC_Source;
-	static nsIRDFResource* kNC_Name;
-	static nsIRDFResource* kNC_URL;
-	static nsIRDFResource* kNC_Child;
-	
-};

mozilla/xpinstall/src/nsWinProfile.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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsWinProfile.h"
-#include "nsWinProfileItem.h"
-#include "nspr.h"
-#include <windows.h>
-
-/* Public Methods */
-
-MOZ_DECL_CTOR_COUNTER(nsWinProfile);
-
-nsWinProfile::nsWinProfile( nsInstall* suObj, const nsString& folder, const nsString& file )
-{
-  MOZ_COUNT_CTOR(nsWinProfile);
-
-  mFilename = new nsString(folder);
-    
-  if (mFilename)
-  {
-    if(mFilename->Last() != '\\')
-    {
-        mFilename->Append("\\");
-    }
-    mFilename->Append(file);
-
-	mInstallObject = suObj;
-  }
-}
-
-nsWinProfile::~nsWinProfile()
-{
-  if (mFilename)
-      delete mFilename;
-
-  MOZ_COUNT_DTOR(nsWinProfile);
-
-}
-
-PRInt32
-nsWinProfile::GetString(nsString section, nsString key, nsString* aReturn)
-{
-  return NativeGetString(section, key, aReturn);
-}
-
-PRInt32
-nsWinProfile::WriteString(nsString section, nsString key, nsString value, PRInt32* aReturn)
-{
-  *aReturn = NS_OK;
-  
-  nsWinProfileItem* wi = new nsWinProfileItem(this, section, key, value, aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if (mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-  
-  return NS_OK;
-}
-
-nsString* nsWinProfile::GetFilename()
-{
-	return mFilename;
-}
-
-nsInstall* nsWinProfile::InstallObject()
-{
-	return mInstallObject;
-}
-
-PRInt32
-nsWinProfile::FinalWriteString( nsString section, nsString key, nsString value )
-{
-	/* do we need another security check here? */
-	return NativeWriteString(section, key, value);
-}
-
-/* Private Methods */
-
-#define STRBUFLEN 255
-  
-PRInt32
-nsWinProfile::NativeGetString(nsString section, nsString key, nsString* aReturn )
-{
-  int       numChars;
-  char      valbuf[STRBUFLEN];
-  char*     sectionCString;
-  char*     keyCString;
-  char*     filenameCString;
-
-  /* make sure conversions worked */
-  if(section.First() != '\0' && key.First() != '\0' && mFilename->First() != '\0')
-  {
-    sectionCString  = section.ToNewCString();
-    keyCString      = key.ToNewCString();
-    filenameCString = mFilename->ToNewCString();
-
-    numChars        = GetPrivateProfileString(sectionCString, keyCString, "", valbuf, STRBUFLEN, filenameCString);
-
-    *aReturn        = valbuf;
-
-    if (sectionCString)   Recycle(sectionCString);
-    if (keyCString)       Recycle(keyCString);
-    if (filenameCString)  Recycle(filenameCString);
-  }
-
-  return numChars;
-}
-
-PRInt32
-nsWinProfile::NativeWriteString( nsString section, nsString key, nsString value )
-{
-  char* sectionCString;
-  char* keyCString;
-  char* valueCString;
-  char* filenameCString;
-  int   success = 0;
-
-	/* make sure conversions worked */
-  if(section.First() != '\0' && key.First() != '\0' && mFilename->First() != '\0')
-  {
-    sectionCString  = section.ToNewCString();
-    keyCString      = key.ToNewCString();
-    valueCString    = value.ToNewCString();
-    filenameCString = mFilename->ToNewCString();
-
-    success = WritePrivateProfileString( sectionCString, keyCString, valueCString, filenameCString );
-
-    if (sectionCString)   Recycle(sectionCString);
-    if (keyCString)       Recycle(keyCString);
-    if (valueCString)     Recycle(valueCString);
-    if (filenameCString)  Recycle(filenameCString);
-  }
-
-  return success;
-}
-

mozilla/xpinstall/src/nsWinProfile.h

@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsWinProfile_h__
-#define nsWinProfile_h__
-
-#include "prtypes.h"
-
-#include "nsInstall.h"
-
-class nsWinProfile
-{
-  public:
-
-    /* Public Fields */
-
-    /* Public Methods */
-
-    nsWinProfile( nsInstall* suObj, const nsString& folder, const nsString& file );
-    ~nsWinProfile(); 
-
-    /**
-     * Schedules a write into a windows "ini" file.  "Value" can be
-     * null to delete the value, but we don't support deleting an entire
-     * section via a null "key".  The actual write takes place during
-     * SoftwareUpdate.FinalizeInstall();
-     *
-     * @return  false for failure, true for success
-     */
-    PRInt32 WriteString( nsString section, nsString key, nsString value, PRInt32* aReturn );
-    
-    /**
-     * Reads a value from a windows "ini" file.  We don't support using
-     * a null "key" to return a list of keys--you have to know what you want
-     *
-     * @return  String value from INI, "" if not found, null if error
-     */
-    PRInt32 GetString( nsString section, nsString key, nsString* aReturn );
-    
-    nsString* GetFilename();
-    nsInstall* InstallObject();
-    
-    PRInt32 FinalWriteString( nsString section, nsString key, nsString value );
-
-    
-  private:
-    
-    /* Private Fields */
-    nsString*  mFilename;
-    nsInstall* mInstallObject;
-    
-    /* Private Methods */
-    PRInt32 NativeWriteString( nsString section, nsString key, nsString value );
-    PRInt32 NativeGetString( nsString section, nsString key, nsString* aReturn );
-};
-
-#endif /* nsWinProfile_h__ */

mozilla/xpinstall/src/nsWinProfileItem.cpp

@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-#include "nsWinProfileItem.h"
-#include "nspr.h"
-#include <windows.h>
-
-/* Public Methods */
-
-MOZ_DECL_CTOR_COUNTER(nsWinProfileItem);
-
-nsWinProfileItem::nsWinProfileItem(nsWinProfile* profileObj, 
-                                   nsString sectionName,
-                                   nsString keyName,
-                                   nsString val,
-                                   PRInt32 *aReturn) : nsInstallObject(profileObj->InstallObject())
-{
-  MOZ_COUNT_CTOR(nsWinProfileItem);
-
-  mProfile = profileObj;
-  mSection = new nsString(sectionName);
-  mKey     = new nsString(keyName);
-  mValue   = new nsString(val);
-
-  *aReturn = nsInstall::SUCCESS;
-
-  if((mSection == nsnull) ||
-     (mKey     == nsnull) ||
-     (mValue   == nsnull))
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-  }
-}
-
-nsWinProfileItem::~nsWinProfileItem()
-{
-  if (mSection) delete mSection;
-  if (mKey)     delete mKey;
-  if (mValue)   delete mValue;
-
-  MOZ_COUNT_DTOR(nsWinProfileItem);
-}
-
-PRInt32 nsWinProfileItem::Complete()
-{
-	if (mProfile) 
-        mProfile->FinalWriteString(*mSection, *mKey, *mValue);
-	
-    return NS_OK;
-}
-  
-char* nsWinProfileItem::toString()
-{
-  char*     resultCString;
-  
-  nsString* filename = new nsString(*mProfile->GetFilename());
-  nsString* result = new nsString("Write ");
-
-  if (filename == nsnull || result == nsnull)
-      return nsnull;
-
-  result->Append(*filename);
-  result->Append(": [");
-  result->Append(*mSection);
-  result->Append("] ");
-  result->Append(*mKey);
-  result->Append("=");
-  result->Append(*mValue);
-
-  resultCString = result->ToNewCString();
-  
-  if (result)   delete result;
-  if (filename) delete filename;
-
-  return resultCString;
-}
-
-void nsWinProfileItem::Abort()
-{
-}
-
-PRInt32 nsWinProfileItem::Prepare()
-{
-	return nsnull;
-}
-
-
-/* CanUninstall
-* WinProfileItem() does not install any files which can be uninstalled,
-* hence this function returns false. 
-*/
-PRBool 
-nsWinProfileItem::CanUninstall()
-{
-    return PR_FALSE;
-}
-
-/* RegisterPackageNode
-* WinProfileItem() installs files which need to be registered,
-* hence this function returns true.
-*/
-PRBool
-nsWinProfileItem::RegisterPackageNode()
-{
-    return PR_TRUE;
-}
-

mozilla/xpinstall/src/nsWinProfileItem.h

@@ -1,81 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsWinProfileItem_h__
-#define nsWinProfileItem_h__
-
-#include "prtypes.h"
-#include "nsSoftwareUpdate.h"
-#include "nsInstallObject.h"
-#include "nsWinProfile.h"
-
-
-PR_BEGIN_EXTERN_C
-
-class nsWinProfileItem : public nsInstallObject {
-
-public:
-
-  /* Public Fields */
-
-  /* Public Methods */
-
-  nsWinProfileItem(nsWinProfile* profileObj,
-                   nsString sectionName,
-                   nsString keyName,
-                   nsString val,
-                   PRInt32 *aReturn);
-
-  virtual ~nsWinProfileItem();
-
-  /**
-   * Completes the install:
-   * - writes the data into the .INI file
-   */
-  PRInt32 Complete();
-  char* toString();
-  
-  // no need for special clean-up
-  void Abort();
-  
-  // no need for set-up
-  PRInt32 Prepare();
-  
-  /* should these be protected? */
-  PRBool CanUninstall();
-  PRBool RegisterPackageNode();
-  
-private:
-  
-  /* Private Fields */
-  nsWinProfile* mProfile;     // initiating profile object
-  nsString*     mSection;     // Name of section
-  nsString*     mKey;         // Name of key
-  nsString*     mValue;       // data to write
-  
-  /* Private Methods */
- 
-};
-
-PR_END_EXTERN_C
-
-#endif /* nsWinProfileItem_h__ */

mozilla/xpinstall/src/nsWinReg.cpp

@@ -1,536 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsWinReg.h"
-#include "nsWinRegItem.h"
-#include <windows.h> /* is this needed? */
-
-/* Public Methods */
-
-MOZ_DECL_CTOR_COUNTER(nsWinReg);
-
-nsWinReg::nsWinReg(nsInstall* suObj)
-{
-    MOZ_COUNT_CTOR(nsWinReg);
-
-    mInstallObject      = suObj;
-	mRootKey = (PRInt32)HKEY_CLASSES_ROOT;
-}
-
-nsWinReg::~nsWinReg()
-{
-    MOZ_COUNT_CTOR(nsWinReg);
-}
-
-PRInt32
-nsWinReg::SetRootKey(PRInt32 key)
-{
-	mRootKey = key;
-    return NS_OK;
-}
-  
-PRInt32
-nsWinReg::CreateKey(const nsString& subkey, const nsString& classname, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_CREATE, subkey, classname, "null", aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-  	mInstallObject->ScheduleForInstall(wi);
-	
-  return 0;
-}
-  
-PRInt32
-nsWinReg::DeleteKey(const nsString& subkey, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_DELETE, subkey, "null", "null", aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-
-  return 0;
-}
-
-PRInt32
-nsWinReg::DeleteValue(const nsString& subkey, const nsString& valname, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_DELETE_VAL, subkey, valname, "null", aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-
-  return 0;
-}
-
-PRInt32
-nsWinReg::SetValueString(const nsString& subkey, const nsString& valname, const nsString& value, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_SET_VAL_STRING, subkey, valname, value, aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-	
-  return 0;
-}
-
-PRInt32
-nsWinReg::GetValueString(const nsString& subkey, const nsString& valname, nsString* aReturn)
-{
-   NativeGetValueString(subkey, valname, aReturn);
-   return NS_OK;
-}
- 
-PRInt32
-nsWinReg::SetValueNumber(const nsString& subkey, const nsString& valname, PRInt32 value, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_SET_VAL_NUMBER, subkey, valname, value, aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-
-  return 0;
-}
-
-PRInt32
-nsWinReg::GetValueNumber(const nsString& subkey, const nsString& valname, PRInt32* aReturn)
-{
-    NativeGetValueNumber(subkey, valname, aReturn);
-    return NS_OK;
-}
- 
-PRInt32
-nsWinReg::SetValue(const nsString& subkey, const nsString& valname, nsWinRegValue* value, PRInt32* aReturn)
-{
-  // fix: need to figure out what to do with nsWinRegValue class.
-  //
-	// nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_SET_VAL, subkey, valname, (nsWinRegValue*)value, aReturn);
-  //
-	// if(wi == nsnull)
-  // {
-  //   return NS_OK;
-  // }
-	// mInstallObject->ScheduleForInstall(wi);
-	return 0;
-}
-  
-PRInt32
-nsWinReg::GetValue(const nsString& subkey, const nsString& valname, nsWinRegValue** aReturn)
-{
-  // fix:
-  return NS_OK;
-}
-  
-nsInstall* nsWinReg::InstallObject()
-{
-	return mInstallObject;
-}
-  
-PRInt32
-nsWinReg::FinalCreateKey(PRInt32 root, const nsString& subkey, const nsString& classname, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeCreateKey(subkey, classname);
-  return NS_OK;
-}
-  
-PRInt32
-nsWinReg::FinalDeleteKey(PRInt32 root, const nsString& subkey, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeDeleteKey(subkey);
-  return NS_OK;
-}
-  
-PRInt32
-nsWinReg::FinalDeleteValue(PRInt32 root, const nsString& subkey, const nsString& valname, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeDeleteValue(subkey, valname);
-  return NS_OK;
-}
-
-PRInt32
-nsWinReg::FinalSetValueString(PRInt32 root, const nsString& subkey, const nsString& valname, const nsString& value, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeSetValueString(subkey, valname, value);
-  return NS_OK;
-}
- 
-PRInt32
-nsWinReg::FinalSetValueNumber(PRInt32 root, const nsString& subkey, const nsString& valname, PRInt32 value, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeSetValueNumber(subkey, valname, value);
-  return NS_OK;
-}
- 
-PRInt32
-nsWinReg::FinalSetValue(PRInt32 root, const nsString& subkey, const nsString& valname, nsWinRegValue* value, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeSetValue(subkey, valname, value);
-  return NS_OK;
-}
-
-
-/* Private Methods */
-
-PRInt32
-nsWinReg::NativeCreateKey(const nsString& subkey, const nsString& classname)
-{
-    HKEY    root, newkey;
-    LONG    result;
-    ULONG   disposition;
-    char*   subkeyCString     = subkey.ToNewCString();
-    char*   classnameCString  = classname.ToNewCString();
-
-#ifdef WIN32
-    root   = (HKEY)mRootKey;
-    result = RegCreateKeyEx(root, subkeyCString, 0, classnameCString, REG_OPTION_NON_VOLATILE, KEY_WRITE, nsnull, &newkey, &disposition);
-
-    if(ERROR_SUCCESS == result)
-    {
-        RegCloseKey( newkey );
-    }
-#endif
-
-    if (subkeyCString)     Recycle(subkeyCString);
-    if (classnameCString)  Recycle(classnameCString);
-
-    return result;
-}
-
-PRInt32
-nsWinReg::NativeDeleteKey(const nsString& subkey)
-{
-    HKEY  root;
-    LONG  result;
-    char* subkeyCString = subkey.ToNewCString();
-
-#ifdef WIN32
-    root   = (HKEY) mRootKey;
-    result = RegDeleteKey( root, subkeyCString );
-#endif
-
-    if (subkeyCString)  Recycle(subkeyCString);
-
-    return result;
-}
-  
-PRInt32
-nsWinReg::NativeDeleteValue(const nsString& subkey, const nsString& valname)
-{
-#if defined (WIN32) || defined (XP_OS2)
-    HKEY    root, newkey;
-    LONG    result;
-    char*   subkeyCString   = subkey.ToNewCString();
-    char*   valnameCString  = valname.ToNewCString();
-
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_WRITE, &newkey);
-
-    if ( ERROR_SUCCESS == result )
-    {
-        result = RegDeleteValue( newkey, valnameCString );
-        RegCloseKey( newkey );
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-
-    return result;
-#else
-    return ERROR_INVALID_PARAMETER;
-#endif
-}
-
-PRInt32
-nsWinReg::NativeSetValueString(const nsString& subkey, const nsString& valname, const nsString& value)
-{
-    HKEY    root;
-    HKEY    newkey;
-    LONG    result;
-    DWORD   length;
-
-    char*   subkeyCString   = subkey.ToNewCString();
-    char*   valnameCString  = valname.ToNewCString();
-    char*   valueCString    = value.ToNewCString();
-    
-    length = value.Length();
-
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_WRITE, &newkey);
-
-    if(ERROR_SUCCESS == result)
-    {
-        result = RegSetValueEx( newkey, valnameCString, 0, REG_SZ, (unsigned char*)valueCString, length );
-        RegCloseKey( newkey );
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-    if (valueCString)    Recycle(valueCString);
-
-    return result;
-}
- 
-#define STRBUFLEN 255
- 
-void
-nsWinReg::NativeGetValueString(const nsString& subkey, const nsString& valname, nsString* aReturn)
-{
-    unsigned char     valbuf[_MAXKEYVALUE_];
-    HKEY              root;
-    HKEY              newkey;
-    LONG              result;
-    DWORD             type            = REG_SZ;
-    DWORD             length          = _MAXKEYVALUE_;
-    char*             subkeyCString   = subkey.ToNewCString();
-    char*             valnameCString  = valname.ToNewCString();
-
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_READ, &newkey );
-
-    if ( ERROR_SUCCESS == result ) {
-        result = RegQueryValueEx( newkey, valnameCString, nsnull, &type, valbuf, &length );
-
-        RegCloseKey( newkey );
-    }
-
-    if(ERROR_SUCCESS == result && type == REG_SZ)
-    {
-        *aReturn = (char*)valbuf;
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-}
-
-PRInt32
-nsWinReg::NativeSetValueNumber(const nsString& subkey, const nsString& valname, PRInt32 value)
-{
-    HKEY    root;
-    HKEY    newkey;
-    LONG    result;
-
-    char*   subkeyCString   = subkey.ToNewCString();
-    char*   valnameCString  = valname.ToNewCString();
-    
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_WRITE, &newkey);
-
-    if(ERROR_SUCCESS == result)
-    {
-        result = RegSetValueEx( newkey, valnameCString, 0, REG_DWORD, (LPBYTE)&value, sizeof(PRInt32));
-        RegCloseKey( newkey );
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-
-    return result;
-}
- 
-void
-nsWinReg::NativeGetValueNumber(const nsString& subkey, const nsString& valname, PRInt32* aReturn)
-{
-    PRInt32 valbuf;
-    PRInt32 valbuflen;
-    HKEY    root;
-    HKEY    newkey;
-    LONG    result;
-    DWORD   type            = REG_DWORD;
-    DWORD   length          = _MAXKEYVALUE_;
-    char*   subkeyCString   = subkey.ToNewCString();
-    char*   valnameCString  = valname.ToNewCString();
-
-    valbuflen = sizeof(PRInt32);
-    root      = (HKEY) mRootKey;
-    result    = RegOpenKeyEx( root, subkeyCString, 0, KEY_READ, &newkey );
-
-    if ( ERROR_SUCCESS == result ) {
-        result = RegQueryValueEx( newkey, valnameCString, nsnull, &type, (LPBYTE)&valbuf, (LPDWORD)&valbuflen);
-
-        RegCloseKey( newkey );
-    }
-
-    if(ERROR_SUCCESS == result && type == REG_DWORD)
-    {
-        *aReturn = valbuf;
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-}
-
-PRInt32
-nsWinReg::NativeSetValue(const nsString& subkey, const nsString& valname, nsWinRegValue* value)
-{
-#if defined (WIN32) || defined (XP_OS2)
-    HKEY    root;
-    HKEY    newkey;
-    LONG    result;
-    DWORD   length;
-    DWORD   type;
-    unsigned char*    data;
-    char*   subkeyCString   = subkey.ToNewCString();
-    char*   valnameCString  = valname.ToNewCString();
-
-
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_WRITE, &newkey );
-
-    if(ERROR_SUCCESS == result)
-    {
-        type = (DWORD)value->type;
-        data = (unsigned char*)value->data;
-        length = (DWORD)value->data_length;
-
-        result = RegSetValueEx( newkey, valnameCString, 0, type, data, length);
-        RegCloseKey( newkey );
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-
-    return result;
-#else
-    return ERROR_INVALID_PARAMETER;
-#endif
-}
-  
-nsWinRegValue*
-nsWinReg::NativeGetValue(const nsString& subkey, const nsString& valname)
-{
-#if defined (WIN32) || defined (XP_OS2)
-    unsigned char    valbuf[STRBUFLEN];
-    HKEY    root;
-    HKEY    newkey;
-    LONG    result;
-    DWORD   length=STRBUFLEN;
-    DWORD   type;
-    nsString* data;
-    nsWinRegValue* value = nsnull;
-    char*   subkeyCString   = subkey.ToNewCString();
-    char*   valnameCString  = valname.ToNewCString();
-
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_READ, &newkey );
-
-    if(ERROR_SUCCESS == result)
-    {
-        result = RegQueryValueEx( newkey, valnameCString, nsnull, &type, valbuf, &length );
-
-        if ( ERROR_SUCCESS == result ) {
-            data = new nsString((char*)valbuf);
-			      length = data->Length();
-            value = new nsWinRegValue(type, (void*)data, length);
-        }
-
-        RegCloseKey( newkey );
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-
-    return value;
-#else
-    return nsnull;
-#endif
-}
-

mozilla/xpinstall/src/nsWinReg.h

@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __NS_WINREG_H__
-#define __NS_WINREG_H__
-
-#include "nsWinRegEnums.h" 
-#include "nsWinRegValue.h"
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-#include "jsapi.h"
-
-#include "plevent.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsHashtable.h"
-
-#include "nsSoftwareUpdate.h"
-
-#include "nsInstallObject.h"
-#include "nsInstallVersion.h"
-#include "nsInstall.h"
-
-#define _MAXKEYVALUE_ 8196
-class nsWinReg
-{
-  public:
-
-    enum
-    {
-      HKEY_CLASSES_ROOT             = 0x80000000,
-      HKEY_CURRENT_USER             = 0x80000001,
-      HKEY_LOCAL_MACHINE            = 0x80000002,
-      HKEY_USERS                    = 0x80000003
-    };
-
-    /* Public Fields */
-
-    /* Public Methods */
-
-                      nsWinReg(nsInstall* suObj);
-                      ~nsWinReg();
-
-    PRInt32           SetRootKey(PRInt32 key);
-    PRInt32           CreateKey(const nsString& subkey, const nsString& classname, PRInt32* aReturn);
-    PRInt32           DeleteKey(const nsString& subkey, PRInt32* aReturn);
-    PRInt32           DeleteValue(const nsString& subkey, const nsString& valname, PRInt32* aReturn);
-    PRInt32           SetValueString(const nsString& subkey, const nsString& valname, const nsString& value, PRInt32* aReturn);
-    PRInt32           GetValueString(const nsString& subkey, const nsString& valname, nsString* aReturn);
-    PRInt32           SetValueNumber(const nsString& subkey, const nsString& valname, PRInt32 value, PRInt32* aReturn);
-    PRInt32           GetValueNumber(const nsString& subkey, const nsString& valname, PRInt32* aReturn);
-    PRInt32           SetValue(const nsString& subkey, const nsString& valname, nsWinRegValue* value, PRInt32* aReturn);
-    PRInt32           GetValue(const nsString& subkey, const nsString& valname, nsWinRegValue** aReturn);
-
-    nsInstall*        InstallObject(void);
-
-    PRInt32           FinalCreateKey(PRInt32 root, const nsString& subkey, const nsString& classname, PRInt32* aReturn);
-    PRInt32           FinalDeleteKey(PRInt32 root, const nsString& subkey, PRInt32* aReturn);
-    PRInt32           FinalDeleteValue(PRInt32 root, const nsString& subkey, const nsString& valname, PRInt32* aReturn);
-    PRInt32           FinalSetValueString(PRInt32 root, const nsString& subkey, const nsString& valname, const nsString& value, PRInt32* aReturn);
-    PRInt32           FinalSetValueNumber(PRInt32 root, const nsString& subkey, const nsString& valname, PRInt32 value, PRInt32* aReturn);
-    PRInt32           FinalSetValue(PRInt32 root, const nsString& subkey, const nsString& valname, nsWinRegValue* value, PRInt32* aReturn);
-
-    
-  private:
-    
-    /* Private Fields */
-    PRInt32    mRootKey;
-    nsInstall* mInstallObject;
-
-    /* Private Methods */
-    PRInt32           NativeCreateKey(const nsString& subkey, const nsString& classname);
-    PRInt32           NativeDeleteKey(const nsString& subkey);
-    PRInt32           NativeDeleteValue(const nsString& subkey, const nsString& valname);
-
-    PRInt32           NativeSetValueString(const nsString& subkey, const nsString& valname, const nsString& value);
-    void              NativeGetValueString(const nsString& subkey, const nsString& valname, nsString* aReturn);
-    PRInt32           NativeSetValueNumber(const nsString& subkey, const nsString& valname, PRInt32 value);
-    void              NativeGetValueNumber(const nsString& subkey, const nsString& valname, PRInt32* aReturn);
-
-    PRInt32           NativeSetValue(const nsString& subkey, const nsString& valname, nsWinRegValue* value);
-    nsWinRegValue*    NativeGetValue(const nsString& subkey, const nsString& valname);
-};
-
-#endif /* __NS_WINREG_H__ */
-

mozilla/xpinstall/src/nsWinRegEnums.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsWinRegEnums_h__
-#define nsWinRegEnums_h__
-
-typedef enum nsWinRegEnum {
-  NS_WIN_REG_CREATE          = 1,
-  NS_WIN_REG_DELETE          = 2,
-  NS_WIN_REG_DELETE_VAL      = 3,
-  NS_WIN_REG_SET_VAL_STRING  = 4,
-  NS_WIN_REG_SET_VAL_NUMBER  = 5,
-  NS_WIN_REG_SET_VAL         = 6
-
-} nsWinRegEnum;
-
-
-typedef enum nsWinRegValueEnum {
-  NS_WIN_REG_SZ                          = 1,
-  NS_WIN_REG_EXPAND_SZ                   = 2,
-  NS_WIN_REG_BINARY                      = 3,
-  NS_WIN_REG_DWORD                       = 4,
-  NS_WIN_REG_DWORD_LITTLE_ENDIAN         = 4,
-  NS_WIN_REG_DWORD_BIG_ENDIAN            = 5,
-  NS_WIN_REG_LINK                        = 6,
-  NS_WIN_REG_MULTI_SZ                    = 7,
-  NS_WIN_REG_RESOURCE_LIST               = 8,
-  NS_WIN_REG_FULL_RESOURCE_DESCRIPTOR    = 9,
-  NS_WIN_REG_RESOURCE_REQUIREMENTS_LIST  = 10
-} nsWinRegValueEnum;
-
-#endif /* nsWinRegEnums_h__ */

mozilla/xpinstall/src/nsWinRegItem.cpp

@@ -1,312 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsWinRegItem.h"
-#include "nspr.h"
-
-#ifdef WIN32
-#include <windows.h> /* is this needed? */
-#endif
-
-/* Public Methods */
-
-MOZ_DECL_CTOR_COUNTER(nsWinRegItem);
-
-nsWinRegItem::nsWinRegItem(nsWinReg* regObj, PRInt32 root, PRInt32 action, const nsString& sub, const nsString& valname, const nsString& val, PRInt32 *aReturn)
-: nsInstallObject(regObj->InstallObject())
-{
-    MOZ_COUNT_CTOR(nsWinRegItem);
-
-    mReg     = regObj;
-	mCommand = action;
-	mRootkey = root;
-
-  *aReturn = nsInstall::SUCCESS;
-
-  /* I'm assuming we need to copy these */
-	mSubkey  = new nsString(sub);
-	mName    = new nsString(valname);
-	mValue   = new nsString(val);
-
-  if((mSubkey == nsnull) ||
-     (mName   == nsnull) ||
-     (mValue  == nsnull))
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-  }
-}
-
-nsWinRegItem::nsWinRegItem(nsWinReg* regObj, PRInt32 root, PRInt32 action, const nsString& sub, const nsString& valname, PRInt32 val, PRInt32 *aReturn)
-: nsInstallObject(regObj->InstallObject())
-{
-    MOZ_COUNT_CTOR(nsWinRegItem);
-
-	mReg     = regObj;
-	mCommand = action;
-	mRootkey = root;
-
-  *aReturn = nsInstall::SUCCESS;
-
-  /* I'm assuming we need to copy these */
-	mSubkey  = new nsString(sub);
-	mName    = new nsString(valname);
-	mValue   = new PRInt32(val);
-
-  if((mSubkey == nsnull) ||
-     (mName   == nsnull) ||
-     (mValue  == nsnull))
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-  }
-}
-
-nsWinRegItem::~nsWinRegItem()
-{
-  if (mSubkey)  delete mSubkey;
-  if (mName)    delete mName;
-  if (mValue)   delete mValue;
-  MOZ_COUNT_DTOR(nsWinRegItem);
-}
-
-PRInt32 nsWinRegItem::Complete()
-{
-  PRInt32 aReturn = NS_OK;
-  
-  if (mReg == nsnull)
-      return nsInstall::OUT_OF_MEMORY;
-
-  switch (mCommand)
-  {
-    case NS_WIN_REG_CREATE:
-        mReg->FinalCreateKey(mRootkey, *mSubkey, *mName, &aReturn);
-        break;
-    
-    case NS_WIN_REG_DELETE:
-        mReg->FinalDeleteKey(mRootkey, *mSubkey, &aReturn);
-        break;
-    
-    case NS_WIN_REG_DELETE_VAL:
-        mReg->FinalDeleteValue(mRootkey, *mSubkey, *mName, &aReturn);
-        break;
-    
-    case NS_WIN_REG_SET_VAL_STRING:
-        mReg->FinalSetValueString(mRootkey, *mSubkey, *mName, *(nsString*)mValue, &aReturn);
-        break;
-
-    case NS_WIN_REG_SET_VAL_NUMBER:
-        mReg->FinalSetValueNumber(mRootkey, *mSubkey, *mName, *(PRInt32*)mValue, &aReturn);
-        break;
-    
-    case NS_WIN_REG_SET_VAL:
-        mReg->FinalSetValue(mRootkey, *mSubkey, *mName, (nsWinRegValue*)mValue, &aReturn);
-        break;
-  }
-	return aReturn;
-}
-  
-#define kCRK  "Create Registry Key: "
-#define kDRK  "Delete Registry Key: "
-#define kDRV  "Delete Registry Value: "
-#define kSRVS "Store Registry Value String: "
-#define kSRVN "Store Registry Value Number: "
-#define kSRV  "Store Registry Value: "
-#define kUNK  "Unknown "
-
-char* nsWinRegItem::toString()
-{
-	nsString*  keyString     = nsnull;
-	nsString*  result        = nsnull;
-  char*      resultCString = nsnull;
-
-	switch(mCommand)
-	{
-    case NS_WIN_REG_CREATE:
-      keyString = keystr(mRootkey, mSubkey, nsnull);
-      result    = new nsString(kCRK);
-      break;
-
-    case NS_WIN_REG_DELETE:
-      keyString = keystr(mRootkey, mSubkey, nsnull);
-      result    = new nsString(kDRK);
-      break;
-
-    case NS_WIN_REG_DELETE_VAL:
-      keyString = keystr(mRootkey, mSubkey, mName);
-      result    = new nsString(kDRV);
-      break;
-
-    case NS_WIN_REG_SET_VAL_STRING:
-      keyString = keystr(mRootkey, mSubkey, mName);
-      result    = new nsString(kSRVS);
-      break;
-
-    case NS_WIN_REG_SET_VAL_NUMBER:
-      keyString = keystr(mRootkey, mSubkey, mName);
-      result    = new nsString(kSRVN);
-      break;
-
-    case NS_WIN_REG_SET_VAL:
-      keyString = keystr(mRootkey, mSubkey, mName);
-      result    = new nsString(kSRV);
-      break;
-
-    default:
-      keyString = keystr(mRootkey, mSubkey, mName);
-      result    = new nsString(kUNK);
-      break;
-	}
-    
-  if (result)
-  {
-      result->Append(*keyString);
-      resultCString = result->ToNewCString();
-  }
-  
-  if (keyString) delete keyString;
-  if (result)    delete result;
-  
-  return resultCString;
-}
-
-PRInt32 nsWinRegItem::Prepare()
-{
-	return nsnull;
-}
-
-void nsWinRegItem::Abort()
-{
-}
-
-/* Private Methods */
-
-nsString* nsWinRegItem::keystr(PRInt32 root, nsString* mSubkey, nsString* mName)
-{
-	nsString  rootstr;
-	nsString* finalstr = nsnull;
-  char*     istr     = nsnull;
-
-	switch(root)
-	{
-	  case (int)(HKEY_CLASSES_ROOT) :
-		  rootstr = "HKEY_CLASSES_ROOT\\";
-		  break;
-
-	  case (int)(HKEY_CURRENT_USER) :
-		  rootstr = "HKEY_CURRENT_USER\\";
-		  break;
-
-	  case (int)(HKEY_LOCAL_MACHINE) :
-		  rootstr = "HKEY_LOCAL_MACHINE\\";
-		  break;
-
-	  case (int)(HKEY_USERS) :
-		  rootstr = "HKEY_USERS\\";
-		  break;
-
-    default:
-      istr = itoa(root);
-      if (istr)
-      {
-        rootstr = "#";
-        rootstr.Append(istr);
-        rootstr.Append("\\");
-        
-        PR_DELETE(istr);
-      }
-      break;
-	}
-
-  finalstr = new nsString(rootstr);
-	if(finalstr != nsnull)
-	{
-    finalstr->Append(*mSubkey);
-    finalstr->Append(" [");
-
-    if(mName != nsnull)
-      finalstr->Append(*mName);
-
-    finalstr->Append("]");
-	}
-
-  return finalstr;
-}
-
-
-char* nsWinRegItem::itoa(PRInt32 n)
-{
-	char* s;
-	int i, sign;
-	if((sign = n) < 0)
-		n = -n;
-	i = 0;
-	
-	s = (char*)PR_CALLOC(sizeof(char));
-
-	do
-		{
-		s = (char*)PR_REALLOC(s, (i+1)*sizeof(char));
-		s[i++] = n%10 + '0';
-		s[i] = '\0';
-		} while ((n/=10) > 0);
-		
-	if(sign < 0)
-	{
-		s = (char*)PR_REALLOC(s, (i+1)*sizeof(char));
-		s[i++] = '-';
-	}
-	s[i]  = '\0';
-	reverseString(s);
-	return s;
-}
-
-void nsWinRegItem::reverseString(char* s)
-{
-	int c, i, j;
-	
-	for(i=0, j=strlen(s)-1; i<j; i++, j--)
-		{
-		c = s[i];
-		s[i] = s[j];
-		s[j] = c;
-		}
-}
-
-/* CanUninstall
-* WinRegItem() does not install any files which can be uninstalled,
-* hence this function returns false. 
-*/
-PRBool
-nsWinRegItem:: CanUninstall()
-{
-    return PR_FALSE;
-}
-
-/* RegisterPackageNode
-* WinRegItem() installs files which need to be registered,
-* hence this function returns true.
-*/
-PRBool
-nsWinRegItem:: RegisterPackageNode()
-{
-    return PR_TRUE;
-}
-

mozilla/xpinstall/src/nsWinRegItem.h

@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsWinRegItem_h__
-#define nsWinRegItem_h__
-
-#include "prtypes.h"
-
-#include "nsSoftwareUpdate.h"
-#include "nsInstallObject.h"
-#include "nsWinReg.h"
-
-PR_BEGIN_EXTERN_C
-
-class nsWinRegItem : public nsInstallObject {
-
-public:
-
-  /* Public Fields */
-
-  /* Public Methods */
-  nsWinRegItem(nsWinReg*        regObj,
-               PRInt32          root,
-               PRInt32          action,
-               const nsString&  sub,
-               const nsString&  valname,
-               const nsString&  val,
-               PRInt32*         aReturn);
-  
-  nsWinRegItem(nsWinReg*        regObj,
-               PRInt32          root,
-               PRInt32          action,
-               const nsString&  sub,
-               const nsString&  valname,
-               PRInt32          val,
-               PRInt32*         aReturn);
-  
-  virtual ~nsWinRegItem();
-
-  PRInt32 Prepare(void);
-
-  PRInt32 Complete();
-  
-  char* toString();
-  
-  void Abort();
-  
-/* should these be protected? */
-  PRBool CanUninstall();
-  PRBool RegisterPackageNode();
-	  
-private:
-  
-  /* Private Fields */
-  
-  nsWinReg* mReg;        // initiating WinReg object
-  PRInt32   mRootkey;
-  PRInt32   mCommand;
-  nsString* mSubkey;     // Name of section
-  nsString* mName;       // Name of key
-  void*     mValue;      // data to write
-  
-  /* Private Methods */
-
-  nsString* keystr(PRInt32 root, nsString* subkey, nsString* name);
-
-  char* itoa(PRInt32 n);
-  void reverseString(char* s);
-};
-
-PR_END_EXTERN_C
-
-#endif /* nsWinRegItem_h__ */

mozilla/xpinstall/src/nsWinRegValue.cpp

@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsWinRegValue.h"
-
-PR_BEGIN_EXTERN_C
-
-
-PR_END_EXTERN_C

mozilla/xpinstall/src/nsWinRegValue.h

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsWinRegValue_h__
-#define nsWinRegValue_h__
-
-#include "prtypes.h"
-
-
-PR_BEGIN_EXTERN_C
-
-struct nsWinRegValue {
-
-public:
-
-  /* Public Fields */
-  PRInt32 type;
-  void*   data;
-  PRInt32 data_length;
-
-  /* Public Methods */
-  nsWinRegValue(PRInt32 datatype, void* regdata, PRInt32 len) 
-	{
-    type        = datatype;
-    data        = regdata;
-    data_length = len;
-  } 
-  
-  /* should we copy the regdata? */
-private:
-  
-  /* Private Fields */
-  
-
-  /* Private Methods */
-
-};
-
-PR_END_EXTERN_C
-
-#endif /* nsWinRegValue_h__ */

mozilla/xpinstall/src/nsWinShortcut.cpp

@@ -1,88 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code,
- * released March 31, 1998.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Sean Su <ssu@netscape.com>
- */
-
-/* This is a hack for vc5.0.  It needs to be set *before* any shell
- * include files. The INITGUID definition turns off the inclusion
- * of shlguid.h in shlobj.h so it has to be done explicitly.
- */
-#if (_MSC_VER == 1100)
-#define INITGUID
-#include "objbase.h"
-DEFINE_OLEGUID(IID_IPersistFile, 0x0000010BL, 0, 0);
-#endif
-
-#include <shlobj.h>
-#include <shlguid.h>
-#include "nsWinShortcut.h"
-
-HRESULT CreateALink(LPCSTR lpszPathObj, LPCSTR lpszPathLink, LPCSTR lpszDesc, LPCSTR lpszWorkingPath, LPCSTR lpszArgs, LPCSTR lpszIconFullPath, int iIcon)
-{ 
-    HRESULT    hres; 
-    IShellLink *psl;
-    char       lpszFullPath[MAX_BUF];
-
-    lstrcpy(lpszFullPath, lpszPathLink);
-    lstrcat(lpszFullPath, "\\");
-    lstrcat(lpszFullPath, lpszDesc);
-    lstrcat(lpszFullPath, ".lnk");
-
-    CreateDirectory(lpszPathLink, NULL);
-    CoInitialize(NULL);
-
-    // Get a pointer to the IShellLink interface. 
-    hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID *)&psl); 
-    if(SUCCEEDED(hres))
-    { 
-        IPersistFile* ppf; 
- 
-        // Set the path to the shortcut target, and add the 
-        // description. 
-        psl->SetPath(lpszPathObj);
-        psl->SetDescription(lpszDesc);
-        if(lpszWorkingPath)
-            psl->SetWorkingDirectory(lpszWorkingPath);
-        if(lpszArgs)
-            psl->SetArguments(lpszArgs);
-        psl->SetIconLocation(lpszIconFullPath, iIcon);
- 
-        // Query IShellLink for the IPersistFile interface for saving the 
-        // shortcut in persistent storage. 
-        hres = psl->QueryInterface(IID_IPersistFile, (LPVOID FAR *)&ppf); 
-        if(SUCCEEDED(hres))
-        { 
-            WORD wsz[MAX_BUF]; 
- 
-            // Ensure that the string is ANSI. 
-            MultiByteToWideChar(CP_ACP, 0, lpszFullPath, -1, (wchar_t *)wsz, MAX_BUF);
- 
-            // Save the link by calling IPersistFile::Save. 
-            hres = ppf->Save((wchar_t *)wsz, TRUE); 
-            ppf->Release(); 
-        } 
-        psl->Release(); 
-    } 
-    CoUninitialize();
-
-    return hres;
-}