Backed out changeset d46dcd6bc7e7 (bug 1137609) to land a better fix. Unrelated to the CLOSED TREE
authorDavid Major <dmajor@mozilla.com>
Tue, 03 Mar 2015 19:07:27 +1300
changeset 246934 b7cdf1cf0939f8b43e39c2139ae80958eb905764
parent 246933 1b55b99dc4325db68b3b5887c073ae58be79090b
child 246935 d75111f24991c6a47914a0e738f9a7b923d93e8d
child 247049 985070813323036d74b87effc5e4eac555c5eaa1
push id884
push userdburns@mozilla.com
push dateTue, 03 Mar 2015 15:29:12 +0000
bugs1137609
milestone39.0a1
backs outd46dcd6bc7e7d66e407e4b4de8b5a2e452da3922
Backed out changeset d46dcd6bc7e7 (bug 1137609) to land a better fix. Unrelated to the CLOSED TREE
toolkit/xre/WindowsCrtPatch.h
--- a/toolkit/xre/WindowsCrtPatch.h
+++ b/toolkit/xre/WindowsCrtPatch.h
@@ -123,18 +123,17 @@ Init()
   //
   // If these assertions fail, see the comment at the top of this file for
   // possible causes. Any changes to the lines below MUST be tested on XP SP2!
   MOZ_ASSERT(!GetModuleHandleA("mozglue.dll"));
   MOZ_ASSERT(!GetModuleHandleA("msvcr120.dll"));
   MOZ_ASSERT(!GetModuleHandleA("msvcr120d.dll"));
 
 #if defined(_M_IX86) && defined(_MSC_VER)
-  // Add the hook on all XP because we can't trust the SP version (bug 1137609)
-  if (!mozilla::IsWin2003OrLater()) {
+  if (!mozilla::IsXPSP3OrLater()) {
     NtdllIntercept.Init("ntdll.dll");
     NtdllIntercept.AddHook("RtlImageNtHeader",
                            reinterpret_cast<intptr_t>(patched_RtlImageNtHeader),
                            reinterpret_cast<void**>(&stub_RtlImageNtHeader));
   }
 #endif
 }