aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Bloice <graham.bloice@trihedral.com>2018-03-01 23:18:17 +0000
committerGraham Bloice <graham.bloice@trihedral.com>2018-03-02 10:53:29 +0000
commit59b0d22ec00154a6a314a7f988e4b393d1f966ee (patch)
tree8a32545eeef3897e6208c0a4fd8b57ef62c121c5
parent13bb4911af9e36d9b95a9db5d6d9e9058b710cff (diff)
Windows: Update target version info
Set the API target level to Win7, along with installer changes to match. Change-Id: Icd93964eadf93018c56218e3efdfed10b9f8959a Reviewed-on: https://code.wireshark.org/review/26218 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-rw-r--r--cmakeconfig.h.in4
-rw-r--r--image/wireshark.exe.manifest.in2
-rw-r--r--packaging/nsis/wireshark.nsi8
-rw-r--r--packaging/wix/Prerequisites.wxi8
4 files changed, 16 insertions, 6 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index a7ab6bd4dd..30660c259a 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -411,11 +411,11 @@
# if defined(NTDDI_VERSION)
# error NTDDI_VERSION already defined.
# endif
-# define NTDDI_VERSION NTDDI_VISTA
+# define NTDDI_VERSION NTDDI_WIN7
# if defined(_WIN32_WINNT)
# error _WIN32_WINNT already defined.
# endif
-# define _WIN32_WINNT _WIN32_WINNT_VISTA
+# define _WIN32_WINNT _WIN32_WINNT_WIN7
/* WpdPack/INclude/pcap/pcap.h checks for "#if defined(WIN32)" */
# ifndef WIN32
diff --git a/image/wireshark.exe.manifest.in b/image/wireshark.exe.manifest.in
index e0b946417a..b59921b941 100644
--- a/image/wireshark.exe.manifest.in
+++ b/image/wireshark.exe.manifest.in
@@ -36,8 +36,6 @@
- The GetWindowsVersion parts of packaging\nsis\wireshark.nsi
- The VersionNT parts of packaging\wix\Prerequisites.wxi
-->
- <!-- Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows 8 -->
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index a9cc6fc6d3..184a4755a3 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -254,6 +254,8 @@ Function .onInit
StrCmp $R0 '2000' lbl_winversion_unsupported_2000
StrCmp $R0 'XP' lbl_winversion_unsupported_xp_2003
StrCmp $R0 '2003' lbl_winversion_unsupported_xp_2003
+ StrCmp $R0 'Vista' lbl_winversion_unsupported_vista_2008
+ StrCmp $R0 '2008' lbl_winversion_unsupported_vista_2008
Goto lbl_winversion_supported
lbl_winversion_unsupported:
@@ -280,6 +282,12 @@ lbl_winversion_unsupported_xp_2003:
/SD IDOK
Quit
+lbl_winversion_unsupported_vista_2008:
+ MessageBox MB_OK \
+ "Windows $R0 is no longer supported.$\nPlease install ${PROGRAM_NAME} 2.2 instead." \
+ /SD IDOK
+ Quit
+
lbl_winversion_supported:
!insertmacro IsWiresharkRunning
diff --git a/packaging/wix/Prerequisites.wxi b/packaging/wix/Prerequisites.wxi
index 6298113907..54e8416a9c 100644
--- a/packaging/wix/Prerequisites.wxi
+++ b/packaging/wix/Prerequisites.wxi
@@ -31,8 +31,12 @@
<![CDATA[Installed OR (VersionNT < 502) OR (VersionNT > 502)]]>
</Condition>
- <Condition Message="$(var.WiresharkName)$(var.WiresharkVersion) is only supported on Windows Vista, Windows Server 2008, or higher.">
- <![CDATA[Installed OR (VersionNT >= 600)]]>
+ <Condition Message="Windows Vista and Server 2008 are no longer supported. Please install $(var.WiresharkName) 2.2 instead.">
+ <![CDATA[Installed OR (VersionNT < 600) OR (VersionNT > 600)]]>
+ </Condition>
+
+ <Condition Message="$(var.WiresharkName)$(var.WiresharkVersion) is only supported on Windows 7, Windows Server 2008R2, or higher.">
+ <![CDATA[Installed OR (VersionNT >= 601)]]>
</Condition>
<!--