Installer: Don't show service pack message twice on UAC-enabled systems.

This commit is contained in:
LoRd_MuldeR 2011-08-27 14:53:44 +02:00
parent 8faa0949bd
commit 1dc6a81916

View File

@ -257,8 +257,7 @@ UninstPage Custom un.LockedListShow
Function .onInit Function .onInit
${If} ${UAC_IsInnerInstance} ${If} ${UAC_IsInnerInstance}
!insertmacro MUI_LANGDLL_DISPLAY ${OrIf} ${UAC_IsAdmin}
${ElseIf} ${UAC_IsAdmin}
!insertmacro MUI_LANGDLL_DISPLAY !insertmacro MUI_LANGDLL_DISPLAY
${Else} ${Else}
System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{2B3D1EBF-B3B6-4E93-92B9-6853029A7162}") i .r1 ?e' System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{2B3D1EBF-B3B6-4E93-92B9-6853029A7162}") i .r1 ?e'
@ -283,6 +282,8 @@ Function .onInit
Quit Quit
${EndIf} ${EndIf}
${If} ${UAC_IsInnerInstance}
${OrIf} ${UAC_IsAdmin}
${If} ${IsWin2000} ${If} ${IsWin2000}
${AndIf} ${AtMostServicePack} 3 ${AndIf} ${AtMostServicePack} 3
MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires the Service Pack 4 for Windows 2000!" MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires the Service Pack 4 for Windows 2000!"
@ -307,6 +308,7 @@ Function .onInit
MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 1 for Windows 7 now?" IDNO +2 MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 1 for Windows 7 now?" IDNO +2
ExecShell "open" "http://technet.microsoft.com/en-us/windows/gg635126" ExecShell "open" "http://technet.microsoft.com/en-us/windows/gg635126"
${EndIf} ${EndIf}
${EndIf}
InitPluginsDir InitPluginsDir
File "/oname=$PLUGINSDIR\checkproc.exe" "checkproc.exe" File "/oname=$PLUGINSDIR\checkproc.exe" "checkproc.exe"