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

System::Call can call exports by ordinal with dll::#123 syntax

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6420 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-12-09 01:17:55 +00:00
parent f9fae88303
commit 18c0cbe3ec
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Contrib/System/Source/System.c
View file

@ -465,7 +465,12 @@ SystemProc *PrepareProc(BOOL NeedForCall)
switch (*ib)
{
case 0x0: SectionType = -1; break;
case _T('#'): SectionType = PST_PROC; ProcType = PT_NOTHING; break;
case _T('#'): // "...#" redefines proc unless preceded by ":", then it's an ordinal (dll::#123)
if (ib <= ibuf || *(ib-1) != _T(':') || PST_PROC != SectionType)
SectionType = PST_PROC, ProcType = PT_NOTHING;
else
changed = FALSE;
break;
case _T('('):
SectionType = PST_PARAMS;
// fake-real parameter: for COM interfaces first param is Interface Pointer
@ -862,6 +867,12 @@ SystemProc *PrepareProc(BOOL NeedForCall)
// Get proc address
proc->Proc = NSISGetProcAddress(proc->Dll, proc->ProcName);
if (!proc->Proc && *proc->ProcName == _T('#'))
{
int ordinal = myatoi(proc->ProcName+1);
if (ordinal && IS_INTRESOURCE(ordinal))
proc->Proc = GetProcAddress(proc->Dll, MAKEINTRESOURCEA(ordinal));
}
if (UsedTString || !proc->Proc)
{
FARPROC tproc;
@ -876,7 +887,7 @@ SystemProc *PrepareProc(BOOL NeedForCall)
if (tproc)
proc->Proc = tproc;
else
proc->ProcResult = PR_ERROR;
if (!proc->Proc) proc->ProcResult = PR_ERROR;
}
}
break;