Browse Source

Stop including a dummy dll on Windows for broken old versions of WebSense.

WebSense has moved to an extension solution instead of dll injection, so
this dummy dll (for blocking injection) is no longer necessary.
pull/1/head
wolfbeast 4 years ago committed by Roy Tam
parent
commit
def01c3bb9
  1. 7
      application/basilisk/installer/package-manifest.in
  2. 7
      application/palemoon/installer/package-manifest.in
  3. 17
      toolkit/library/dummydll/dummydll.cpp
  4. 19
      toolkit/library/dummydll/moz.build
  5. 3
      toolkit/library/moz.build

7
application/basilisk/installer/package-manifest.in

@ -140,13 +140,6 @@
@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

7
application/palemoon/installer/package-manifest.in

@ -141,13 +141,6 @@
@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@/components/*

17
toolkit/library/dummydll/dummydll.cpp

@ -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;
}

19
toolkit/library/dummydll/moz.build

@ -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

3
toolkit/library/moz.build

@ -106,9 +106,6 @@ 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 += [

Loading…
Cancel
Save