Make LyX compiled by MSVC 2015 run on Vista again

Patch and tests from Dima Ruinskiy, comments by me. For details see discussion
in bug 10186.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33daf5b699a493a2184a2fe5c812ba17b1a2dd38..81adb1ff230494d56167c5e07762492f30fa4a41 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -766,10 +766,14 @@ if(WIN32)
                set(WIN32_CONSOLE WIN32)
        endif()
        if(MSVC)
-               add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
+               # -DPSAPI_VERSION=1 is needed to run on vista (bug 10186)
+               add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX -DPSAPI_VERSION=1)
                # disable checked iterators for msvc release builds to get maximum speed
                set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
        else()
+               # -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h
+               # does not use it and always declares the vista compatible API.
+               # If this ever changes then -DPSAPI_VERSION might be needed here as well. 
                add_definitions(-DWINVER=0x0500)
        endif()
 endif()

diff --git a/lib/CREDITS b/lib/CREDITS
index 3967ef5100a0daf18979dc54ba25124c9e6d2096..cfd6d31a7fc98aac70fc9f89a2338232b74e327e 100644 (file)
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -468,6 +468,9 @@
 @bPaul A. Rubin
 @iE-mail: rubin () msu ! edu
    Major rework of the AMS classes
+@bDima Ruinskiy
+@iE-mail: dima.ruinskiy () outlook ! com
+   Reintroduction of Windows Vista support (bug 10186)
 @bGuy Rutenberg
 @iE-mail: guyrutenberg () gmail ! com
    System call fixes

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index a2e690658362378990e1e6495c173ca691b7d0b5..262dafae00a2f10d3844a93568279a0ffb21ff31 100755 (executable)
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -1571,6 +1571,14 @@ contributors = [
                  "25 September 2007",
                  u"Major rework of the AMS classes"),
 
+     contributor(u"Dima Ruinskiy",
+                 "dima.ruinskiy () outlook ! com",
+                 "GPL",
+                 "Joining LyX development team",
+                 "m=146687842921797",
+                 "24 June 2016",
+                 u"Reintroduction of Windows Vista support (bug 10186)"),
+
      contributor(u"Guy Rutenberg",
                  "guyrutenberg () gmail ! com",
                  "GPL",

diff --git a/status.22x b/status.22x
index f13c03bc9726560ee3b131d96861eff1811f1d52..f4d5840c259da48179f32f64055ac9ef2acf50b9 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -198,3 +198,6 @@ What's new
 - Fix monolithic builds with autotools on Mac OS X.
 
 - Avoid 'ar' warning with recent binutils versions.
+
+- LyX compiled with Microsoft Visual Studio 2015 runs now on Windows Vista (bug 10186)
+