Renaming zlib to mozz similar to what is used on linux. This is to avoid linking to EVIL implementations of zlib. see bug 190460. r=cls,r=ssu, sr=darin. a=asa

embedding/config/basebrowser-installer-win.pkg

@@ -82,7 +82,7 @@ components\content_base.xpt
 ; Imaging:
 ; 
 ; in xpcom-win
-;zlib.dll
+;mozz.dll
 components\imglib2.dll
 
 ; 

embedding/config/basebrowser-win

@@ -45,7 +45,6 @@ js3250.dll
 ; XPCOM:
 ; 
 xpcom.dll
-mozreg.dll
 components\xpcom_base.xpt
 components\xpcom_components.xpt
 components\xpcom_ds.xpt
@@ -55,6 +54,8 @@ components\xpcom_io.xpt
 components\xpcom_nativeapp.xpt
 components\xpcom_thread.xpt
 components\xpcom_xpti.xpt
+components\mozreg.dll
+components\mozreg.xpt
 
 ; xpconnect
 components\xpc3250.dll
@@ -81,7 +82,7 @@ components\content_base.xpt
 ; 
 ; Imaging:
 ; 
-zlib.dll
+mozz.dll
 components\imglib2.dll
 
 ; 

modules/zlib/src/Makefile.in

@@ -35,7 +35,6 @@ ifeq ($(OS_ARCH),WINNT)
 MAPFILE	= $(LIBRARY_NAME).map
 DEFFILE	= $(srcdir)/zlib.def
 DEFINES	+= -DZLIB_DLL=1
-LIBRARY_NAME = zlib
 endif
 
 CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)

xpinstall/packager/windows/xpcom.jst

@@ -63,6 +63,7 @@ function updateWinReg()
 
 function upgradeCleanup()
 {
+  deleteThisFile("Program",    "zlib.dll");
   deleteThisFile("Program",    "component.reg");
   deleteThisFile("Components", "compreg.dat");
   deleteThisFile("Components", "xpti.dat");

xpinstall/packager/xpcom-win.pkg

@@ -17,7 +17,7 @@ bin\plc4.dll
 bin\plds4.dll
 bin\xpcom.dll
 bin\xpistub.dll
-bin\zlib.dll
+bin\mozz.dll
 bin\components\jar50.dll
 bin\components\xpinstal.dll
 ;install\ren8dot3.exe,bin\ren8dot3.exe