From 8daf8b147406e69305fe50ab2938e103135d13b9 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 22 Jan 2009 19:38:29 +0000
Subject: [PATCH] o Update Windows installer to handle Windows 7 (tested with
 the Beta   build 7000) [Rob Nicholls]

---
 CHANGELOG                        | 3 +++
 mswin32/winpcap/winpcap-nmap.nsi | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 714a7453f..5786924c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Update Windows installer to handle Windows 7 (tested with the Beta
+  build 7000) [Rob Nicholls]
+
 o Nmap now reports a proper error message when you combine an IPv6
   scan (-6) with random IPv4 address selection (-iR). [Henri Doreau]
 
diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi
index 7e4f7ea7a..37ae31567 100644
--- a/mswin32/winpcap/winpcap-nmap.nsi
+++ b/mswin32/winpcap/winpcap-nmap.nsi
@@ -288,7 +288,8 @@ Section "WinPcap" SecWinPcap
 
   ; Check windows version
   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $R0 '6.0' vista_files
+  StrCpy $R0 $R0 2 
+  StrCmp $R0 '6.' vista_files
 
   File Packet.dll
   File WanPacket.dll