forked from osmocom/wireshark
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>
This commit is contained in:
parent
13bb4911af
commit
59b0d22ec0
|
@ -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
|
||||
|
|
|
@ -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 -->
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
<!--
|
||||
|
|
Loading…
Reference in New Issue