2 files changed, 66 insertions, 0 deletions
diff --git a/toolkit/crashreporter/injector/injector.cpp b/toolkit/crashreporter/injector/injector.cpp
new file mode 100644
index 000000000..048b42a93
--- /dev/null
+++ b/toolkit/crashreporter/injector/injector.cpp
@@ -0,0 +1,40 @@
+/* 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 <windows.h>
+
+#include "client/windows/handler/exception_handler.h"
+
+using google_breakpad::ExceptionHandler;
+using std::wstring;
+
+extern "C" BOOL WINAPI DummyEntryPoint(HINSTANCE instance,
+                                       DWORD reason,
+                                       void* reserved)
+{
+  __debugbreak();
+
+  return FALSE; // We're being loaded remotely, this shouldn't happen!
+}
+
+// support.microsoft.com/kb/94248
+extern "C" BOOL WINAPI _CRT_INIT(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved); 
+
+extern "C"
+__declspec(dllexport) DWORD Start(void* context)
+{
+  // Because the remote DLL injector does not call DllMain, we have to
+  // initialize the CRT manually
+  _CRT_INIT(nullptr, DLL_PROCESS_ATTACH, nullptr);
+
+  HANDLE hCrashPipe = reinterpret_cast<HANDLE>(context);
+
+  ExceptionHandler* e = new (std::nothrow)
+    ExceptionHandler(wstring(), nullptr, nullptr, nullptr,
+                     ExceptionHandler::HANDLER_ALL,
+                     MiniDumpNormal, hCrashPipe, nullptr);
+  if (e)
+    e->set_handle_debug_exceptions(true);
+  return 1;
+}
diff --git a/toolkit/crashreporter/injector/moz.build b/toolkit/crashreporter/injector/moz.build
new file mode 100644
index 000000000..2009f823b
--- /dev/null
+++ b/toolkit/crashreporter/injector/moz.build
@@ -0,0 +1,26 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+SOURCES += [
+    'injector.cpp',
+]
+
+SharedLibrary('breakpadinjector')
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/toolkit/crashreporter/google-breakpad/src',
+]
+
+USE_STATIC_LIBS = True
+
+if CONFIG['GNU_CC']:
+    LDFLAGS += ['-Wl,-e,_DummyEntryPoint@12']
+else:
+    LDFLAGS += ['-ENTRY:DummyEntryPoint']
+
+DISABLE_STL_WRAPPING = True