diff options
| author | sr55 <[email protected]> | 2014-12-11 21:34:53 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-12-11 21:34:53 +0000 |
| commit | 437ebf11d958eb89dde3cd98b8b11d2b4dc6cba8 (patch) | |
| tree | ddf693c9a896bcead1714295144e40fbe22971a6 | |
| parent | 843d05122d745269fe01367efcd9350cef67eaa6 (diff) | |
WinGUI: Update the installer to abort if running on windows xp or earlier with an error message. I don't have an XP machine / VM to test this on anymore, so if it doesn't work, let me know.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6596 b64f7644-9d1e-0410-96f1-a4d463321fa5
4 files changed, 28 insertions, 0 deletions
diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi index 07149a342..adb1eaffa 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi @@ -23,6 +23,7 @@ SetCompressor lzma ; MUI 1.67 compatible ------
!include "MUI.nsh"
+!include WinVer.nsh
; MUI Settings
!define MUI_ABORTWARNING
@@ -72,6 +73,12 @@ Function .onInit StrCmp $R0 0 +3
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
Abort
+
+ ; Detect if the intsaller is running on Windows XP and abort if it is.
+ ${IfNot} ${AtLeastWinVista}
+ MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."
+ Quit
+ ${EndIf}
;Remove previous version
ReadRegStr $R0 HKLM \
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index e9bd5c1db..c7052b05a 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -23,6 +23,7 @@ SetCompressor lzma ; MUI 1.67 compatible ------
!include "MUI.nsh"
+!include WinVer.nsh
; MUI Settings
!define MUI_ABORTWARNING
@@ -73,6 +74,12 @@ Function .onInit MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
Abort
+ ; Detect if the intsaller is running on Windows XP and abort if it is.
+ ${IfNot} ${AtLeastWinVista}
+ MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."
+ Quit
+ ${EndIf}
+
;Remove previous version
ReadRegStr $R0 HKLM \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl index 07b9d6240..df1f5d329 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl @@ -23,6 +23,7 @@ SetCompressor lzma ; MUI 1.67 compatible ------
!include "MUI.nsh"
+!include WinVer.nsh
; MUI Settings
!define MUI_ABORTWARNING
@@ -73,6 +74,12 @@ Function .onInit MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
Abort
+ ; Detect if the intsaller is running on Windows XP and abort if it is.
+ ${IfNot} ${AtLeastWinVista}
+ MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."
+ Quit
+ ${EndIf}
+
;Remove previous version
ReadRegStr $R0 HKLM \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl index 15c35d248..7d085451d 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl @@ -23,6 +23,7 @@ SetCompressor lzma ; MUI 1.67 compatible ------
!include "MUI.nsh"
+!include WinVer.nsh
; MUI Settings
!define MUI_ABORTWARNING
@@ -73,6 +74,12 @@ Function .onInit MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
Abort
+ ; Detect if the intsaller is running on Windows XP and abort if it is.
+ ${IfNot} ${AtLeastWinVista}
+ MessageBox MB_OK "Windows Vista with Service Pack 1 or later is required in order to run HandBrake."
+ Quit
+ ${EndIf}
+
;Remove previous version
ReadRegStr $R0 HKLM \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
|