mirror of
https://github.com/nmap/nmap.git
synced 2026-08-04 06:40:48 +00:00
The WinPcap Windows installer now has x64 npf.sys support. Thanks for Rob Nicholls for the patch.
This commit is contained in:
parent
c6ee0c4995
commit
bc0826654a
2 changed files with 35 additions and 1 deletions
|
|
@ -155,6 +155,7 @@ FunctionEnd
|
|||
|
||||
Function un.registerServiceSC
|
||||
nsExec::Exec "sc stop npf"
|
||||
nsExec::Exec "sc delete npf"
|
||||
FunctionEnd
|
||||
|
||||
Function autoStartWinPcap
|
||||
|
|
@ -196,7 +197,23 @@ Section "WinPcap" SecWinPcap
|
|||
install:
|
||||
SetOutPath $SYSDIR\drivers
|
||||
|
||||
File npf.sys
|
||||
; check for x64, install the correct npf.sys file into system32\drivers
|
||||
System::Call "kernel32::GetCurrentProcess() i .s"
|
||||
System::Call "kernel32::IsWow64Process(i s, *i .r0)"
|
||||
StrCmp $0 "0" is32bit is64bit
|
||||
|
||||
is32bit:
|
||||
File npf.sys ; x86 NT5/NT6 version
|
||||
Goto npfdone
|
||||
|
||||
is64bit:
|
||||
; disable Wow64FsRedirection
|
||||
System::Call kernel32::Wow64EnableWow64FsRedirection(i0)
|
||||
File x64\npf.sys ; x64 NT5/NT6 version
|
||||
; re-enable Wow64FsRedirection
|
||||
System::Call kernel32::Wow64EnableWow64FsRedirection(i1)
|
||||
|
||||
npfdone:
|
||||
|
||||
; Install some basic registry keys
|
||||
WriteRegStr HKLM "Software\WinPcap" "" '"$INSTDIR"'
|
||||
|
|
@ -241,8 +258,25 @@ Section "Uninstall"
|
|||
Delete $SYSDIR\WanPacket.dll
|
||||
Delete $SYSDIR\wpcap.dll
|
||||
|
||||
; check for x64, delete npf.sys file from system32\drivers
|
||||
System::Call "kernel32::GetCurrentProcess() i .s"
|
||||
System::Call "kernel32::IsWow64Process(i s, *i .r0)"
|
||||
StrCmp $0 "0" del32bitnpf del64bitnpf
|
||||
del64bitnpf:
|
||||
; disable Wow64FsRedirection
|
||||
System::Call kernel32::Wow64EnableWow64FsRedirection(i0)
|
||||
|
||||
Delete $SYSDIR\drivers\npf.sys
|
||||
|
||||
; re-enable Wow64FsRedirection
|
||||
System::Call kernel32::Wow64EnableWow64FsRedirection(i1)
|
||||
Goto npfdeleted
|
||||
del32bitnpf:
|
||||
|
||||
Delete $SYSDIR\drivers\npf.sys
|
||||
|
||||
npfdeleted:
|
||||
|
||||
RMDir "$INSTDIR"
|
||||
|
||||
SectionEnd
|
||||
|
|
|
|||
BIN
mswin32/winpcap/x64/npf.sys
Normal file
BIN
mswin32/winpcap/x64/npf.sys
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue