Make sure the language selection dialog is shown on systems that don't use UAC (like Windows XP). On these systems there will be no "inner" instance of the installer.

This commit is contained in:
LoRd_MuldeR 2011-03-28 04:25:06 +02:00
parent 138838928d
commit 3af79d261b

View File

@ -251,6 +251,8 @@ UninstPage Custom un.LockedListShow
Function .onInit Function .onInit
${If} ${UAC_IsInnerInstance} ${If} ${UAC_IsInnerInstance}
!insertmacro MUI_LANGDLL_DISPLAY !insertmacro MUI_LANGDLL_DISPLAY
${ElseIf} ${UAC_IsAdmin}
!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'
Pop $0 Pop $0
@ -276,6 +278,8 @@ FunctionEnd
Function un.onInit Function un.onInit
${If} ${UAC_IsInnerInstance} ${If} ${UAC_IsInnerInstance}
!insertmacro MUI_LANGDLL_DISPLAY !insertmacro MUI_LANGDLL_DISPLAY
${ElseIf} ${UAC_IsAdmin}
!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'
Pop $0 Pop $0
@ -313,9 +317,10 @@ Function MyUacInit
!ifdef LAMEXP_IS_PRERELEASE !ifdef LAMEXP_IS_PRERELEASE
!insertmacro GetCommandlineParameter "Update" "?" $R0 !insertmacro GetCommandlineParameter "Update" "?" $R0
StrCmp $R0 "?" 0 +3 StrCmp $R0 "?" 0 SkipPrereleaseWarning
MessageBox MB_TOPMOST|MB_ICONEXCLAMATION|MB_OKCANCEL "$(LAMEXP_LANG_PRERELEASE_WARNING)" /SD IDOK IDOK +2 MessageBox MB_TOPMOST|MB_ICONEXCLAMATION|MB_OKCANCEL "$(LAMEXP_LANG_PRERELEASE_WARNING)" /SD IDOK IDOK +2
Abort Abort
SkipPrereleaseWarning:
!endif !endif
FunctionEnd FunctionEnd