Bug 1466357 - Use RefreshShellIcons instead of manually reimplementing it for Windows installer. r=mhowell

Differential Revision: https://phabricator.services.mozilla.com/D67379

--HG--
extra : moz-landing-system : lando
This commit is contained in:
jayati 2020-03-18 20:33:19 +00:00
parent 13a92841e9
commit 0eac3c871d
4 changed files with 5 additions and 5 deletions

View File

@ -779,7 +779,7 @@ Section "-InstallEndCleanup"
Call AddFirewallEntries
; Refresh desktop icons
System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_DWORDFLUSH}, i 0, i 0)"
${RefreshShellIcons}
${InstallEndCleanupCommon}
@ -793,7 +793,7 @@ Section "-InstallEndCleanup"
; user is an admin.
UAC::IsAdmin
${If} "$0" == "1"
; When a reboot is required give SHChangeNotify time to finish the
; When a reboot is required give RefreshShellIcons time to finish the
; refreshing the icons so the OS doesn't display the icons from helper.exe
Sleep 10000
${LogHeader} "Reboot Required To Finish Installation"

View File

@ -1642,7 +1642,7 @@ Function CheckInstall
CopyFiles /SILENT "$INSTDIR\install.log" "$INSTDIR\install.tmp"
; The unfocus and refocus that happens approximately here is caused by the
; installer calling SHChangeNotify to refresh the shortcut icons.
; installer calling RefreshShellIcons to refresh the shortcut icons.
; When the full installer completes the installation the install.log will no
; longer be in use.

View File

@ -509,7 +509,7 @@ Section "Uninstall"
; Refresh desktop icons otherwise the start menu internet item won't be
; removed and other ugly things will happen like recreation of the app's
; clients registry key by the OS under some conditions.
System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i 0, i 0, i 0)"
${RefreshShellIcons}
; Users who uninstall then reinstall expecting Firefox to use a clean profile
; may be surprised during first-run. This key is checked during startup of Firefox and

View File

@ -5937,7 +5937,7 @@ end:
finish:
${UnloadUAC}
System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i 0, i 0, i 0)"
${RefreshShellIcons}
Quit ; Nothing initialized so no need to call OnEndCommon
continue: