Commit 576d1fd0 authored by Sebastien Marchand's avatar Sebastien Marchand Committed by Commit Bot

Hook up the delay load failure function in the renderer processes (Take 3)

This is a reland of https://chromium-review.googlesource.com/c/chromium/src/+/1665913

A whitelist has been added to allow "bthprops.cpl" to fail to be delay
loaded as the failure will be intercepted by bluetooth_init_win.cc

-------- Original CL description -------------

This allows getting a crash report when failing to delay load a DLL.

Example of the stack trace that this will provide:
chrome_child!base::debug::BreakDebugger+0xc [C:\src\chrome\src\base\debug\debugger_win.cc @ 28]
chrome_child!logging::LogMessage::~LogMessage+0x3f5 [C:\src\chrome\src\base\logging.cc @ 939]
chrome_child!DllLoadHook+0x75 [C:\src\chrome\src\chrome\child\delay_load_failure_hook.cc @ 24]
chrome_child!__delayLoadHelper2+0x13f [d:\agent\_work\3\s\src\vctools\delayimp\delayhlp.cpp @ 305]
chrome_child!RtlUnwind+0x470
chrome_child!SkFontMgr::legacyMakeTypeface+0x13 [C:\src\chrome\src\third_party\skia\src\core\SkFontMgr.cpp @ 164]
chrome_child!blink::DWriteVersionSupportsVariations+0x7f
chrome_child!blink::WebFontTypefaceFactory::FontManagerForVariations+0xc

Bug: 970893, 976241
Change-Id: I5a4981d81bcec92c4916481b5238a161bdb290f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1676996Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarWill Harris <wfh@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672641}
parent a7cdaba4
...@@ -14,6 +14,7 @@ static_library("child") { ...@@ -14,6 +14,7 @@ static_library("child") {
if (is_win) { if (is_win) {
sources += [ sources += [
"delay_load_failure_hook.cc",
"v8_crashpad_support_win.cc", "v8_crashpad_support_win.cc",
"v8_crashpad_support_win.h", "v8_crashpad_support_win.h",
] ]
......
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// windows.h needs to be included before delayimp.h.
#include <windows.h>
#include <delayimp.h>
#include "base/debug/alias.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
namespace {
// Delay load failure hook that generates a crash report. By default a failure
// to delay load will trigger an exception handled by the delay load runtime and
// this won't generate a crash report.
extern "C" FARPROC WINAPI DelayLoadFailureHook(unsigned reason,
DelayLoadInfo* dll_info) {
char dll_name[MAX_PATH];
base::strlcpy(dll_name, dll_info->szDll, base::size(dll_name));
// It's not an error if "bthprops.cpl" fails to be loaded, there's a custom
// exception handler in 'device/bluetooth/bluetooth_init_win.cc" that will
// intercept the exception triggered by the delay load runtime. Returning 0
// will tell the runtime that this failure hasn't been handled and it'll cause
// the exception to be raised.
if (base::CompareCaseInsensitiveASCII(dll_name, "bthprops.cpl") == 0)
return 0;
base::debug::Alias(&dll_name);
CHECK(false);
return 0;
}
} // namespace
// Set the delay load failure hook to the function above.
//
// The |__pfnDliFailureHook2| failure notification hook gets called
// automatically by the delay load runtime in case of failure, see
// https://docs.microsoft.com/en-us/cpp/build/reference/failure-hooks?view=vs-2019
// for more information about this.
extern "C" const PfnDliHook __pfnDliFailureHook2 = DelayLoadFailureHook;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment