forked from osmocom/wireshark
Add /SD defaults to every MessageBox call (even if they're commented
out). Fixes bug 8451. Don't yell at the user so much. svn path=/trunk/; revision=48196
This commit is contained in:
parent
1b788d4061
commit
a606a88647
|
@ -115,7 +115,7 @@ ${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER}
|
|||
; into any problems here.
|
||||
Delete "$INSTDIR\$EXECUTABLE.exe"
|
||||
IfErrors 0 deletionSuccess
|
||||
MessageBox MB_OK "$EXECUTABLE.exe could not be removed. Is it in use?" IDOK 0
|
||||
MessageBox MB_OK "$EXECUTABLE.exe could not be removed. Is it in use?" /SD IDOK IDOK 0
|
||||
Abort "$EXECUTABLE.exe could not be removed. Aborting the uninstall process."
|
||||
|
||||
deletionSuccess:
|
||||
|
@ -269,7 +269,7 @@ Section /o "Un.WinPcap" un.SecWinPcap
|
|||
SectionIn 2
|
||||
ReadRegStr $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "UninstallString"
|
||||
;IfErrors un.lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not installed
|
||||
;MessageBox MB_OK "WinPcap $1"
|
||||
;MessageBox MB_OK "WinPcap $1" /SD IDOK
|
||||
ExecWait '$1' $0
|
||||
DetailPrint "WinPcap uninstaller returned $0"
|
||||
;SetRebootFlag true
|
||||
|
@ -281,7 +281,7 @@ Section "-Un.Finally"
|
|||
SectionIn 1 2
|
||||
; this test must be done after all other things uninstalled (e.g. Global Settings)
|
||||
IfFileExists "$INSTDIR" 0 NoFinalErrorMsg
|
||||
MessageBox MB_OK "Please note: The directory $INSTDIR could not be removed!" IDOK 0 ; skipped if dir doesn't exist
|
||||
MessageBox MB_OK "Unable to remove $INSTDIR." /SD IDOK IDOK 0 ; skipped if dir doesn't exist
|
||||
NoFinalErrorMsg:
|
||||
SectionEnd
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ Icon "..\..\image\wiresharkinst.ico"
|
|||
!define MUI_COMPONENTSPAGE_SMALLDESC
|
||||
!define MUI_FINISHPAGE_NOAUTOCLOSE
|
||||
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of ${PROGRAM_NAME}.\r\n\r\nBefore starting the installation, make sure ${PROGRAM_NAME} is not running.\r\n\r\nClick 'Next' to continue."
|
||||
;!define MUI_FINISHPAGE_LINK "Install WinPcap to be able to capture packets from a network!"
|
||||
;!define MUI_FINISHPAGE_LINK "Install WinPcap to be able to capture packets from a network."
|
||||
;!define MUI_FINISHPAGE_LINK_LOCATION "http://www.winpcap.org"
|
||||
|
||||
; NSIS shows Readme files by opening the Readme file with the default application for
|
||||
|
@ -205,7 +205,7 @@ Function .onInit
|
|||
!if ${WIRESHARK_TARGET_PLATFORM} == "win64"
|
||||
; http://forums.winamp.com/printthread.php?s=16ffcdd04a8c8d52bee90c0cae273ac5&threadid=262873
|
||||
${IfNot} ${RunningX64}
|
||||
MessageBox MB_OK "This version of Wireshark only runs on x64 machines.\nTry installing the 32-bit version instead."
|
||||
MessageBox MB_OK "This version of Wireshark only runs on x64 machines.\nTry installing the 32-bit version instead." /SD IDOK
|
||||
Abort
|
||||
${EndIf}
|
||||
!endif
|
||||
|
@ -391,11 +391,11 @@ Delete "$INSTDIR\vcredist_${TARGET_MACHINE}.exe"
|
|||
!else
|
||||
!ifdef MSVCR_DLL
|
||||
; msvcr*.dll (MSVC V7 or V7.1) - simply copy the dll file
|
||||
!echo "IF YOU GET AN ERROR HERE, check the MSVC_VARIANT setting in config.nmake: MSVC2005 vs. MSVC2005EE!"
|
||||
!echo "IF YOU GET AN ERROR HERE, check the MSVC_VARIANT setting in config.nmake: MSVC2005 vs. MSVC2005EE."
|
||||
File "${MSVCR_DLL}"
|
||||
!else
|
||||
!if ${MSVC_VARIANT} != "MSVC6"
|
||||
!error "C-Runtime redistributable for this package not available / not redistributable!"
|
||||
!error "C-Runtime redistributable for this package not available / not redistributable."
|
||||
!endif
|
||||
!endif ; MSVCR_DLL
|
||||
!endif ; VCREDIST_EXE
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
; RunningX64 checks if the installer is running on x64.
|
||||
;
|
||||
; ${If} ${RunningX64}
|
||||
; MessageBox MB_OK "running on x64"
|
||||
; MessageBox MB_OK "running on x64" /SD IDOK
|
||||
; ${EndIf}
|
||||
;
|
||||
; DisableX64FSRedirection disables file system redirection.
|
||||
|
|
Loading…
Reference in New Issue