Bug 1500057 - Port bug 1496179 to TB: Make mozglue.dll a private SxS assembly. r=jorgk f=emk
authorRichard Marti <richard.marti@gmail.com>
Thu, 18 Oct 2018 13:45:52 +0200
changeset 33425 66f690f4e070f2809fa2ee855ddf70aef1a846b1
parent 33424 c7b5816c507193e924cbf75b26d25d062579b865
child 33426 f77ce17097fa70f4a394f4ac1abc99ffdc116823
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1500057, 1496179
Bug 1500057 - Port bug 1496179 to TB: Make mozglue.dll a private SxS assembly. r=jorgk f=emk SxS assemblies do not obey the usual DLL search order. It will make it possible to load mozglue.dll from appdir even if the PreferSystem32Images mitigation is enabled and System32 has a random mozglue.dll.
mail/app/thunderbird.exe.manifest
--- a/mail/app/thunderbird.exe.manifest
+++ b/mail/app/thunderbird.exe.manifest
@@ -14,16 +14,26 @@
                         name="Microsoft.Windows.Common-Controls"
                         version="6.0.0.0"
                         processorArchitecture="*"
                         publicKeyToken="6595b64144ccf1df"
                         language="*"
                 />
         </dependentAssembly>
 </dependency>
+<dependency>
+        <dependentAssembly>
+                <assemblyIdentity
+                        type="win32"
+                        name="mozglue"
+                        version="1.0.0.0"
+                        language="*"
+                />
+        </dependentAssembly>
+</dependency>
 <ms_asmv3:trustInfo xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
   <ms_asmv3:security>
     <ms_asmv3:requestedPrivileges>
       <ms_asmv3:requestedExecutionLevel level="asInvoker" uiAccess="false" />
     </ms_asmv3:requestedPrivileges>
   </ms_asmv3:security>
 </ms_asmv3:trustInfo>
   <ms_asmv3:application xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">