From 3589fb5737c49c307b114ad51ed2f48c128f85f1 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 29 Sep 2006 15:39:24 +0000 Subject: [PATCH] added vista this should be replaced with a call to GetVersion and IntCmp with defines the way it is now, users are tempted to use StrCmp and get installers not working with newer versions of windows git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4760 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/usefulfunc.but | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Docs/src/usefulfunc.but b/Docs/src/usefulfunc.but index bf847e97..d1590e06 100644 --- a/Docs/src/usefulfunc.but +++ b/Docs/src/usefulfunc.but @@ -166,7 +166,7 @@ \c ; \c ; Returns on top of stack \c ; -\c ; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003) +\c ; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista) \c ; or \c ; '' (Unknown Windows Version) \c ; @@ -223,6 +223,7 @@ \c StrCmp $R1 '5.0' lbl_winnt_2000 \c StrCmp $R1 '5.1' lbl_winnt_XP \c StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error +\c StrCmp $R1 '6.0' lbl_winnt_vista lbl_error \c \c lbl_winnt_x: \c StrCpy $R0 "NT $R0" 6 @@ -240,6 +241,10 @@ \c Strcpy $R0 '2003' \c Goto lbl_done \c +\c lbl_winnt_vista: +\c Strcpy $R0 'Vista' +\c Goto lbl_done +\c \c lbl_error: \c Strcpy $R0 '' \c lbl_done: