зеркало из https://github.com/nextcloud/desktop.git
Adjust to new version of NSIS UAC
This commit is contained in:
Родитель
e1a36b53dc
Коммит
1d600ceecc
|
@ -248,11 +248,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
|
|||
##############################################################################
|
||||
|
||||
Function LaunchApplication
|
||||
${UAC.CallFunctionAsUser} LaunchApplicationAsUser
|
||||
FunctionEnd
|
||||
|
||||
Function LaunchApplicationAsUser
|
||||
Exec "$INSTDIR\${APPLICATION_EXECUTABLE}"
|
||||
!insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\${APPLICATION_EXECUTABLE}" "" "" ""
|
||||
FunctionEnd
|
||||
|
||||
##############################################################################
|
||||
|
@ -367,7 +363,6 @@ Function PageLeaveReinstall
|
|||
RMDir $INSTDIR
|
||||
no_remove_uninstaller:
|
||||
StrCmp $R0 "2" 0 +3
|
||||
UAC::Unload
|
||||
Quit
|
||||
BringToFront
|
||||
reinst_done:
|
||||
|
@ -762,7 +757,7 @@ Function .onInit
|
|||
${MementoSectionRestore}
|
||||
|
||||
UAC_Elevate:
|
||||
UAC::RunElevated
|
||||
!insertmacro UAC_RunElevated
|
||||
StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
|
||||
StrCmp 0 $0 0 UAC_Err ; Error?
|
||||
StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
|
||||
|
@ -810,11 +805,9 @@ Function .onInstSuccess
|
|||
${AndIf} $InstallRunIfSilent == "yes"
|
||||
Call LaunchApplication
|
||||
${EndIf}
|
||||
UAC::Unload ;Must call unload!
|
||||
FunctionEnd
|
||||
|
||||
Function .onInstFailed
|
||||
UAC::Unload ;Must call unload!
|
||||
FunctionEnd
|
||||
|
||||
##############################################################################
|
||||
|
@ -827,7 +820,7 @@ Function un.onInit
|
|||
Call un.SetLang
|
||||
|
||||
UAC_Elevate:
|
||||
UAC::RunElevated
|
||||
!insertmacro UAC_RunElevated
|
||||
StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
|
||||
StrCmp 0 $0 0 UAC_Err ; Error?
|
||||
StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
|
||||
|
@ -858,9 +851,7 @@ Function un.onInit
|
|||
FunctionEnd
|
||||
|
||||
Function un.onUnInstSuccess
|
||||
UAC::Unload ;Must call unload!
|
||||
FunctionEnd
|
||||
|
||||
Function un.onUnInstFailed
|
||||
UAC::Unload ;Must call unload!
|
||||
FunctionEnd
|
||||
|
|
Загрузка…
Ссылка в новой задаче