mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26028) -Fix [FS#5773]: make the installer warning about Windows XP SP3 not trigger on the 64 bit Windows XP which isn't really Windows XP to start with

release/1.4
rubidium 2013-11-17 16:16:55 +00:00
parent ec4806a82d
commit 8abbcd3700
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
os/windows/installer/install.nsi
View File

@ -545,15 +545,22 @@ FunctionEnd
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack ; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack
Function GetWindowsVersion Function GetWindowsVersion
GetVersion::WindowsPlatformArchitecture
Pop $R0
IntCmp $R0 64 WinNT 0
ClearErrors ClearErrors
StrCpy $R0 "win9x" StrCpy $R0 "win9x"
${If} ${IsNT} ${If} ${IsNT}
${If} ${IsWinXP} ${If} ${IsWinXP}
${AndIf} ${AtLeastServicePack} 3 ${AndIf} ${AtLeastServicePack} 3
${OrIf} ${AtLeastWin2003} ${OrIf} ${AtLeastWin2003}
StrCpy $R0 "winnt" GoTo WinNT
${EndIf} ${EndIf}
${EndIf} ${EndIf}
GoTo Done
WinNT:
StrCpy $R0 "winnt"
Done:
Push $R0 Push $R0
FunctionEnd FunctionEnd