;Reserved Files
;--------------------------------
-ReserveFile "${NSISDIR}\Plugins\System.dll"
-ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
ReserveFile "${NSISDIR}\Plugins\Aero.dll"
-ReserveFile "${NSISDIR}\Plugins\StdUtils.dll"
+ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
+ReserveFile "${NSISDIR}\Plugins\LockedList.dll"
ReserveFile "${NSISDIR}\Plugins\nsDialogs.dll"
+ReserveFile "${NSISDIR}\Plugins\nsExec.dll"
ReserveFile "${NSISDIR}\Plugins\StartMenu.dll"
-ReserveFile "${NSISDIR}\Plugins\LockedList.dll"
+ReserveFile "${NSISDIR}\Plugins\StdUtils.dll"
+ReserveFile "${NSISDIR}\Plugins\System.dll"
+ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
ReserveFile "checkproc.exe"
Section "-Finished"
!insertmacro PrintProgress "$(MUI_TEXT_FINISH_TITLE)."
-
+ ${StdUtils.Unload}
+
; ---- POLL ----
; !insertmacro UAC_AsUser_ExecShell "" "http://mulder.brhack.net/temp/style_poll/" "" "" SW_SHOWNORMAL
; ---- POLL ----
!error "LAMEXP_UPX_PATH is not defined !!!"
!endif
-;UUID
-!define MyRegPath "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FBD7A67D-D700-4043-B54F-DD106D00F308}"
-
;Web-Site
!define MyWebSite "http://mulder.at.gg/"
RunTryAgain:
- DetailPrint "Exec: $PLUGINSDIR\LameXP-Install.exe"
- StdUtils::ExecShellWait /NOUNLOAD '$R9' "open" "$PLUGINSDIR\LameXP-Install.exe"
- Pop $R1
+ DetailPrint "ExecShellWait: $PLUGINSDIR\LameXP-Install.exe"
+ ${StdUtils.ExecShellWait} $R1 "$PLUGINSDIR\LameXP-Install.exe" "open" '$R9'
DetailPrint "Result: $R1"
StrCmp $R1 "error" RunFailed
StrCmp $R1 "no_wait" RunSuccess
Sleep 333
HideWindow
- StdUtils::WaitForProc /NOUNLOAD $R1
+ ${StdUtils.WaitForProc} $R1
Goto RunSuccess
; --------
RunFailed:
- MessageBox MB_ABORTRETRYIGNORE|MB_DEFBUTTON2|MB_ICONSTOP|MB_TOPMOST "Failed to launch the installer. Please try again!" IDRETRY RunTryAgain IDIGNORE RunFallback
+ MessageBox MB_RETRYCANCEL|MB_DEFBUTTON2|MB_ICONSTOP|MB_TOPMOST "Failed to launch the installer. Please try again!" IDRETRY RunTryAgain
- SetDetailsPrint both
- DetailPrint "Failed to launch installer :-("
- SetDetailsPrint listonly
-
- StdUtils::Unload
- Abort "Aborted."
-
; --------
- RunFallback:
-
ClearErrors
ExecShell "open" "$PLUGINSDIR\LameXP-Install.exe" '$R9' SW_SHOWNORMAL
IfErrors 0 RunSuccess
-
+
ClearErrors
ExecShell "" "$PLUGINSDIR\LameXP-Install.exe" '$R9' SW_SHOWNORMAL
IfErrors 0 RunSuccess
- Goto RunFailed
-
+ ; --------
+
+ SetDetailsPrint both
+ DetailPrint "Failed to launch installer :-("
+ SetDetailsPrint listonly
+
+ ${StdUtils.Unload}
+ Abort "Aborted."
+
; --------
RunSuccess:
Delete /REBOOTOK "$PLUGINSDIR\LameXP-Install.exe"
- StdUtils::Unload
+ ${StdUtils.Unload}
SectionEnd
#define VER_LAMEXP_MINOR_LO 3
#define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 3
-#define VER_LAMEXP_BUILD 722
+#define VER_LAMEXP_BUILD 723
///////////////////////////////////////////////////////////////////////////////
// Tools versions