Bug 1489391: Part 2 - Remove SetWindowLong*/SetWindowLongPtr* from TestDllInterceptor r=aklotz
authorDavid Parks <daparks@mozilla.com>
Thu, 05 Dec 2019 00:41:32 +0000
changeset 505577 33fef95ff8cfbbccb4d4924323f2f4d32b61ed73
parent 505576 bdffefea6e9afbb321c09b953c1153a459b91976
child 505578 45555bb975a210a23500fbfb21dcf49e6ec13f8e
push id102352
push userdaparks@mozilla.com
push dateThu, 05 Dec 2019 02:39:42 +0000
treeherderautoland@33fef95ff8cf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaklotz
bugs1489391
milestone73.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1489391: Part 2 - Remove SetWindowLong*/SetWindowLongPtr* from TestDllInterceptor r=aklotz SetWindowLong*/SetWindowLongPtr* was being intercepted so that we could override windowprocs in windowed plugins on Windows. We no longer support windowed plugins so these functions are never intercepted. Differential Revision: https://phabricator.services.mozilla.com/D55536
mozglue/tests/interceptor/TestDllInterceptor.cpp
--- a/mozglue/tests/interceptor/TestDllInterceptor.cpp
+++ b/mozglue/tests/interceptor/TestDllInterceptor.cpp
@@ -910,23 +910,16 @@ extern "C" int wmain(int argc, wchar_t* 
 #endif  // !defined(_M_ARM64)
       TEST_DETOUR_SKIP_EXEC("kernel32.dll", BaseThreadInitThunk) &&
 #if defined(_M_X64) || defined(_M_ARM64)
       MAYBE_TEST_HOOK(!IsWin8OrLater(), "kernel32.dll",
                       RtlInstallFunctionTableCallback, Equals, FALSE) &&
       TEST_HOOK("user32.dll", GetKeyState, Ignore, 0) &&  // see Bug 1316415
 #endif
       TEST_HOOK("user32.dll", GetWindowInfo, Equals, FALSE) &&
-#if defined(_M_X64)
-      TEST_HOOK("user32.dll", SetWindowLongPtrA, Equals, 0) &&
-      TEST_HOOK("user32.dll", SetWindowLongPtrW, Equals, 0) &&
-#elif defined(_M_IX86)
-      TEST_HOOK("user32.dll", SetWindowLongA, Equals, 0) &&
-      TEST_HOOK("user32.dll", SetWindowLongW, Equals, 0) &&
-#endif
       TEST_HOOK("user32.dll", TrackPopupMenu, Equals, FALSE) &&
       TEST_DETOUR("user32.dll", CreateWindowExW, Equals, nullptr) &&
       TEST_HOOK("user32.dll", InSendMessageEx, Equals, ISMEX_NOSEND) &&
       TEST_HOOK("user32.dll", SendMessageTimeoutW, Equals, 0) &&
       TEST_HOOK("user32.dll", SetCursorPos, NotEquals, FALSE) &&
 #if !defined(_M_ARM64)
       TEST_HOOK("imm32.dll", ImmGetContext, Equals, nullptr) &&
 #endif  // !defined(_M_ARM64)