1 diff --git a/nsis-3.0b3-src/SCons/Config/ms b/nsis-3.0b3-src/SCons/Config/ms
2 index 32d3d33..d2c4d25 100644
3 --- a/nsis-3.0b3-src/SCons/Config/ms
4 +++ b/nsis-3.0b3-src/SCons/Config/ms
5 @@ -16,7 +16,7 @@ def entry(x,u):
7 defenv['ENTRY_FLAG'] = entry
8 defenv['MAP_FLAG'] = '/map'
9 -defenv['NODEFLIBS_FLAG'] = '/NODEFAULTLIB'
10 +#defenv['NODEFLIBS_FLAG'] = '/NODEFAULTLIB'
11 defenv['C_FLAG'] = '/TC'
12 defenv['CPP_FLAG'] = '/TP'
13 defenv['CPP_REQUIRES_STDLIB'] = 0
14 @@ -29,7 +29,7 @@ defenv['STDCALL'] = '__stdcall'
15 msvs_version = float(defenv['MSVS_VERSION'].replace('Exp',''))
16 if msvs_version >= 8.0:
17 defenv['EXCEPTION_FLAG'] = '/EHsc'
18 - defenv.Append(CCFLAGS = ['/GS-'])
19 + defenv.Append(CCFLAGS = ['/GS'])
20 defenv.Append(CPPDEFINES = ['_CRT_SECURE_NO_WARNINGS', '_CRT_NONSTDC_NO_WARNINGS', '_CRT_SECURE_NO_DEPRECATE', '_CRT_NON_CONFORMING_SWPRINTFS'])
21 defenv['MSVCRT_FLAG'] = '/MT' # Avoid msvcr?0.dll dependency
23 @@ -43,6 +43,10 @@ if msvs_version >= 11.0:
24 defenv['SUBSYS_CON'] = '/subsystem:console,5.01' # support windows xp
25 defenv['SUBSYS_WIN'] = '/subsystem:windows,5.01' # support windows xp
27 +if msvs_version >= 14.0:
28 + defenv.Append(CCFLAGS = ['/guard:cf'])
29 + defenv.Append(LINKFLAGS = ['/guard:cf'])
33 defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')])
34 @@ -143,9 +147,9 @@ stub_env.Append(CCFLAGS = ['/Fa${TARGET}.lst']) # listing file name
35 stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no default libraries
36 stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
38 -if msvs_version >= 10.0:
39 - # no relocations that our resource editor ignores
40 - stub_env.Append(LINKFLAGS = ['/FIXED'])
41 +#if msvs_version >= 10.0:
42 +# # no relocations that our resource editor ignores
43 +# stub_env.Append(LINKFLAGS = ['/FIXED'])
45 stub_uenv = stub_env.Clone()
46 stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
47 diff --git a/nsis-3.0b3-src/Source/exehead/Main.c b/nsis-3.0b3-src/Source/exehead/Main.c
48 index eb231e7..e4642ce 100644
49 --- a/nsis-3.0b3-src/Source/exehead/Main.c
50 +++ b/nsis-3.0b3-src/Source/exehead/Main.c
51 @@ -84,6 +84,7 @@ void *g_SHGetFolderPath;
52 NSIS_ENTRYPOINT_GUINOCRT
53 EXTERN_C void NSISWinMainNOCRT()
55 + __security_init_cookie();
57 const TCHAR *m_Err = _LANG_ERRORWRITINGTEMP;