Backed out changeset a72bfbdf5c9b (bug 1294650) a=lizzard
authorWes Kocher <wkocher@mozilla.com>
Fri, 02 Sep 2016 11:03:26 -0700
changeset 348012 3cb50e5df49728e19c6f5bcb4c5b3fe34a9db53c
parent 348011 1dd122df980683688de68d91fa8a3bf90eac19b4
child 348013 d35ac86c5271f6ad22bf1f76b1bc8adb0398e7bd
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslizzard
bugs1294650
milestone50.0a2
backs outa72bfbdf5c9b36e68ca806a25944180f2652f0c9
Backed out changeset a72bfbdf5c9b (bug 1294650) a=lizzard
browser/installer/package-manifest.in
toolkit/library/dummydll/dummydll.cpp
toolkit/library/dummydll/moz.build
toolkit/library/moz.build
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -136,23 +136,16 @@
 @BINPATH@/@DLL_PREFIX@mozavcodec@DLL_SUFFIX@
 #endif
 @RESPATH@/browser/blocklist.xml
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 @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]
 @RESPATH@/browser/components/components.manifest
 @RESPATH@/components/alerts.xpt
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 @BINPATH@/IA2Marshal.dll
deleted file mode 100644
--- a/toolkit/library/dummydll/dummydll.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 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;
-}
deleted file mode 100644
--- a/toolkit/library/dummydll/moz.build
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- 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
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -92,19 +92,16 @@ LOCAL_INCLUDES += [
 
 if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
     LOCAL_INCLUDES += [
         '/xpcom/base',
     ]
 
 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 += [
     'js',
 ]
 
 USE_LIBS += [
     'gkmedias',