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

Enable NPF by default under Vista. 

svn path=/trunk/; revision=22894
This commit is contained in:
Gerald Combs 2007-09-17 18:40:34 +00:00
parent 48de2df871
commit 7b6bc7a2b6
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
packaging/nsis/GetWindowsVersion.nsh
View File

@ -1,4 +1,3 @@
; GetWindowsVersion ; GetWindowsVersion
; ;
; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/ ; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
@ -6,7 +5,7 @@
; ;
; Returns on top of stack ; Returns on top of stack
; ;
; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003) ; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista)
; or ; or
; '' (Unknown Windows Version) ; '' (Unknown Windows Version)
; ;
@ -14,77 +13,82 @@
; Call GetWindowsVersion ; Call GetWindowsVersion
; Pop $R0 ; Pop $R0
; ; at this point $R0 is "NT 4.0" or whatnot ; ; at this point $R0 is "NT 4.0" or whatnot
Function GetWindowsVersion Function GetWindowsVersion
Push $R0 Push $R0
Push $R1 Push $R1
ClearErrors ClearErrors
ReadRegStr $R0 HKLM \ ReadRegStr $R0 HKLM \
"SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
IfErrors 0 lbl_winnt IfErrors 0 lbl_winnt
; we are not NT ; we are not NT
ReadRegStr $R0 HKLM \ ReadRegStr $R0 HKLM \
"SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
StrCpy $R1 $R0 1 StrCpy $R1 $R0 1
StrCmp $R1 '4' 0 lbl_error StrCmp $R1 '4' 0 lbl_error
StrCpy $R1 $R0 3 StrCpy $R1 $R0 3
StrCmp $R1 '4.0' lbl_win32_95 StrCmp $R1 '4.0' lbl_win32_95
StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98 StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
lbl_win32_95: lbl_win32_95:
StrCpy $R0 '95' StrCpy $R0 '95'
Goto lbl_done Goto lbl_done
lbl_win32_98: lbl_win32_98:
StrCpy $R0 '98' StrCpy $R0 '98'
Goto lbl_done Goto lbl_done
lbl_win32_ME: lbl_win32_ME:
StrCpy $R0 'ME' StrCpy $R0 'ME'
Goto lbl_done Goto lbl_done
lbl_winnt: lbl_winnt:
StrCpy $R1 $R0 1 StrCpy $R1 $R0 1
StrCmp $R1 '3' lbl_winnt_x StrCmp $R1 '3' lbl_winnt_x
StrCmp $R1 '4' lbl_winnt_x StrCmp $R1 '4' lbl_winnt_x
StrCpy $R1 $R0 3 StrCpy $R1 $R0 3
StrCmp $R1 '5.0' lbl_winnt_2000 StrCmp $R1 '5.0' lbl_winnt_2000
StrCmp $R1 '5.1' lbl_winnt_XP StrCmp $R1 '5.1' lbl_winnt_XP
StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error StrCmp $R1 '5.2' lbl_winnt_2003
StrCmp $R1 '6.0' lbl_winnt_vista lbl_error
lbl_winnt_x: lbl_winnt_x:
StrCpy $R0 "NT $R0" 6 StrCpy $R0 "NT $R0" 6
Goto lbl_done Goto lbl_done
lbl_winnt_2000: lbl_winnt_2000:
Strcpy $R0 '2000' Strcpy $R0 '2000'
Goto lbl_done Goto lbl_done
lbl_winnt_XP: lbl_winnt_XP:
Strcpy $R0 'XP' Strcpy $R0 'XP'
Goto lbl_done Goto lbl_done
lbl_winnt_2003: lbl_winnt_2003:
Strcpy $R0 '2003' Strcpy $R0 '2003'
Goto lbl_done Goto lbl_done
lbl_winnt_vista:
Strcpy $R0 'Vista'
Goto lbl_done
lbl_error: lbl_error:
Strcpy $R0 '' Strcpy $R0 ''
lbl_done: lbl_done:
Pop $R1 Pop $R1
Exch $R0 Exch $R0
FunctionEnd FunctionEnd

3
packaging/nsis/wireshark.nsi
View File

@ -1290,10 +1290,13 @@ lbl_winpcap_done:
StrCmp $R0 '95' lbl_npf_disable StrCmp $R0 '95' lbl_npf_disable
StrCmp $R0 '98' lbl_npf_disable StrCmp $R0 '98' lbl_npf_disable
StrCmp $R0 'ME' lbl_npf_disable StrCmp $R0 'ME' lbl_npf_disable
; Enable NPF by default under Vista.
StrCmp $R0 'Vista' lbl_npf_enable
ReadRegDWORD $NPF_START HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Services\NPF" "Start" ReadRegDWORD $NPF_START HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Services\NPF" "Start"
; (Winpcap may not be installed already, so no regKey is no error here) ; (Winpcap may not be installed already, so no regKey is no error here)
IfErrors lbl_npf_done ;RegKey not available, so do not set it IfErrors lbl_npf_done ;RegKey not available, so do not set it
IntCmp $NPF_START 2 0 lbl_npf_done lbl_npf_done IntCmp $NPF_START 2 0 lbl_npf_done lbl_npf_done
lbl_npf_enable:
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 8" "State" "1" WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 8" "State" "1"
Goto lbl_npf_done Goto lbl_npf_done
;disable ;disable