Followup for Bug 1161661 - Provide progress and state feedback via the stub installer taskbar icon. r=spohl
authorRobert Strong <robert.bugzilla@gmail.com>
Tue, 12 May 2015 19:40:23 -0700
changeset 243595 932176dec8d15e2129750bb3eafc428f173edbb5
parent 243594 638f0db43a3f9ae22ac45a2b54ac408faa55be3e
child 243596 ef21b61e8820b280ab0b12aede45e5e08b02ff0c
push id12913
push userrstrong@mozilla.com
push dateWed, 13 May 2015 02:40:33 +0000
treeherderfx-team@932176dec8d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl
bugs1161661
milestone41.0a1
Followup for Bug 1161661 - Provide progress and state feedback via the stub installer taskbar icon. r=spohl
toolkit/mozapps/installer/windows/nsis/common.nsh
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -7410,18 +7410,17 @@
 
 !define ITBL3SetProgressValue "!insertmacro ITBL3SetProgressValueCall"
 !define un.ITBL3SetProgressValue "!insertmacro ITBL3SetProgressValueCall"
 
 !macro ITBL3SetProgressValue_
   Exch $R9
   Exch 1
   Exch $R8
-  ${If} ${AtLeastWin7}
-  ${AndIf} $ITaskbarList3 <> 0
+  ${If} $ITaskbarList3 <> 0
     System::Call "${ITaskbarList3->SetProgressValue}(i$HWNDPARENT, l$R8, l$R9)"
   ${EndIf}
   Exch $R8
   Exch 1
   Exch $R9
 !macroend
 
 ; Normal state / no progress bar
@@ -7450,18 +7449,17 @@
   ${CallArtificialFunction} ITBL3SetProgressState_
 !macroend
 
 !define ITBL3SetProgressState "!insertmacro ITBL3SetProgressStateCall"
 !define un.ITBL3SetProgressState "!insertmacro ITBL3SetProgressStateCall"
 
 !macro ITBL3SetProgressState_
   Exch $R9
-  ${If} ${AtLeastWin7}
-  ${AndIf} $ITaskbarList3 <> 0
+  ${If} $ITaskbarList3 <> 0
     System::Call "${ITaskbarList3->SetProgressState}(i$HWNDPARENT, i$R9)"
   ${EndIf}
   Exch $R9
 !macroend
 
 ################################################################################
 # Helpers for the new user interface