Bug 1138070 - Don't use GetModuleHandleA on RtlImageNtHeader. r=dmajor, a=sledru
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Wed, 04 Mar 2015 11:09:04 +1300
changeset 245445 611f37fccce0
parent 245444 d3002e389444
child 245446 9fa2911fe8f5
child 245448 5c63fc4a9682
child 245449 de94ecf54660
child 245455 822b1d4c6423
push id676
push userryanvm@gmail.com
push date2015-03-04 16:46 +0000
treeherdermozilla-release@611f37fccce0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor, sledru
bugs1138070
milestone36.0
Bug 1138070 - Don't use GetModuleHandleA on RtlImageNtHeader. r=dmajor, a=sledru
toolkit/xre/WindowsCrtPatch.h
--- a/toolkit/xre/WindowsCrtPatch.h
+++ b/toolkit/xre/WindowsCrtPatch.h
@@ -100,17 +100,17 @@ PatchModuleImports(HMODULE module, PIMAG
   }
 }
 
 PIMAGE_NT_HEADERS NTAPI
 patched_RtlImageNtHeader(HMODULE module)
 {
   PIMAGE_NT_HEADERS headers = stub_RtlImageNtHeader(module);
 
-  if (module == GetModuleHandleA("msvcr120.dll")) {
+  if (module == GetModuleHandleW(L"msvcr120.dll")) {
     PatchModuleImports(module, headers);
   }
 
   return headers;
 }
 
 // Non-inline to make the asserts stand out
 MOZ_NEVER_INLINE void