osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use the now released WinPcap 3.1 version instead of the beta 4. 

We don't need to uninstall an old WinPcap version first, as this is done by the WinPcap installer itself now.

svn path=/trunk/; revision=15256
This commit is contained in:
Ulf Lamping 2005-08-07 23:10:06 +00:00
parent 3d3dbb9b15
commit 7761e8ef56
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/nsis/Makefile.am
View File

@ -8,5 +8,5 @@ EXTRA_DIST = \
servicelib.nsh \
AdditionalTasksPage.ini \
WinPcapPage.ini \
WinPcap_3_1_beta4.exe \
WinPcap_3_1.exe \
Makefile.nmake

2
packaging/nsis/WinPcapPage.ini
View File

@ -45,7 +45,7 @@ Text=This text will be replaced, depending if WinPcap is already installed
[Field 6]
Type=Button
Left=0
Right=150
Right=100
Top=120
Bottom=135
Text=What is WinPcap?

BIN
packaging/nsis/WinPcap_3_1.exe Normal file
View File

Binary file not shown.

BIN
packaging/nsis/WinPcap_3_1_beta4.exe
View File

Binary file not shown.

14
packaging/nsis/ethereal.nsi
View File

@ -531,16 +531,17 @@ StrCmp $0 "0" SecRequired_skip_Winpcap
; Uinstall old WinPcap first
ReadRegStr $WINPCAP_UNINSTALL HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "UninstallString"
IfErrors lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not installed
ExecWait '$WINPCAP_UNINSTALL' $0
DetailPrint "WinPcap uninstaller returned $0"
; from released version 3.1, WinPcap will uninstall an old version by itself
;ExecWait '$WINPCAP_UNINSTALL' $0
;DetailPrint "WinPcap uninstaller returned $0"
lbl_winpcap_notinstalled:
SetOutPath $INSTDIR
File "WinPcap_3_1_beta4.exe"
ExecWait '"$INSTDIR\WinPcap_3_1_beta4.exe"' $0
File "WinPcap_3_1.exe"
ExecWait '"$INSTDIR\WinPcap_3_1.exe"' $0
DetailPrint "WinPcap installer returned $0"
SecRequired_skip_Winpcap:
; Load Winpcap NPF service at startup (depending on additional tasks page)
; Load Winpcap NPF service at startup (depending on winpcap page)
ReadINIStr $0 "$PLUGINSDIR\WinPcapPage.ini" "Field 8" "State"
StrCmp $0 "0" SecRequired_no_WinpcapService
WriteRegDWORD HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Services\NPF" "Start" 2 ;set NPF to (SERVICE_AUTO_START)
@ -1060,7 +1061,7 @@ lbl_ignore_wimp:
!endif
; detect if WinPcap should be installed
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.1 beta 4"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.1"
ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName"
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"
@ -1080,6 +1081,7 @@ lbl_winpcap_installed:
StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta" lbl_winpcap_do_install
StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta2" lbl_winpcap_do_install
StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta3" lbl_winpcap_do_install
StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta4" lbl_winpcap_do_install
; lbl_winpcap_dont_install:
; seems to be the current or even a newer version, so don't install