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

WinPcap 4.1.1 -> 4.1.2. 

svn path=/trunk/; revision=33493
This commit is contained in:
Gerald Combs 2010-07-12 23:52:35 +00:00
parent cfe9b05691
commit df14866685
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docbook/wsug_src/WSUG_chapter_introduction.xml
View File

@ -280,7 +280,7 @@
</para></listitem>
<listitem><para>
Windows 2000 no longer works with Wireshark. The last known version
to work was Wireshark 1.2.x (which includes WinPcap 4.1.1). You still
to work was Wireshark 1.2.x (which includes WinPcap 4.1.2). You still
can get it from <ulink
url="http://www.wireshark.org/download/win32/all-versions/" />.
Microsoft retired support for Windows 2000 in 2010.

2
packaging/nsis/Makefile.am
View File

@ -8,7 +8,7 @@ EXTRA_DIST = \
VersionCompare.nsh \
AdditionalTasksPage.ini \
WinPcapPage.ini \
WinPcap_4_1_1.exe \
WinPcap_4_1_2.exe \
Makefile.nmake \
Custom.nmake \
custom_plugins.txt

2
packaging/nsis/Makefile.nmake
View File

@ -16,7 +16,7 @@ EXE=../../tshark.exe ../../editcap.exe \
!IFDEF GTK_DIR
../../wireshark.exe \
!ENDIF
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_1_1.exe
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_1_2.exe
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll
DOC=../../doc/ws.css \
../../doc/capinfos.html \

BIN
packaging/nsis/WinPcap_4_1_1.exe
View File

Binary file not shown.

BIN
packaging/nsis/WinPcap_4_1_2.exe Executable file
View File

Binary file not shown.

10
packaging/nsis/wireshark.nsi
View File

@ -786,8 +786,8 @@ IfErrors lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not inst
;DetailPrint "WinPcap uninstaller returned $0"
lbl_winpcap_notinstalled:
SetOutPath $INSTDIR
File "WinPcap_4_1_1.exe"
ExecWait '"$INSTDIR\WinPcap_4_1_1.exe"' $0
File "WinPcap_4_1_2.exe"
ExecWait '"$INSTDIR\WinPcap_4_1_2.exe"' $0
DetailPrint "WinPcap installer returned $0"
SecRequired_skip_Winpcap:
@ -1301,7 +1301,7 @@ lbl_winversion_unsupported_2000:
lbl_winversion_supported:
; detect if WinPcap should be installed
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 4.1.1"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 4.1.2"
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
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed"
@ -1314,7 +1314,7 @@ lbl_winpcap_installed:
; Compare the installed build against the one we have.
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.
${VersionCompare} $WINPCAP_VERSION "4.1.0.1753" $1 ; WinPcap 4.1.1
${VersionCompare} $WINPCAP_VERSION "4.1.0.2001" $1 ; WinPcap 4.1.2
StrCmp $1 "2" lbl_winpcap_do_install
;lbl_winpcap_dont_install:
@ -1327,7 +1327,7 @@ lbl_winpcap_installed:
; force the user to upgrade by hand
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Flags" "DISABLED"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap 4.1.1, please uninstall $WINPCAP_NAME manually first."
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap 4.1.2, please uninstall $WINPCAP_NAME manually first."
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Flags" "DISABLED"
Goto lbl_winpcap_done