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

PEAddResource now supports the res: protocol

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7301 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2021-08-23 21:50:59 +00:00
parent aca76bc307
commit 1531c8e23e
9 changed files with 267 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/script.cpp
View file

@ -2255,7 +2255,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
case TOK_PEADDRESOURCE:
{
init_res_editor();
int tokidx = 1, ovr = 0, rep = 0;
int tokidx = 1, ovr = 0, rep = 0, result = PS_ERROR;
if (!_tcsicmp(line.gettoken_str(tokidx), _T("/OVERWRITE"))) // Update the resource even if it exists
++ovr, ++tokidx;
else if (!_tcsicmp(line.gettoken_str(tokidx), _T("/REPLACE"))) // Only update existing resource
@ -2275,15 +2275,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG(_T("Error: Resource %") NPRIns _T("\n"), rep ? ("does not exist") : ("already exists"));
return PS_ERROR;
}
int result = PS_ERROR;
if (FILE*f = FOPEN(line.gettoken_str(tokidx+0), ("rb")))
if (res_editor->UpdateResourceFromExternal(rt, rn, rl, line.gettoken_str(tokidx+0), CResourceEditor::TM_AUTO))
{
if (res_editor->UpdateResource(rt, rn, rl, f, CResourceEditor::TM_AUTO))
{
SCRIPT_MSG(_T("PEAddResource: %") NPRIs _T("=%") NPRIs _T("\n"), make_friendly_resource_path(rt, rnraw, rl).c_str(), line.gettoken_str(tokidx+0));
result = PS_OK;
}
fclose(f);
SCRIPT_MSG(_T("PEAddResource: %") NPRIs _T("=%") NPRIs _T("\n"), make_friendly_resource_path(rt, rnraw, rl).c_str(), line.gettoken_str(tokidx+0));
result = PS_OK;
}
return result;
}