Bug 1194890 - Ensure that any user32 imports to mozglue are delay loaded. r=glandium, a=ritu
authorAaron Klotz <aklotz@mozilla.com>
Fri, 14 Aug 2015 16:27:03 -0600
changeset 289064 8bae9ec37b78758048f94feeddc7526d3ba1b2df
parent 289063 ca0ab2a3305b0b62a58b2803df024251256f3623
child 289065 40a77893341e14a1b118ae27ec6735ec74659960
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, ritu
bugs1194890
milestone42.0a2
Bug 1194890 - Ensure that any user32 imports to mozglue are delay loaded. r=glandium, a=ritu
mozglue/build/moz.build
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -21,16 +21,20 @@ if CONFIG['OS_TARGET'] == 'Android':
 
 if CONFIG['MOZ_ASAN']:
     SOURCES += [
         'AsanOptions.cpp',
     ]
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     DEFFILE = 'mozglue.def'
+    # We'll break the DLL blocklist if we immediately load user32.dll
+    DELAYLOAD_DLLS += [
+        'user32.dll',
+    ]
 
 if not CONFIG['JS_STANDALONE']:
 
     if CONFIG['MOZ_MEMORY'] and (CONFIG['MOZ_NATIVE_JEMALLOC'] or FORCE_SHARED_LIB):
         pass
         # TODO: SHARED_LIBRARY_LIBS go here
     else:
         # Temporary, until bug 662814 lands