From 837c6885974129a7e7464493ec3e4eef5b01173a Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 2 Dec 2008 22:41:59 +0000 Subject: [PATCH] more tests from the forum git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5811 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/Tests/winver.nsi | 156 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 150 insertions(+), 6 deletions(-) diff --git a/Source/Tests/winver.nsi b/Source/Tests/winver.nsi index 6537ec76..b067aff2 100644 --- a/Source/Tests/winver.nsi +++ b/Source/Tests/winver.nsi @@ -338,6 +338,22 @@ Section !insertmacro TestWinVer "Windows 98" 98 0 client 9x + #### WINDOWS 98 SE + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD " A " + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 4, i 10, i 67766446, i 1, &t128 s, &i2 0, &i2 0, &i2 0, &i1 0, &i1 0" + # 9c000000040000000a000000ae080a040100000020412000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD " A " + StrCpy $OSVERSIONINFO_INIT "i 148, i 4, i 10, i 67766446, i 1, &t128 s, &i2 64, &i2 40960, &i2 8544, &i1 68, &i1 0" + # 94000000040000000a000000ae080a04010000002041200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows 98 SE" 98 1 client 9x + #### WINDOWS ME # OSVERSIONINFOEX @@ -402,6 +418,54 @@ Section !insertmacro TestWinVer "Windows 2000 SP0" 2000 0 client nt + #### WINDOWS 2000 SP1 + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD "Service Pack 1" + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 5, i 0, i 2195, i 2, &t128 s, &i2 1, &i2 0, &i2 0, &i1 1, &i1 0" + # 9c0000000500000000000000930800000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000011e + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD "Service Pack 1" + StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 0, i 2195, i 2, &t128 s, &i2 0, &i2 0, &i2 7, &i1 20, &i1 0" + # 940000000500000000000000930800000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows 2000 SP1" 2000 1 client nt + + #### WINDOWS 2000 SP2 + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD "Service Pack 2" + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 5, i 0, i 2195, i 2, &t128 s, &i2 2, &i2 0, &i2 0, &i1 1, &i1 0" + # 9c0000000500000000000000930800000200000053657276696365205061636b2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000011e + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD "Service Pack 2" + StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 0, i 2195, i 2, &t128 s, &i2 0, &i2 0, &i2 5, &i1 20, &i1 0" + # 940000000500000000000000930800000200000053657276696365205061636b2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows 2000 SP2" 2000 2 client nt + + #### WINDOWS 2000 SP3 + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD "Service Pack 3" + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 5, i 0, i 2195, i 2, &t128 s, &i2 3, &i2 0, &i2 0, &i1 1, &i1 0" + # 9c0000000500000000000000930800000200000053657276696365205061636b2033000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000011e + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD "Service Pack 3" + StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 0, i 2195, i 2, &t128 s, &i2 0, &i2 0, &i2 7, &i1 20, &i1 0" + # 940000000500000000000000930800000200000053657276696365205061636b2033000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows 2000 SP3" 2000 3 client nt + #### WINDOWS 2000 SP4 # OSVERSIONINFOEX @@ -418,7 +482,23 @@ Section !insertmacro TestWinVer "Windows 2000 SP4" 2000 4 client nt - #### WINDOWS XP SP2 + #### WINDOWS XP PRO SP1 + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD "Service Pack 1" + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 5, i 1, i 2600, i 2, &t128 s, &i2 1, &i2 0, &i2 256, &i1 1, &i1 0" + # 9c0000000500000001000000280a00000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000001011e + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD "Service Pack 1" + StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 1, i 2600, i 2, &t128 s, &i2 93, &i2 0, &i2 26, &i1 20, &i1 0" + # 940000000500000001000000280a00000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows XP Pro SP1" XP 1 client nt + + #### WINDOWS XP PRO SP2 # OSVERSIONINFOEX StrCpy $OSVERSIONINFOEX_RES 1 @@ -432,9 +512,9 @@ Section StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 1, i 2600, i 2, &t128s, &i2 0, &i2 0, &i2 0, &i1 0, &i1 0" # 940000000500000001000000280a00000200000053657276696365205061636b2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - !insertmacro TestWinVer "Windows XP SP2" XP 2 client nt + !insertmacro TestWinVer "Windows XP Pro SP2" XP 2 client nt - #### WINDOWS XP SP3 + #### WINDOWS XP PRO SP3 # OSVERSIONINFOEX StrCpy $OSVERSIONINFOEX_RES 1 @@ -448,7 +528,7 @@ Section StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 1, i 2600, i 2, &t128s, &i2 0, &i2 0, &i2 0, &i1 0, &i1 0" # 940000000500000001000000280a00000200000053657276696365205061636b2033000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - !insertmacro TestWinVer "Windows XP SP3" XP 3 client nt + !insertmacro TestWinVer "Windows XP Pro SP3" XP 3 client nt #### WINDOWS XP x64 SP1 @@ -466,7 +546,7 @@ Section !insertmacro TestWinVer "Windows XP x64 SP1" XP 1 client nt - #### WINDOWS SERVER 2003 STANDARD EDITION + #### WINDOWS SERVER 2003 STANDARD EDITION SP0 # OSVERSIONINFOEX StrCpy $OSVERSIONINFOEX_RES 1 @@ -480,7 +560,55 @@ Section StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 2, i 3790, i 2, &t128 s, &i2 0, &i2 0, &i2 7, &i1 20, &i1 0" # 940000000500000002000000ce0e0000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - !insertmacro TestWinVer "Windows Server 2003" 2003 0 server nt + !insertmacro TestWinVer "Windows Server 2003 SP0" 2003 0 server nt + + #### WINDOWS SERVER 2003 STANDARD EDITION SP1 + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD "Service Pack 1" + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 5, i 2, i 3790, i 2, &t128 s, &i2 1, &i2 0, &i2 272, &i1 3, &i1 0" + # 9c0000000500000002000000ce0e00000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000001001031e + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD "Service Pack 1" + StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 2, i 3790, i 2, &t128 s, &i2 0, &i2 0, &i2 44, &i1 20, &i1 0" + # 940000000500000002000000ce0e00000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows Server 2003 SP1" 2003 1 server nt + + #### WINDOWS SERVER 2003 STANDARD EDITION SP2 + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD "Service Pack 2" + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 5, i 2, i 3790, i 2, &t128 s, &i2 2, &i2 0, &i2 272, &i1 3, &i1 0" + # 9c0000000500000002000000ce0e00000200000053657276696365205061636b2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000001001031e + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD "Service Pack 2" + StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 2, i 3790, i 2, &t128 s, &i2 93, &i2 0, &i2 20, &i1 20, &i1 0" + # 940000000500000002000000ce0e00000200000053657276696365205061636b2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows Server 2003 SP2" 2003 2 server nt + + #### WINDOWS SERVER 2003 R2 + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD "Service Pack 2" + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 5, i 2, i 3790, i 2, &t128 s, &i2 2, &i2 0, &i2 274, &i1 3, &i1 0" + # 9c0000000500000002000000ce0e00000200000053657276696365205061636b2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000001201031e + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD "Service Pack 2" + StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 2, i 3790, i 2, &t128 s, &i2 0, &i2 0, &i2 44, &i1 20, &i1 0" + # 940000000500000002000000ce0e00000200000053657276696365205061636b2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows Server 2003 x64 R2" 2003 2 server nt #### WINDOWS VISTA ULTIMATE SP0 @@ -514,6 +642,22 @@ Section !insertmacro TestWinVer "Windows Vista SP1" Vista 1 client nt + #### WINDOWS VISTA x64 SP1 + + # OSVERSIONINFOEX + StrCpy $OSVERSIONINFOEX_RES 1 + StrCpy $OSVERSIONINFOEX_CSD "Service Pack 1" + StrCpy $OSVERSIONINFOEX_INIT "i 156, i 6, i 0, i 6001, i 2, &t128 s, &i2 1, &i2 0, &i2 256, &i1 1, &i1 0" + # 9c0000000600000000000000711700000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000001011e + + # OSVERSIONINFO + StrCpy $OSVERSIONINFO_RES 1 + StrCpy $OSVERSIONINFO_CSD "Service Pack 1" + StrCpy $OSVERSIONINFO_INIT "i 148, i 6, i 0, i 6001, i 2, &t128 s, &i2 10402, &i2 0, &i2 5938, &i1 49, &i1 0" + # 940000000600000000000000711700000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + !insertmacro TestWinVer "Windows Vista x64 SP1" Vista 1 client nt + #### WINDOWS 2008 SERVER SP1 # OSVERSIONINFOEX