1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-15 04:09:01 +00:00

Add some extra debug information related to the Windows version detected

by the installer.  Also notes that we recommend starting the WinPcap service at system startup for Windows 7 as well as vista.  The patch is from Rob Nicholls.
This commit is contained in:
fyodor
2009-09-23 00:31:17 +00:00
parent 556a59791f
commit aee2d3825a
2 changed files with 4 additions and 1 deletions

View File

@@ -7,7 +7,7 @@ Left=10
Right=-1
Top=20
Bottom=28
Text=Start the WinPcap service 'NPF' at startup (recommended on Windows Vista)
Text=Start the WinPcap service 'NPF' at startup (recommended on Windows 7 and Vista)
State=1
[Field 2]

View File

@@ -288,6 +288,7 @@ Section "WinPcap" SecWinPcap
; Check windows version
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
DetailPrint "Windows CurrentVersion: $R0"
StrCpy $R0 $R0 2
StrCmp $R0 '6.' vista_files
@@ -307,10 +308,12 @@ Section "WinPcap" SecWinPcap
StrCmp $0 "0" is32bit is64bit
is32bit:
DetailPrint "Installing x86 driver"
File npf.sys ; x86 NT5/NT6 version
Goto npfdone
is64bit:
DetailPrint "Installing x64 driver"
; disable Wow64FsRedirection
System::Call kernel32::Wow64EnableWow64FsRedirection(i0)
File x64\npf.sys ; x64 NT5/NT6 version