Stop delay loading user32.dll from chrome.dll on x86/Windows.

base/win/delay_load_hook.cc

Index: base/win/delay_load_hook.cc
diff --git a/base/win/delay_load_hook.cc b/base/win/delay_load_hook.cc
new file mode 100644
index 0000000000000000000000000000000000000000..23e703e58410883c7d42efbc4b076607804f2d86
--- /dev/null
+++ b/base/win/delay_load_hook.cc
@@ -0,0 +1,100 @@
+// Copyright (c) 2013 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.
+
+#include "base/win/delay_load_hook.h"
+
+#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700
+// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h, and in
+// delayimp.h previous to VS2012.
+#undef FACILITY_VISUALCPP
+#endif
+#include <DelayIMP.h>
+
+#include "base/logging.h"
+#include "base/string_util.h"
+
+// So long as these symbols are supplied to the final binary through an
+// object file (as opposed to indirectly thruogh a library), these pointers
+// will override the CRT's symbols and direct the notifications to our hook.
+PfnDliHook __pfnDliNotifyHook2 = base::win::ChromeDelayLoadHook;
+PfnDliHook __pfnDliFailureHook2 = base::win::ChromeDelayLoadHook;
+
+
+namespace {
+
+FARPROC OnPreLoadLibrary(DelayLoadInfo* info) {
+  // If the DLL name ends with "-delay.dll", this call is about one of our
+  // custom import libraries. In this case we need to snip the suffix off,
+  // and bind to the real DLL.
+  std::string dll_name(info->szDll);
+  const char kDelaySuffix[] = "-delay.dll";
+  if (EndsWith(dll_name, kDelaySuffix, false)) {
+    // Trim the "-delay.dll" suffix from the string.
+    dll_name.resize(dll_name.length() - (sizeof(kDelaySuffix) - 1));
+    dll_name.append(".dll");
+
+    HMODULE dll = ::LoadLibraryA(dll_name.c_str());
+
+    return reinterpret_cast<FARPROC>(dll);
+  }
+
+  return NULL;
+}
+
+FARPROC OnFailLoadLib(DelayLoadInfo* info) {
+  LOG(FATAL) << "Failed to delay load DLL: " << info->szDll;
+  return NULL;
+}
+
+FARPROC OnFailGetProc(DelayLoadInfo* info) {
+  if (info->dlp.fImportByName) {
+    LOG(FATAL) << "Failed to delay load function: '" << info->dlp.szProcName
+               << "' from DLL: " << info->szDll;
+  } else {
+    LOG(FATAL) << "Failed to delay load ordinal: '" << info->dlp.dwOrdinal
+               << "' from DLL: " << info->szDll;
+  }

[cpu_(ooo_6.6-7.5), 2013/02/20 21:52:55]

not sure we want this here, the current handling via the exception seems more
robust, at least from the perspective of actually showing a dialog to the user.
I mean the dialog is shown by csrss in the current code.

I guess we also want a crash report which can be accommodated either here or
there.

At least a unification of this with hard_error_handler_win.cc needs to happen.

[Sigurður Ásgeirsson, 2013/02/26 18:56:19]

Moved this to chrome/app. However, the intent here is to link the hook into
chrome.dll to handle the redirection.
Maybe the error reporting from here is not the best idea?

+
+  return NULL;
+}
+
+}  // namespace
+
+namespace base {
+namespace win {
+
+FARPROC WINAPI ChromeDelayLoadHook(unsigned reason, DelayLoadInfo* info) {
+  switch (reason) {
+    case dliNoteStartProcessing:
+      LOG(INFO) << "Delay load dliNoteStartProcessing notification.";
+      break;
+    case dliNotePreLoadLibrary:
+      return OnPreLoadLibrary(info);
+
+      break;
+    case dliNotePreGetProcAddress:
+      LOG(INFO) << "Delay load dliNotePreGetProcAddress notification.";
+      break;
+
+    case dliFailLoadLib:
+      return OnFailLoadLib(info);
+      break;
+
+    case dliFailGetProc:
+      return OnFailGetProc(info);
+      break;
+
+    case dliNoteEndProcessing:
+      LOG(INFO) << "Delay load dliNoteEndProcessing notification.";
+      break;
+    default:
+      NOTREACHED() << "Impossible delay load notification.";
+      break;
+  }
+
+  return NULL;
+}
+
+}  // namespace win
+}  // namespace base