Bug 251078 Remove xpcom's rebase utility

patch by sdwalker@myrealbox.com r=bryner

allmakefiles.sh

@@ -607,7 +607,6 @@ xpcom/sample/Makefile
 xpcom/threads/Makefile
 xpcom/tools/Makefile
 xpcom/tools/registry/Makefile
-xpcom/tools/windows/Makefile
 xpcom/windbgdlg/Makefile
 $MAKEFILES_libreg
 $MAKEFILES_libjar

browser/installer/Makefile.in

@@ -56,7 +56,6 @@ NO_PKG_FILES = \
 	msmap* \
 	nm2tsv* \
 	nsinstall* \
-	rebasedlls* \
 	regchrome* \
 	regxpcom* \
 	res/samples \

mail/installer/Makefile.in

@@ -57,7 +57,6 @@ NO_PKG_FILES = \
 	msmap* \
 	nm2tsv* \
 	nsinstall* \
-	rebasedlls* \
 	regchrome* \
 	regxpcom* \
 	res/samples \

xpcom/base/nsStackFrameWin.cpp

@@ -247,10 +247,6 @@ EnsureSymInitialized()
  * so that the address in the file agrees with the address in memory.
  * Otherwise StackWalk will return FALSE when it hits a frame in a dll's
  * whose in memory address doesn't match it's in-file address.
- *
- * Fortunately, there is a handy dandy routine in IMAGEHLP.DLL that does
- * the rebasing and accordingly I've made a tool to use it to rebase the
- * DLL's in one fell swoop (see xpcom/tools/windows/rebasedlls.cpp).
  */
 
 

xpcom/build/xpcom.pkg

@@ -101,6 +101,3 @@ dist/include/nspr/plstr.h
 !optional dist/bin/.autoreg
 !optional dist/bin/components/xpti.dat
 !optional dist/bin/components/compreg.dat
-#if OS_ARCH==WINNT
-dist/bin/rebasedlls.exe
-#endif

xpcom/tools/Makefile.in

@@ -45,9 +45,5 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 DIRS		= registry
 
-ifeq ($(OS_ARCH),WINNT)
-DIRS		+= windows
-endif
-
 include $(topsrcdir)/config/rules.mk
 

xpcom/tools/windows/.cvsignore

-Makefile

xpcom/tools/windows/Makefile.in

-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-SIMPLE_PROGRAMS	= rebasedlls$(BIN_SUFFIX)
-
-CPPSRCS		= rebasedlls.cpp
-
-OS_LIBS		+= $(call EXPAND_LIBNAME,imagehlp)
-
-include $(topsrcdir)/config/rules.mk
-

xpcom/tools/windows/rebasedlls.cpp

-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include <windows.h>
-#include <stdio.h>
-#include <imagehlp.h>
-#include <time.h>
-
-static char* gSymbolPath = NULL;
-static DWORD gBaseAddr = (DWORD) 0x60000000;
-static time_t now;
-
-static void
-ReBase(char* aDLLName)
-{
-  DWORD oldsize, oldbase, newsize;
-  DWORD newbase = gBaseAddr;
-  BOOL b = ReBaseImage(aDLLName, gSymbolPath, TRUE, FALSE, FALSE,
-		       0, &oldsize, &oldbase, &newsize, &newbase,
-		       now);
-  DWORD lastError = ::GetLastError();
-  printf("%-20s %08x %08x %08x %08x",
-	 aDLLName, oldbase, oldsize, newbase, newsize);
-  if (!b) {
-    printf(" (failed: error=%d/0x%x)", lastError, lastError);
-  }
-  fputs("\n", stdout);
-
-  // advance base; round size up to nearest 64k
-  newsize = ((newsize + 65535) >> 16) << 16;
-  gBaseAddr = newbase + newsize;
-}
-
-static void
-Usage()
-{
-  printf("Usage: ReBase [-libs library-path] dlls...\n");
-}
-
-int
-main(int argc, char** argv)
-{
-  now = time(0);
-  int i;
-  for (i = 1; i < argc; i++) {
-    if (argv[i][0] == '-') {
-      if (strcmp(argv[i], "-libs") == 0) {
-	if (i == argc - 1) {
-	  Usage();
-	  return -1;
-	}
-	gSymbolPath = argv[++i];
-      }
-      else {
-	Usage();
-	return -1;
-      }
-    }
-    else
-      break;
-  }
-
-  if (i < argc) {
-    printf("Library              OldBase  OldSize  NewBase  NewSize\n");
-    printf("-------              -------  -------  -------  -------\n");
-  }
-  for (; i < argc; i++) {
-    ReBase(argv[i]);
-  }
-  return 0;
-}