From 77e6de242f47d12aabf563c7e4ed0e6e47ac3bac Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 13 May 2009 18:11:00 +0000 Subject: [PATCH] comparison tests for win7/2008r2 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5963 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/Tests/winver.nsi | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Source/Tests/winver.nsi b/Source/Tests/winver.nsi index b067aff2..d2f9559c 100644 --- a/Source/Tests/winver.nsi +++ b/Source/Tests/winver.nsi @@ -147,15 +147,17 @@ Var OSVERSIONINFOEX_INIT !macroend -!define ORDER_95 0 -!define ORDER_NT4 0 -!define ORDER_98 1 -!define ORDER_ME 2 -!define ORDER_2000 3 -!define ORDER_XP 4 -!define ORDER_2003 5 -!define ORDER_Vista 6 -!define ORDER_2008 7 +!define ORDER_95 0 +!define ORDER_NT4 0 +!define ORDER_98 1 +!define ORDER_ME 2 +!define ORDER_2000 3 +!define ORDER_XP 4 +!define ORDER_2003 5 +!define ORDER_Vista 6 +!define ORDER_2008 7 +!define ORDER_7 8 +!define ORDER_2008R2 9 !macro TestWinVerOrder NAME VER V_ @@ -217,6 +219,8 @@ Var OSVERSIONINFOEX_INIT !insertmacro TestWinVerDiff "${NAME}" ${VER} 2003 !insertmacro TestWinVerDiff "${NAME}" ${VER} Vista !insertmacro TestWinVerDiff "${NAME}" ${VER} 2008 + !insertmacro TestWinVerDiff "${NAME}" ${VER} 7 + !insertmacro TestWinVerDiff "${NAME}" ${VER} 2008R2 # test version comparison @@ -229,6 +233,8 @@ Var OSVERSIONINFOEX_INIT !insertmacro TestWinVerOrder "${NAME}" ${VER} 2003 !insertmacro TestWinVerOrder "${NAME}" ${VER} Vista !insertmacro TestWinVerOrder "${NAME}" ${VER} 2008 + !insertmacro TestWinVerOrder "${NAME}" ${VER} 7 + !insertmacro TestWinVerOrder "${NAME}" ${VER} 2008R2 # test service pack equality