Commit 77c2d072 authored by Cliff Smolinsky's avatar Cliff Smolinsky Committed by Commit Bot

Remove gdi32 from delayloads list

Due to a font rendering issue on Win7 only, delayloading gdi32.dll
cannot be supported at this time on any platform (since it's a build-
time not a runtime decision).

Bug: 980577
Change-Id: Icf361411093847c0cfb0b70ce0e90aca351ead09
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1705156Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarBruce Dawson <brucedawson@chromium.org>
Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Commit-Queue: Cliff Smolinsky <cliffsmo@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#678357}
parent fe17d250
......@@ -576,7 +576,6 @@ if (is_win) {
"/DELAYLOAD:dxgi.dll",
"/DELAYLOAD:dxva2.dll",
"/DELAYLOAD:esent.dll",
"/DELAYLOAD:gdi32.dll",
"/DELAYLOAD:imm32.dll",
"/DELAYLOAD:ole32.dll",
"/DELAYLOAD:oleacc.dll",
......
......@@ -158,7 +158,7 @@ TEST_F(DelayloadsTest, DISABLED_ChromeDllLoadSanityTestImpl) {
EXPECT_EQ(nullptr, ::GetModuleHandle(L"user32.dll"));
}
TEST_F(DelayloadsTest, ChromeChildDllDelayloadsCheck) {
TEST_F(DelayloadsTest, DISABLED_ChromeChildDllDelayloadsCheck) {
base::FilePath dll;
ASSERT_TRUE(base::PathService::Get(base::DIR_EXE, &dll));
dll = dll.Append(L"chrome_child.dll");
......@@ -209,7 +209,7 @@ TEST_F(DelayloadsTest, ChromeChildDllDelayloadsCheck) {
}
}
TEST_F(DelayloadsTest, ChromeChildDllLoadSanityTest) {
TEST_F(DelayloadsTest, DISABLED_ChromeChildDllLoadSanityTest) {
// On Win7 we expect this test to result in user32.dll getting loaded. As a
// result, we need to ensure it is executed in its own test process. This
// "test" will re-launch with custom parameters to accomplish that.
......
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