Bug 1406890: Fix detection for Baum Cobra in 64 bit processes. r?MarcoZ draft
authorJames Teh <jteh@mozilla.com>
Tue, 14 Nov 2017 09:49:05 +1000
changeset 697744 aba9e9269a1409a5c829fabb00bb711dcf4ee3f7
parent 697417 c9f889585dd884a692064b8c9a9e3ad1d1deb308
child 740183 b7787dde1b7e8b5f5e8166e4b5116febf0570f6f
push id89072
push userbmo:jteh@mozilla.com
push dateTue, 14 Nov 2017 13:22:22 +0000
reviewersMarcoZ
bugs1406890
milestone59.0a1
Bug 1406890: Fix detection for Baum Cobra in 64 bit processes. r?MarcoZ The Compatibility code previously only tested for OsmHooks.dll to detect Baum Cobra. However, the 64 bit dll is called OsmHks64.dll. Update the code to test for both so that detection works in 64 bit processes. Aside from telemetry, this is also needed to ensure that the InSendMessageEx hook is used to work around RPC_E_CANTCALLOUT_ININPUTSYNCCALL. MozReview-Commit-ID: FjliZybHrZH
accessible/windows/msaa/Compatibility.cpp
--- a/accessible/windows/msaa/Compatibility.cpp
+++ b/accessible/windows/msaa/Compatibility.cpp
@@ -178,17 +178,17 @@ Compatibility::Init()
     sConsumers |= DOLPHIN;
 
   if (::GetModuleHandleW(L"STSA32"))
     sConsumers |= SEROTEK;
 
   if (::GetModuleHandleW(L"nvdaHelperRemote"))
     sConsumers |= NVDA;
 
-  if (::GetModuleHandleW(L"OsmHooks"))
+  if (::GetModuleHandleW(L"OsmHooks") || ::GetModuleHandleW(L"OsmHks64"))
     sConsumers |= COBRA;
 
   if (::GetModuleHandleW(L"WebFinderRemote"))
     sConsumers |= ZOOMTEXT;
 
   if (::GetModuleHandleW(L"Kazahook"))
     sConsumers |= KAZAGURU;