diff --git a/mozilla/tools/preloader/check.ico b/mozilla/tools/preloader/check.ico
new file mode 100644
index 00000000000..f3f7ae27c63
Binary files /dev/null and b/mozilla/tools/preloader/check.ico differ
diff --git a/mozilla/tools/preloader/check1.ico b/mozilla/tools/preloader/check1.ico
new file mode 100644
index 00000000000..7a90ab4f10a
Binary files /dev/null and b/mozilla/tools/preloader/check1.ico differ
diff --git a/mozilla/tools/preloader/icon1.ico b/mozilla/tools/preloader/icon1.ico
new file mode 100644
index 00000000000..438fed86a98
Binary files /dev/null and b/mozilla/tools/preloader/icon1.ico differ
diff --git a/mozilla/tools/preloader/makefile.win b/mozilla/tools/preloader/makefile.win
new file mode 100644
index 00000000000..6d40644752f
--- /dev/null
+++ b/mozilla/tools/preloader/makefile.win
@@ -0,0 +1,56 @@
+#!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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH = ..\..
+
+WIN_LIBS =                      \
+ shell32.lib                    \
+ $(NULL)
+
+LFLAGS = -Wl,--subsystem,windows
+CFLAGS = -x c++ -fno-exceptions -O -c
+RESFILE = preloader.res
+
+CPP_OBJS =                      \
+ .\$(OBJDIR)\preloader.obj      \
+ $(NULL)
+
+CPPSRCS =                       \
+ preloader.cpp                  \
+ $(NULL)
+
+MAKE_OBJ_TYPE = exe
+
+PROGRAM = .\$(OBJDIR)\preloader.exe
+
+MOZ_NO_COVERAGE = 1
+
+include <$(DEPTH)\config\rules.mak>
+
+preloader.res: preloader.rc resource.h
+
+install:: $(PROGRAM)
+	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
+
+clobber::
+	rm -rf $(DIST)\bin\$(PROGRAM)
+         
+
diff --git a/mozilla/tools/preloader/preloader.cpp b/mozilla/tools/preloader/preloader.cpp
new file mode 100644
index 00000000000..517ae393859
--- /dev/null
+++ b/mozilla/tools/preloader/preloader.cpp
@@ -0,0 +1,1222 @@
+/* -*- 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.
+ *
+ */
+
+/****************************************************************************
+
+  Module Notes:
+  =============
+
+  Overview:
+    This little win32 application knows how to load the modules for
+    intalled version netscape and mozilla browsers. It preloads these
+    modules in order to make overall startup time seem faster to our
+    end users. 
+
+  Notes:
+    We assume that this preloader is stored with the mozilla/netscape
+    install somewhere, and that a link to that file is stored in either 
+    the CURRENT_USER startup folder or the ALL_USERS startup folder. 
+    If it's get's put somewhere else (like DEFAULT_USERS) then the 
+    code we use to remove ourselves from the startup folder needs to 
+    be adjusted accordingly.
+
+
+  Who       When      What Changed
+  ==================================================================
+  rickg   03.15.01    Version 1.0 of the preloader; proof of concept. 
+
+  rickg   04.16.01    changed code to use system-tray API's directly
+  rickg   04.17.01    added menu code to system tray to allow user to disable us
+  rickg   04.18.01    added code to auto-remove the preloader from startup folder
+  rickg   04.18.01    switched strings to resource files for easier localization.
+  rickg   04.23.01    added code to prevent multiple instances
+  rickg   04.23.01    added code to prevent preloader operation if browser is already running
+  rickg   04.23.01    added code to display unique icon (ugly yellow) if browser is already running.
+  rickg   04.23.01    added code to get/set "tuning" config settings from config dialog 
+  rickg   04.24.01    added code to get/set "tuning" settings from registry
+  rickg   04.24.01    added accelerators to menu, and changed tooltip    
+  rickg   04.24.01    moved more strings to resource file
+  rickg   04.24.01    hooked up "tuning" config settings for modulepercent and gFrequencyPercent
+
+  NOTE: I've not hooked up the gEntryPercent setting.
+
+ ****************************************************************************/
+
+
+//additional includes
+#include "resrc1.h"
+#include <atlbase.h>
+#include <windows.h>
+#include <commctrl.h>
+#include <stdio.h>
+
+//trayicon notification message
+#define WM_TRAY   WM_USER+0x100+5
+
+static  NOTIFYICONDATA gTrayData = {0,0,0,0,0,0,0};
+static  HWND gMainWindow=0;
+static  HICON gCheckIcons[2] = {0,0};
+static  HICON gBrowserRunningIcon = {0};
+
+static  const int kLoadTimerID = 2;
+static  const int kPingModuleTimerID = 3;
+
+static  char  gExePath[1024]={0};   //used to keep a path to our executable...
+static  const char* thePathSep="\\";
+static  const char* gBrowserWindowName=0;
+static  const char *gRegKey=0;
+static  const char *gRegSubKey=0;
+
+static  HINSTANCE gMainInst=0;      //application main instance handle
+static  int gModulePercent = 100;   //This tells us the percent of modules to load (default value)
+static  int gEntryPercent  = 50;    //Tells us the % of entry points per module (default value)
+static  int gFrequencyPercent = 50; //Tells us relative frequency to call entry points (default value)
+
+/***********************************************************
+  call this to change the icon shown for our tray app 
+ ***********************************************************/
+void SetTrayIcon(const HICON hIcon){
+  gTrayData.hIcon=hIcon;
+  Shell_NotifyIcon(NIM_MODIFY, &gTrayData);
+}
+
+/***********************************************************
+  call this to change the tooltip shown for our tray app
+ ***********************************************************/
+void SetTrayToolTip(const char *aTip){
+  if(aTip) {
+    if(!gTrayData.szTip[0])  //if previously no tooltip
+      gTrayData.uFlags=gTrayData.uFlags | NIF_TIP;
+    strcpy(gTrayData.szTip, aTip);
+  }
+  else gTrayData.uFlags=NIF_ICON | NIF_MESSAGE;
+  Shell_NotifyIcon(NIM_MODIFY, &gTrayData);
+}
+
+/***********************************************************
+  call this to init and display the tray app.
+ ***********************************************************/
+void ShowTrayApp(bool aVisible) {
+
+  if(aVisible) {
+    gTrayData.cbSize=sizeof(NOTIFYICONDATA);
+    gTrayData.hWnd=gMainWindow;
+    gTrayData.uID=IDI_CHECK;  //our tray ID
+    gTrayData.uFlags= NIF_ICON | NIF_MESSAGE | NIF_TIP;
+    gTrayData.uCallbackMessage=WM_TRAY; //send a WM_TRAY message when users clicks in our tray window
+    gTrayData.hIcon=gCheckIcons[0]; //init our default icon
+  
+    Shell_NotifyIcon(NIM_ADD, &gTrayData); //now show our tray icon
+
+    char theTip[256];
+    if(LoadString(gMainInst,IDS_TOOLTIP,theTip,sizeof(theTip))){
+      SetTrayToolTip(theTip);  
+    }
+    else SetTrayToolTip("Click to configure moz-preloader");
+    SetTrayIcon(gCheckIcons[0]);
+  }
+  else {
+    Shell_NotifyIcon(NIM_DELETE, &gTrayData);
+  }
+}
+
+//********************************************************************
+
+
+static bool  gUseFullModuleList = false;
+
+
+//this enum distinguishes version of netscape (and mozilla).
+enum eAppVersion {eNetscape65, eNetscape60, eMozilla, eNetscapePre60, eUserPath,eUnknown};
+
+
+//Constants for my DLL loader to use...
+static char gMozPath[2048]= {0};
+static char gUserPath[2048]= {0};
+
+static char gMozModuleList[4096] = {0};
+static char* gModuleCP = gMozModuleList;
+static int  gModuleCount=0;
+static int gMozPathLen=0;
+static int gUserPathLen=0;
+
+static const char *theMozPath=0;
+static int  gDLLIndex=0;
+
+
+/*********************************************************
+  This counts the number of unique modules in the given
+  list of modules, by counting semicolons.
+ *********************************************************/
+int CountModules(char*&aModuleList) {
+  char *cp=aModuleList;
+  
+  int count=0;
+
+  while(*cp) {
+    if(*cp) {
+      count++;
+    }
+    char *theSemi=strchr(cp,';');
+    if(theSemi) {
+      cp=theSemi+1; //skip the semi
+    }
+  }
+  return count;
+}
+
+
+/*********************************************************
+  This list describes the set of modules for NS6.0
+  XXX This data should really live in a string table too.
+ *********************************************************/
+int Get60ModuleList(char*&aModuleList) {
+  
+  static char* theModuleList = 
+
+    "nspr4;plds4;plc4;mozreg;xpcom;img3250;zlib;" \
+
+    "gkgfxwin;gkwidget;" \
+
+    "components\\gkparser;" \
+    "jpeg3250;" \
+    "js3250;" \
+    "jsj3250;" \
+    "jsdom;" \
+    "components\\jsloader;" \
+
+    "components\\activation;" \
+    "components\\appcomps;" \
+    "components\\addrbook;" \
+    "components\\appshell;" \
+    "components\\caps;" \
+    "components\\chardet;" \
+    "components\\chrome;" \
+    "components\\cookie;" \
+    "components\\docshell;" \
+    "components\\editor;" \
+    "components\\gkhtml;" \
+    "components\\gkplugin;" \
+    "components\\gkview;" \
+    "gkwidget;" \
+    "components\\jar50;" \
+    "components\\lwbrk;" \
+    "mozreg;" \
+    "components\\necko;" \
+    "components\\nsgif;" \
+    "components\\nslocale;" \
+    "components\\nsprefm;" \
+    "components\\profile;" \
+    "components\\psmglue;" \
+    "components\\rdf;" \
+    "components\\shistory;" \
+    "components\\strres;" \
+    "components\\txmgr;" \
+    "components\\txtsvc;" \
+    "components\\ucharuti;" \
+    "components\\uconv;" \
+    "components\\ucvlatin;" \
+    "components\\ucvcn;" \
+    "components\\ucvja;" \
+    "components\\urildr;" \
+    "components\\wallet;" \
+    "components\\xpc3250;" \
+    "components\\xpinstal;" \
+    "components\\xppref32;" \
+    "components\\mozbrwsr;" \
+    "components\\nsjpg;" \
+    "components\\oji;" \
+
+    "msgbsutl;" \
+    "components\\mork;" \
+    "components\\msglocal;" \
+
+    "xprt;" \
+    "xptl;" \
+    "xpcs;";
+
+  strcpy(aModuleList,theModuleList);
+  return CountModules(theModuleList);
+}
+
+/*********************************************************
+  This list describes the set of modules for NS6.5
+  XXX This data should really live in a string table too.
+ *********************************************************/
+int Get65ModuleList(char *&aModuleList) {
+  static char* theModuleList = 
+
+  "nspr4;plds4;plc4;mozreg;xpcom;img3250;zlib;" \
+
+  "gkgfxwin;gkwidget;" \
+
+  "components\\gkparser;" \
+  "jpeg3250;" \
+  "js3250;" \
+  "jsj3250;" \
+  "jsdom;" \
+  "components\\jsloader;" \
+
+  "components\\activation;" \
+  "components\\addrbook;" \
+  "components\\appcomps;" \
+  "components\\appshell;" \
+  "components\\embedcomponents;"
+  "components\\caps;" \
+  "components\\chardet;" \
+  "components\\chrome;" \
+  "components\\cookie;" \
+  "components\\docshell;" \
+  "components\\editor;" \
+  "components\\gkplugin;" \
+  "components\\gkview;" \
+  "gkwidget;" \
+  "components\\jar50;" \
+  "components\\lwbrk;" \
+  "components\\necko;" \
+  "components\\nsgif;" \
+  "components\\nslocale;" \
+  "components\\nsprefm;" \
+  "components\\profile;" \
+  "components\\psmglue;" \
+  "components\\rdf;" \
+  "components\\shistory;" \
+  "components\\strres;" \
+  "components\\txmgr;" \
+  "components\\txtsvc;" \
+  "components\\ucharuti;" \
+  "components\\uconv;" \
+  "components\\ucvlatin;" \
+  "components\\ucvcn;" \
+  "components\\ucvja;" \
+  "components\\urildr;" \
+  "components\\wallet;" \
+  "components\\xpc3250;" \
+  "components\\xpinstal;" \
+  "components\\xppref32;" \
+  "components\\xmlextras;" \
+
+  "components\\gklayout;" \
+  "components\\gkcontent;" \
+  "components\\mozbrwsr;" \
+  "components\\nsjpg;" \
+  "components\\oji;" \
+
+  "msgbsutl;" \
+  "components\\mork;" \
+  "components\\msglocal;" \
+
+  "xprt;" \
+  "xptl;" \
+  "xpcs;";
+
+  strcpy(aModuleList,theModuleList);
+  return CountModules(theModuleList);
+}
+
+
+/*********************************************************
+  ...
+ *********************************************************/
+static char gKeyBuffer[512]={0};
+static char gSubKeyBuffer[128]={0};
+static char gWinNameBuffer[128]={0};     //this is the expected browser name.
+
+void GetPathFromRegistry(eAppVersion aVersion, const char *&aKey, const char *&aSubkey, char *&aModuleList, int &aSize) {
+  
+  switch(aVersion) { 
+  
+    case eMozilla:
+
+      aKey=(LoadString(gMainInst,IDS_MOZ_KEY,gKeyBuffer,sizeof(gKeyBuffer))) ? gKeyBuffer : "Software\\Mozilla.org\\Mozilla\\0.8 (en)\\Main"; 
+
+      aSubkey = (LoadString(gMainInst,IDS_SUBKEY_INSTALL,gSubKeyBuffer,sizeof(gSubKeyBuffer))) ? gSubKeyBuffer : "Install Directory";
+
+      gBrowserWindowName = (LoadString(gMainInst,IDS_MOZ_WINDOWNAME,gWinNameBuffer,sizeof(gWinNameBuffer))) ? gWinNameBuffer: "- Mozilla";
+
+      aSize=Get65ModuleList(aModuleList);
+
+      break;
+    
+    case eNetscape65:
+
+      aKey=(LoadString(gMainInst,IDS_NS65_KEY,gKeyBuffer,sizeof(gKeyBuffer))) ? gKeyBuffer : "Software\\Netscape\\Netscape 6\\6.5 (en)\\Main"; 
+
+      aSubkey = (LoadString(gMainInst,IDS_SUBKEY_INSTALL,gSubKeyBuffer,sizeof(gSubKeyBuffer))) ? gSubKeyBuffer : "Install Directory";
+
+      gBrowserWindowName = (LoadString(gMainInst,IDS_NS_WINDOWNAME,gWinNameBuffer,sizeof(gWinNameBuffer))) ? gWinNameBuffer: "- Netstacpe 6";
+
+      aSize=Get65ModuleList(aModuleList);
+
+      break;
+    
+    case eNetscape60:
+
+      aKey=(LoadString(gMainInst,IDS_NS60_KEY,gKeyBuffer,sizeof(gKeyBuffer))) ? gKeyBuffer : "Software\\Netscape\\Netscape 6\\6.0 (en)\\Main"; 
+
+      aSubkey = (LoadString(gMainInst,IDS_SUBKEY_PATH,gSubKeyBuffer,sizeof(gSubKeyBuffer))) ? gSubKeyBuffer : "Path";
+
+      gBrowserWindowName = (LoadString(gMainInst,IDS_NS_WINDOWNAME,gWinNameBuffer,sizeof(gWinNameBuffer))) ? gWinNameBuffer: "- Netstacpe 6";
+
+      aSize=Get60ModuleList(aModuleList);
+
+      break;
+
+    case eNetscapePre60:
+
+      aKey=(LoadString(gMainInst,IDS_PRE60_KEY,gKeyBuffer,sizeof(gKeyBuffer))) ? gKeyBuffer : "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\netscp6.exe"; 
+
+      aSubkey = (LoadString(gMainInst,IDS_SUBKEY_PATH,gSubKeyBuffer,sizeof(gSubKeyBuffer))) ? gSubKeyBuffer : "Path";
+
+      gBrowserWindowName = (LoadString(gMainInst,IDS_NS_WINDOWNAME,gWinNameBuffer,sizeof(gWinNameBuffer))) ? gWinNameBuffer: "- Netstacpe 6";
+
+      aSize=Get60ModuleList(aModuleList);
+
+      break;
+
+    case eUserPath:
+      aKey  = 0;
+      aSubkey= 0;
+      strcpy(gMozPath,gUserPath);
+
+      aSize=Get65ModuleList(aModuleList);
+
+      gBrowserWindowName = (LoadString(gMainInst,IDS_MOZ_WINDOWNAME,gWinNameBuffer,sizeof(gWinNameBuffer))) ? gWinNameBuffer: "- Mozilla";
+
+      break;
+
+    case eUnknown:
+      break;
+  }
+}
+
+/*********************************************************
+  Get the path to the netscape6 browser via the registry...
+ *********************************************************/
+void GetMozillaRegistryInfo(eAppVersion aVersion) {
+
+  //first we try to get the registry info based on the command line settings.
+  //if that fails, we try others.
+
+  LONG theOpenResult = 1; //any non-zero will do to initialize this...
+  
+  while(ERROR_SUCCESS!=theOpenResult) {
+     
+    GetPathFromRegistry(aVersion,gRegKey,gRegSubKey,gModuleCP,gModuleCount);
+    theOpenResult=ERROR_SUCCESS;
+
+    CRegKey theRegKey;
+
+    if(eUserPath!=aVersion) {
+      theOpenResult=theRegKey.Open(HKEY_LOCAL_MACHINE,gRegKey,KEY_QUERY_VALUE);
+
+      if(ERROR_SUCCESS==theOpenResult) {
+        DWORD theSize=1024;
+
+        theRegKey.QueryValue(gMozPath,gRegSubKey,&theSize);
+
+        if((ERROR_SUCCESS==theOpenResult) && (aVersion!=eUserPath)) {
+
+          theSize=1024;
+          char theCachedModuleList[1024] = {0};
+
+          theRegKey.QueryValue(theCachedModuleList,"Modules",&theSize);
+
+          if(theCachedModuleList[0]) {
+            strcpy(gMozModuleList,theCachedModuleList);
+          }
+          else {
+            theRegKey.Create(HKEY_LOCAL_MACHINE,gRegKey);
+            theRegKey.SetValue( HKEY_LOCAL_MACHINE, gRegKey, gMozModuleList, "Modules");
+          }
+        }
+
+        break;
+      }
+    }
+    aVersion=eAppVersion(int(aVersion)+1);
+    
+  } //while
+
+  gMozPathLen=strlen(gMozPath);
+  gModuleCP = gMozModuleList;
+
+}
+
+
+/*********************************************************
+  Extract the "next" module name from our module name list.
+  XXX The module names should come from string resources.
+ *********************************************************/
+void GetNextModuleName(char* aName) {
+  //scan ahead to find the next ';' or the end of the string...
+  bool done=false;
+  char theChar=0;
+
+  aName[0]=0;
+
+  char *theCP=gModuleCP;
+
+  while(*theCP) {
+    theChar=*theCP;
+    if(';'==theChar)
+      break;
+    else theCP++;
+  }
+
+  if(theCP!=gModuleCP) {
+    size_t theSize=theCP-gModuleCP;
+    strncpy(aName,gModuleCP,theSize);
+    aName[theSize]=0;
+    gModuleCP=theCP;
+    while(';'==*gModuleCP)
+      gModuleCP++;
+  }
+
+}
+
+/****************************************************************
+  The following types are fraudulent. They're just here so 
+  we can write up calls entry points in each module.
+ ****************************************************************/
+
+const  int        gMaxProcIndex=256;
+static HINSTANCE  gInstances[256];
+static long*      gFuncTable[256][gMaxProcIndex];
+static int        gDLLCount=0;
+
+struct nsIID; 
+typedef const nsIID& (*GetIIDFunc)(void);
+
+
+/****************************************************************
+  Call this once for each module you want to preload.
+ ****************************************************************/
+HINSTANCE LoadModule(const char* aName) {
+
+  //gModulePercent
+
+  //we operate on gMozPath directly to avoid an unnecessary string copy.
+  //when we're done with this method, we reset gMozpath to it's original value for reuse.
+
+  strcat(gMozPath,aName);
+  strcat(gMozPath,".dll");
+
+  gFuncTable[gDLLCount][0]=0; //make sure the table looks empty by default.
+  
+  HINSTANCE theInstance=gInstances[gDLLCount++]=LoadLibrary(gMozPath);
+
+  int theEntryCount=0;
+
+  if(theInstance) {
+    //let's get addresses throughout the module, skipping over every 20.
+    for(int theEntryPoint=0;theEntryPoint<64;theEntryPoint++){
+      long *entry=(long*)::GetProcAddress(theInstance,MAKEINTRESOURCE(1+(20*theEntryPoint)));
+      if(entry) {
+        gFuncTable[gDLLCount-1][theEntryCount++]=entry;
+        gFuncTable[gDLLCount][theEntryCount]=0; //always add a null to the end
+      }
+    }
+  }
+
+  gMozPath[gMozPathLen]=0;
+  return theInstance;
+}
+
+
+BOOL CALLBACK EnumWindowsProc(HWND hwnd,LPARAM lParam ) {
+
+  char buf[256]={0};
+  if(GetWindowText(hwnd,buf,sizeof(buf))){
+    if(strstr(buf,gBrowserWindowName)) {
+      return FALSE; //stop iterating now...
+    }
+  }
+  return TRUE;
+}
+
+/****************************************************************
+  Call this to detect whether the browser is running.
+ ****************************************************************/
+bool BrowserIsRunning() {
+  if(!EnumWindows(EnumWindowsProc,0)) {
+    return true;
+  }
+  return false;
+}
+
+/****************************************************************
+  This function get's called repeatedly to call on a timer,
+  and it calls GetProcAddr() to keep modules from paging.
+ ****************************************************************/
+VOID CALLBACK KeepAliveTimerProc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime  ) {
+
+  //let's go see if mozilla is running.
+  //if so, then bail out without pinging modules...
+  
+  if(BrowserIsRunning()) {
+    return;
+  }
+
+  static bool theTimerIsRunning=false;
+  static int  theCurrentModule=0;
+  static int  theCurrentProc=0;
+
+  if(!theTimerIsRunning) { //ignore other timer calls till we're done.
+    theTimerIsRunning=true;
+
+    const int modulesPerStep=40; //how many modules to "touch" each time...
+
+    int theCount=0;
+
+    for(int theSteps=0;theSteps<modulesPerStep;theSteps++) {
+
+      volatile long *p=(long*)gFuncTable[theCurrentModule++][theCurrentProc];
+      if (p && (*p)){  
+        //don't actually invoke it, just cause it to load into memory...
+        //note that modules have different number of entry points.
+        //so not all modules have an entry point at theCurrentProc index.
+      }
+     
+      if(theCurrentModule>=gDLLCount) {
+        theCurrentModule=0; //loop back around to top of module list...
+        theCurrentProc++;
+        if(theCurrentProc>=gMaxProcIndex){
+          theCurrentProc=0; //reset this too!
+        }
+      }
+
+    }
+
+    theTimerIsRunning=false;
+  }
+}
+
+
+/****************************************************************
+  This gets called repeatedly by a windows timer, and loads
+  the modules that it gets from the modulelist (see top of this file).
+
+  This routine has been updated to account for the gModulesPercent
+  setting (1-100). We'll load modules until we cross over this 
+  percentage.
+ ****************************************************************/
+VOID CALLBACK LoadModuleTimerProc(HWND hwnd, UINT uMsg, UINT idEvent,DWORD dwTime) {
+
+  static bool theTimerIsRunning=false;
+  static int  gTrayIconIndex = 0;
+
+  if(!theTimerIsRunning) {
+    theTimerIsRunning=true;
+
+      //gDLLCount is the number of modules loaded so far
+      //gModuleCount is the total number of modules we know about
+      //gModulePercent is the total % of modules we're being asked to load (config setting)
+
+    if(gDLLCount/gModuleCount<gModulePercent) {
+
+        //we'll only load more modules if haven't loaded the max percentage of modules
+        //based on the configuration UI (stored in gModulePercent).
+
+      const int theModulePerCallCount = 2; // specifies how many modules to load per timer callback.
+
+      for(int theModuleIndex=0;theModuleIndex<theModulePerCallCount;theModuleIndex++) {
+
+        SetTrayIcon(gCheckIcons[gTrayIconIndex]);
+
+        gTrayIconIndex = (gTrayIconIndex==1) ? 0 : gTrayIconIndex+1; //this toggles the preloader icon to show activity...
+
+        char theDLLName[512];
+        GetNextModuleName(theDLLName);
+
+        if(theDLLName[0]) {
+          HINSTANCE theInstance=LoadModule(theDLLName);
+        }
+        else {
+          KillTimer(gMainWindow,kLoadTimerID);     
+          SetTrayIcon(gCheckIcons[1]);
+      
+          //now make a new timer that calls GetProcAddr()...
+          //we take gFrequencyPercent into account. We assume a timer range (min..max) of ~200ms.
+
+          int theFreq=10+(100-gFrequencyPercent)*2;
+
+          UINT result=SetTimer(gMainWindow,kPingModuleTimerID,theFreq,KeepAliveTimerProc);
+          return; //bail out
+      
+        }
+      }
+    }
+
+    theTimerIsRunning=false;
+  }
+}
+ 
+/****************************************
+  we support the following args:
+    -f(+/-) : use FULL module list (not really supported yet)
+    -m : use mozilla installation
+    -n : use netscape installation (this is the default)
+    -p : use the given path (use this when you're running from a debug build rather than an installed version)
+ ****************************************/
+void ParseArgs(LPSTR &CmdLineArgs,eAppVersion &anAppVersion) {
+
+  const char* cp=CmdLineArgs;
+  
+  anAppVersion = eNetscape65; //by default.
+
+  while(*cp) {
+    char theChar=*cp;
+    if(('-'==theChar) || ('/'==theChar)){
+      //we found a valid command, go get it...
+      ++cp;
+      char theCmd=*cp;
+
+      switch(theCmd) {
+        case 'n':
+        case 'N':
+          anAppVersion=eNetscape65;
+          break;
+
+        case 'm':
+        case 'M':
+          anAppVersion=eMozilla;
+          break;
+
+        case 'f':
+        case 'F':
+          ++cp;          
+          if('+'==*cp) {
+            gUseFullModuleList=true;
+          }
+          break;
+
+        case 'p':
+        case 'P':
+          cp++; //skip over the command, then get the install path the user wants us to use.
+          anAppVersion=eUserPath;
+          while(*cp) {              //skip whitespace...
+            if(' '!=*cp)
+              break;
+            cp++;
+          }
+            //now eat the path
+          gMozPathLen=gUserPathLen=0;
+          if('"'==*cp) { // path is either "a b" or ab
+            cp++; // skip the "
+            while(*cp) {
+              if('"'!=*cp) {
+                gUserPath[gUserPathLen++]=*cp;
+              }
+              cp++;
+            }
+          }
+          else {
+            while(*cp) {
+              if(' '!=*cp) {
+                gUserPath[gUserPathLen++]=*cp;
+              }
+              cp++;
+            }
+          }
+          if(gUserPath[gUserPathLen-1]!= '\\') // make sure there's a \ on the end. 
+            gUserPath[gUserPathLen++] = '\\';
+          gUserPath[gUserPathLen]=0;
+          continue;
+          break;
+        default:
+          break;
+      }
+    }
+    cp++; 
+  }
+
+}
+
+/*********************************************************
+  This is the event loop controller for our diable 
+  dialog box UI.
+ *********************************************************/
+BOOL CALLBACK DisableDialogProc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam) {
+
+  switch(Msg) {
+
+    case WM_INITDIALOG:
+      {
+        RECT cr1,cr2;
+
+          //The rect code below is used to put our dialog right by the taskbar.
+          //It makes it's presence more obvious to the user.
+
+        HWND theTopWnd=GetDesktopWindow();
+        GetClientRect(theTopWnd,&cr1);
+        GetClientRect(hwnd,&cr2);
+        int w=cr2.right-cr2.left;
+        int h=cr2.bottom-cr2.top;
+
+        SetWindowPos(hwnd,HWND_TOP,cr1.right-(w+50),cr1.bottom-(h+70),0,0,SWP_NOSIZE);
+        return TRUE;
+      }
+  
+    case WM_COMMAND:
+      switch(LOWORD(wParam)) {
+        case IDOK:
+          EndDialog(hwnd,1);
+          break;
+        case IDCANCEL:
+          EndDialog(hwnd,0);
+          return TRUE;
+          break;
+        default:
+          break;
+      }//switch
+    default:
+      break;
+  }
+  
+  return FALSE;
+}
+
+/*********************************************************
+  This is the event loop controller for our performance
+  conifuration dialog box UI.
+ *********************************************************/
+BOOL CALLBACK ConfigureDialogProc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam) {
+
+  int x=0;
+
+  switch(Msg) {
+
+    case WM_INITDIALOG:
+      {
+        RECT cr1,cr2;
+
+          //The rect code below is used to put our dialog right by the taskbar.
+          //It makes it's presence more obvious to the user.
+
+        HWND theTopWnd=GetDesktopWindow();
+        GetClientRect(theTopWnd,&cr1);
+        GetClientRect(hwnd,&cr2);
+        int w=cr2.right-cr2.left;
+        int h=cr2.bottom-cr2.top;
+
+        /*---------------------------------------------------------------
+          add code here to set the range of our sliders...
+         ---------------------------------------------------------------*/
+
+        HWND theSlider=GetDlgItem(hwnd,IDC_MODULES);
+        gModulePercent = SendMessage(theSlider, TBM_SETPOS, (BOOL)TRUE, (LONG)gModulePercent); 
+
+        theSlider=GetDlgItem(hwnd,IDC_ENTRIES);
+        gEntryPercent = SendMessage(theSlider, TBM_SETPOS, (BOOL)TRUE, (LONG)gEntryPercent); 
+
+        theSlider=GetDlgItem(hwnd,IDC_FREQUENCY);
+        gFrequencyPercent = SendMessage(theSlider, TBM_SETPOS, (BOOL)TRUE, (LONG)gFrequencyPercent); 
+        
+        SetWindowPos(hwnd,HWND_TOP,cr1.right-(w+50),cr1.bottom-(h+70),0,0,SWP_NOSIZE);
+        return TRUE;
+      }
+
+    case WM_COMMAND:
+      switch(LOWORD(wParam)) {
+
+        case IDOK:
+
+          {
+            HWND theSlider=GetDlgItem(hwnd,IDC_MODULES);
+            gModulePercent = SendMessage(theSlider, TBM_GETPOS, 0, 0); 
+
+            theSlider=GetDlgItem(hwnd,IDC_ENTRIES);
+            gEntryPercent = SendMessage(theSlider, TBM_GETPOS, 0, 0); 
+
+            theSlider=GetDlgItem(hwnd,IDC_FREQUENCY);
+            gFrequencyPercent = SendMessage(theSlider, TBM_GETPOS, 0, 0); 
+
+            EndDialog(hwnd,1);
+
+            //and now, let's save the configuration settings...
+
+            CRegKey theRegKey;
+
+            LONG theOpenResult=theRegKey.Open(HKEY_LOCAL_MACHINE,gRegKey,KEY_QUERY_VALUE);
+            if(ERROR_SUCCESS!=theOpenResult) {
+              theRegKey.Create(HKEY_LOCAL_MACHINE,gRegKey);
+            }
+
+            char theSettings[128];
+            sprintf(theSettings,"%i %i %i",gModulePercent,gEntryPercent,gFrequencyPercent);
+            theRegKey.SetValue( HKEY_LOCAL_MACHINE, gRegKey, theSettings, "Settings");
+          }
+          
+          break;
+
+        case IDCANCEL:
+          EndDialog(hwnd,0);
+          return TRUE;
+          break;
+
+        default:
+          break;
+      }//switch
+    default:
+      break;
+  }
+  
+  return FALSE;
+}
+
+/*********************************************************
+  The user asked us to disable the preloader. So we'll try
+  to remove ourselves from both the current user start
+  menu and ALL-USERS start menu.
+
+  This ASSUMES that the installer put us into the startup
+  folder using a shortcut to our current exe name.
+
+  So, if the exe is called "preloader.exe", then we assume
+  that the installer put us into the startup folder as:
+
+  "shortcut to preloader.exe.lnk".
+ *********************************************************/
+void RemoveFromStartupFolder() {
+  
+  //Using the name of our running application, let's derive the
+  //name of the link to it in the startup folder.
+
+  char theAppName[128]={0};
+  char theFilename[128]={0};
+  char theFullPath[1024]={0};
+
+  const char *theLastSep=strrchr(gExePath,thePathSep[0]);
+
+  if(theLastSep) {
+    theLastSep++; //skip the slash
+
+    char prefix[512]={0};
+    
+    if(LoadString(gMainInst,IDS_STARTUP_FOLDER_PREFIX,prefix,sizeof(prefix))){
+      
+      char suffix[512]={0};
+    
+      if(LoadString(gMainInst,IDS_STARTUP_FOLDER_SUFFIX,suffix,sizeof(suffix))){
+        strcpy(theFilename,prefix);
+        strcat(theFilename,theLastSep);
+        strcat(theFilename,suffix);
+      }
+    
+    }
+  }
+
+  if(theFilename) { //dont try if you can't get a reasonable guess to the path in the startup folder.
+  
+    //-----------------------------------------------------------------------------
+    //first, let's try to remove ourselves from the current users's startup folder...
+    //-----------------------------------------------------------------------------
+
+    char theUserKey[256]={0};
+    if(LoadString(gMainInst,IDS_STARTUP_FOLDER_KEY,theUserKey,sizeof(theUserKey))) {
+
+      CRegKey theRegKey;
+
+      LONG theOpenResult=theRegKey.Open(HKEY_CURRENT_USER,theUserKey,KEY_QUERY_VALUE);
+
+      if(ERROR_SUCCESS==theOpenResult) {
+    
+        DWORD theSize=sizeof(theFullPath);
+
+        char theSubKey[128]={0};
+        
+        if(LoadString(gMainInst,IDS_STARTUP_FOLDER_SUBKEY1,theSubKey,sizeof(theSubKey))) {
+         
+          theRegKey.QueryValue(theFullPath,theSubKey,&theSize);
+          if(theFullPath) {
+
+            //Now let's construct a complete path to our preloader.exe.lnk.
+
+            strcat(theFullPath,thePathSep);
+            strcat(theFullPath,theFilename);
+
+            //Ask the OS to remove us from the startup folder...
+
+            DeleteFile(theFullPath);
+          }
+        }
+      }
+    }
+
+    //-----------------------------------------------------------------------------
+    //Next, let's try to remove ourselves from ALL_USERS startup folder...
+    //-----------------------------------------------------------------------------
+
+    CRegKey theRegKey2;
+
+    LONG theOpenResult=theRegKey2.Open(HKEY_LOCAL_MACHINE,theUserKey,KEY_QUERY_VALUE);
+
+    if(ERROR_SUCCESS==theOpenResult) {
+  
+      DWORD theSize=sizeof(theFullPath);
+
+      char theSubKey[128]={0};
+      
+      if(LoadString(gMainInst,IDS_STARTUP_FOLDER_SUBKEY2,theSubKey,sizeof(theSubKey))) {
+       
+        theRegKey2.QueryValue(theFullPath,theSubKey,&theSize);
+        if(theFullPath) {
+
+          //Now let's construct a complete path to our preloader.exe.lnk.
+
+          strcat(theFullPath,thePathSep);
+          strcat(theFullPath,theFilename);
+
+          //Ask the OS to remove us from the startup folder...
+
+          DeleteFile(theFullPath);
+        }
+      }
+    }
+
+  }
+}
+
+
+/*********************************************************
+  
+ *********************************************************/
+LRESULT CALLBACK WindowFunc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam) {
+
+  static HMENU hPopup=0;           //menu handle
+  static int   gState=0;
+  static bool  gConfigDialogShowing=false;
+
+  switch(Msg) {
+
+    case WM_CREATE: 
+      //initialize icons
+
+      gCheckIcons[0]=LoadIcon(gMainInst, MAKEINTRESOURCE(IDI_CHECK));
+      gCheckIcons[1]=LoadIcon(gMainInst, MAKEINTRESOURCE(IDI_CHECK1));
+      gBrowserRunningIcon = LoadIcon(gMainInst, MAKEINTRESOURCE(IDI_BROWSERRUNNING));
+
+      //initialize popup menu
+      hPopup=LoadMenu(gMainInst, MAKEINTRESOURCE(IDR_MENU1));
+
+      gMainWindow=hwnd;
+      ShowTrayApp(true); //now display our app in the system tray
+
+      break;
+
+    //notification from trayicon received
+    case WM_TRAY:
+
+      //if right mouse button pressed
+      if(lParam == WM_RBUTTONDOWN && (!gConfigDialogShowing)) {
+        POINT pt;
+        GetCursorPos(&pt);  //get cursor position
+        SetForegroundWindow(hwnd);  //set window to foreground
+        //display popup menu
+        BOOL bRes=TrackPopupMenu(GetSubMenu(hPopup, 0), TPM_BOTTOMALIGN | TPM_RIGHTALIGN | TPM_RIGHTBUTTON,
+                                 pt.x, pt.y, 0, hwnd, 0);
+        //send dummy message to window
+        SendMessage(hwnd, WM_NULL, 0, 0);
+      }
+      break;
+
+    //notification from menu received
+    case WM_COMMAND:
+
+      switch(LOWORD(wParam)) {
+
+        case IDM_CONFIGURE:
+          {
+            if(!gConfigDialogShowing) {
+              gConfigDialogShowing=true;
+              if(DialogBox(gMainInst,MAKEINTRESOURCE(IDD_PERFORMANCE),hwnd,ConfigureDialogProc)) {
+              }
+              gConfigDialogShowing=false;
+            }
+          }
+          break;
+
+        case IDM_REMOVE:
+          //show them the disable preloader dialog. If they say yes, remove ourselves from
+          //the start menu (if that's where we were launched from) and quit.
+          //now fall through on purpose...
+          if(DialogBox(gMainInst,MAKEINTRESOURCE(DISABLE),hwnd,DisableDialogProc)) {
+            //a non-zero result means we are supposed to kill the preloader 
+            //and remove it from the startup folder.
+
+            RemoveFromStartupFolder();
+            //now fall thru...
+
+          }
+          else break;
+                
+        case IDM_EXIT:
+          DestroyWindow(hwnd);
+          break;
+
+        //change icon in system tray; why bother?
+        case IDM_CHANGE:
+          if(!gState) {
+            gState=1;
+          } 
+          else {
+            gState=0;
+          }
+          break;
+      }
+      break;
+
+    //exit application
+    case WM_DESTROY:
+      //release used resources
+
+      ShowTrayApp(false);
+
+      DestroyIcon(gCheckIcons[0]);
+      DestroyIcon(gCheckIcons[1]);
+
+      DestroyMenu(hPopup);
+      PostQuitMessage(0);
+      break;
+
+    default:
+      return DefWindowProc(hwnd, Msg, wParam, lParam);
+  }
+  return 0;
+}
+
+ 
+/*********************************************************
+  Main 
+ *********************************************************/
+int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpszArgs,int nWinMode){
+
+  ::CreateMutex(NULL, FALSE, "YourMutexName");
+  if (GetLastError()  == ERROR_ALREADY_EXISTS ) {
+    //Bail out if we already have one instance running.
+    exit(0);
+  }
+
+  WNDCLASS WinClass;
+
+  static char theClassName[128];
+  if(!LoadString(hInstance,IDS_CLASSNAME,theClassName,sizeof(theClassName)))
+    strcpy(theClassName,"MozPreloader"); //as a backup; just being paranoid.
+
+  //register window class
+  WinClass.hInstance=hInstance;
+
+  //---------------------------------------------------------------
+  //  We hang on to the app name in case they disable us.
+  //  We'll remove a .lnk entry of this name from the startup folder.
+  //---------------------------------------------------------------
+
+  GetModuleFileName(hInstance,gExePath,sizeof(gExePath)); //remember where we were run from in case we get disabled. 
+
+
+  //---------------------------------------------------------------
+  //  Now let's init and register our window class...
+  //---------------------------------------------------------------
+
+  gMainInst=hInstance;
+  WinClass.lpszClassName=theClassName;  //specify class name
+  WinClass.lpfnWndProc=WindowFunc;    //specify callback function
+  WinClass.style=0;
+  WinClass.hIcon=LoadIcon(NULL, IDI_APPLICATION); //specify icon
+  WinClass.hCursor=LoadCursor(NULL, IDC_ARROW);   //specify cursor
+  WinClass.lpszMenuName=0;
+  WinClass.cbClsExtra=0;
+  WinClass.cbWndExtra=0;
+  WinClass.hbrBackground=(HBRUSH)GetStockObject(WHITE_BRUSH); //specify window background
+
+  if(!RegisterClass(&WinClass))
+    return 0;
+
+  //create window
+  HWND hwnd=CreateWindow(theClassName,0,WS_OVERLAPPEDWINDOW,10,10,10,10,HWND_DESKTOP,NULL,hInstance,NULL);
+  gMainWindow=hwnd;
+
+  //hide window
+  ShowWindow(hwnd, SW_HIDE);
+
+  //---------------------------------------------------------------
+  //  Now let's grab the module settings info...
+  //---------------------------------------------------------------
+
+  bool useDebugModuleList=false;
+  
+  eAppVersion theAppVersion;
+
+  ParseArgs(lpszArgs,theAppVersion);
+  GetMozillaRegistryInfo(theAppVersion); 
+
+  SetTrayIcon(gBrowserRunningIcon); //by default.
+
+  //---------------------------------------------------------------
+  //  Now let's grab the config settings (if they happen to exist)
+  //---------------------------------------------------------------
+
+  CRegKey theRegKey;
+
+  LONG theOpenResult=theRegKey.Open(HKEY_LOCAL_MACHINE,gRegKey,KEY_QUERY_VALUE);
+  if(ERROR_SUCCESS==theOpenResult) {
+
+    const int theSize=1024;
+    DWORD size=theSize;
+    char theSettings[theSize] = {0};
+
+    theOpenResult=theRegKey.QueryValue(theSettings,"Settings",&size);
+    if(ERROR_SUCCESS==theOpenResult) {
+      //now let's decode the settings from the string
+      char *cp=theSettings;
+        
+      gModulePercent = atoi(cp);
+      cp=strchr(cp,' '); //skip ahead to the next space...
+      cp++; //and step over it
+
+      gEntryPercent = atoi(cp);
+      cp=strchr(cp,' '); //skip ahead to the next space...
+      cp++; //and step over it
+
+      gFrequencyPercent = atoi(cp);
+
+    }
+  }
+
+  //---------------------------------------------------------------
+  //  And start the timer...
+  //---------------------------------------------------------------
+
+  if(!BrowserIsRunning()) {
+    SetTimer(hwnd,kLoadTimerID,50,LoadModuleTimerProc); //don't bother with the preloader if the browser is already up...
+  }
+  
+  //start message pump
+  MSG WinMsg;
+  while(GetMessage(&WinMsg, NULL, 0, 0)) {
+    TranslateMessage(&WinMsg);
+    DispatchMessage(&WinMsg);
+  }
+
+  return WinMsg.wParam;
+}
+
diff --git a/mozilla/tools/preloader/preloader.ico b/mozilla/tools/preloader/preloader.ico
new file mode 100644
index 00000000000..de8ea447ba2
Binary files /dev/null and b/mozilla/tools/preloader/preloader.ico differ
diff --git a/mozilla/tools/preloader/preloader.rc b/mozilla/tools/preloader/preloader.rc
new file mode 100644
index 00000000000..2eb01a7c328
--- /dev/null
+++ b/mozilla/tools/preloader/preloader.rc
@@ -0,0 +1,180 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resrc1.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_MAIN                ICON    DISCARDABLE     "preloader.ico"
+IDI_CHECK               ICON    DISCARDABLE     "check.ico"
+IDI_CHECK1              ICON    DISCARDABLE     "check1.ico"
+IDI_BROWSERRUNNING      ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+DISABLE DIALOG DISCARDABLE  0, 0, 186, 63
+STYLE DS_MODALFRAME | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Disable Preloader?"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
+    LTEXT           "Are you sure you want to disable the preloader, after all of our hard work?",
+                    IDC_STATIC,20,13,89,33
+END
+
+IDD_PERFORMANCE DIALOG DISCARDABLE  0, 0, 233, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Performance Configuration"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,168,42,50,14
+    CONTROL         "Slider1",IDC_MODULES,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,57,17,100,19
+    CONTROL         "Slider2",IDC_ENTRIES,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,57,37,100,19
+    CONTROL         "Slider3",IDC_FREQUENCY,"msctls_trackbar32",
+                    TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,57,58,100,19
+    LTEXT           "Modules",IDC_STATIC,17,26,28,8
+    LTEXT           "Entry Points",IDC_STATIC,17,45,38,8
+    LTEXT           "Frequency",IDC_STATIC,17,66,34,8
+    LTEXT           "Min",IDC_STATIC,61,8,12,8
+    LTEXT           "Max",IDC_STATIC,143,9,14,8
+    PUSHBUTTON      "Cancel",IDCANCEL,168,60,50,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_MENU1 MENU DISCARDABLE 
+BEGIN
+    POPUP "Popup"
+    BEGIN
+        MENUITEM "&Disable",                    IDM_REMOVE
+        MENUITEM "&Configure",                  IDM_CONFIGURE
+        MENUITEM "E&xit",                       IDM_EXIT
+    END
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resrc1.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""resource.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    DISABLE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 179
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 56
+    END
+
+    IDD_PERFORMANCE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 226
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 88
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_MOZ_KEY             "Software\\Mozilla.org\\Mozilla\\0.8 (en)\\Main"
+    IDS_NS65_KEY            "Software\\Netscape\\Netscape 6\\6.5 (en)\\Main"
+    IDS_NS60_KEY            "Software\\Netscape\\Netscape 6\\6.0 (en)\\Main"
+    IDS_PRE60_KEY           "Software\\MicrosoftWindows\\CurrentVersion\\App Paths\netscp6.exe"
+    IDS_STARTUP_FOLDER_PREFIX "Shortcut to "
+    IDS_STARTUP_FOLDER_SUFFIX ".lnk"
+    IDS_STARTUP_FOLDER_KEY  "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"
+    IDS_STARTUP_FOLDER_SUBKEY1 "Startup"
+    IDS_STARTUP_FOLDER_SUBKEY2 "Common Startup"
+    IDS_CLASSNAME           "MozPreLoader"
+    IDS_TOOLTIP             "Right click to configure the preloader"
+    IDS_SUBKEY_INSTALL      "Install Directory"
+    IDS_SUBKEY_PATH         "Path"
+    IDS_NS_WINDOWNAME       "- Netscape 6"
+    IDS_MOZ_WINDOWNAME      "- Mozilla"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/mozilla/tools/preloader/resource.h b/mozilla/tools/preloader/resource.h
new file mode 100644
index 00000000000..48addd3d980
--- /dev/null
+++ b/mozilla/tools/preloader/resource.h
@@ -0,0 +1,11 @@
+
+//icon IDs
+#define IDI_MAIN                        101
+
+#include <windows.h>
+
+
+//menu messages
+
+
+
diff --git a/mozilla/tools/preloader/resrc1.h b/mozilla/tools/preloader/resrc1.h
new file mode 100644
index 00000000000..e8e3aab0738
--- /dev/null
+++ b/mozilla/tools/preloader/resrc1.h
@@ -0,0 +1,49 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by main.rc
+//
+#define IDS_MOZ_KEY                     1
+#define IDS_NS65_KEY                    2
+#define IDS_NS60_KEY                    3
+#define IDS_PRE60_KEY                   4
+#define IDS_STARTUP_FOLDER_PREFIX       5
+#define IDS_STARTUP_FOLDER_SUFFIX       6
+#define IDS_STARTUP_FOLDER_KEY          7
+#define IDS_STARTUP_FOLDER_SUBKEY1      8
+#define IDS_STARTUP_FOLDER_SUBKEY2      9
+#define IDS_CLASSNAME                   10
+#define IDS_TOOLTIP                     11
+#define IDS_SUBKEY_INSTALL              12
+#define IDS_SUBKEY_PATH                 13
+#define IDS_NS_WINDOWNAME               14
+#define IDS_MOZ_WINDOWNAME              15
+#define DISABLE                         101
+#define TRYMERICK                       101
+#define IDD_DIALOG1                     102
+#define IDR_MENU1                       106
+#define IDI_CHECK                       108
+#define IDD_PERFORMANCE                 108
+#define IDI_CHECK1                      109
+#define IDI_BROWSERRUNNING              110
+#define IDC_SLIDER1                     1000
+#define IDC_MODULES                     1000
+#define IDC_SLIDER2                     1001
+#define IDC_ENTRIES                     1001
+#define IDC_SLIDER3                     1002
+#define IDC_FREQUENCY                   1002
+#define IDM_CONFIGURE                   40007
+#define IDM_EXIT                        40011
+#define IDM_CHANGE                      40012
+#define IDM_REMOVE                      40013
+#define IDC_STATIC                      -1
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        111
+#define _APS_NEXT_COMMAND_VALUE         40008
+#define _APS_NEXT_CONTROL_VALUE         1003
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif