Update windows installer to use newer OS detection code, and warn if the service pack is not up to date.

 Now, also block if trying to install on XP SP1 or lower.
 Also added missing SSE2 strings in several languages.

13 files changed, 38 insertions, 119 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 8a6114f0d5..4815c1a538 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -125,11 +125,13 @@ Var DO_UNINSTALL_V2     ; If non-null, path to a previous Viewer 2 installation
 !include "FileFunc.nsh"     ; For GetParameters, GetOptions

 !insertmacro GetParameters

 !insertmacro GetOptions

+!include WinVer.nsh			; for OS and SP detection

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; After install completes, launch app

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function .onInstSuccess

+Call CheckWindowsServPack				; Warn if not on the latest SP before asking to launch.

     Push $R0	# Option value, unused

 

     StrCmp $SKIP_DIALOGS "true" label_launch 

@@ -161,26 +163,38 @@ Function dirPre
 FunctionEnd    

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Make sure we're not on Windows 98 / ME

+; Make sure we are not on a verion of windows older than XP SP2

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CheckWindowsVersion

-	DetailPrint "Checking Windows version..."

-	Call GetWindowsVersion

-	Pop $R0

-	; Just get first two characters, ignore 4.0 part of "NT 4.0"

-	StrCpy $R0 $R0 2

-	; Blacklist certain OS versions

-	StrCmp $R0 "95" win_ver_bad

-	StrCmp $R0 "98" win_ver_bad

-	StrCmp $R0 "ME" win_ver_bad

-	StrCmp $R0 "NT" win_ver_bad

-	Return

-win_ver_bad:

-	StrCmp $SKIP_DIALOGS "true" +2 ; If skip_dialogs is set just install

-            MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort

-	Return

-win_ver_abort:

-	Quit

+  ${IfNot} ${AtLeastWin2000}

+  ${OrIf} ${IsWinXP}

+  ${AndIfNot} ${AtLeastServicePack} 1

+  ${OrIf} ${IsWin2003}

+  ${AndIfNot} ${AtLeastServicePack} 1

+    MessageBox MB_OK $(CheckWindowsVersionMB)

+    Quit

+  ${EndIf}

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;Recommend Upgrading Service Pack

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckWindowsServPack

+  ${If} ${IsWinXP}

+  ${AndIfNot} ${IsServicePack} 3

+  ${OrIf} ${IsWin2003}

+  ${AndIfNot} ${IsServicePack} 2

+  ${OrIf} ${IsWinVista}

+  ${AndIfNot} ${IsServicePack} 2

+  ${OrIf} ${IsWin2008}

+  ${AndIfNot} ${IsServicePack} 2

+  ${OrIf} ${IsWin7}

+  ${AndIfNot} ${IsServicePack} 1

+  ${OrIf} ${IsWin2008R2}

+  ${AndIfNot} ${IsServicePack} 1

+    MessageBox MB_OK $(CheckWindowsServPackMB)

+    DetailPrint $(UseLatestServPackDP)

+  ${EndIf}

 FunctionEnd

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

@@ -231,17 +245,13 @@ FunctionEnd
 ; Checks for CPU valid (must have SSE2 support)

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CheckCPUFlags

-    Call GetWindowsVersion

-    Pop $R0

-    StrCmp $R0 "2000" OK_SSE  ; sse check not available on win2k.

-

     Push $1

     System::Call 'kernel32::IsProcessorFeaturePresent(i) i(10) .r1'

-    IntCmp $1 1 OK_SSE

-    MessageBox MB_OKCANCEL $(MissingSSE2) /SD IDOK IDOK OK_SSE

+    IntCmp $1 1 OK_SSE2

+    MessageBox MB_OKCANCEL $(MissingSSE2) /SD IDOK IDOK OK_SSE2

     Quit

 

-  OK_SSE:

+  OK_SSE2:

     Pop $1

     Return

 FunctionEnd

@@ -758,103 +768,13 @@ Call un.ProgramFiles
 

 SectionEnd 				; end of uninstall section

 

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; (From the NSIS documentation, JC)

-; GetWindowsVersion

-;

-; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/

-; Updated by Joost Verburg

-;

-; Returns on top of stack

-;

-; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)

-; or

-; '' (Unknown Windows Version)

-;

-; Usage:

-;   Call GetWindowsVersion

-;   Pop $R0

-;   ; at this point $R0 is "NT 4.0" or whatnot

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function GetWindowsVersion

- 

-   Push $R0

-   Push $R1

- 

-   ReadRegStr $R0 HKLM \

-   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion

-

-   IfErrors 0 lbl_winnt

-   

-   ; we are not NT

-   ReadRegStr $R0 HKLM \

-   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber

- 

-   StrCpy $R1 $R0 1

-   StrCmp $R1 '4' 0 lbl_error

- 

-   StrCpy $R1 $R0 3

- 

-   StrCmp $R1 '4.0' lbl_win32_95

-   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98

- 

-   lbl_win32_95:

-     StrCpy $R0 '95'

-   Goto lbl_done

- 

-   lbl_win32_98:

-     StrCpy $R0 '98'

-   Goto lbl_done

- 

-   lbl_win32_ME:

-     StrCpy $R0 'ME'

-   Goto lbl_done

- 

-   lbl_winnt:

- 

-   StrCpy $R1 $R0 1

- 

-   StrCmp $R1 '3' lbl_winnt_x

-   StrCmp $R1 '4' lbl_winnt_x

- 

-   StrCpy $R1 $R0 3

- 

-   StrCmp $R1 '5.0' lbl_winnt_2000

-   StrCmp $R1 '5.1' lbl_winnt_XP

-   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error

- 

-   lbl_winnt_x:

-     StrCpy $R0 "NT $R0" 6

-   Goto lbl_done

- 

-   lbl_winnt_2000:

-     Strcpy $R0 '2000'

-   Goto lbl_done

- 

-   lbl_winnt_XP:

-     Strcpy $R0 'XP'

-   Goto lbl_done

- 

-   lbl_winnt_2003:

-     Strcpy $R0 '2003'

-   Goto lbl_done

- 

-   lbl_error:

-     Strcpy $R0 ''

-   lbl_done:

- 

-   Pop $R1

-   Exch $R0

- 

-FunctionEnd

-

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;  Note: to add new languages, add a language file include to the list 

 ;;  at the top of this file, add an entry to the menu and then add an 

 ;;  entry to the language ID selector below

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function .onInit

+Call CheckWindowsVersion		; Don't install if on Windows XP SP1 or older (do to XP x64 only having SP2 and no SP3)

     Push $0

     ${GetParameters} $COMMANDLINE              ; get our command line

 

@@ -924,13 +844,12 @@ StrCpy $INSTPROG "${INSTNAME}"
 StrCpy $INSTEXE "${INSTEXE}"

 StrCpy $INSTSHORTCUT "${SHORTCUT}"

 

-Call CheckWindowsVersion		; warn if on Windows 98/ME

-Call CheckCPUFlags			; Make sure we have SSE2 support

+Call CheckCPUFlags				; Make sure we have SSE2 support

 Call CheckIfAdministrator		; Make sure the user can install/uninstall

 Call CheckIfAlreadyCurrent		; Make sure that we haven't already installed this version

 Call CloseSecondLife			; Make sure we're not running

 Call CheckNetworkConnection		; ping secondlife.com

-Call CheckWillUninstallV2               ; See if a V2 install exists and will be removed.

+Call CheckWillUninstallV2		; See if a V2 install exists and will be removed.

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 StrCmp $DO_UNINSTALL_V2 "" PRESERVE_DONE

diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi
index 0c832e8ba9..2352649b4b 100644
--- a/indra/newview/installers/windows/lang_da.nsi
+++ b/indra/newview/installers/windows/lang_da.nsi
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index b717a4d3a5..397262afe1 100644
--- a/indra/newview/installers/windows/lang_de.nsi
+++ b/indra/newview/installers/windows/lang_de.nsi
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index da0d7f54d2..df0d55d9e0 100644
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi
diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi
index c6a7f38f3f..32967a0dfa 100644
--- a/indra/newview/installers/windows/lang_es.nsi
+++ b/indra/newview/installers/windows/lang_es.nsi
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index 008c240ed7..5b2c3b187c 100644
--- a/indra/newview/installers/windows/lang_fr.nsi
+++ b/indra/newview/installers/windows/lang_fr.nsi
diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi
index eccd965a92..ce66b61f9f 100644
--- a/indra/newview/installers/windows/lang_it.nsi
+++ b/indra/newview/installers/windows/lang_it.nsi
diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
index f564291f7d..e68830123a 100644
--- a/indra/newview/installers/windows/lang_ja.nsi
+++ b/indra/newview/installers/windows/lang_ja.nsi
diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi
index 191bae4755..7883819190 100644
--- a/indra/newview/installers/windows/lang_pl.nsi
+++ b/indra/newview/installers/windows/lang_pl.nsi
diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi
index da56a3c336..eb3fb2386c 100644
--- a/indra/newview/installers/windows/lang_pt-br.nsi
+++ b/indra/newview/installers/windows/lang_pt-br.nsi
diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi
index de7affe08a..3b0042fbf5 100644
--- a/indra/newview/installers/windows/lang_ru.nsi
+++ b/indra/newview/installers/windows/lang_ru.nsi
diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi
index 5e7e3d797b..b9be1eab08 100644
--- a/indra/newview/installers/windows/lang_tr.nsi
+++ b/indra/newview/installers/windows/lang_tr.nsi
diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
index ecf1185fbb..3c6f6fd289 100644
--- a/indra/newview/installers/windows/lang_zh.nsi
+++ b/indra/newview/installers/windows/lang_zh.nsi