From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 4 Feb 2018 18:37:40 +0000 (+0100)
Subject: patch 8.0.1473: MS-Windows: D&D fails between 32 and 64 bit apps
X-Git-Tag: v8.0.1473
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=511ffdd65d48b0597ed10614d161b5e811342058;p=vim

patch 8.0.1473: MS-Windows: D&D fails between 32 and 64 bit apps

Problem:    MS-Windows: D&D fails between 32 and 64 bit apps.
Solution:   Add the /HIGHENTROPYVA:NO linker option. (Ken Takata, closes #2504)
---

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index b496e5a5c..c2e808c95 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1179,6 +1179,13 @@ LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
 !endif
 !endif
 
+!if $(MSVC_MAJOR) >= 11 && "$(CPU)" == "AMD64" && "$(GUI)" == "yes"
+# This option is required for VC2012 or later so that 64-bit gvim can
+# accept D&D from 32-bit applications.  NOTE: This disables 64-bit ASLR,
+# therefore the security level becomes as same as VC2010.
+LINKARGS1 = $(LINKARGS1) /HIGHENTROPYVA:NO
+!endif
+
 all:	$(VIM).exe \
 	vimrun.exe \
 	install.exe \
diff --git a/src/version.c b/src/version.c
index 5c4e17ba9..8f3430399 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1473,
 /**/
     1472,
 /**/