From b3bd182c1bccb7e8057c51d17d3d8805e29b6782 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Tue, 24 Feb 2015 12:14:44 +0000 Subject: [PATCH] Fixed installer text mangling. The `Unicode true` line needs to be included before anything else for NSIS to handle Unicode text correctly. --- src/installer.nsi | 63 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/src/installer.nsi b/src/installer.nsi index 02f480a3..9132313d 100644 --- a/src/installer.nsi +++ b/src/installer.nsi @@ -1,4 +1,4 @@ -;LOOT NSIS Installer Script +;LOOT NSIS Installer Script ;-------------------------------- ;Include NSIS files. @@ -8,6 +8,38 @@ !include "LogicLib.nsh" !include "nsDialogs.nsh" +;-------------------------------- +;General + + ; Display Unicode text correctly. + Unicode true + + ;Name, file and version info for installer. + Name "LOOT v0.7.0" + OutFile "..\build\LOOT Installer.exe" + VIProductVersion 0.7.0.0 + + ;Request application privileges for Windows Vista/7 + RequestExecutionLevel admin + + ;Icon for installer\uninstaller + !define MUI_ICON "..\resources\icon.ico" + !define MUI_UNICON "..\resources\icon.ico" + + ; This causes an "are you sure?" message to be displayed if you try to quit the installer or uninstaller. + !define MUI_ABORTWARNING + !define MUI_UNABORTWARNING + + ;Checks that the installer's CRC is correct. + CRCCheck force + + ;The SOLID lzma compressor gives the best compression ratio. + SetCompressor /SOLID lzma + + ;Default install directory. + InstallDir "$PROGRAMFILES\LOOT" + InstallDirRegKey HKLM "Software\LOOT" "Installed Path" + ;-------------------------------- ; Helper Function @@ -70,35 +102,6 @@ Function ReplaceLineStr Pop $R0 FunctionEnd -;-------------------------------- -;General - - ;Name, file and version info for installer. - Name "LOOT v0.7.0" - OutFile "..\build\LOOT Installer.exe" - VIProductVersion 0.7.0.0 - - ;Request application privileges for Windows Vista/7 - RequestExecutionLevel admin - - ;Icon for installer\uninstaller - !define MUI_ICON "..\resources\icon.ico" - !define MUI_UNICON "..\resources\icon.ico" - - ; This causes an "are you sure?" message to be displayed if you try to quit the installer or uninstaller. - !define MUI_ABORTWARNING - !define MUI_UNABORTWARNING - - ;Checks that the installer's CRC is correct. - CRCCheck force - - ;The SOLID lzma compressor gives the best compression ratio. - SetCompressor /SOLID lzma - - ;Default install directory. - InstallDir "$PROGRAMFILES\LOOT" - InstallDirRegKey HKLM "Software\LOOT" "Installed Path" - ;-------------------------------- ;Pages