Bug 1294650 - Install shim 'qipcap' dlls into the Firefox folder to circumvent dll injection by the 3rd party Websense product. r=aklotz

MozReview-Commit-ID: 11qJbfim7Lm

browser/installer/package-manifest.in

@@ -141,6 +141,13 @@
 @RESPATH@/run-mozilla.sh
 #endif
 #endif
+#ifdef XP_WIN
+#ifdef _AMD64_
+@BINPATH@/@DLL_PREFIX@qipcap64@DLL_SUFFIX@
+#else
+@BINPATH@/@DLL_PREFIX@qipcap@DLL_SUFFIX@
+#endif
+#endif
 
 ; [Components]
 #ifdef MOZ_ARTIFACT_BUILDS

toolkit/library/dummydll/dummydll.cpp

@@ -0,0 +1,17 @@
+/* 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>
+
+BOOL WINAPI DllMain(
+  HANDLE hModule,
+  DWORD dwReason,
+  LPVOID lpvReserved
+)
+{
+  if (dwReason == DLL_PROCESS_ATTACH) {
+    ::DisableThreadLibraryCalls((HMODULE)hModule);
+  }
+  return TRUE;
+}

toolkit/library/dummydll/moz.build

@@ -0,0 +1,19 @@
+# -*- Mode: python; c-basic-offset: 4; 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/.
+
+# Bug 1294650 - populate our install with a shim dll to work around a
+# 3rd party code injection crash.
+
+SOURCES += [
+    'dummydll.cpp',
+]
+
+if CONFIG['CPU_ARCH'] == 'x86_64':
+  GeckoSharedLibrary('qipcap64')
+else:
+  GeckoSharedLibrary('qipcap')
+
+NO_VISIBILITY_FLAGS = True

toolkit/library/moz.build

@@ -102,6 +102,9 @@ if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
 
 DIRS += ['gtest']
 
+if CONFIG['OS_ARCH'] == 'WINNT':
+  DIRS += ['dummydll']
+
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
 USE_LIBS += [