From f3d9c4093e3ebfc23605f6a31315d17d6b083fe7 Mon Sep 17 00:00:00 2001 From: fyodor Date: Sun, 23 Dec 2007 06:25:35 +0000 Subject: [PATCH] o Fixed Nmap Winpcap installer to use CurrentVersion registry key on Windows rather than VersionNumber to more reliably detect Vista machines. This should prevent the XP version of Packet.dll from being installed on Vista. [Rob Nicholls] --- CHANGELOG | 5 +++++ mswin32/winpcap/winpcap-nmap.nsi | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d98d526b1..664afb067 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ # Nmap Changelog ($Id$); -*-text-*- +o Fixed Nmap Winpcap installer to use CurrentVersion registry key on + Windows rather than VersionNumber to more reliably detect Vista + machines. This should prevent the XP version of Packet.dll from + being installed on Vista. [Rob Nicholls] + o Added nmap.fetchfile() function for scripts so they can easily find Nmap's nmap-* data files. [Kris] diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi index 72aae841e..88882b199 100644 --- a/mswin32/winpcap/winpcap-nmap.nsi +++ b/mswin32/winpcap/winpcap-nmap.nsi @@ -107,13 +107,12 @@ Section "" ;No components page, name is not important File wpcap.dll ; Check windows version - ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" VersionNumber - StrCmp $R0 '6.0'vista_files no_vista_files + ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion + StrCmp $R0 '6.0' vista_files - no_vista_files: - File Packet.dll - File WanPacket.dll - Goto install + File Packet.dll + File WanPacket.dll + Goto install vista_files: File vista\Packet.dll