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): 6 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 22 else: 23 @@ -143,9 +143,9 @@ stub_env.Append(CCFLAGS = ['/Fa${TARGET}.lst']) # listing file name 24 stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no default libraries 25 stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file 26 27 -if msvs_version >= 10.0: 28 - # no relocations that our resource editor ignores 29 - stub_env.Append(LINKFLAGS = ['/FIXED']) 30 +#if msvs_version >= 10.0: 31 +# # no relocations that our resource editor ignores 32 +# stub_env.Append(LINKFLAGS = ['/FIXED']) 33 34 stub_uenv = stub_env.Clone() 35 stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) 36 diff --git a/nsis-3.0b3-src/Source/exehead/Main.c b/nsis-3.0b3-src/Source/exehead/Main.c 37 index eb231e7..e4642ce 100644 38 --- a/nsis-3.0b3-src/Source/exehead/Main.c 39 +++ b/nsis-3.0b3-src/Source/exehead/Main.c 40 @@ -84,6 +84,7 @@ void *g_SHGetFolderPath; 41 NSIS_ENTRYPOINT_GUINOCRT 42 EXTERN_C void NSISWinMainNOCRT() 43 { 44 + __security_init_cookie(); 45 int ret = 0; 46 const TCHAR *m_Err = _LANG_ERRORWRITINGTEMP; 47 48
