dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

moved VARS_SECTION_NAME from config.h to config.py and renamed it to NSIS_VARS_SECTION

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4495 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-01-21 15:17:28 +00:00
parent 5e71f67d63
commit dcc5a3c002
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
SCons/config.py
View file

@ -28,6 +28,14 @@ cfg.Add(
) )
) )
cfg.Add(
(
'NSIS_VARS_SECTION',
'defines the name of the PE section containing the runtime variables',
'.ndata'
)
)
cfg.Add( cfg.Add(
BoolOption( BoolOption(
'NSIS_CONFIG_UNINSTALL_SUPPORT', 'NSIS_CONFIG_UNINSTALL_SUPPORT',
@ -426,6 +434,7 @@ def AddBoolDefine(define):
AddValuedDefine('NSIS_MAX_STRLEN') AddValuedDefine('NSIS_MAX_STRLEN')
AddValuedDefine('NSIS_MAX_INST_TYPES') AddValuedDefine('NSIS_MAX_INST_TYPES')
AddValuedDefine('NSIS_DEFAULT_LANG') AddValuedDefine('NSIS_DEFAULT_LANG')
AddValuedDefine('NSIS_VARS_SECTION')
AddBoolDefine('NSIS_CONFIG_UNINSTALL_SUPPORT') AddBoolDefine('NSIS_CONFIG_UNINSTALL_SUPPORT')
AddBoolDefine('NSIS_CONFIG_LICENSEPAGE') AddBoolDefine('NSIS_CONFIG_LICENSEPAGE')

4
Source/build.cpp
View file

@ -2372,9 +2372,9 @@ int CEXEBuild::write_output(void)
VerifyDeclaredUserVarRefs(&m_UserVarNames); VerifyDeclaredUserVarRefs(&m_UserVarNames);
int MaxUserVars = m_UserVarNames.getnum(); int MaxUserVars = m_UserVarNames.getnum();
// -1 because the default size is 1 // -1 because the default size is 1
if (!res_editor->AddExtraVirtualSize2PESection(VARS_SECTION_NAME, (MaxUserVars - 1) * sizeof(NSIS_STRING))) if (!res_editor->AddExtraVirtualSize2PESection(NSIS_VARS_SECTION, (MaxUserVars - 1) * sizeof(NSIS_STRING)))
{ {
ERROR_MSG("Internal compiler error #12346: invalid exehead cannot find section \"%s\"!\n", VARS_SECTION_NAME); ERROR_MSG("Internal compiler error #12346: invalid exehead cannot find section \"%s\"!\n", NSIS_VARS_SECTION);
return PS_ERROR; return PS_ERROR;
} }

2
Source/exehead/config.h
View file

@ -126,8 +126,6 @@
#define NSIS_DEFAULT_LANG 1033 #define NSIS_DEFAULT_LANG 1033
#endif #endif
#define VARS_SECTION_NAME ".ndata"
typedef char NSIS_STRING[NSIS_MAX_STRLEN]; typedef char NSIS_STRING[NSIS_MAX_STRLEN];
#endif//!APSTUDIO_INVOKED #endif//!APSTUDIO_INVOKED

6
Source/exehead/util.c
View file

@ -21,13 +21,13 @@ char g_log_file[1024];
// which result in extra memory for extra variables without code to do allocation :) // which result in extra memory for extra variables without code to do allocation :)
// nsis then removes the "DISCARDABLE" style from section (for safe) // nsis then removes the "DISCARDABLE" style from section (for safe)
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma bss_seg(VARS_SECTION_NAME) # pragma bss_seg(NSIS_VARS_SECTION)
NSIS_STRING g_usrvars[1]; NSIS_STRING g_usrvars[1];
# pragma bss_seg() # pragma bss_seg()
# pragma comment(linker, "/section:" VARS_SECTION_NAME ",rwd") # pragma comment(linker, "/section:" NSIS_VARS_SECTION ",rwd")
#else #else
# ifdef __GNUC__ # ifdef __GNUC__
NSIS_STRING g_usrvars[1] __attribute__((section (VARS_SECTION_NAME))); NSIS_STRING g_usrvars[1] __attribute__((section (NSIS_VARS_SECTION)));
# else # else
# error Unknown compiler. You must implement the seperate PE section yourself. # error Unknown compiler. You must implement the seperate PE section yourself.
# endif # endif