update WinPcap installer to recent 4.0.2
svn path=/trunk/; revision=23429
This commit is contained in:
parent
405be3098f
commit
8cdc8e0d57
Binary file not shown.
Binary file not shown.
|
@ -637,8 +637,8 @@ IfErrors lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not inst
|
||||||
;DetailPrint "WinPcap uninstaller returned $0"
|
;DetailPrint "WinPcap uninstaller returned $0"
|
||||||
lbl_winpcap_notinstalled:
|
lbl_winpcap_notinstalled:
|
||||||
SetOutPath $INSTDIR
|
SetOutPath $INSTDIR
|
||||||
File "WinPcap_4_0_1.exe"
|
File "WinPcap_4_0_2.exe"
|
||||||
ExecWait '"$INSTDIR\WinPcap_4_0_1.exe"' $0
|
ExecWait '"$INSTDIR\WinPcap_4_0_2.exe"' $0
|
||||||
DetailPrint "WinPcap installer returned $0"
|
DetailPrint "WinPcap installer returned $0"
|
||||||
SecRequired_skip_Winpcap:
|
SecRequired_skip_Winpcap:
|
||||||
|
|
||||||
|
@ -1259,7 +1259,7 @@ lbl_ignore_wimp:
|
||||||
|
|
||||||
|
|
||||||
; detect if WinPcap should be installed
|
; detect if WinPcap should be installed
|
||||||
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 4.0.1"
|
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 4.0.2"
|
||||||
ReadRegStr $WINPCAP_NAME HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName"
|
ReadRegStr $WINPCAP_NAME HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName"
|
||||||
IfErrors 0 lbl_winpcap_installed ;if RegKey is available, WinPcap is already installed
|
IfErrors 0 lbl_winpcap_installed ;if RegKey is available, WinPcap is already installed
|
||||||
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed"
|
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed"
|
||||||
|
@ -1272,7 +1272,7 @@ lbl_winpcap_installed:
|
||||||
; Compare the installed build against the one we have.
|
; Compare the installed build against the one we have.
|
||||||
ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion"
|
ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion"
|
||||||
StrCmp $WINPCAP_VERSION "" lbl_winpcap_do_install ; WinPcap is really old(?) or installed improperly.
|
StrCmp $WINPCAP_VERSION "" lbl_winpcap_do_install ; WinPcap is really old(?) or installed improperly.
|
||||||
${VersionCompare} $WINPCAP_VERSION "4.0.0.901" $1 ; WinPcap 4.0.1
|
${VersionCompare} $WINPCAP_VERSION "4.0.0.1040" $1 ; WinPcap 4.0.2
|
||||||
StrCmp $1 "2" lbl_winpcap_do_install
|
StrCmp $1 "2" lbl_winpcap_do_install
|
||||||
|
|
||||||
;lbl_winpcap_dont_install:
|
;lbl_winpcap_dont_install:
|
||||||
|
|
Loading…
Reference in New Issue