diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-02-04 19:37:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-02-04 19:37:40 +0100 |
| commit | 511ffdd65d48b0597ed10614d161b5e811342058 (patch) | |
| tree | 46c980ae5eec88be1a07053bfeed54e8326e02b2 | |
| parent | 5d4247402b7195c6872485ddf1600a1cea723027 (diff) | |
patch 8.0.1473: MS-Windows: D&D fails between 32 and 64 bit appsv8.0.1473
Problem: MS-Windows: D&D fails between 32 and 64 bit apps.
Solution: Add the /HIGHENTROPYVA:NO linker option. (Ken Takata, closes #2504)
| -rw-r--r-- | src/Make_mvc.mak | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index b496e5a5c2..c2e808c954 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 5c4e17ba9c..8f34303999 100644 --- 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, |