From d158f78f87b9d382247c5d238abab4f1885f9049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Wed, 1 Nov 2017 14:34:36 +0100
Subject: [PATCH] Win installer: fix detection of 64bit Krita and 64bit JabRef

also update the changelog
---
 .../Win32/packaging/installer/ChangeLog.txt       |  8 +++++++-
 .../packaging/installer/include/detection.nsh     | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index b29eefa044..6a701cf885 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,11 +1,17 @@
 Changelog for LyX-224-1:
 - installs LyX 2.2.4
+- fix bug that the BibTeX editor Jabref and the image editor Krita
+  were not detected as 64bit application
 - updated to MiKTeX 2.9 build 6361
-- updated to ImageMagick 7.0.6-2
+- updated to ImageMagick 7.0.7-8
 - updated to Perl 5.24.2.1
 - updated to Python 2.7.14
 - updated to Qt 5.6.3
 - updated to Ghostscript 9.22
+- updated spell checker dictionaries for English (GB, US), Portuguese, Scottish,
+  Tibetan and Ukrainian
+  (To benefit from them you must uninstall an already installed LyX 2.2.x and
+   then use this installer.)
 
 
 Changelog for LyX-223-1:
diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh
index f1aba7cd8f..5fd7011ee5 100644
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -144,6 +144,9 @@ Function MissingPrograms
    StrCpy $ImageEditor "Photoshop"
   ${endif}
   # check for Krita
+  ${if} ${RunningX64}
+   SetRegView 64
+  ${endif}
   ReadRegStr $0 HKLM "SOFTWARE\Classes\Krita.Document\shell\open\command" ""
   ${if} $0 != ""
    StrCpy $0 "$0" -16 # delete '\krita.exe" "%1"'
@@ -155,12 +158,22 @@ Function MissingPrograms
    ${endif}
    StrCpy $ImageEditor "Krita"
   ${endif}
+  ${if} ${RunningX64}
+   SetRegView 32
+  ${endif}
 
   # test if and where the BibTeX-editor JabRef is installed
-  ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
+  ${if} ${RunningX64}
+   SetRegView 64
+  ${endif}
+  ReadRegStr $PathBibTeXEditor HKLM "SOFTWARE\JabRef" "Path"
+  # if not installed as admin, check for user
   ${if} $PathBibTeXEditor == ""
    ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
   ${endif}
+  ${if} ${RunningX64}
+   SetRegView 32
+  ${endif}
 
   ${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"
    StrCpy $PathBibTeXEditor ""