diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-04-06 16:20:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-04-06 16:20:19 +0000 |
| commit | 2ed3c977fcbdcf28a80ad6268f00ac15bb2f7b1a (patch) | |
| tree | 8ef5a24a7af6348b09386fd80764cd2a424be376 /packaging/nsis/GetWindowsVersion.nsh | |
| parent | 846eed1d9e69bf6b256c8b2214a4391dd6446d9a (diff) | |
| download | wireshark-2ed3c977fcbdcf28a80ad6268f00ac15bb2f7b1a.tar.gz | |
Add Windows 7(Untested).
svn path=/trunk/; revision=32402
Diffstat (limited to 'packaging/nsis/GetWindowsVersion.nsh')
| -rw-r--r-- | packaging/nsis/GetWindowsVersion.nsh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packaging/nsis/GetWindowsVersion.nsh b/packaging/nsis/GetWindowsVersion.nsh index 8dcaa26e37..beecfd6f9f 100644 --- a/packaging/nsis/GetWindowsVersion.nsh +++ b/packaging/nsis/GetWindowsVersion.nsh @@ -5,7 +5,7 @@ ; ; Returns on top of stack ; -; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista) +; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista, Windows 7) ; or ; '' (Unknown Windows Version) ; @@ -62,7 +62,8 @@ Function GetWindowsVersion StrCmp $R1 '5.0' lbl_winnt_2000 StrCmp $R1 '5.1' lbl_winnt_XP StrCmp $R1 '5.2' lbl_winnt_2003 - StrCmp $R1 '6.0' lbl_winnt_vista lbl_error + StrCmp $R1 '6.0' lbl_winnt_vista + StrCmp $R1 '7.0' lbl_winnt_7 lbl_error lbl_winnt_x: StrCpy $R0 "NT $R0" 6 @@ -84,6 +85,10 @@ Function GetWindowsVersion Strcpy $R0 'Vista' Goto lbl_done + lbl_winnt_7: + Strcpy $R0 'Windows 7' + Goto lbl_done + lbl_error: Strcpy $R0 '' lbl_done: |