Bug 1023941 followup: Fix bustage on builds that use Win7 SDK
authorDavid Major <dmajor@mozilla.com>
Sun, 31 Aug 2014 08:44:22 +1200
changeset 224258 ab03252f744e4f149c1a034efff32b50acf61ff7
parent 224257 cb5509ae7f9600b1a8d6ad3abb3c4ec685c256e0
child 224259 b45a94bb2c63e93065bb8ae92d67a1b67dbc1b53
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1023941
milestone34.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 1023941 followup: Fix bustage on builds that use Win7 SDK
toolkit/xre/WindowsCrtPatch.h
--- a/toolkit/xre/WindowsCrtPatch.h
+++ b/toolkit/xre/WindowsCrtPatch.h
@@ -87,17 +87,17 @@ PatchModuleImports(HMODULE module, PIMAG
   RVAPtr<IMAGE_IMPORT_DESCRIPTOR> descriptor(module, importDirectory->VirtualAddress);
 
   for (; descriptor->OriginalFirstThunk; ++descriptor) {
     RVAPtr<char> importedModule(module, descriptor->Name);
     if (!stricmp(importedModule, "kernel32.dll")) {
       RVAPtr<IMAGE_THUNK_DATA> thunk(module, descriptor->OriginalFirstThunk);
       for (; thunk->u1.AddressOfData; ++thunk) {
         RVAPtr<IMAGE_IMPORT_BY_NAME> import(module, thunk->u1.AddressOfData);
-        if (!strcmp(import->Name, "GetLogicalProcessorInformation")) {
+        if (!strcmp((char*)import->Name, "GetLogicalProcessorInformation")) {
           memcpy(import->Name, "DebugBreak", sizeof("DebugBreak"));
         }
       }
     }
   }
 }
 
 PIMAGE_NT_HEADERS NTAPI