From ab31df369dd784a0daa1c0686bd45318a362fc13 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 26 May 2021 23:05:54 +1000
Subject: [PATCH] packaging: improved nsis installer

- Enabled Hi-DPI
- Enabled Unicode
---
 .github/workflows/ci.yml             | 6 +++---
 app/packaging/windows/nsis/olive.nsi | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd2190d820..6164c80c10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -257,9 +257,9 @@ jobs:
           #$DOWNLOAD_TOOL http://web.archive.org/web/20210226132532/http://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe
           cp $(cygpath $GITHUB_WORKSPACE)/app/packaging/windows/nsis/* .
           cp $(cygpath $GITHUB_WORKSPACE)/LICENSE .
-          $DOWNLOAD_TOOL https://nsis.sourceforge.io/mediawiki/images/c/c7/ShellExecAsUser.zip
-          7z x ShellExecAsUser.zip ShellExecAsUser.dll
-          makensis -V4 -DX64 "-XOutFile $PKGNAME.exe" "-X!AddPluginDir $(pwd -W)" olive.nsi
+          $DOWNLOAD_TOOL https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z
+          7z e ShellExecAsUser_amd64-Unicode.7z Plugins/x86-unicode/ShellExecAsUser.dll
+          makensis -V4 -DX64 "-XOutFile $PKGNAME.exe" "-X!AddPluginDir /x86-unicode $(pwd -W)" olive.nsi
 
           # Create Portable ZIP
           echo -n > olive-editor/portable
diff --git a/app/packaging/windows/nsis/olive.nsi b/app/packaging/windows/nsis/olive.nsi
index 550ecdf4be..11e67f3c77 100644
--- a/app/packaging/windows/nsis/olive.nsi
+++ b/app/packaging/windows/nsis/olive.nsi
@@ -1,4 +1,4 @@
-!include "MUI.nsh"
+!include "MUI2.nsh"
 
 !define MUI_ICON "install icon.ico"
 !define MUI_UNICON "uninstall icon.ico"
@@ -12,6 +12,8 @@ SetCompressor lzma
 
 Name ${APP_NAME}
 
+ManifestDPIAware true
+Unicode true
 
 !ifdef X64
 InstallDir "$PROGRAMFILES64\${APP_NAME}"