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

added missing try catch block for init_res_editor calls

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4579 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-03-11 18:19:10 +00:00
parent cfe99c1c26
commit aa3bda79fb
1 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/build.cpp
View file

@ -1728,6 +1728,8 @@ int CEXEBuild::AddVersionInfo()
rVersionInfo.SetFileVersion(MAKELONG(iml, imm),MAKELONG(ill, ilm)); rVersionInfo.SetFileVersion(MAKELONG(iml, imm),MAKELONG(ill, ilm));
rVersionInfo.SetProductVersion(MAKELONG(iml, imm),MAKELONG(ill, ilm)); rVersionInfo.SetProductVersion(MAKELONG(iml, imm),MAKELONG(ill, ilm));
try
{
init_res_editor(); init_res_editor();
for ( int i = 0; i < rVersionInfo.GetStringTablesCount(); i++ ) for ( int i = 0; i < rVersionInfo.GetStringTablesCount(); i++ )
{ {
@ -1746,6 +1748,11 @@ int CEXEBuild::AddVersionInfo()
res_editor->UpdateResource(RT_VERSION, 1, lang_id, (BYTE*)VerInfoStream.get(), VerInfoStream.getlen()); res_editor->UpdateResource(RT_VERSION, 1, lang_id, (BYTE*)VerInfoStream.get(), VerInfoStream.getlen());
} }
} }
catch (exception& err) {
ERROR_MSG("Error adding version information: %s\n", err.what());
return PS_ERROR;
}
}
} }
return PS_OK; return PS_OK;
@ -2393,7 +2400,9 @@ int CEXEBuild::write_output(void)
// Generate language tables // Generate language tables
RET_UNLESS_OK( GenerateLangTables() ); RET_UNLESS_OK( GenerateLangTables() );
try {
init_res_editor(); init_res_editor();
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
@ -2404,7 +2413,6 @@ int CEXEBuild::write_output(void)
} }
// Save all changes to the exe header // Save all changes to the exe header
try {
close_res_editor(); close_res_editor();
} }
catch (exception& err) { catch (exception& err) {