# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1517769905 -3600
# Node ID ac68616f0cf7578573fbe09738a352db61dde8f1
# Parent  ffbc5e141df52f748996966d9d6bfc89194e9d83
patch 8.0.1473: MS-Windows: D&D fails between 32 and 64 bit apps

commit https://github.com/vim/vim/commit/511ffdd65d48b0597ed10614d161b5e811342058
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Feb 4 19:37:40 2018 +0100

    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 https://github.com/vim/vim/issues/2504)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1473,
+/**/
     1472,
 /**/
     1471,