diff -r 000000000000 -r 6474c204b198 tools/trace-malloc/lib/nsWinTraceMalloc.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/trace-malloc/lib/nsWinTraceMalloc.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,252 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "prinrval.h"
+#include "prlock.h"
+#include "nscore.h"
+
+#include "nsDebugHelpWin32.h"
+#include "nsTraceMallocCallbacks.h"
+
+/***************************************************************************/
+// shows how to use the dhw stuff to hook imported functions
+
+#if _MSC_VER < 1300
+#define NS_DEBUG_CRT "MSVCRTD.dll"
+#elif _MSC_VER == 1300
+#define NS_DEBUG_CRT "msvcr70d.dll"
+#elif _MSC_VER == 1310
+#define NS_DEBUG_CRT "msvcr71d.dll"
+#elif _MSC_VER == 1400
+#define NS_DEBUG_CRT "msvcr80d.dll"
+#elif _MSC_VER == 1500
+#define NS_DEBUG_CRT "msvcr90d.dll"
+#elif _MSC_VER == 1600
+#define NS_DEBUG_CRT "msvcr100d.dll"
+#elif _MSC_VER == 1700
+#define NS_DEBUG_CRT "msvcr110d.dll"
+#elif _MSC_VER == 1800
+#define NS_DEBUG_CRT "msvcr120d.dll"
+#else
+#error "Don't know filename of MSVC debug library."
+#endif
+
+decltype(malloc) dhw_malloc;
+
+DHWImportHooker &getMallocHooker()
+{
+  static DHWImportHooker gMallocHooker(NS_DEBUG_CRT, "malloc", (PROC) dhw_malloc);
+  return gMallocHooker;
+}
+
+void * __cdecl dhw_malloc( size_t size )
+{
+    tm_thread *t = tm_get_thread();
+    ++t->suppress_tracing;
+    uint32_t start = PR_IntervalNow();
+    void* result = DHW_ORIGINAL(malloc, getMallocHooker())(size);
+    uint32_t end = PR_IntervalNow();
+    --t->suppress_tracing;
+    MallocCallback(result, size, start, end, t);
+    return result;    
+}
+
+decltype(calloc) dhw_calloc;
+
+DHWImportHooker &getCallocHooker()
+{
+  static DHWImportHooker gCallocHooker(NS_DEBUG_CRT, "calloc", (PROC) dhw_calloc);
+  return gCallocHooker;
+}
+
+void * __cdecl dhw_calloc( size_t count, size_t size )
+{
+    tm_thread *t = tm_get_thread();
+    ++t->suppress_tracing;
+    uint32_t start = PR_IntervalNow();
+    void* result = DHW_ORIGINAL(calloc, getCallocHooker())(count,size);
+    uint32_t end = PR_IntervalNow();
+    --t->suppress_tracing;
+    CallocCallback(result, count, size, start, end, t);
+    return result;    
+}
+
+decltype(free) dhw_free;
+DHWImportHooker &getFreeHooker()
+{
+  static DHWImportHooker gFreeHooker(NS_DEBUG_CRT, "free", (PROC) dhw_free);
+  return gFreeHooker;
+}
+
+void __cdecl dhw_free( void* p )
+{
+    tm_thread *t = tm_get_thread();
+    ++t->suppress_tracing;
+    uint32_t start = PR_IntervalNow();
+    DHW_ORIGINAL(free, getFreeHooker())(p);
+    uint32_t end = PR_IntervalNow();
+    --t->suppress_tracing;
+    /* FIXME bug 392008: We could race with reallocation of p. */
+    FreeCallback(p, start, end, t);
+}
+
+
+decltype(realloc) dhw_realloc;
+DHWImportHooker &getReallocHooker()
+{
+  static DHWImportHooker gReallocHooker(NS_DEBUG_CRT, "realloc", (PROC) dhw_realloc);
+  return gReallocHooker;
+}
+
+void * __cdecl dhw_realloc(void * pin, size_t size)
+{
+    tm_thread *t = tm_get_thread();
+    ++t->suppress_tracing;
+    uint32_t start = PR_IntervalNow();
+    void* pout = DHW_ORIGINAL(realloc, getReallocHooker())(pin, size);
+    uint32_t end = PR_IntervalNow();
+    --t->suppress_tracing;
+    /* FIXME bug 392008: We could race with reallocation of pin. */
+    ReallocCallback(pin, pout, size, start, end, t);
+    return pout;
+}
+
+// Note the mangled name!
+void * __cdecl dhw_new(size_t size);
+DHWImportHooker &getNewHooker()
+{
+  static DHWImportHooker gNewHooker(NS_DEBUG_CRT, "??2@YAPAXI@Z", (PROC) dhw_new);
+  return gNewHooker;
+}
+
+void * __cdecl dhw_new(size_t size)
+{
+    tm_thread *t = tm_get_thread();
+    ++t->suppress_tracing;
+    uint32_t start = PR_IntervalNow();
+    void* result = DHW_ORIGINAL(dhw_new, getNewHooker())(size);
+    uint32_t end = PR_IntervalNow();
+    --t->suppress_tracing;
+    MallocCallback(result, size, start, end, t);//do we need a different one for new?
+    return result;
+}
+
+// Note the mangled name!
+void __cdecl dhw_delete(void* p);
+DHWImportHooker &getDeleteHooker()
+{
+  static DHWImportHooker gDeleteHooker(NS_DEBUG_CRT, "??3@YAXPAX@Z", (PROC) dhw_delete);
+  return gDeleteHooker;
+}
+
+void __cdecl dhw_delete(void* p)
+{
+    tm_thread *t = tm_get_thread();
+    ++t->suppress_tracing;
+    uint32_t start = PR_IntervalNow();
+    DHW_ORIGINAL(dhw_delete, getDeleteHooker())(p);
+    uint32_t end = PR_IntervalNow();
+    --t->suppress_tracing;
+    FreeCallback(p, start, end, t);
+}
+
+// Note the mangled name!
+void * __cdecl dhw_vec_new(size_t size);
+DHWImportHooker &getVecNewHooker()
+{
+  static DHWImportHooker gVecNewHooker(NS_DEBUG_CRT, "??_U@YAPAXI@Z", (PROC) dhw_vec_new);
+  return gVecNewHooker;
+}
+
+void * __cdecl dhw_vec_new(size_t size)
+{
+    tm_thread *t = tm_get_thread();
+    ++t->suppress_tracing; // need to suppress since new[] calls new
+    uint32_t start = PR_IntervalNow();
+    void* result = DHW_ORIGINAL(dhw_vec_new, getVecNewHooker())(size);
+    uint32_t end = PR_IntervalNow();
+    --t->suppress_tracing;
+    MallocCallback(result, size, start, end, t);//do we need a different one for new[]?
+    return result;
+}
+
+// Note the mangled name!
+void __cdecl dhw_vec_delete(void* p);
+DHWImportHooker &getVecDeleteHooker()
+{
+  static DHWImportHooker gVecDeleteHooker(NS_DEBUG_CRT, "??_V@YAXPAX@Z", (PROC) dhw_vec_delete);
+  return gVecDeleteHooker;
+}
+
+void __cdecl dhw_vec_delete(void* p)
+{
+    tm_thread *t = tm_get_thread();
+    ++t->suppress_tracing;
+    uint32_t start = PR_IntervalNow();
+    DHW_ORIGINAL(dhw_vec_delete, getVecDeleteHooker())(p);
+    uint32_t end = PR_IntervalNow();
+    --t->suppress_tracing;
+    FreeCallback(p, start, end, t);
+}
+
+/*C Callbacks*/
+PR_IMPLEMENT(void)
+StartupHooker()
+{
+  //run through get all hookers
+  DHWImportHooker &loadlibraryW = DHWImportHooker::getLoadLibraryWHooker();
+  DHWImportHooker &loadlibraryExW = DHWImportHooker::getLoadLibraryExWHooker();
+  DHWImportHooker &loadlibraryA = DHWImportHooker::getLoadLibraryAHooker();
+  DHWImportHooker &loadlibraryExA = DHWImportHooker::getLoadLibraryExAHooker();
+  DHWImportHooker &mallochooker = getMallocHooker();
+  DHWImportHooker &reallochooker = getReallocHooker();
+  DHWImportHooker &callochooker = getCallocHooker();
+  DHWImportHooker &freehooker = getFreeHooker();
+  DHWImportHooker &newhooker = getNewHooker();
+  DHWImportHooker &deletehooker = getDeleteHooker();
+  DHWImportHooker &vecnewhooker = getVecNewHooker();
+  DHWImportHooker &vecdeletehooker = getVecDeleteHooker();
+  printf("Startup Hooker\n");
+}
+
+PR_IMPLEMENT(void)
+ShutdownHooker()
+{
+}
+
+extern "C" {
+  void* dhw_orig_malloc(size_t);
+  void* dhw_orig_calloc(size_t, size_t);
+  void* dhw_orig_realloc(void*, size_t);
+  void dhw_orig_free(void*);
+}
+
+void*
+dhw_orig_malloc(size_t size)
+{
+    return DHW_ORIGINAL(malloc, getMallocHooker())(size);
+}
+
+void*
+dhw_orig_calloc(size_t count, size_t size)
+{
+    return DHW_ORIGINAL(calloc, getCallocHooker())(count,size);
+}
+
+void*
+dhw_orig_realloc(void* pin, size_t size)
+{
+    return DHW_ORIGINAL(realloc, getReallocHooker())(pin, size);
+}
+
+void
+dhw_orig_free(void* p)
+{
+    DHW_ORIGINAL(free, getFreeHooker())(p);
+}