Bug 1531869 - Fix auto-update of MAPI DLLs by reinstating accidentally removed code (bug 1336804, rev 6c8ca70fc623). r=rstrong a=jorgk CLOSED TREE THUNDERBIRD_60_5_3_BUILD1 THUNDERBIRD_60_5_3_RELEASE
authorJorg K <jorgk@jorgk.com>
Mon, 04 Mar 2019 11:26:44 +0100
changeset 32097 8c8f49c6968e30b5ebb62d5a3d3abb2dd581c2e7
parent 32096 8626d03f14b3cc7b43a656f174c18cb984db3e88
child 32098 c442f6083903399f807372f8e4a065fbec855dca
push id159
push usermozilla@jorgk.com
push dateMon, 04 Mar 2019 12:49:34 +0000
treeherdercomm-esr60@8c8f49c6968e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong, jorgk
bugs1531869, 1336804
Bug 1531869 - Fix auto-update of MAPI DLLs by reinstating accidentally removed code (bug 1336804, rev 6c8ca70fc623). r=rstrong a=jorgk CLOSED TREE
mail/installer/windows/nsis/shared.nsh
--- a/mail/installer/windows/nsis/shared.nsh
+++ b/mail/installer/windows/nsis/shared.nsh
@@ -14,16 +14,19 @@
   ${UpdateProtocolHandlers}
 
   ; setup the application model id registration value
   ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
 
   ; Win7 taskbar and start menu link maintenance
   Call FixShortcutAppModelIDs
 
+  ; Upgrade the copies of the MAPI DLL's
+  ${UpgradeMapiDLLs}
+
   ClearErrors
   WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
   ${If} ${Errors}
     StrCpy $TmpVal "HKCU" ; used primarily for logging
   ${Else}
     SetShellVarContext all    ; Set SHCTX to all users (e.g. HKLM)
     DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
     StrCpy $TmpVal "HKLM" ; used primarily for logging