Skip to content

Commit 511ffdd

Browse files
committed
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)
1 parent 5d42474 commit 511ffdd

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

src/Make_mvc.mak

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,6 +1179,13 @@ LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
11791179
!endif
11801180
!endif
11811181

1182+
!if $(MSVC_MAJOR) >= 11 && "$(CPU)" == "AMD64" && "$(GUI)" == "yes"
1183+
# This option is required for VC2012 or later so that 64-bit gvim can
1184+
# accept D&D from 32-bit applications. NOTE: This disables 64-bit ASLR,
1185+
# therefore the security level becomes as same as VC2010.
1186+
LINKARGS1 = $(LINKARGS1) /HIGHENTROPYVA:NO
1187+
!endif
1188+
11821189
all: $(VIM).exe \
11831190
vimrun.exe \
11841191
install.exe \

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ static char *(features[]) =
771771

772772
static int included_patches[] =
773773
{ /* Add new patch number below this line */
774+
/**/
775+
1473,
774776
/**/
775777
1472,
776778
/**/

0 commit comments

Comments
 (0)