From aee2d3825a00c35a1b5c5a4bc50e423fa7c507c8 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 23 Sep 2009 00:31:17 +0000
Subject: [PATCH] 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.

---
 mswin32/winpcap/options.ini      | 2 +-
 mswin32/winpcap/winpcap-nmap.nsi | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mswin32/winpcap/options.ini b/mswin32/winpcap/options.ini
index bb7d08a3c..eef0c2c45 100644
--- a/mswin32/winpcap/options.ini
+++ b/mswin32/winpcap/options.ini
@@ -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]
diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi
index 37ae31567..d4dc9880b 100644
--- a/mswin32/winpcap/winpcap-nmap.nsi
+++ b/mswin32/winpcap/winpcap-nmap.nsi
@@ -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