Bug 946195 - Remove dummyvccorlib, cruft from component extension work we never made use of. r=bbondy, sr=glandium

browser/installer/package-manifest.in

@@ -790,7 +790,6 @@ bin/libfreebl_32int64_3.so
 [metro]
 ; gre resources
 @BINPATH@/CommandExecuteHandler@BIN_SUFFIX@
-@BINPATH@/dummyvccorlib.dll
 @BINPATH@/resources.pri
 @BINPATH@/VisualElementsManifest.xml
 @BINPATH@/tileresources

toolkit/library/moz.build

@@ -4,9 +4,6 @@
 # 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/.
 
-if CONFIG['MOZ_METRO'] and CONFIG['OS_ARCH'] == 'WINNT':
-    DIRS += ['winvccorlib']
-
 LIBRARY_NAME = 'xul'
 
 SOURCES += [

toolkit/library/nsDllMain.cpp

@@ -4,18 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
 #include <windows.h>
-#if defined(_WIN32_WINNT_WIN8) && defined(_MSC_VER) && _MSC_VER < 1700
-// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h, and MSVC
-// defines it in delayimp.h previous to VS2012.
-#undef FACILITY_VISUALCPP
-#endif
-#include <delayimp.h>
 #include "nsToolkit.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/WindowsVersion.h"
 
-using mozilla::IsWin8OrLater;
-
 #if defined(__GNUC__)
 // If DllMain gets name mangled, it won't be seen.
 extern "C" {
@@ -46,83 +38,6 @@ BOOL APIENTRY DllMain(
     return TRUE;
 }
 
-#if defined(MOZ_METRO)
-/*
- * DelayDllLoadHook - the crt calls here anytime a delay load dll is about to
- * load. There are a number of events, we listen for dliNotePreLoadLibrary.
- * 
- * On Win8, we enable Windows Runtime Component Extension support. When enabled
- * the compiler bakes auto-generated code into our binary, including a c init-
- * ializer which inits the winrt library through a call into the winrt standard
- * lib 'vccorlib'. Vccorlib in turn has system dll dependencies which are only
- * available on Win8 (currently API-MS-WIN-CORE-WINRT and
- * API-MS-WIN-CORE-WINRT-STRING), which prevent xul.dll from loading on os <=
- * Win7. To get around this we generate a dummy vccore lib with the three entry
- * points the initializer needs and load it in place of the real vccorlib. We
- * also have to add vccorlib and the system dlls to the delay load list.
- *
- * In addition to setting up dummyvccorlib, we also have additional checks for
- * for unexpected behavior, specifically:
- * - trap attempts to load entry points in dummyvccorlib. This is not expected
- *   to happen in release code. It can happen during development if winrt apis
- *   are accessed when running on the desktop, or when winrt objects are
- *   accidentially placed in the global scope.
- * - trap and handle calls to vccorlib's __abi_FailFast in a breakpad compatible
- *   way. __abi_FailFast is called by exception handling code generated by the
- *   compiler for delegate events.
- */
-
-const char* kvccorlib = "vccorlib";
-const char* kwinrtprelim = "api-ms-win-core-winrt";
-const char* kfailfast = "?__abi_FailFast";
-
-static bool IsWinRTDLLNotPresent(PDelayLoadInfo pdli, const char* aLibToken)
-{
-  return (!IsWin8OrLater() && pdli->szDll &&
-          !strnicmp(pdli->szDll, aLibToken, strlen(aLibToken)));
-}
-
-static bool IsWinRTDLLPresent(PDelayLoadInfo pdli, const char* aLibToken)
-{
-  return (IsWin8OrLater() && pdli->szDll &&
-          !strnicmp(pdli->szDll, aLibToken, strlen(aLibToken)));
-}
-
-void __stdcall __abi_MozFailFast()
-{
-  MOZ_CRASH();
-}
-
-FARPROC WINAPI DelayDllLoadHook(unsigned dliNotify, PDelayLoadInfo pdli)
-{
-  if (dliNotify == dliNotePreLoadLibrary) {
-    if (IsWinRTDLLNotPresent(pdli, kvccorlib)) {
-      return (FARPROC)LoadLibraryA("dummyvccorlib.dll");
-    }
-    NS_ASSERTION(!IsWinRTDLLNotPresent(pdli, kwinrtprelim),
-      "Attempting to load winrt libs in non-metro environment. "
-      "(Winrt variable type placed in global scope?)");
-  }
-  if (dliNotify == dliFailGetProc && IsWinRTDLLNotPresent(pdli, kvccorlib)) {
-    NS_WARNING("Attempting to access winrt vccorlib entry point in non-metro environment.");
-    NS_WARNING(pdli->szDll);
-    NS_WARNING(pdli->dlp.szProcName);
-    NS_ABORT();
-  }
-  if (dliNotify == dliNotePreGetProcAddress &&
-      IsWinRTDLLPresent(pdli, kvccorlib) &&
-      pdli->dlp.szProcName &&
-      !strnicmp(pdli->dlp.szProcName, kfailfast, strlen(kfailfast))) {
-    return (FARPROC)__abi_MozFailFast;
-  }
-  return nullptr;
-}
-
-ExternC PfnDliHook __pfnDliNotifyHook2 = DelayDllLoadHook;
-ExternC PfnDliHook __pfnDliFailureHook2 = DelayDllLoadHook;
-
-#endif // MOZ_METRO
-
 #if defined(__GNUC__)
 } // extern "C"
 #endif

toolkit/library/winvccorlib/dummyvccorlib.cpp

@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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>
-
-// A dummy vccorlib.dll for shunting winrt initialization calls when we are not
-// using the winrt library. For a longer explanantion see nsDllMain.cpp.
-
-extern "C" {
-__declspec(dllexport) long __stdcall __InitializeWinRTRuntime(unsigned long data) { return S_OK; }
-}
-
-namespace Platform {
-namespace Details {
-__declspec(dllexport) HRESULT InitializeData(int __threading_model) { return S_OK; }
-__declspec(dllexport) void UninitializeData(int __threading_model) { }
-}
-}

toolkit/library/winvccorlib/moz.build

@@ -1,17 +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/.
-
-# When we're linking GTest we recurse into this directory but don't need
-# to generate this library
-if not CONFIG['LINK_GTEST']:
-    LIBRARY_NAME = 'dummyvccorlib'
-
-    FORCE_SHARED_LIB = True
-
-SOURCES += [
-    'dummyvccorlib.cpp',
-]
-